diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-08-28 16:16:00 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-28 16:16:00 -0400 |
| commit | c8307317344f0ca6d176882cf8b55d3bf82dc680 (patch) | |
| tree | 393b23af98581a7dec2e0731732a23ece4b23007 /src/field_screen_effect.c | |
| parent | e9b734c1efd9ad8a079d9ca7c9ed65cff801be1c (diff) | |
| parent | 09cfed64b5a10a51ca246ce7a4f57b95cf4b4456 (diff) | |
Merge branch 'master' into doc-blender
Diffstat (limited to 'src/field_screen_effect.c')
| -rw-r--r-- | src/field_screen_effect.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/field_screen_effect.c b/src/field_screen_effect.c index 92ee8cad3..9becd2166 100644 --- a/src/field_screen_effect.c +++ b/src/field_screen_effect.c @@ -299,7 +299,7 @@ static void FieldCB_TeleportTileWarpExit(void) { Overworld_PlaySpecialMapMusic(); WarpFadeInScreen(); - PlaySE(SE_TK_WARPOUT); + PlaySE(SE_WARP_OUT); CreateTask(Task_TeleportTileWarpExit, 10); ScriptContext2_Enable(); } @@ -308,7 +308,7 @@ static void FieldCB_MossdeepGymWarpExit(void) { Overworld_PlaySpecialMapMusic(); WarpFadeInScreen(); - PlaySE(SE_TK_WARPOUT); + PlaySE(SE_WARP_OUT); CreateTask(Task_ExitNonDoor, 10); ScriptContext2_Enable(); SetObjectEventLoadFlag((~SKIP_OBJECT_EVENT_LOAD) & 0xF); @@ -487,7 +487,7 @@ void DoWarp(void) TryFadeOutOldMapMusic(); WarpFadeOutScreen(); PlayRainStoppingSoundEffect(); - PlaySE(SE_KAIDAN); + PlaySE(SE_EXIT); gFieldCallback = FieldCB_DefaultWarpExit; CreateTask(Task_WarpAndLoadMap, 10); } @@ -549,7 +549,7 @@ void DoTeleportTileWarp(void) ScriptContext2_Enable(); TryFadeOutOldMapMusic(); WarpFadeOutScreen(); - PlaySE(SE_TK_WARPIN); + PlaySE(SE_WARP_IN); CreateTask(Task_WarpAndLoadMap, 10); gFieldCallback = FieldCB_TeleportTileWarpExit; } @@ -561,7 +561,7 @@ void DoMossdeepGymWarp(void) SaveObjectEvents(); TryFadeOutOldMapMusic(); WarpFadeOutScreen(); - PlaySE(SE_TK_WARPIN); + PlaySE(SE_WARP_IN); CreateTask(Task_WarpAndLoadMap, 10); gFieldCallback = FieldCB_MossdeepGymWarpExit; } @@ -605,7 +605,7 @@ void DoCableClubWarp(void) ScriptContext2_Enable(); TryFadeOutOldMapMusic(); WarpFadeOutScreen(); - PlaySE(SE_KAIDAN); + PlaySE(SE_EXIT); CreateTask(Task_DoCableClubWarp, 10); } @@ -619,7 +619,7 @@ static void Task_ReturnToWorldFromLinkRoom(u8 taskId) ClearLinkCallback_2(); FadeScreen(FADE_TO_BLACK, 0); TryFadeOutOldMapMusic(); - PlaySE(SE_KAIDAN); + PlaySE(SE_EXIT); data[0]++; break; case 1: @@ -760,7 +760,7 @@ void DoContestHallWarp(void) TryFadeOutOldMapMusic(); WarpFadeOutScreen(); PlayRainStoppingSoundEffect(); - PlaySE(SE_KAIDAN); + PlaySE(SE_EXIT); gFieldCallback = FieldCB_WarpExitFadeFromBlack; CreateTask(Task_DoContestHallWarp, 10); } @@ -1028,7 +1028,7 @@ static void sub_80B01BC(u8 taskId) case 0: FreezeObjectEvents(); ScriptContext2_Enable(); - PlaySE(SE_TK_WARPIN); + PlaySE(SE_WARP_IN); sub_808D1C8(); task->data[0]++; break; |