diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/field_control_avatar.c | 2 | ||||
| -rw-r--r-- | src/field_special_scene.c | 4 | ||||
| -rw-r--r-- | src/new_game.c | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c index 1f049c0bd..c5f2c08e7 100644 --- a/src/field_control_avatar.c +++ b/src/field_control_avatar.c @@ -517,7 +517,7 @@ bool8 sub_8068894(void) } if (SafariZoneTakeStep() == TRUE) return TRUE; - if (sub_810D9B0(1) == TRUE) + if (CountSSTidalStep(1) == TRUE) { ScriptContext1_SetupScript(gUnknown_0815FD0D); return TRUE; diff --git a/src/field_special_scene.c b/src/field_special_scene.c index fc4d96e18..59280b743 100644 --- a/src/field_special_scene.c +++ b/src/field_special_scene.c @@ -239,7 +239,7 @@ bool8 sub_80C7754(void) s8 mapGroup, mapNum; s16 x, y; - if (sub_810D9EC(&mapGroup, &mapNum, &x, &y)) + if (GetSSTidalLocation(&mapGroup, &mapNum, &x, &y)) { return FALSE; } @@ -270,7 +270,7 @@ void Task_HandlePorthole(u8 taskId) data[1] = 1; if (!sub_80A212C(0xFF, location->mapNum, location->mapGroup)) return; - if (sub_810D9B0(1) == TRUE) + if (CountSSTidalStep(1) == TRUE) { if (*var == 2) *var = 9; diff --git a/src/new_game.c b/src/new_game.c index 8fa946748..6d2722c44 100644 --- a/src/new_game.c +++ b/src/new_game.c @@ -139,10 +139,10 @@ void NewGameInitData(void) ClearRoamerData(); ClearRoamerLocationData(); gSaveBlock1.registeredItem = 0; - ClearItems(); + ClearBag(); NewGameInitPCItems(); - sub_810C994(); - sub_8133F80(); + ClearPokeblocks(); + ClearDecorationInventories(); InitEasyChatPhrases(); SetMauvilleOldMan(); InitDewfordTrends(); |