diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-05-09 19:08:23 -0400 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-05-09 19:08:23 -0400 |
| commit | c10de4945141a6cca8c1b7328f4102bfc2c8ae28 (patch) | |
| tree | 6ae5a6428c1ac5f33004e5bf57af3bb31e2338fd /src/field_special_scene.c | |
| parent | fc761599b412206f80d961a6052dce49b9998689 (diff) | |
| parent | c0c3d2c52ad839450041d1ca6a29691efc5c5d35 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeruby
Diffstat (limited to 'src/field_special_scene.c')
| -rw-r--r-- | src/field_special_scene.c | 4 |
1 files changed, 2 insertions, 2 deletions
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; |