summaryrefslogtreecommitdiff
path: root/src/battle_setup.c
diff options
context:
space:
mode:
authorDiegoisawesome <diego@domoreaweso.me>2018-10-16 21:47:08 -0500
committerDiegoisawesome <diego@domoreaweso.me>2018-10-16 21:47:08 -0500
commite75f0b4f80670bd3b6a28257f10770911869ea08 (patch)
treed22ea566cd8e0fd4b8abd5b4dd36c339f98fea85 /src/battle_setup.c
parented1bb3030bae8b0d00a1fbb68ebd50f6376938ac (diff)
Port/decompile field_control_avatar
Diffstat (limited to 'src/battle_setup.c')
-rw-r--r--src/battle_setup.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/battle_setup.c b/src/battle_setup.c
index f9fab3d17..db173a38e 100644
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -56,8 +56,8 @@ extern bool8 InBattlePyramid(void);
extern bool8 InBattlePike(void);
extern bool32 InTrainerHill(void);
extern bool32 FieldPoisonEffectIsRunning(void);
-extern void prev_quest_postbuffer_cursor_backup_reset(void);
-extern void ResetPoisonStepCounter(void);
+extern void RestartWildEncounterImmunitySteps(void);
+extern void ClearPoisonStepCounter(void);
extern void sub_81BE72C(void);
extern void sub_808BCF4(void);
extern void sub_80EECC8(void);
@@ -354,8 +354,8 @@ static void Task_BattleStart(u8 taskId)
{
overworld_free_bg_tilemaps();
SetMainCallback2(CB2_InitBattle);
- prev_quest_postbuffer_cursor_backup_reset();
- ResetPoisonStepCounter();
+ RestartWildEncounterImmunitySteps();
+ ClearPoisonStepCounter();
DestroyTask(taskId);
}
break;
@@ -921,8 +921,8 @@ static void CB2_StartFirstBattle(void)
gMain.savedCallback = CB2_EndFirstBattle;
FreeAllWindowBuffers();
SetMainCallback2(CB2_InitBattle);
- prev_quest_postbuffer_cursor_backup_reset();
- ResetPoisonStepCounter();
+ RestartWildEncounterImmunitySteps();
+ ClearPoisonStepCounter();
IncrementGameStat(GAME_STAT_TOTAL_BATTLES);
IncrementGameStat(GAME_STAT_WILD_BATTLES);
sub_80EECC8();