Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-08-22 10:10:17 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Alleviate some fakematches in battle_util.c

Browse Source
This commit is contained in:
AZero13
2026-07-14 13:22:53 -04:00
parent 83df84e406
commit 3a92f1d8b8
1 changed files with 6 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/battle_util.c
View File

@@ -1211,12 +1211,8 @@ u8 DoFieldEndTurnEffects(void)
}
}
// It's stupid, but won't match without it
{
u8 *var = &gBattleStruct->turnCountersTracker;
(*var)++;
gBattleStruct->turnSideTracker = 0;
}
*(&gBattleStruct->turnCountersTracker) = gBattleStruct->turnCountersTracker + 1;
gBattleStruct->turnSideTracker = 0;
// fall through
case ENDTURN_REFLECT:
while (gBattleStruct->turnSideTracker < 2)
@@ -1824,13 +1820,8 @@ bool8 HandleWishPerishSongOnTurnEnd(void)
return TRUE;
}
}
// Why do I have to keep doing this to match?
{
u8 *state = &gBattleStruct->wishPerishSongState;
*state = 1;
gBattleStruct->wishPerishSongBattlerId = 0;
}
// fall through
*(&gBattleStruct->wishPerishSongState) = 1;
gBattleStruct->wishPerishSongBattlerId = 0;
case 1:
while (gBattleStruct->wishPerishSongBattlerId < gBattlersCount)
{
@@ -1859,13 +1850,8 @@ bool8 HandleWishPerishSongOnTurnEnd(void)
return TRUE;
}
}
// Hm...
{
u8 *state = &gBattleStruct->wishPerishSongState;
*state = 2;
gBattleStruct->wishPerishSongBattlerId = 0;
}
// fall through
*(&gBattleStruct->wishPerishSongState) = 2;
gBattleStruct->wishPerishSongBattlerId = 0;
case 2:
if ((gBattleTypeFlags & BATTLE_TYPE_ARENA)
&& gBattleStruct->arenaTurnCounter == 2