diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-02-28 13:18:21 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-02-28 13:18:21 -0500 |
| commit | 9cf19244fa1fe925d4273eb32c8b7c68c5271152 (patch) | |
| tree | 9fd19206d77565875f50a6d4c2d6a661fd64ecf7 /src/field_fadetransition.c | |
| parent | 8a092738468de1f4bbe11b7ef4d338735312e9dd (diff) | |
Port Lavaridge Gym B1F Warp from Emerald
Diffstat (limited to 'src/field_fadetransition.c')
| -rw-r--r-- | src/field_fadetransition.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/field_fadetransition.c b/src/field_fadetransition.c index 0076c2d8f..02a51087f 100644 --- a/src/field_fadetransition.c +++ b/src/field_fadetransition.c @@ -50,7 +50,7 @@ void palette_bg_faded_fill_black(void) CpuFastFill16(RGB_BLACK, gPlttBufferFaded, 0x400); } -void pal_fill_for_maplights(void) +void WarpFadeInScreen(void) { switch (sub_80C9DCC(get_map_light_from_warp0(), GetCurrentMapType())) { @@ -178,7 +178,7 @@ static void task_mpl_807DD60(u8 taskId) case 1: if (gTasks[task->data[1]].isActive != TRUE) { - pal_fill_for_maplights(); + WarpFadeInScreen(); task->data[0]++; } break; @@ -212,7 +212,7 @@ static void sub_807DDF0(u8 taskId) case 1: if (IsLinkTaskFinished()) { - pal_fill_for_maplights(); + WarpFadeInScreen(); task->data[0]++; } break; @@ -278,7 +278,7 @@ static void sub_807DE78(bool8 a0) static void sub_807DF4C(bool8 a0) { if (!a0) - pal_fill_for_maplights(); + WarpFadeInScreen(); else FadeInFromBlack(); } @@ -302,7 +302,7 @@ void sub_807DF7C(void) static void sub_807DF94(void) { Overworld_PlaySpecialMapMusic(); - pal_fill_for_maplights(); + WarpFadeInScreen(); sub_8111CF0(); PlaySE(SE_TK_WARPOUT); CreateTask(sub_807E31C, 10); @@ -906,7 +906,7 @@ static void sub_807EC34(u8 taskId) break; case 0: Overworld_PlaySpecialMapMusic(); - pal_fill_for_maplights(); + WarpFadeInScreen(); ScriptContext2_Enable(); sub_807ECBC(&data[1], &data[2], &data[3], &data[4], &data[5]); data[0]++; |