Commit Graph

8757 Commits

Author SHA1 Message Date
BuffelSaft
fd4414fe62 Spaces instead of tabs 2021-11-23 23:01:43 +13: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
499fb8071d Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2 2021-11-23 17:12:24 +13:00
BuffelSaft
fa0b5188bb Dynamic move targeting
Properly implement Expanding Force by replacing all  instances that read move target from gBattleMoves with a function.
2021-11-23 16:56:11 +13:00
BuffelSaft
6b8f86c276 Snap Trap placeholder anims
Set up animation data for Snap Trap so it can be easily replaced with a proper animation later.
2021-11-23 11:05:36 +13:00
BuffelSaft
ff60882b29 Requested changes 2021-11-23 11:04:39 +13:00
ghoulslash
3ac480076c
Merge pull request #1933 from BuffelSaft/brick-break
Fix Brick Break
2021-11-21 22:30:38 -05:00
BuffelSaft
8118f3bb44 Fix Brick Break
Should remove the target's screens, not the attacker's.
2021-11-22 16:17:10 +13:00
BuffelSaft
50d0cd52e8 Clean up Corrosive Gas
Remove code and unused move effect.
2021-11-22 15:13:54 +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
BuffelSaft
42b8f18cb1 Remove Corrosive Gas code
This was not working at all in testing, so it can be done by a separate PR later.
2021-11-22 14:35:01 +13:00
BuffelSaft
70f0018c08 Partially implement Shell Trap
Doesn't play the animation when the trap triggers, but kinda works? May also be incredibly buggy, but I'm not interested in working on this move any further.
2021-11-22 14:14:41 +13:00
Eduardo Quezada D'Ottone
0f801b110b
Merge pull request #1696 from ghoulslash/battle_ai
AI Item Usage Considers Move Choice
2021-11-21 14:51:20 -03:00
Eduardo Quezada D'Ottone
dee7f97a8d
Merge branch 'battle_engine' into battle_ai 2021-11-21 14:46:09 -03:00
Eduardo Quezada D'Ottone
30a4ef3723
Merge pull request #1924 from ghoulslash/be/wish
Fix wish
2021-11-21 14:04:06 -03:00
ghoulslash
3404039330
Merge pull request #1918 from kleeenexfeu/be_mega_evo_alter_turn
Mega Evolution alters turn order
2021-11-21 08:12:21 -05:00
BuffelSaft
abb67e96e8 Finish Expanding Force
Hits both foes if the user is affected by Psychic Terrain. Modified targeting is also shown in the move selection screen.
2021-11-21 21:49:47 +13:00
BuffelSaft
bcaa17ffb3 Finish/tidy up Court Change
Use a macro to simplify timer and status updates, and swap things like reflectBattlerId to the opposing side - this is required for the effects to be properly swapped.
2021-11-21 17:20:45 +13:00
Eduardo Quezada D'Ottone
29172d6357
Merge pull request #1925 from ghoulslash/be/rampage
fix rampage cancelling
2021-11-21 00:15:53 -03:00
ghoulslash
3fb62f74c6 fix rampage cancelling 2021-11-20 18:35:56 -05:00
ghoulslash
37ab20e29c fix wish 2021-11-20 16:49:04 -05:00
kleeenexfeu
62b31aec55
syntax 2021-11-20 02:12:43 +01:00
kleeenexfeu
da20dae9c3
Only recalculate speed for battler choosing a move
Other actions have priority
2021-11-20 02:09:33 +01:00
kleeenexfeu
6402a7ab6e
follow suggestion
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
2021-11-19 23:42:20 +01:00
kleeenexfeu
c1743db19a
follow suggestion
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
2021-11-19 23:30:45 +01:00
kleeenexfeu
acddeeb1f9
follow suggestion
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
2021-11-19 23:30:33 +01:00
Eduardo Quezada D'Ottone
377c313771
Merge pull request #1919 from ghoulslash/be/unseenfist
Fix unseen fist check
2021-11-19 18:48:58 -03:00
ghoulslash
fb468b6776 fix unseen fist check 2021-11-19 16:32:00 -05:00
kleeenexfeu
fa4d71817b
Spaces instead of tab 2021-11-19 22:30:30 +01:00
kleeenexfeu
03a9f3f413 Mega Evolution alters turn order 2021-11-19 22:03:10 +01:00
Eduardo Quezada D'Ottone
1696e60b9f
Merge pull request #1876 from ghoulslash/be/ai_updates
Some more CanAIFaintTarget checks and other AI updates
2021-11-19 17:33:21 -03:00
Eduardo Quezada D'Ottone
ef3f573cc2
Merge pull request #1917 from BuffelSaft/unseen_fist
Implement Unseen Fist
2021-11-19 17:29:25 -03:00
BuffelSaft
14a2e86313 Fix Scale Shot
Lowers defense and raises speed instead of just lowering defense now. Tested with Contrary and min/max speed/def.
2021-11-19 21:57:32 +13:00
BuffelSaft
48c91d03cd Fix terrain checks on DLC moves
Expanding Force and Rising Voltage now boost damage correctly. Expanding Force doesn't hit both targets yet however.
2021-11-19 20:20:16 +13:00
BuffelSaft
86efd69370 Finish/fix Beak Blast
This was not working at all, but the basic framework was there; some small changes tidied it up and made it work.
2021-11-19 20:19:10 +13: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
c4f27174c3 Implement Unseen Fist
Unseen Fist allows contact moves to bypass protect effects, but doesn't lift the effect.
2021-11-19 16:21:33 +13:00
ghoulslash
b2411dbbc4
Merge pull request #1909 from AsparagusEduardo/BE_Leek
Updated Leek's effect with config
2021-11-16 08:50:31 -05:00
Eduardo Quezada D'Ottone
7dbc94deef Fixed undef 2021-11-15 23:36:52 -03:00
Eduardo Quezada D'Ottone
0af63c04eb Removed redundant uses of STATUS3_GASTRO_ACID check. 2021-11-15 23:29:54 -03:00
Eduardo Quezada D'Ottone
cc833ebb59 Created macro + config for always critting when using high-crit moves 2021-11-15 23:21:46 -03:00
Eduardo Quezada D'Ottone
a1bd6bd52f Updated species that benefit from Leek 2021-11-15 22:30:20 -03:00
Eduardo Quezada D'Ottone
bef896c65a
Merge pull request #1908 from kleeenexfeu/kleeenexfeu-PartyBattlerShouldAvoidHazardsfix
PartyBattlerShouldAvoidHazards fix
2021-11-15 19:54:46 -03:00
kleeenexfeu
ea34d4694d
PartyBattlerShouldAvoidHazards fix
AI was loading and modifying wrong data in the RAM
2021-11-15 16:48:44 +01:00
ghoulslash
2a1299715f merge w be 2021-11-15 10:45:59 -05:00
ghoulslash
9fdd6fffee AI_GetAbility supports hidden abilities 2021-11-15 10:45:23 -05:00
ghoulslash
0e397c43fe
Merge pull request #1898 from AsparagusEduardo/BE_postIETweaks
Adjusted elements to simplify the conflicts between BE and IE
2021-11-15 08:27:28 -05:00
Eduardo Quezada D'Ottone
2a5fed3c65
Merge pull request #1905 from BuffelSaft/aura
Fix Dark Aura and Fairy Aura
2021-11-15 08:40:11 -03:00
BuffelSaft
d4fa346540 Fix Dark Aura and Fairy Aura
Damage boost should be 33%, not 25%.
2021-11-15 21:40:20 +13:00
ghoulslash
8b296b97a8
Merge pull request #1887 from BuffelSaft/knock-off
Fix Knock Off, add config
2021-11-14 08:27:51 -05:00