From 3336eb341d4407a42115b52f6404ad921269b2af Mon Sep 17 00:00:00 2001 From: PokeCodec <67983839+PokeCodec@users.noreply.github.com> Date: Tue, 8 Sep 2020 14:26:37 -0400 Subject: [PATCH] More adjustments --- include/battle_main.h | 2 -- src/battle_main.c | 7 +++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/include/battle_main.h b/include/battle_main.h index 890e47f39..9e3dc7cd6 100644 --- a/include/battle_main.h +++ b/include/battle_main.h @@ -73,8 +73,6 @@ void nullsub_20(void); void BeginBattleIntro(void); void SwitchInClearSetData(void); void FaintClearSetData(void); -void sub_803B3AC(void); // unused -void sub_803B598(void); // unused void BattleTurnPassed(void); u8 IsRunningFromBattleImpossible(void); void SwitchPartyOrder(u8 battlerId); diff --git a/src/battle_main.c b/src/battle_main.c index e62513680..e2b3714fc 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -3753,7 +3753,7 @@ static void BattleIntroRecordMonsToDex(void) } } -void sub_803B3AC(void) // unused +static void sub_803B3AC(void) // unused { if (gBattleControllerExecFlags == 0) gBattleMainFunc = BattleIntroPrintPlayerSendsOut; @@ -3856,7 +3856,7 @@ static void BattleIntroPlayer1SendsOutMonAnimation(void) gBattleMainFunc = TryDoEventsBeforeFirstTurn; } -void sub_803B598(void) // unused +static void sub_803B598(void) // unused { if (gBattleControllerExecFlags == 0) { @@ -3879,8 +3879,7 @@ void sub_803B598(void) // unused static void TryDoEventsBeforeFirstTurn(void) { - s32 i; - s32 j; + s32 i, j; u8 effect = 0; if (gBattleControllerExecFlags)