diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2018-01-24 23:38:36 -0500 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2018-01-24 23:38:36 -0500 |
| commit | 4ba3b9f592e2a23bb57e59ca41acd0cfb27a0d84 (patch) | |
| tree | 4009791ef38c7f47f8ba14a1ba17ea3e75058544 /src/engine | |
| parent | 4327bee485510b424cbf28e450d90ff50e6fe78b (diff) | |
| parent | 4e54b9f65e93e84887ef81b726a187bbf3197530 (diff) | |
merge
Diffstat (limited to 'src/engine')
| -rw-r--r-- | src/engine/cable_club.c | 4 | ||||
| -rw-r--r-- | src/engine/time_events.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/engine/cable_club.c b/src/engine/cable_club.c index 44d832e2b..e7c504c7b 100644 --- a/src/engine/cable_club.c +++ b/src/engine/cable_club.c @@ -676,7 +676,7 @@ static void sub_808382C(u8 taskId) switch (task->data[0]) { case 0: - fade_screen(1, 0); + FadeScreen(1, 0); gLinkType = 0x2211; ClearLinkCallback_2(); task->data[0]++; @@ -812,7 +812,7 @@ static void sub_8083AAC(u8 taskId) { case 0: ScriptContext2_Enable(); - fade_screen(1, 0); + FadeScreen(1, 0); ClearLinkCallback_2(); task->data[0]++; break; diff --git a/src/engine/time_events.c b/src/engine/time_events.c index 3e3054aa3..4bd732788 100644 --- a/src/engine/time_events.c +++ b/src/engine/time_events.c @@ -93,7 +93,7 @@ void UpdateShoalTideFlag(void) static void Task_WaitWeather(u8 taskId) { - if (sub_807DDFC()) + if (IsWeatherChangeComplete()) { EnableBothScriptContexts(); DestroyTask(taskId); |