atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More adjustments

Browse source
This commit is contained in:
PokeCodec 2020-09-08 14:26:37 -04:00
parent 0a13d718ea
commit 3336eb341d
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/battle_main.h
View file

@ -73,8 +73,6 @@ void nullsub_20(void);
void BeginBattleIntro(void); void BeginBattleIntro(void);
void SwitchInClearSetData(void); void SwitchInClearSetData(void);
void FaintClearSetData(void); void FaintClearSetData(void);
void sub_803B3AC(void); // unused
void sub_803B598(void); // unused
void BattleTurnPassed(void); void BattleTurnPassed(void);
u8 IsRunningFromBattleImpossible(void); u8 IsRunningFromBattleImpossible(void);
void SwitchPartyOrder(u8 battlerId); void SwitchPartyOrder(u8 battlerId);

7
src/battle_main.c
View file

@ -3753,7 +3753,7 @@ static void BattleIntroRecordMonsToDex(void)
} }
} }
void sub_803B3AC(void) // unused static void sub_803B3AC(void) // unused
{ {
if (gBattleControllerExecFlags == 0) if (gBattleControllerExecFlags == 0)
gBattleMainFunc = BattleIntroPrintPlayerSendsOut; gBattleMainFunc = BattleIntroPrintPlayerSendsOut;
@ -3856,7 +3856,7 @@ static void BattleIntroPlayer1SendsOutMonAnimation(void)
gBattleMainFunc = TryDoEventsBeforeFirstTurn; gBattleMainFunc = TryDoEventsBeforeFirstTurn;
} }
void sub_803B598(void) // unused static void sub_803B598(void) // unused
{ {
if (gBattleControllerExecFlags == 0) if (gBattleControllerExecFlags == 0)
{ {
@ -3879,8 +3879,7 @@ void sub_803B598(void) // unused
static void TryDoEventsBeforeFirstTurn(void) static void TryDoEventsBeforeFirstTurn(void)
{ {
s32 i; s32 i, j;
s32 j;
u8 effect = 0; u8 effect = 0;
if (gBattleControllerExecFlags) if (gBattleControllerExecFlags)