dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Give songs meaningful english names

Browse Source
This commit is contained in:
GriffinR
2020-08-20 18:02:00 -04:00
parent 6c34effda9
commit 3014241179
1178 changed files with 10482 additions and 10477 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/field_screen_effect.c
View File

@@ -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;