dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Some labels

Browse Source
This commit is contained in:
DizzyEggg
2018-08-25 21:04:12 +02:00
parent 0d8c5b613e
commit 2b7c138cbe
7 changed files with 172 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/battle_main.c
View File

@@ -3929,7 +3929,7 @@ static void TryDoEventsBeforeFirstTurn(void)
if (gBattleTypeFlags & BATTLE_TYPE_ARENA)
{
StopCryAndClearCrySongs();
BattleScriptExecute(BattleScript_82DB8BE);
BattleScriptExecute(BattleScript_ArenaTurnBeginning);
}
}
@@ -4019,7 +4019,7 @@ void BattleTurnPassed(void)
if (gBattleTypeFlags & BATTLE_TYPE_PALACE)
BattleScriptExecute(BattleScript_82DB881);
else if (gBattleTypeFlags & BATTLE_TYPE_ARENA && gBattleStruct->field_DA == 0)
BattleScriptExecute(BattleScript_82DB8BE);
BattleScriptExecute(BattleScript_ArenaTurnBeginning);
}
u8 IsRunningFromBattleImpossible(void)