From df0389fdc0ae11a5b6615842ff0ebcbec5e67396 Mon Sep 17 00:00:00 2001 From: AlexOn1ine Date: Sun, 23 Feb 2025 23:22:31 +0100 Subject: [PATCH] clean up --- endturneffect_bak.c | 23 ----------------------- include/battle_end_turn.h | 3 ++- include/config/general.h | 2 +- 3 files changed, 3 insertions(+), 25 deletions(-) delete mode 100644 endturneffect_bak.c diff --git a/endturneffect_bak.c b/endturneffect_bak.c deleted file mode 100644 index c28ea3fcfe..0000000000 --- a/endturneffect_bak.c +++ /dev/null @@ -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; -} diff --git a/include/battle_end_turn.h b/include/battle_end_turn.h index 577d1ab615..468544cf2b 100644 --- a/include/battle_end_turn.h +++ b/include/battle_end_turn.h @@ -3,4 +3,5 @@ u32 DoEndTurnEffects(void); -#endif // GUARD_BATTLE_END_TURN \ No newline at end of file +#endif // GUARD_BATTLE_END_TURN + diff --git a/include/config/general.h b/include/config/general.h index bd34106832..cff1432bb7 100644 --- a/include/config/general.h +++ b/include/config/general.h @@ -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).