ghoulslash
6b84a9f0b3
merge w be
2022-07-17 12:40:43 -04:00
BuffelSaft
af6242f2e0
Requested changes, Sticky Web edge case
...
Fix issues found by ghoulslash, and make sure Defiant works properly with Sticky Web and Court Change.
2022-04-27 21:51:10 +12:00
BuffelSaft
5358cc0a00
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2
2022-04-25 13:38:13 +12:00
ExpoSeed
f50a406b18
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves
2022-03-22 12:56:23 -05:00
BuffelSaft
9d1800f53e
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2
2022-01-27 17:18:51 +13:00
LOuroboros
8eaf0718ec
Review changes
...
Also updated tryfaintmon call in BattleScript_FlingEnd, and updated CanFling.
2022-01-23 19:13:04 -03:00
LOuroboros
a8a8c7e2fa
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into flingBE
2022-01-23 02:37:07 -03:00
Eduardo Quezada D'Ottone
6aabe58649
Merge branch 'battle_engine' into magician
2022-01-15 13:06:13 -03:00
WiserVisor
8923ffb3af
Merge branch 'battle_engine' into battle_engine
2021-12-23 15:29:10 -08:00
ExpoSeed
d6747527da
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves
2021-12-16 21:44:01 -06:00
ultima-soul
7369f60c06
Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into battle_engine_sync
2021-12-03 17:30:45 -08:00
BuffelSaft
a89ce0c38a
Swapped webs don't trigger Defiant
...
Track the side that originally set Sticky Web, and if it matches the side the target of the speed drop is on, don't activate Defiant. Hard to tell if this is a bug or a feature in gen 8 - maybe the swapped webs are considered a "friendly" effect?
Also, fix Sticky Web not activating Defiant.
2021-11-23 22:54:30 +13:00
BuffelSaft
ff60882b29
Requested changes
2021-11-23 11:04:39 +13:00
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
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
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
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
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
