diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-04-06 00:37:08 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-06 00:37:08 -0400 |
| commit | 93d17ef7c886b96791931ba50406b59756e1bdbd (patch) | |
| tree | a96f8cc5e480114dadd1362372da0606c26bc928 /src/battle_setup.c | |
| parent | 5f1a4de374417b7580131d45c0a478f062f3916f (diff) | |
| parent | 35a578c62050893d5f347f637acbdcbbfb99f311 (diff) | |
Merge branch 'master' into doc-rm
Diffstat (limited to 'src/battle_setup.c')
| -rw-r--r-- | src/battle_setup.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/battle_setup.c b/src/battle_setup.c index df8a3ac45..ee923d6c7 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -235,7 +235,7 @@ static void DoStandardWildBattle(void) { ScriptContext2_Enable(); FreezeObjectEvents(); - sub_805C780(); + StopPlayerAvatar(); gMain.savedCallback = CB2_EndWildBattle; gBattleTypeFlags = 0; CreateBattleStartTask(GetWildBattleTransition(), 0); @@ -247,7 +247,7 @@ void StartRoamerBattle(void) { ScriptContext2_Enable(); FreezeObjectEvents(); - sub_805C780(); + StopPlayerAvatar(); gMain.savedCallback = CB2_EndWildBattle; gBattleTypeFlags = BATTLE_TYPE_ROAMER; CreateBattleStartTask(GetWildBattleTransition(), MUS_VS_DEN); @@ -259,7 +259,7 @@ static void DoSafariBattle(void) { ScriptContext2_Enable(); FreezeObjectEvents(); - sub_805C780(); + StopPlayerAvatar(); gMain.savedCallback = CB2_EndSafariBattle; gBattleTypeFlags = BATTLE_TYPE_SAFARI; CreateBattleStartTask(GetWildBattleTransition(), 0); @@ -269,7 +269,7 @@ static void DoGhostBattle(void) { ScriptContext2_Enable(); FreezeObjectEvents(); - sub_805C780(); + StopPlayerAvatar(); gMain.savedCallback = CB2_EndWildBattle; gBattleTypeFlags = BATTLE_TYPE_GHOST; CreateBattleStartTask(GetWildBattleTransition(), 0); @@ -399,7 +399,7 @@ static void sub_807FB08(void) { ScriptContext2_Enable(); FreezeObjectEvents(); - sub_805C780(); + StopPlayerAvatar(); gMain.savedCallback = sub_807FAF8; SavePlayerParty(); InitPokedudePartyAndOpponent(); |