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/field/secret_base.c | |
| parent | e2a0522780d7124a392bf028c9c1f50c4213b460 (diff) | |
| parent | 003ed9293b2c51f0481ed31f0e0459cbecbf757e (diff) | |
Merge pull request #544 from huderlem/weather
Further document weather
Diffstat (limited to 'src/field/secret_base.c')
| -rw-r--r-- | src/field/secret_base.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/field/secret_base.c b/src/field/secret_base.c index 134aebbc6..2d02de004 100644 --- a/src/field/secret_base.c +++ b/src/field/secret_base.c @@ -348,7 +348,7 @@ void sub_80BBA48(u8 taskid) void sub_80BBAF0(void) { CreateTask(sub_80BBA48, 0); - fade_screen(1, 0); + FadeScreen(1, 0); saved_warp2_set(0, gSaveBlock1.location.mapGroup, gSaveBlock1.location.mapNum, -1); } @@ -362,7 +362,7 @@ bool8 sub_80BBB24(void) void sub_80BBB50(u8 taskid) { FieldObjectTurn(&(gMapObjects[gPlayerAvatar.mapObjectId]), 2); - if (sub_807D770() == 1) { + if (IsWeatherNotFadingIn() == 1) { EnableBothScriptContexts(); DestroyTask(taskid); } @@ -397,7 +397,7 @@ void sub_80BBC78(void) { u8 taskid = CreateTask(sub_80BBBEC, 0); gTasks[taskid].data[0] = 0; - fade_screen(1, 0); + FadeScreen(1, 0); } bool8 CurrentMapIsSecretBase(void) @@ -534,7 +534,7 @@ void sub_80BC074(u8 taskid) void sub_80BC0F8(void) { CreateTask(sub_80BC074, 0); - fade_screen(1, 0); + FadeScreen(1, 0); } void sub_80BC114(void) { |