clean up
This commit is contained in:
parent
335233bab5
commit
df0389fdc0
@ -1,23 +0,0 @@
|
||||
bool32 HandleWishPerishSongOnTurnEnd(void)
|
||||
{
|
||||
gHitMarker |= (HITMARKER_GRUDGE | HITMARKER_IGNORE_BIDE);
|
||||
|
||||
if ((gBattleTypeFlags & BATTLE_TYPE_ARENA)
|
||||
&& gBattleStruct->arenaTurnCounter == 2
|
||||
&& IsBattlerAlive(B_POSITION_PLAYER_LEFT) && IsBattlerAlive(B_POSITION_OPPONENT_LEFT))
|
||||
{
|
||||
s32 i;
|
||||
|
||||
// This seems to be a bug?
|
||||
for (i = 0; i < 2; i++)
|
||||
CancelMultiTurnMoves(i);
|
||||
|
||||
gBattlescriptCurrInstr = BattleScript_ArenaDoJudgment;
|
||||
BattleScriptExecute(BattleScript_ArenaDoJudgment);
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
gHitMarker &= ~(HITMARKER_GRUDGE | HITMARKER_IGNORE_BIDE);
|
||||
|
||||
return FALSE;
|
||||
}
|
||||
@ -3,4 +3,5 @@
|
||||
|
||||
u32 DoEndTurnEffects(void);
|
||||
|
||||
#endif // GUARD_BATTLE_END_TURN
|
||||
#endif // GUARD_BATTLE_END_TURN
|
||||
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
// still has them in the ROM. This is because the developers forgot
|
||||
// to define NDEBUG before release, however this has been changed as
|
||||
// Ruby's actual debug build does not use the AGBPrint features.
|
||||
// #define NDEBUG
|
||||
#define NDEBUG
|
||||
|
||||
// To enable printf debugging, comment out "#define NDEBUG". This allows
|
||||
// the various AGBPrint functions to be used. (See include/gba/isagbprint.h).
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user