BuffelSaft
d2eb5f0e61
Remove shell trap effect code
...
Left strings and animations as those were fine, but code was non-functional and fixing it was not trivial.
2021-11-22 14:46:47 +13:00
ultima-soul
3ed51d6d91
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-11-21 10:40:26 -08:00
W1serV1ser
c2f81cd5f5
Added Sky Drop
2021-11-20 11:44:48 -08:00
BuffelSaft
98712e576e
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2
2021-11-19 17:48:11 +13:00
BuffelSaft
16a4fc9062
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike
2021-11-19 16:33:24 +13:00
LOuroboros
5c485d9769
Fixed Fling when gLastUsedItem is 0
...
Also renamed VARIOUS_JUMP_IF_NO_FLING_POWER to VARIOUS_JUMP_IF_FLING_FAILS.
2021-11-15 14:02:33 -03:00
LOuroboros
a01fd2eb7a
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into flingBE
2021-11-15 12:47:26 -03:00
LOuroboros
cbb6639f8d
Fling tweaks
...
-Updated and renamed VARIOUS_JUMP_IF_FLING_FAILS (now VARIOUS_JUMP_IF_NO_FLING_POWER)
-Updated BattleScript_EffectFling following Smogon's description of Fling's effect.
-Refactored BattleScript_FlingMentalHerb thanks to GetMentalHerbEffect
-No need to define flingPower when its value is 0
-Forced the target to eat a berry that was flung at them by overwriting their item with the berry thrown and restoring their original item after its effect finishes.
-Added a preproc config for Klutz.
2021-11-15 12:40:10 -03:00
ghoulslash
940a165be7
merge w be
2021-11-13 09:09:15 -05:00
LOuroboros
2fe015e5ce
Implemented Fling
2021-11-13 10:27:05 -03:00
BuffelSaft
04867ac0d3
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike
2021-11-13 17:33:25 +13:00
BuffelSaft
55b279ba0a
Fix several move effects
...
Dragon Tail, Natural Gift, Spit Up all hit twice now. Could maybe use isparentalbondlaststrike instead of some of the other checks too.
2021-11-13 16:29:12 +13:00
Eduardo Quezada D'Ottone
a7870dbef0
Merge branch 'battle_engine' into magician
2021-11-12 19:40:34 -03:00
ghoulslash
a26da51e9d
fix contrary animations for MOVE_EFFECT_statchange
2021-11-12 12:44:45 -05:00
BuffelSaft
e2599c2469
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch1
2021-11-10 14:31:32 +13:00
BuffelSaft
72d12a575d
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike
2021-11-07 12:13:18 +13:00
ghoulslash
da6ec51fc2
merge w be
2021-11-06 10:43:35 -04:00
ghoulslash
41bf1dc2f4
merge w be
2021-11-06 10:40:57 -04:00
LOuroboros
5f458c9cd3
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into photonGeyser
2021-11-05 10:58:53 -03:00
BuffelSaft
ee83d1142c
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch1
2021-11-05 21:40:05 +13:00
LOuroboros
4f251e6ec2
Moved VARIOUS_TRY_TO_REVERT_MIMICRY to VARIOUS_REMOVE_TERRAIN
2021-11-04 12:13:55 -03:00
BuffelSaft
cecd341011
Fix Tar Shot
...
If Tar Shot can't do anything to the target it should fail. Checking this is clunky, but it works.
2021-11-04 20:47:45 +13:00
BuffelSaft
28e78cb6c4
Gen 8 moves initial commit
...
Full credit to Nunuchu42 and cfmnephrite for this code.
2021-11-04 19:50:54 +13:00
LOuroboros
b931e34172
Handled Mimicry's interaction with Steel Roller's effect
2021-11-03 23:23:28 -03:00
LOuroboros
f6628e301f
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into mimicry
2021-11-03 20:43:33 -03:00
ghoulslash
48c29a9cd8
proper mirror armor sticky web targeting
2021-11-03 15:05:52 -04:00
LOuroboros
af6e72ecfe
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into photonGeyser
2021-11-03 08:56:01 -03:00
LOuroboros
69b42de0d9
Implemented Mimicry
...
Thanks to AsparagusEduardo for helping me optimize RestoreBattlerOriginalTypes.
2021-11-02 14:44:55 -03:00
ghoulslash
ffcba355b0
merge w be
2021-11-02 10:36:08 -04:00
ghoulslash
98b4b821dc
merge with be
2021-11-01 13:55:55 -04:00
ghoulslash
a1e64fce4f
handle simple beam, gastro acid
2021-11-01 13:50:57 -04:00
ghoulslash
b5d20da927
merge with be
2021-11-01 11:36:18 -04:00
BuffelSaft
fb25e1ac98
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike
2021-11-01 22:37:23 +13:00
ghoulslash
468ee66cd8
fix synthesis and leaf guard w utility umbrella
2021-10-30 11:04:50 -04:00
ghoulslash
af914ee7ed
merge w be
2021-10-29 22:33:50 -04:00
ghoulslash
f342e7c590
merge with be
2021-10-28 17:03:10 -04:00
LOuroboros
a77f058146
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into photonGeyser
2021-10-28 14:24:43 -03:00
LOuroboros
82101d3581
Optimizations
2021-10-28 14:02:43 -03:00
LOuroboros
28522f3ffb
Fixed Hyperspace Fury not breaking through protections
...
Also repositioned VARIOUS_JUMP_IF_SPECIES.
2021-10-28 12:09:44 -03:00
ghoulslash
bebaded415
merge with be
2021-10-27 16:48:38 -04:00
LOuroboros
fc7f1acf20
Merge branch 'Photon_Geyser' of https://github.com/MissingNoL/pokeemerald-expansion into photonGeyser
2021-10-27 11:13:59 -03:00
LOuroboros
1ab8c84f41
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into hyperspaceFury
2021-10-26 21:23:21 -03:00
Eduardo Quezada D'Ottone
76b6250104
Merge branch 'battle_engine' into plasmaFists
2021-10-23 11:06:34 -03:00
LOuroboros
a6315ffc75
Implemented Plasma Fists
2021-10-19 09:50:18 -03:00
LOuroboros
d9b8e11a9c
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into primalReversionBE
2021-10-19 07:47:42 -03:00
BuffelSaft
e59be67023
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike
2021-10-15 16:25:11 +13:00
Eduardo Quezada D'Ottone
21837b659a
Merge branch 'battle_engine' into bug_bite
2021-10-14 19:46:50 -03:00
BuffelSaft
fc6e8f598c
Merge branch 'battle_engine' into battle_bond
2021-10-14 16:24:59 +13:00
BuffelSaft
bb8d0e3d6b
Fix Battle Bond
...
Battle Bond Greninja transforms only after a KO, and doesn't revert when switched out.
2021-10-14 16:18:11 +13:00
ghoulslash
a3d2bdc9cf
merge with be
2021-10-13 18:30:53 -04:00
GriffinR
def6cc8158
Label battle script macro arguments
2021-10-13 17:44:04 -04:00
GriffinR
fc15b0d5f0
Add controller buffer constants, finish misc battle doc
2021-10-13 16:21:39 -04:00
ghoulslash
996301d5d3
add mirror armor
2021-10-12 18:04:34 -04:00
ghoulslash
bbd09fdcf7
add wandering spirit
2021-10-12 10:32:51 -04:00
ghoulslash
06bcfea3b8
merge with be
2021-10-10 19:56:33 -04:00
LOuroboros
91a68cd5db
Implemented Primal Reversion
2021-10-09 00:36:41 -03:00
BuffelSaft
07bdd2ffe6
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike
2021-10-09 15:18:51 +13:00
ghoulslash
ce455ac7e7
merge with be
2021-10-08 07:44:32 -04:00
ghoulslash
9a4e0cf757
magician fixes, handle edge cases
2021-10-07 17:37:47 -04:00
ghoulslash
4aeadd96c9
merge with be
2021-10-06 14:49:23 -04:00
ghoulslash
4382420dd2
merge with be
2021-10-06 13:32:59 -04:00
LOuroboros
b85b3094c8
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into primalAbilitiesDev
2021-10-03 07:05:56 -03:00
ghoulslash
761006a164
merge with be
2021-09-26 19:19:32 -04:00
GriffinR
a66d7e1b43
Document some single-remaining symbols
2021-09-24 17:14:20 -04:00
ghoulslash
2f69748e0d
merge with be
2021-09-23 14:38:01 -04:00
ghoulslash
94ec25319f
syntax fixes. Use BlocksPrankster for perish song battle script
2021-09-23 14:35:37 -04:00
BuffelSaft
530998c4b7
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike
2021-09-23 16:41:35 +12:00
BuffelSaft
2f03ac31b9
Multihit refactor and Parental Bond
...
Port multihit system from the CFRU, implement Parental Bond, refactor certain moves as required and implement all remaining multi hit moves except Dragon Darts.
2021-09-23 14:31:21 +12:00
ghoulslash
13062b5a8f
fix lash out, obstruct, and decorate
2021-09-22 09:43:40 -04:00
ghoulslash
0ea6c65b83
merge with be
2021-09-17 09:10:09 -04:00
ghoulslash
b916d7991c
merge with be
2021-09-16 21:52:29 -04:00
ghoulslash
af8d86f0c9
merge with be
2021-09-16 13:33:35 -04:00
ghoulslash
c2e0990aab
fix some merge conflicts
2021-09-16 13:29:36 -04:00
ghoulslash
9d8672e3df
merge with be
2021-09-16 13:12:59 -04:00
ghoulslash
9c94eb6140
but it failed check for rototiller
2021-09-16 10:24:32 -04:00
ghoulslash
aa475ab300
merge with be
2021-09-15 16:42:23 -04:00
ghoulslash
60713a8f2d
fix room service activation msg, stat target
2021-09-14 12:50:36 -04:00
ghoulslash
95af97593b
fix some comment styling. fix throat spray for multi-target moves
2021-09-14 11:53:35 -04:00
ghoulslash
6ce1227447
fix throat spray bugs. move shell bell, throat spray etc to life orb moveend case
2021-09-03 11:05:11 -04:00
ExpoSeed
5a5c257f68
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves
2021-09-02 21:43:20 -05:00
ghoulslash
7c53214dad
merge with be
2021-09-02 15:33:42 -04:00
LOuroboros
9e4f33d09e
Implemented Desolate Land, Primordial Sea and Delta Stream
2021-08-27 17:56:43 -03:00
ghoulslash
c7c0fbc296
merge with be, make AI CanBeStatused functions separate from general util ones
2021-08-12 13:37:53 -06:00
ghoulslash
d218322b2c
merge with be
2021-08-12 01:26:13 -04:00
ghoulslash
4ca6d76160
add bug bite
2021-07-25 14:55:52 -06:00
ghoulslash
c914ed8572
fix sucker punch, surging strikes, obstruct, and snipe shot
2021-07-25 09:38:54 -06:00
ghoulslash
a37d4c3da9
merge with be, give life dew jungle healing effect
2021-07-25 08:22:05 -06:00
Xhyzi
c2bd046ea6
Shell Trap
2021-06-15 20:22:50 +02:00
Xhyzi
155e9b6332
Court Change
2021-06-15 20:14:10 +02:00
Xhyzi
0202b75822
Beak Blast
2021-06-15 19:57:21 +02:00
Xhyzi
7799e49e3a
Corrosive Gas
2021-06-15 19:45:24 +02:00
MissingNoL
bfc66a21cc
gBattlescriptCurrInstr[3] is not reading species parameter
2021-06-06 19:14:11 -07:00
MissingNoL
921b80de7c
Update battle_script_commands.h
...
Properly aligned the list of number IDs
2021-06-05 16:40:03 -07:00
MissingNoL
f30a9542ee
Problem: Photon Geyser is calculating as Shell Side Arm?? Needs: Poison effect, contact move for Shell Side Arm
2021-05-27 22:21:55 -07:00
ghoulslash
c356ffaed4
merge with be. fix null ptr check in GetBattleMoveSplit
2021-05-24 10:46:53 -06:00
ghoulslash
5840b1f0ed
utility umbrella effect
2021-05-24 09:52:45 -06:00
ultima-soul
14a0303e2f
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-27 18:36:37 -07:00
GriffinR
f4d8a91ba4
Misc battle script cleanup
2021-04-03 14:07:31 -04:00
GriffinR
c9d3b26ff7
Label miss string indexes
2021-04-02 02:12:46 -04:00
Evan
b130396c0e
merge with be
2021-03-01 17:05:10 -07:00
Evan
f4d4cf262e
fix screen cleaner, curious medicine, as one
2021-02-02 09:00:07 -07:00
Evan
c009b51ae8
add grassy glide, misty explosion, steel roller, obstruct, behemoth, decorate, snipe shot
2021-01-28 13:27:00 -07:00
Evan
dd51edd881
add eerie spell, surging strikes, jungle healing
2021-01-28 10:51:00 -07:00
Evan
8ec12c665c
merge with be
2021-01-20 17:36:13 -07:00
Evan
e61309dce6
merge with be
2021-01-20 17:34:24 -07:00
Evan
16d54b6d32
merge with be, add form checks to CanBattlerGetOrLoseItem
2021-01-20 14:28:03 -07:00
Evan
10b1d33d13
handle battler being affected by terrain
2021-01-16 12:05:51 -07:00
Evan
8ef6a2c80d
merge with be
2021-01-13 14:23:30 -07:00
Evan
1e22ae4cf2
merge with be
2021-01-10 09:08:25 -07:00
Evan
b5128be68b
eject packer invisible before openpartymenu
2021-01-08 08:02:00 -07:00
Evan
5eb49722c0
add red card effect
2021-01-07 19:33:39 -07:00
Evan
7fffe23e63
add terrain seeds
2021-01-06 20:22:05 -07:00
Evan
d5d2cac60c
init branch
2021-01-06 14:42:45 -07:00
Evan
0a3908ee92
add neigh and as one abilities
2021-01-05 19:37:23 -07:00
BuffelSaft
10cf5b3673
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into Batte_Engine_Only
2021-01-04 10:55:30 +13:00
Evan
a0b9ece980
merge with BE
2020-12-20 16:39:50 -07:00
Evan
e70e2bcd65
merge with be
2020-12-14 09:09:51 -07:00
Evan
b85dacce9d
fix conflicts
2020-12-14 08:50:41 -07:00
Evan
34dd11448b
sticky barb transfer + pickpocket combo, fix CanBattlerGetOrLoseItem
2020-12-09 10:28:18 -07:00
BuffelSaft
72b769ec75
Add config options for Jump Kick
...
Added options for:
- Gen 4 style recoil when target is immune (user takes 50% of target's max HP)
- Gen 3 style recoil when target is immune (i.e no recoil)
- Gen 5+ recoil was already implemented but was bugged
2020-12-07 19:30:31 +13:00
Evan
4060b09bd6
expand top left move window. add z move init anim
2020-11-27 17:06:36 -05:00
Evan
ef43596a79
toggleable manual ability popup destruction
2020-11-19 15:16:27 -07:00
Evan
99d9a36860
add totem boosts
2020-11-19 10:35:37 -07:00
Evan
64bcac4589
move pickpocket to back of moveend sequence
2020-11-12 23:30:00 -07:00
DizzyEggg
0066640a1e
Merge with master
2020-07-27 14:51:39 +02:00
GriffinR
aba42513d3
Clean up some battle scr cmd data
2020-07-18 18:10:15 -04:00
DizzyEggg
1a94d27fe6
Emergency Exit
2020-07-15 17:21:12 +02:00
DizzyEggg
3bdf675221
Hopefully illusion works as intended now
2020-06-28 19:45:48 +02:00
Eduardo Alvaro Quezada D'Ottone
9fb073ca23
Some cleanup ( #454 )
...
* Toxic Thread doesn't have power.
* Added missing commas.
* Autotomize typo.
It wasn't until today that I learned that autotomize was a word.
2020-06-27 11:21:13 +02:00
DizzyEggg
548a43f8d9
Rocky Helmet before Knock Off
2020-06-25 16:15:11 +02:00
Eduardo Alvaro Quezada D'Ottone
8d848997c9
Battle Configs: The Revenge ( #363 )
...
* Turns for Uproar
* Chances for the amount of hits with multi-hit moves.
* Electric type mon's immunity to paralysis
* (Hi) Jump Kick to always do 1/2 of maxHP when crashing
* Turns for Disable.
* Minimized mons can always be hit by moves like Stomp
* Grass types immune to powder and spore moves.
* Psywave's damage formula
* Fixed random usage.
2020-05-28 10:38:27 +02:00
DizzyEggg
ee68f0f826
Fix switch-in abilities when shift style switch
2020-04-25 11:17:59 +02:00
DizzyEggg
40ce053ce1
Adrenaline Orb
2020-04-22 15:12:25 +02:00
DizzyEggg
d56aaf7c0b
Destiny Knot
2020-04-22 14:40:44 +02:00
DizzyEggg
c8ba013539
Power Herb
2020-04-22 10:44:19 +02:00
Eduardo Alvaro Quezada D'Ottone
c5a6acc7db
Corrosion ( #306 )
...
* Status move poisoning for Steel and Poison types.
* Can poison itself with Toxic Orb.
* Secondary effect poisoning now working.
* Created a function that checks if abilities can bypass type immunities.
* Created macro to handle typeimmunity
* Applied review changes.
* Applied review requests.
* Left more readable version of HOLD_EFFECT_TOXIC_ORB.
2020-04-21 15:59:19 +02:00
DizzyEggg
328e951afa
Ally Switch, tbd
2020-04-20 20:05:04 +02:00
DizzyEggg
0f628c8ff2
Fairy Lock
2020-04-20 19:41:07 +02:00
DizzyEggg
dd17360ab0
Zen Mode and Shields Down
2020-04-19 21:18:39 +02:00
DizzyEggg
ad481c8688
Moody
2020-04-19 15:44:44 +02:00
DizzyEggg
c01ed5325c
Poison Touch fix
2020-04-19 14:43:54 +02:00
DizzyEggg
6a3944d27c
Frisk, would be easier if it didnt scan 2 opponents
2020-04-19 13:37:56 +02:00
DizzyEggg
e62f1475d4
Beast Boost and Receiver
2020-04-19 12:07:56 +02:00
DizzyEggg
e42ead10c9
Soul Heart
2020-04-18 19:59:09 +02:00
DizzyEggg
34f5d9e2ae
Burn Up And Purify
2020-04-17 21:14:26 +02:00
Eduardo Alvaro Quezada D'Ottone
2b9eb00486
Mind blown ( #302 )
...
* Mind Blown Part 1 (Definition and self-damage)
* Mind Blown Part 2 (Damp interaction)
2020-04-14 09:27:29 +02:00
DizzyEggg
cb5b673f8a
Big Root and STRENGTH Sap
2020-04-13 15:00:17 +02:00
DizzyEggg
39e3b0b740
Form changes layout and Stance Change Aegi
2019-12-31 19:11:53 +01:00
Nephrite
0343f63eda
Dancer
...
Implemented Dancer and all relevant code for interacting with abilities, certain moves, etc
2019-12-07 10:19:01 +00:00
DizzyEggg
ea6736cd8d
merge
2019-11-10 12:09:14 +01:00
