diff options
| author | Tetrable <atifhuss386@gmail.com> | 2019-01-03 02:28:18 +0000 |
|---|---|---|
| committer | Tetrable <atifhuss386@gmail.com> | 2019-01-03 02:28:18 +0000 |
| commit | 30e7ac0dcadc1ca15d56dc24e79489be63527357 (patch) | |
| tree | bb804c19ca84b582f7517af645bfc8665b26a1e1 /src/overworld.c | |
| parent | 50aa222aff56499aeef1c64c9191f53b9b20a1de (diff) | |
| parent | b471bba55e7e3743fa8cdb796cba57c41f5bfdbc (diff) | |
Fix merge conflicts
Diffstat (limited to 'src/overworld.c')
| -rw-r--r-- | src/overworld.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/overworld.c b/src/overworld.c index ef424cff8..9df69e360 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -127,7 +127,7 @@ extern void ExecuteTruckSequence(void); extern void sub_80A0A38(void); extern void WriteFlashScanlineEffectBuffer(u8); extern void sub_81AA2F8(void); -extern void sub_8195E10(void); +extern void InitMatchCallCounters(void); extern void sub_80EDB44(void); extern void sub_81D64C0(void); extern void InitFieldMessageBox(void); @@ -1777,7 +1777,7 @@ void CB2_ContinueSavedGame(void) PlayTimeCounter_Start(); ScriptContext1_Init(); ScriptContext2_Disable(); - sub_8195E10(); + InitMatchCallCounters(); if (UseContinueGameWarp() == TRUE) { ClearContinueGameWarpStatus(); |