Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes Zigzgoon battle being able to use a Gimmick (#5129)

Browse Source 
* Fixes Zigzgoon battle being able to use a Gimmick

* add commit

* Update src/battle_terastal.c

* Update src/battle_dynamax.c
This commit is contained in:
Alex 2024-08-11 00:23:51 +02:00 committed by GitHub
parent a4dc9a0480
commit 77afb01477
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/battle_dynamax.c
View File

@ -76,6 +76,10 @@ bool32 CanDynamax(u32 battler)
u16 species = gBattleMons[battler].species; u16 species = gBattleMons[battler].species;
u16 holdEffect = GetBattlerHoldEffect(battler, FALSE); u16 holdEffect = GetBattlerHoldEffect(battler, FALSE);
// Prevents Zigzagoon from dynamaxing in vanilla.
if (gBattleTypeFlags & BATTLE_TYPE_FIRST_BATTLE && GetBattlerSide(battler) == B_SIDE_OPPONENT)
return FALSE;
// Check if Player has a Dynamax Band. // Check if Player has a Dynamax Band.
if (!TESTING && (GetBattlerPosition(battler) == B_POSITION_PLAYER_LEFT if (!TESTING && (GetBattlerPosition(battler) == B_POSITION_PLAYER_LEFT
|| (!(gBattleTypeFlags & BATTLE_TYPE_MULTI) && GetBattlerPosition(battler) == B_POSITION_PLAYER_RIGHT))) || (!(gBattleTypeFlags & BATTLE_TYPE_MULTI) && GetBattlerPosition(battler) == B_POSITION_PLAYER_RIGHT)))

4
src/battle_terastal.c
View File

@ -63,6 +63,10 @@ bool32 CanTerastallize(u32 battler)
{ {
u32 holdEffect = GetBattlerHoldEffect(battler, FALSE); u32 holdEffect = GetBattlerHoldEffect(battler, FALSE);
// Prevents Zigzagoon from terastalizing in vanilla.
if (gBattleTypeFlags & BATTLE_TYPE_FIRST_BATTLE && GetBattlerSide(battler) == B_SIDE_OPPONENT)
return FALSE;
if (TESTING || GetBattlerSide(battler) == B_SIDE_OPPONENT) if (TESTING || GetBattlerSide(battler) == B_SIDE_OPPONENT)
{ {
// Skip all other checks in this block, go to HasTrainerUsedGimmick // Skip all other checks in this block, go to HasTrainerUsedGimmick