diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-01-20 15:24:20 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-20 15:24:20 -0800 |
| commit | 185846f20840c03ba1616c4d0c6eca949147512c (patch) | |
| tree | 2ee03f3c11f552976589d1ac0b0de474bf78fb96 /src/engine | |
| parent | e2a0522780d7124a392bf028c9c1f50c4213b460 (diff) | |
| parent | 003ed9293b2c51f0481ed31f0e0459cbecbf757e (diff) | |
Merge pull request #544 from huderlem/weather
Further document weather
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); |