falso
/
papermario
mirror of https://github.com/pmret/papermario.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SetMusicTrack --> SetMusic

This commit is contained in:
z64a 2025-05-28 22:27:36 -04:00
parent 22c2befb85
commit c3416b5cb2
527 changed files with 950 additions and 950 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/dead.h
View File

@ -124,7 +124,7 @@
#define dma_copy dead_dma_copy #define dma_copy dead_dma_copy
#define create_worker_scene dead_create_worker_scene #define create_worker_scene dead_create_worker_scene
#define GetEntryID dead_GetEntryID #define GetEntryID dead_GetEntryID
#define SetMusicTrack dead_SetMusicTrack #define SetMusic dead_SetMusic
#define FadeInMusic dead_FadeInMusic #define FadeInMusic dead_FadeInMusic
#define RandInt dead_RandInt #define RandInt dead_RandInt
#define PlayEffect_impl dead_PlayEffect_impl #define PlayEffect_impl dead_PlayEffect_impl

4
include/script_api/common.h
View File

@ -1028,7 +1028,7 @@ API_CALLABLE(RegisterMusicEvents);
API_CALLABLE(FadeOutMusic); API_CALLABLE(FadeOutMusic);
/// @evtapi /// @evtapi
API_CALLABLE(SetMusicTrack); API_CALLABLE(SetMusic);
/// @evtapi /// @evtapi
API_CALLABLE(FadeInMusic); API_CALLABLE(FadeInMusic);
@ -1040,7 +1040,7 @@ API_CALLABLE(EnableMusicProximityMix);
API_CALLABLE(AdjustMusicProximityMix); API_CALLABLE(AdjustMusicProximityMix);
/// @evtapi /// @evtapi
API_CALLABLE(SetMusicTrackVolumes); API_CALLABLE(SetTrackVolumes);
/// @evtapi /// @evtapi
API_CALLABLE(PopSong); API_CALLABLE(PopSong);

4
src/evt/audio_api.c
View File

@ -80,7 +80,7 @@ API_CALLABLE(FadeOutMusic) {
} }
} }
API_CALLABLE(SetMusicTrack) { API_CALLABLE(SetMusic) {
Bytecode* args = script->ptrReadPos; Bytecode* args = script->ptrReadPos;
s32 musicPlayer = evt_get_variable(script, *args++); s32 musicPlayer = evt_get_variable(script, *args++);
s32 songID = evt_get_variable(script, *args++); s32 songID = evt_get_variable(script, *args++);
@ -128,7 +128,7 @@ API_CALLABLE(AdjustMusicProximityMix) {
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }
API_CALLABLE(SetMusicTrackVolumes) { API_CALLABLE(SetTrackVolumes) {
Bytecode* args = script->ptrReadPos; Bytecode* args = script->ptrReadPos;
s16 trackVolSet = evt_get_variable(script, *args++); s16 trackVolSet = evt_get_variable(script, *args++);

6
src/world/area_arn/arn_02/music.c
View File

@ -3,11 +3,11 @@
EvtScript N(EVS_SetupMusic) = { EvtScript N(EVS_SetupMusic) = {
Switch(GB_StoryProgress) Switch(GB_StoryProgress)
CaseLt(STORY_CH3_TUBBA_WOKE_UP) CaseLt(STORY_CH3_TUBBA_WOKE_UP)
Call(SetMusicTrack, 0, SONG_GUSTY_GULCH, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_GUSTY_GULCH, 0, VOL_LEVEL_FULL)
CaseLt(STORY_CH3_DEFEATED_TUBBA_BLUBBA) CaseLt(STORY_CH3_DEFEATED_TUBBA_BLUBBA)
Call(SetMusicTrack, 0, SONG_TUBBA_ESCAPE, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_TUBBA_ESCAPE, 0, VOL_LEVEL_FULL)
CaseDefault CaseDefault
Call(SetMusicTrack, 0, SONG_GUSTY_GULCH, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_GUSTY_GULCH, 0, VOL_LEVEL_FULL)
EndSwitch EndSwitch
Call(PlayAmbientSounds, AMBIENT_WIND) Call(PlayAmbientSounds, AMBIENT_WIND)
Return Return

6
src/world/area_arn/arn_03/music.c
View File

@ -3,11 +3,11 @@
EvtScript N(EVS_SetupMusic) = { EvtScript N(EVS_SetupMusic) = {
Switch(GB_StoryProgress) Switch(GB_StoryProgress)
CaseLt(STORY_CH3_TUBBA_WOKE_UP) CaseLt(STORY_CH3_TUBBA_WOKE_UP)
Call(SetMusicTrack, 0, SONG_GUSTY_GULCH, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_GUSTY_GULCH, 0, VOL_LEVEL_FULL)
CaseLt(STORY_CH3_DEFEATED_TUBBA_BLUBBA) CaseLt(STORY_CH3_DEFEATED_TUBBA_BLUBBA)
Call(SetMusicTrack, 0, SONG_TUBBA_ESCAPE, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_TUBBA_ESCAPE, 0, VOL_LEVEL_FULL)
CaseDefault CaseDefault
Call(SetMusicTrack, 0, SONG_GUSTY_GULCH, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_GUSTY_GULCH, 0, VOL_LEVEL_FULL)
EndSwitch EndSwitch
Call(PlayAmbientSounds, AMBIENT_WIND) Call(PlayAmbientSounds, AMBIENT_WIND)
Return Return

6
src/world/area_arn/arn_04/music.c
View File

@ -3,11 +3,11 @@
EvtScript N(EVS_SetupMusic) = { EvtScript N(EVS_SetupMusic) = {
Switch(GB_StoryProgress) Switch(GB_StoryProgress)
CaseLt(STORY_CH3_TUBBA_WOKE_UP) CaseLt(STORY_CH3_TUBBA_WOKE_UP)
Call(SetMusicTrack, 0, SONG_GUSTY_GULCH, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_GUSTY_GULCH, 0, VOL_LEVEL_FULL)
CaseLt(STORY_CH3_DEFEATED_TUBBA_BLUBBA) CaseLt(STORY_CH3_DEFEATED_TUBBA_BLUBBA)
Call(SetMusicTrack, 0, SONG_TUBBA_ESCAPE, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_TUBBA_ESCAPE, 0, VOL_LEVEL_FULL)
CaseDefault CaseDefault
Call(SetMusicTrack, 0, SONG_GUSTY_GULCH, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_GUSTY_GULCH, 0, VOL_LEVEL_FULL)
EndSwitch EndSwitch
Call(PlayAmbientSounds, AMBIENT_WIND) Call(PlayAmbientSounds, AMBIENT_WIND)
Return Return

8
src/world/area_arn/arn_05/music.c
View File

@ -4,13 +4,13 @@
EvtScript N(EVS_SetupMusic) = { EvtScript N(EVS_SetupMusic) = {
Switch(GB_StoryProgress) Switch(GB_StoryProgress)
CaseLt(STORY_CH3_SAW_TUBBA_EAT_BOO) CaseLt(STORY_CH3_SAW_TUBBA_EAT_BOO)
Call(SetMusicTrack, 0, SONG_GUSTY_GULCH, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_GUSTY_GULCH, 0, VOL_LEVEL_FULL)
CaseLt(STORY_CH3_TUBBA_WOKE_UP) CaseLt(STORY_CH3_TUBBA_WOKE_UP)
Call(SetMusicTrack, 0, SONG_GUSTY_GULCH, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_GUSTY_GULCH, 0, VOL_LEVEL_FULL)
CaseLt(STORY_CH3_DEFEATED_TUBBA_BLUBBA) CaseLt(STORY_CH3_DEFEATED_TUBBA_BLUBBA)
Call(SetMusicTrack, 0, SONG_TUBBA_ESCAPE, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_TUBBA_ESCAPE, 0, VOL_LEVEL_FULL)
CaseDefault CaseDefault
Call(SetMusicTrack, 0, SONG_GUSTY_GULCH, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_GUSTY_GULCH, 0, VOL_LEVEL_FULL)
EndSwitch EndSwitch
Call(PlayAmbientSounds, AMBIENT_WIND) Call(PlayAmbientSounds, AMBIENT_WIND)
Return Return

2
src/world/area_arn/arn_05/npc.c
View File

@ -418,7 +418,7 @@ EvtScript N(EVS_Scene_TubbaRaid) = {
Call(CloseMessage) Call(CloseMessage)
Call(ForceUsePartner) Call(ForceUsePartner)
Wait(60 * DT) Wait(60 * DT)
Call(SetMusicTrack, 0, SONG_TUBBAS_MANOR, BGM_VARIATION_1, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_TUBBAS_MANOR, BGM_VARIATION_1, VOL_LEVEL_FULL)
Call(SetCamType, CAM_DEFAULT, 6, TRUE) Call(SetCamType, CAM_DEFAULT, 6, TRUE)
Call(SetCamSpeed, CAM_DEFAULT, Float(90.0)) Call(SetCamSpeed, CAM_DEFAULT, Float(90.0))
Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-11.5)) Call(SetCamPitch, CAM_DEFAULT, Float(17.0), Float(-11.5))

10
src/world/area_arn/arn_07/music.c
View File

@ -3,18 +3,18 @@
EvtScript N(EVS_SetupMusic) = { EvtScript N(EVS_SetupMusic) = {
Switch(GB_StoryProgress) Switch(GB_StoryProgress)
CaseLt(STORY_CH3_TUBBA_WOKE_UP) CaseLt(STORY_CH3_TUBBA_WOKE_UP)
Call(SetMusicTrack, 0, SONG_GUSTY_GULCH, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_GUSTY_GULCH, 0, VOL_LEVEL_FULL)
Call(PlayAmbientSounds, AMBIENT_WIND) Call(PlayAmbientSounds, AMBIENT_WIND)
CaseLt(STORY_CH3_HEART_ESCAPED_WINDY_MILL) CaseLt(STORY_CH3_HEART_ESCAPED_WINDY_MILL)
Call(SetMusicTrack, 0, SONG_TUBBA_ESCAPE, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_TUBBA_ESCAPE, 0, VOL_LEVEL_FULL)
Call(PlayAmbientSounds, AMBIENT_WIND) Call(PlayAmbientSounds, AMBIENT_WIND)
CaseLt(STORY_CH3_DEFEATED_TUBBA_BLUBBA) CaseLt(STORY_CH3_DEFEATED_TUBBA_BLUBBA)
Call(SetMusicTrack, 0, SONG_TUBBA_BLUBBA_THEME, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_TUBBA_BLUBBA_THEME, 0, VOL_LEVEL_FULL)
Call(PlayAmbientSounds, AMBIENT_WIND) Call(PlayAmbientSounds, AMBIENT_WIND)
CaseEq(STORY_CH3_BEGAN_PEACH_MISSION) CaseEq(STORY_CH3_BEGAN_PEACH_MISSION)
Call(SetMusicTrack, 0, SONG_STAR_SPIRIT_THEME, BGM_VARIATION_1, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_STAR_SPIRIT_THEME, BGM_VARIATION_1, VOL_LEVEL_FULL)
CaseDefault CaseDefault
Call(SetMusicTrack, 0, SONG_GUSTY_GULCH, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_GUSTY_GULCH, 0, VOL_LEVEL_FULL)
Call(PlayAmbientSounds, AMBIENT_WIND) Call(PlayAmbientSounds, AMBIENT_WIND)
EndSwitch EndSwitch
Return Return

4
src/world/area_arn/arn_07/npc.c
View File

@ -117,7 +117,7 @@ EvtScript N(EVS_Scene_BossDefeated) = {
Call(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) Call(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION)
Call(EnableNpcShadow, NPC_SELF, FALSE) Call(EnableNpcShadow, NPC_SELF, FALSE)
Set(GB_StoryProgress, STORY_CH3_DEFEATED_TUBBA_BLUBBA) Set(GB_StoryProgress, STORY_CH3_DEFEATED_TUBBA_BLUBBA)
Call(SetMusicTrack, 0, SONG_CHEERFUL_BOOS_MANSION, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_CHEERFUL_BOOS_MANSION, 0, VOL_LEVEL_FULL)
Call(GetCurrentPartnerID, LVar6) Call(GetCurrentPartnerID, LVar6)
IfEq(LVar6, PARTNER_BOW) IfEq(LVar6, PARTNER_BOW)
Set(LVar5, -4) Set(LVar5, -4)
@ -310,7 +310,7 @@ EvtScript N(EVS_NpcDefeat_Tubba) = {
Call(GetBattleOutcome, LVar0) Call(GetBattleOutcome, LVar0)
Switch(LVar0) Switch(LVar0)
CaseEq(OUTCOME_PLAYER_WON) CaseEq(OUTCOME_PLAYER_WON)
Call(SetMusicTrack, 0, SONG_TUBBAS_MANOR, BGM_VARIATION_1, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_TUBBAS_MANOR, BGM_VARIATION_1, VOL_LEVEL_FULL)
ExecWait(N(EVS_Scene_TubbaRelents)) ExecWait(N(EVS_Scene_TubbaRelents))
Exec(N(EVS_Scene_BossDefeated)) Exec(N(EVS_Scene_BossDefeated))
CaseEq(OUTCOME_PLAYER_LOST) CaseEq(OUTCOME_PLAYER_LOST)

6
src/world/area_arn/arn_08/music.c
View File

@ -3,11 +3,11 @@
EvtScript N(EVS_SetupMusic) = { EvtScript N(EVS_SetupMusic) = {
Switch(GB_StoryProgress) Switch(GB_StoryProgress)
CaseLt(STORY_CH3_HEART_FLED_FIRST_TUNNEL) CaseLt(STORY_CH3_HEART_FLED_FIRST_TUNNEL)
Call(SetMusicTrack, 0, SONG_TUBBA_ESCAPE, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_TUBBA_ESCAPE, 0, VOL_LEVEL_FULL)
CaseLt(STORY_CH3_DEFEATED_TUBBA_BLUBBA) CaseLt(STORY_CH3_DEFEATED_TUBBA_BLUBBA)
Call(SetMusicTrack, 0, SONG_TUBBA_BLUBBA_THEME, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_TUBBA_BLUBBA_THEME, 0, VOL_LEVEL_FULL)
CaseDefault CaseDefault
Call(SetMusicTrack, 0, SONG_GUSTY_GULCH, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_GUSTY_GULCH, 0, VOL_LEVEL_FULL)
EndSwitch EndSwitch
Call(ClearAmbientSounds, 250) Call(ClearAmbientSounds, 250)
Return Return

6
src/world/area_arn/arn_09/music.c
View File

@ -3,11 +3,11 @@
EvtScript N(EVS_SetupMusic) = { EvtScript N(EVS_SetupMusic) = {
Switch(GB_StoryProgress) Switch(GB_StoryProgress)
CaseLt(STORY_CH3_HEART_FLED_FIRST_TUNNEL) CaseLt(STORY_CH3_HEART_FLED_FIRST_TUNNEL)
Call(SetMusicTrack, 0, SONG_TUBBA_ESCAPE, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_TUBBA_ESCAPE, 0, VOL_LEVEL_FULL)
CaseLt(STORY_CH3_DEFEATED_TUBBA_BLUBBA) CaseLt(STORY_CH3_DEFEATED_TUBBA_BLUBBA)
Call(SetMusicTrack, 0, SONG_TUBBA_BLUBBA_THEME, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_TUBBA_BLUBBA_THEME, 0, VOL_LEVEL_FULL)
CaseDefault CaseDefault
Call(SetMusicTrack, 0, SONG_GUSTY_GULCH, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_GUSTY_GULCH, 0, VOL_LEVEL_FULL)
EndSwitch EndSwitch
Return Return
End End

6
src/world/area_arn/arn_10/music.c
View File

@ -3,11 +3,11 @@
EvtScript N(EVS_SetupMusic) = { EvtScript N(EVS_SetupMusic) = {
Switch(GB_StoryProgress) Switch(GB_StoryProgress)
CaseLt(STORY_CH3_HEART_FLED_FIRST_TUNNEL) CaseLt(STORY_CH3_HEART_FLED_FIRST_TUNNEL)
Call(SetMusicTrack, 0, SONG_TUBBA_ESCAPE, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_TUBBA_ESCAPE, 0, VOL_LEVEL_FULL)
CaseLt(STORY_CH3_DEFEATED_TUBBA_BLUBBA) CaseLt(STORY_CH3_DEFEATED_TUBBA_BLUBBA)
Call(SetMusicTrack, 0, SONG_TUBBA_BLUBBA_THEME, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_TUBBA_BLUBBA_THEME, 0, VOL_LEVEL_FULL)
CaseDefault CaseDefault
Call(SetMusicTrack, 0, SONG_GUSTY_GULCH, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_GUSTY_GULCH, 0, VOL_LEVEL_FULL)
EndSwitch EndSwitch
Return Return
End End

6
src/world/area_arn/arn_11/music.c
View File

@ -3,11 +3,11 @@
EvtScript N(EVS_SetupMusic) = { EvtScript N(EVS_SetupMusic) = {
Switch(GB_StoryProgress) Switch(GB_StoryProgress)
CaseLt(STORY_CH3_WENT_DOWN_THE_WELL) CaseLt(STORY_CH3_WENT_DOWN_THE_WELL)
Call(SetMusicTrack, 0, SONG_TUBBA_ESCAPE, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_TUBBA_ESCAPE, 0, VOL_LEVEL_FULL)
CaseLt(STORY_CH3_DEFEATED_TUBBA_BLUBBA) CaseLt(STORY_CH3_DEFEATED_TUBBA_BLUBBA)
Call(SetMusicTrack, 0, SONG_TUBBA_BLUBBA_THEME, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_TUBBA_BLUBBA_THEME, 0, VOL_LEVEL_FULL)
CaseDefault CaseDefault
Call(SetMusicTrack, 0, SONG_GUSTY_GULCH, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_GUSTY_GULCH, 0, VOL_LEVEL_FULL)
EndSwitch EndSwitch
Return Return
End End

6
src/world/area_arn/arn_12/music.c
View File

@ -3,11 +3,11 @@
EvtScript N(EVS_SetupMusic) = { EvtScript N(EVS_SetupMusic) = {
Switch(GB_StoryProgress) Switch(GB_StoryProgress)
CaseLt(STORY_CH3_HEART_FLED_FIRST_TUNNEL) CaseLt(STORY_CH3_HEART_FLED_FIRST_TUNNEL)
Call(SetMusicTrack, 0, SONG_TUBBA_ESCAPE, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_TUBBA_ESCAPE, 0, VOL_LEVEL_FULL)
CaseLt(STORY_CH3_DEFEATED_TUBBA_BLUBBA) CaseLt(STORY_CH3_DEFEATED_TUBBA_BLUBBA)
Call(SetMusicTrack, 0, SONG_TUBBA_BLUBBA_THEME, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_TUBBA_BLUBBA_THEME, 0, VOL_LEVEL_FULL)
CaseDefault CaseDefault
Call(SetMusicTrack, 0, SONG_GUSTY_GULCH, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_GUSTY_GULCH, 0, VOL_LEVEL_FULL)
EndSwitch EndSwitch
Return Return
End End

6
src/world/area_arn/arn_13/music.c
View File

@ -3,11 +3,11 @@
EvtScript N(EVS_SetupMusic) = { EvtScript N(EVS_SetupMusic) = {
Switch(GB_StoryProgress) Switch(GB_StoryProgress)
CaseLt(STORY_CH3_HEART_FLED_FIRST_TUNNEL) CaseLt(STORY_CH3_HEART_FLED_FIRST_TUNNEL)
Call(SetMusicTrack, 0, SONG_TUBBA_ESCAPE, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_TUBBA_ESCAPE, 0, VOL_LEVEL_FULL)
CaseLt(STORY_CH3_DEFEATED_TUBBA_BLUBBA) CaseLt(STORY_CH3_DEFEATED_TUBBA_BLUBBA)
Call(SetMusicTrack, 0, SONG_TUBBA_BLUBBA_THEME, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_TUBBA_BLUBBA_THEME, 0, VOL_LEVEL_FULL)
CaseDefault CaseDefault
Call(SetMusicTrack, 0, SONG_GUSTY_GULCH, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_GUSTY_GULCH, 0, VOL_LEVEL_FULL)
EndSwitch EndSwitch
Return Return
End End

6
src/world/area_dgb/dgb_00/music.c
View File

@ -3,11 +3,11 @@
EvtScript N(EVS_SetupMusic) = { EvtScript N(EVS_SetupMusic) = {
Switch(GB_StoryProgress) Switch(GB_StoryProgress)
CaseLt(STORY_CH3_TUBBA_WOKE_UP) CaseLt(STORY_CH3_TUBBA_WOKE_UP)
Call(SetMusicTrack, 0, SONG_GUSTY_GULCH, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_GUSTY_GULCH, 0, VOL_LEVEL_FULL)
CaseLt(STORY_CH3_DEFEATED_TUBBA_BLUBBA) CaseLt(STORY_CH3_DEFEATED_TUBBA_BLUBBA)
Call(SetMusicTrack, 0, SONG_TUBBA_ESCAPE, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_TUBBA_ESCAPE, 0, VOL_LEVEL_FULL)
CaseDefault CaseDefault
Call(SetMusicTrack, 0, SONG_GUSTY_GULCH, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_GUSTY_GULCH, 0, VOL_LEVEL_FULL)
EndSwitch EndSwitch
Call(ClearAmbientSounds, 250) Call(ClearAmbientSounds, 250)
Return Return

6
src/world/area_dgb/dgb_01/music.c
View File

@ -3,11 +3,11 @@
EvtScript N(EVS_SetupMusic) = { EvtScript N(EVS_SetupMusic) = {
Switch(GB_StoryProgress) Switch(GB_StoryProgress)
CaseLt(STORY_CH3_TUBBA_WOKE_UP) CaseLt(STORY_CH3_TUBBA_WOKE_UP)
Call(SetMusicTrack, 0, SONG_TUBBAS_MANOR, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_TUBBAS_MANOR, 0, VOL_LEVEL_FULL)
CaseLt(STORY_CH3_DEFEATED_TUBBA_BLUBBA) CaseLt(STORY_CH3_DEFEATED_TUBBA_BLUBBA)
Call(SetMusicTrack, 0, SONG_TUBBA_ESCAPE, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_TUBBA_ESCAPE, 0, VOL_LEVEL_FULL)
CaseDefault CaseDefault
Call(SetMusicTrack, 0, SONG_TUBBAS_MANOR, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_TUBBAS_MANOR, 0, VOL_LEVEL_FULL)
EndSwitch EndSwitch
Call(ClearAmbientSounds, 250) Call(ClearAmbientSounds, 250)
Return Return

6
src/world/area_dgb/dgb_02/music.c
View File

@ -3,11 +3,11 @@
EvtScript N(EVS_SetupMusic) = { EvtScript N(EVS_SetupMusic) = {
Switch(GB_StoryProgress) Switch(GB_StoryProgress)
CaseLt(STORY_CH3_TUBBA_WOKE_UP) CaseLt(STORY_CH3_TUBBA_WOKE_UP)
Call(SetMusicTrack, 0, SONG_TUBBAS_MANOR, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_TUBBAS_MANOR, 0, VOL_LEVEL_FULL)
CaseLt(STORY_CH3_DEFEATED_TUBBA_BLUBBA) CaseLt(STORY_CH3_DEFEATED_TUBBA_BLUBBA)
Call(SetMusicTrack, 0, SONG_TUBBA_ESCAPE, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_TUBBA_ESCAPE, 0, VOL_LEVEL_FULL)
CaseDefault CaseDefault
Call(SetMusicTrack, 0, SONG_TUBBAS_MANOR, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_TUBBAS_MANOR, 0, VOL_LEVEL_FULL)
EndSwitch EndSwitch
Return Return
End End

6
src/world/area_dgb/dgb_03/music.c
View File

@ -3,11 +3,11 @@
EvtScript N(EVS_SetupMusic) = { EvtScript N(EVS_SetupMusic) = {
Switch(GB_StoryProgress) Switch(GB_StoryProgress)
CaseLt(STORY_CH3_TUBBA_WOKE_UP) CaseLt(STORY_CH3_TUBBA_WOKE_UP)
Call(SetMusicTrack, 0, SONG_TUBBAS_MANOR, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_TUBBAS_MANOR, 0, VOL_LEVEL_FULL)
CaseLt(STORY_CH3_DEFEATED_TUBBA_BLUBBA) CaseLt(STORY_CH3_DEFEATED_TUBBA_BLUBBA)
Call(SetMusicTrack, 0, SONG_TUBBA_ESCAPE, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_TUBBA_ESCAPE, 0, VOL_LEVEL_FULL)
CaseDefault CaseDefault
Call(SetMusicTrack, 0, SONG_TUBBAS_MANOR, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_TUBBAS_MANOR, 0, VOL_LEVEL_FULL)
EndSwitch EndSwitch
Return Return
End End

6
src/world/area_dgb/dgb_04/music.c
View File

@ -3,11 +3,11 @@
EvtScript N(EVS_SetupMusic) = { EvtScript N(EVS_SetupMusic) = {
Switch(GB_StoryProgress) Switch(GB_StoryProgress)
CaseLt(STORY_CH3_TUBBA_WOKE_UP) CaseLt(STORY_CH3_TUBBA_WOKE_UP)
Call(SetMusicTrack, 0, SONG_TUBBAS_MANOR, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_TUBBAS_MANOR, 0, VOL_LEVEL_FULL)
CaseLt(STORY_CH3_DEFEATED_TUBBA_BLUBBA) CaseLt(STORY_CH3_DEFEATED_TUBBA_BLUBBA)
Call(SetMusicTrack, 0, SONG_TUBBA_ESCAPE, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_TUBBA_ESCAPE, 0, VOL_LEVEL_FULL)
CaseDefault CaseDefault
Call(SetMusicTrack, 0, SONG_TUBBAS_MANOR, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_TUBBAS_MANOR, 0, VOL_LEVEL_FULL)
EndSwitch EndSwitch
Return Return
End End

6
src/world/area_dgb/dgb_05/music.c
View File

@ -3,11 +3,11 @@
EvtScript N(EVS_SetupMusic) = { EvtScript N(EVS_SetupMusic) = {
Switch(GB_StoryProgress) Switch(GB_StoryProgress)
CaseLt(STORY_CH3_TUBBA_WOKE_UP) CaseLt(STORY_CH3_TUBBA_WOKE_UP)
Call(SetMusicTrack, 0, SONG_TUBBAS_MANOR, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_TUBBAS_MANOR, 0, VOL_LEVEL_FULL)
CaseLt(STORY_CH3_DEFEATED_TUBBA_BLUBBA) CaseLt(STORY_CH3_DEFEATED_TUBBA_BLUBBA)
Call(SetMusicTrack, 0, SONG_TUBBA_ESCAPE, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_TUBBA_ESCAPE, 0, VOL_LEVEL_FULL)
CaseDefault CaseDefault
Call(SetMusicTrack, 0, SONG_TUBBAS_MANOR, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_TUBBAS_MANOR, 0, VOL_LEVEL_FULL)
EndSwitch EndSwitch
Return Return
End End

6
src/world/area_dgb/dgb_06/music.c
View File

@ -3,11 +3,11 @@
EvtScript N(EVS_SetupMusic) = { EvtScript N(EVS_SetupMusic) = {
Switch(GB_StoryProgress) Switch(GB_StoryProgress)
CaseLt(STORY_CH3_TUBBA_WOKE_UP) CaseLt(STORY_CH3_TUBBA_WOKE_UP)
Call(SetMusicTrack, 0, SONG_TUBBAS_MANOR, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_TUBBAS_MANOR, 0, VOL_LEVEL_FULL)
CaseLt(STORY_CH3_DEFEATED_TUBBA_BLUBBA) CaseLt(STORY_CH3_DEFEATED_TUBBA_BLUBBA)
Call(SetMusicTrack, 0, SONG_TUBBA_ESCAPE, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_TUBBA_ESCAPE, 0, VOL_LEVEL_FULL)
CaseDefault CaseDefault
Call(SetMusicTrack, 0, SONG_TUBBAS_MANOR, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_TUBBAS_MANOR, 0, VOL_LEVEL_FULL)
EndSwitch EndSwitch
Return Return
End End

6
src/world/area_dgb/dgb_07/music.c
View File

@ -3,11 +3,11 @@
EvtScript N(EVS_SetupMusic) = { EvtScript N(EVS_SetupMusic) = {
Switch(GB_StoryProgress) Switch(GB_StoryProgress)
CaseLt(STORY_CH3_TUBBA_WOKE_UP) CaseLt(STORY_CH3_TUBBA_WOKE_UP)
Call(SetMusicTrack, 0, SONG_TUBBAS_MANOR, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_TUBBAS_MANOR, 0, VOL_LEVEL_FULL)
CaseLt(STORY_CH3_DEFEATED_TUBBA_BLUBBA) CaseLt(STORY_CH3_DEFEATED_TUBBA_BLUBBA)
Call(SetMusicTrack, 0, SONG_TUBBA_ESCAPE, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_TUBBA_ESCAPE, 0, VOL_LEVEL_FULL)
CaseDefault CaseDefault
Call(SetMusicTrack, 0, SONG_TUBBAS_MANOR, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_TUBBAS_MANOR, 0, VOL_LEVEL_FULL)
EndSwitch EndSwitch
Return Return
End End

6
src/world/area_dgb/dgb_08/music.c
View File

@ -3,11 +3,11 @@
EvtScript N(EVS_SetupMusic) = { EvtScript N(EVS_SetupMusic) = {
Switch(GB_StoryProgress) Switch(GB_StoryProgress)
CaseLt(STORY_CH3_TUBBA_WOKE_UP) CaseLt(STORY_CH3_TUBBA_WOKE_UP)
Call(SetMusicTrack, 0, SONG_TUBBAS_MANOR, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_TUBBAS_MANOR, 0, VOL_LEVEL_FULL)
CaseLt(STORY_CH3_DEFEATED_TUBBA_BLUBBA) CaseLt(STORY_CH3_DEFEATED_TUBBA_BLUBBA)
Call(SetMusicTrack, 0, SONG_TUBBA_ESCAPE, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_TUBBA_ESCAPE, 0, VOL_LEVEL_FULL)
CaseDefault CaseDefault
Call(SetMusicTrack, 0, SONG_TUBBAS_MANOR, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_TUBBAS_MANOR, 0, VOL_LEVEL_FULL)
EndSwitch EndSwitch
Return Return
End End

6
src/world/area_dgb/dgb_09/music.c
View File

@ -3,11 +3,11 @@
EvtScript N(EVS_SetupMusic) = { EvtScript N(EVS_SetupMusic) = {
Switch(GB_StoryProgress) Switch(GB_StoryProgress)
CaseLt(STORY_CH3_TUBBA_WOKE_UP) CaseLt(STORY_CH3_TUBBA_WOKE_UP)
Call(SetMusicTrack, 0, SONG_TUBBAS_MANOR, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_TUBBAS_MANOR, 0, VOL_LEVEL_FULL)
CaseLt(STORY_CH3_DEFEATED_TUBBA_BLUBBA) CaseLt(STORY_CH3_DEFEATED_TUBBA_BLUBBA)
Call(SetMusicTrack, 0, SONG_TUBBA_ESCAPE, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_TUBBA_ESCAPE, 0, VOL_LEVEL_FULL)
CaseDefault CaseDefault
Call(SetMusicTrack, 0, SONG_TUBBAS_MANOR, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_TUBBAS_MANOR, 0, VOL_LEVEL_FULL)
EndSwitch EndSwitch
Return Return
End End

6
src/world/area_dgb/dgb_10/music.c
View File

@ -3,11 +3,11 @@
EvtScript N(EVS_SetupMusic) = { EvtScript N(EVS_SetupMusic) = {
Switch(GB_StoryProgress) Switch(GB_StoryProgress)
CaseLt(STORY_CH3_TUBBA_WOKE_UP) CaseLt(STORY_CH3_TUBBA_WOKE_UP)
Call(SetMusicTrack, 0, SONG_TUBBAS_MANOR, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_TUBBAS_MANOR, 0, VOL_LEVEL_FULL)
CaseLt(STORY_CH3_DEFEATED_TUBBA_BLUBBA) CaseLt(STORY_CH3_DEFEATED_TUBBA_BLUBBA)
Call(SetMusicTrack, 0, SONG_TUBBA_ESCAPE, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_TUBBA_ESCAPE, 0, VOL_LEVEL_FULL)
CaseDefault CaseDefault
Call(SetMusicTrack, 0, SONG_TUBBAS_MANOR, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_TUBBAS_MANOR, 0, VOL_LEVEL_FULL)
EndSwitch EndSwitch
Return Return
End End

6
src/world/area_dgb/dgb_11/music.c
View File

@ -3,11 +3,11 @@
EvtScript N(EVS_SetupMusic) = { EvtScript N(EVS_SetupMusic) = {
Switch(GB_StoryProgress) Switch(GB_StoryProgress)
CaseLt(STORY_CH3_TUBBA_WOKE_UP) CaseLt(STORY_CH3_TUBBA_WOKE_UP)
Call(SetMusicTrack, 0, SONG_TUBBAS_MANOR, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_TUBBAS_MANOR, 0, VOL_LEVEL_FULL)
CaseLt(STORY_CH3_DEFEATED_TUBBA_BLUBBA) CaseLt(STORY_CH3_DEFEATED_TUBBA_BLUBBA)
Call(SetMusicTrack, 0, SONG_TUBBA_ESCAPE, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_TUBBA_ESCAPE, 0, VOL_LEVEL_FULL)
CaseDefault CaseDefault
Call(SetMusicTrack, 0, SONG_TUBBAS_MANOR, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_TUBBAS_MANOR, 0, VOL_LEVEL_FULL)
EndSwitch EndSwitch
Return Return
End End

6
src/world/area_dgb/dgb_12/music.c
View File

@ -3,11 +3,11 @@
EvtScript N(EVS_SetupMusic) = { EvtScript N(EVS_SetupMusic) = {
Switch(GB_StoryProgress) Switch(GB_StoryProgress)
CaseLt(STORY_CH3_TUBBA_WOKE_UP) CaseLt(STORY_CH3_TUBBA_WOKE_UP)
Call(SetMusicTrack, 0, SONG_TUBBAS_MANOR, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_TUBBAS_MANOR, 0, VOL_LEVEL_FULL)
CaseLt(STORY_CH3_DEFEATED_TUBBA_BLUBBA) CaseLt(STORY_CH3_DEFEATED_TUBBA_BLUBBA)
Call(SetMusicTrack, 0, SONG_TUBBA_ESCAPE, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_TUBBA_ESCAPE, 0, VOL_LEVEL_FULL)
CaseDefault CaseDefault
Call(SetMusicTrack, 0, SONG_TUBBAS_MANOR, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_TUBBAS_MANOR, 0, VOL_LEVEL_FULL)
EndSwitch EndSwitch
Return Return
End End

6
src/world/area_dgb/dgb_13/music.c
View File

@ -3,11 +3,11 @@
EvtScript N(EVS_SetupMusic) = { EvtScript N(EVS_SetupMusic) = {
Switch(GB_StoryProgress) Switch(GB_StoryProgress)
CaseLt(STORY_CH3_TUBBA_WOKE_UP) CaseLt(STORY_CH3_TUBBA_WOKE_UP)
Call(SetMusicTrack, 0, SONG_TUBBAS_MANOR, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_TUBBAS_MANOR, 0, VOL_LEVEL_FULL)
CaseLt(STORY_CH3_DEFEATED_TUBBA_BLUBBA) CaseLt(STORY_CH3_DEFEATED_TUBBA_BLUBBA)
Call(SetMusicTrack, 0, SONG_TUBBA_ESCAPE, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_TUBBA_ESCAPE, 0, VOL_LEVEL_FULL)
CaseDefault CaseDefault
Call(SetMusicTrack, 0, SONG_TUBBAS_MANOR, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_TUBBAS_MANOR, 0, VOL_LEVEL_FULL)
EndSwitch EndSwitch
Return Return
End End

6
src/world/area_dgb/dgb_14/music.c
View File

@ -3,11 +3,11 @@
EvtScript N(EVS_SetupMusic) = { EvtScript N(EVS_SetupMusic) = {
Switch(GB_StoryProgress) Switch(GB_StoryProgress)
CaseLt(STORY_CH3_TUBBA_WOKE_UP) CaseLt(STORY_CH3_TUBBA_WOKE_UP)
Call(SetMusicTrack, 0, SONG_TUBBAS_MANOR, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_TUBBAS_MANOR, 0, VOL_LEVEL_FULL)
CaseLt(STORY_CH3_DEFEATED_TUBBA_BLUBBA) CaseLt(STORY_CH3_DEFEATED_TUBBA_BLUBBA)
Call(SetMusicTrack, 0, SONG_TUBBA_ESCAPE, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_TUBBA_ESCAPE, 0, VOL_LEVEL_FULL)
CaseDefault CaseDefault
Call(SetMusicTrack, 0, SONG_TUBBAS_MANOR, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_TUBBAS_MANOR, 0, VOL_LEVEL_FULL)
EndSwitch EndSwitch
Return Return
End End

8
src/world/area_dgb/dgb_15/music.c
View File

@ -4,14 +4,14 @@ EvtScript N(EVS_SetupMusic) = {
Switch(GB_StoryProgress) Switch(GB_StoryProgress)
CaseLt(STORY_CH3_TUBBA_WOKE_UP) CaseLt(STORY_CH3_TUBBA_WOKE_UP)
IfEq(GB_ARN_Tubba_MapID, 15) IfEq(GB_ARN_Tubba_MapID, 15)
Call(SetMusicTrack, 0, SONG_TUBBA_BLUBBA_THEME, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_TUBBA_BLUBBA_THEME, 0, VOL_LEVEL_FULL)
Else Else
Call(SetMusicTrack, 0, SONG_TUBBAS_MANOR, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_TUBBAS_MANOR, 0, VOL_LEVEL_FULL)
EndIf EndIf
CaseLt(STORY_CH3_DEFEATED_TUBBA_BLUBBA) CaseLt(STORY_CH3_DEFEATED_TUBBA_BLUBBA)
Call(SetMusicTrack, 0, SONG_TUBBA_ESCAPE, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_TUBBA_ESCAPE, 0, VOL_LEVEL_FULL)
CaseDefault CaseDefault
Call(SetMusicTrack, 0, SONG_TUBBAS_MANOR, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_TUBBAS_MANOR, 0, VOL_LEVEL_FULL)
EndSwitch EndSwitch
Return Return
End End

4
src/world/area_dgb/dgb_15/npc.c
View File

@ -38,7 +38,7 @@ EvtScript N(EVS_NpcIdle_Tubba) = {
Wait(1) Wait(1)
EndLoop EndLoop
Call(DisablePlayerInput, TRUE) Call(DisablePlayerInput, TRUE)
Call(SetMusicTrack, 0, SONG_TUBBA_BLUBBA_THEME, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_TUBBA_BLUBBA_THEME, 0, VOL_LEVEL_FULL)
Wait(15) Wait(15)
Thread Thread
Call(UseSettingsFrom, CAM_DEFAULT, -50, 0, 180) Call(UseSettingsFrom, CAM_DEFAULT, -50, 0, 180)
@ -51,7 +51,7 @@ EvtScript N(EVS_NpcIdle_Tubba) = {
Call(SetNpcAnimation, NPC_Tubba, ANIM_WorldTubba_Anim09) Call(SetNpcAnimation, NPC_Tubba, ANIM_WorldTubba_Anim09)
Call(SetNpcYaw, NPC_SELF, 270) Call(SetNpcYaw, NPC_SELF, 270)
Call(NpcMoveTo, NPC_SELF, -53, 180, 60) Call(NpcMoveTo, NPC_SELF, -53, 180, 60)
Call(SetMusicTrack, 0, SONG_TUBBA_BLUBBA_THEME, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_TUBBA_BLUBBA_THEME, 0, VOL_LEVEL_FULL)
Call(SetNpcAnimation, NPC_SELF, ANIM_WorldTubba_Anim06) Call(SetNpcAnimation, NPC_SELF, ANIM_WorldTubba_Anim06)
Wait(15) Wait(15)
Call(SpeakToPlayer, NPC_SELF, ANIM_WorldTubba_Anim10, ANIM_WorldTubba_Anim06, 0, MSG_CH3_00F3) Call(SpeakToPlayer, NPC_SELF, ANIM_WorldTubba_Anim10, ANIM_WorldTubba_Anim06, 0, MSG_CH3_00F3)

6
src/world/area_dgb/dgb_16/music.c
View File

@ -3,11 +3,11 @@
EvtScript N(EVS_SetupMusic) = { EvtScript N(EVS_SetupMusic) = {
Switch(GB_StoryProgress) Switch(GB_StoryProgress)
CaseLt(STORY_CH3_TUBBA_WOKE_UP) CaseLt(STORY_CH3_TUBBA_WOKE_UP)
Call(SetMusicTrack, 0, SONG_TUBBAS_MANOR, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_TUBBAS_MANOR, 0, VOL_LEVEL_FULL)
CaseLt(STORY_CH3_DEFEATED_TUBBA_BLUBBA) CaseLt(STORY_CH3_DEFEATED_TUBBA_BLUBBA)
Call(SetMusicTrack, 0, SONG_TUBBA_ESCAPE, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_TUBBA_ESCAPE, 0, VOL_LEVEL_FULL)
CaseDefault CaseDefault
Call(SetMusicTrack, 0, SONG_TUBBAS_MANOR, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_TUBBAS_MANOR, 0, VOL_LEVEL_FULL)
EndSwitch EndSwitch
Return Return
End End

6
src/world/area_dgb/dgb_17/music.c
View File

@ -3,11 +3,11 @@
EvtScript N(EVS_SetupMusic) = { EvtScript N(EVS_SetupMusic) = {
Switch(GB_StoryProgress) Switch(GB_StoryProgress)
CaseLt(STORY_CH3_TUBBA_WOKE_UP) CaseLt(STORY_CH3_TUBBA_WOKE_UP)
Call(SetMusicTrack, 0, SONG_TUBBAS_MANOR, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_TUBBAS_MANOR, 0, VOL_LEVEL_FULL)
CaseLt(STORY_CH3_DEFEATED_TUBBA_BLUBBA) CaseLt(STORY_CH3_DEFEATED_TUBBA_BLUBBA)
Call(SetMusicTrack, 0, SONG_TUBBA_ESCAPE, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_TUBBA_ESCAPE, 0, VOL_LEVEL_FULL)
CaseDefault CaseDefault
Call(SetMusicTrack, 0, SONG_TUBBAS_MANOR, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_TUBBAS_MANOR, 0, VOL_LEVEL_FULL)
EndSwitch EndSwitch
Return Return
End End

6
src/world/area_dgb/dgb_18/music.c
View File

@ -3,11 +3,11 @@
EvtScript N(EVS_SetupMusic) = { EvtScript N(EVS_SetupMusic) = {
Switch(GB_StoryProgress) Switch(GB_StoryProgress)
CaseLt(STORY_CH3_TUBBA_WOKE_UP) CaseLt(STORY_CH3_TUBBA_WOKE_UP)
Call(SetMusicTrack, 0, SONG_TUBBAS_MANOR, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_TUBBAS_MANOR, 0, VOL_LEVEL_FULL)
CaseLt(STORY_CH3_DEFEATED_TUBBA_BLUBBA) CaseLt(STORY_CH3_DEFEATED_TUBBA_BLUBBA)
Call(SetMusicTrack, 0, SONG_TUBBA_ESCAPE, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_TUBBA_ESCAPE, 0, VOL_LEVEL_FULL)
CaseDefault CaseDefault
Call(SetMusicTrack, 0, SONG_TUBBAS_MANOR, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_TUBBAS_MANOR, 0, VOL_LEVEL_FULL)
EndSwitch EndSwitch
Return Return
End End

4
src/world/area_dgb/dgb_18/npc.c
View File

@ -102,7 +102,7 @@ EvtScript N(EVS_Scene_TubbaFallsAsleep) = {
Wait(5) Wait(5)
EndLoop EndLoop
EndThread EndThread
Call(SetMusicTrack, 0, SONG_TUBBA_BLUBBA_THEME, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_TUBBA_BLUBBA_THEME, 0, VOL_LEVEL_FULL)
Call(SetNpcAnimation, NPC_SELF, ANIM_WorldTubba_Anim09) Call(SetNpcAnimation, NPC_SELF, ANIM_WorldTubba_Anim09)
Call(SetNpcPos, NPC_SELF, -210, 0, 180) Call(SetNpcPos, NPC_SELF, -210, 0, 180)
Call(NpcMoveTo, NPC_SELF, -60, 180, 30) Call(NpcMoveTo, NPC_SELF, -60, 180, 30)
@ -427,7 +427,7 @@ EvtScript N(EVS_Scene_YakkeyShouts) = {
BreakLoop BreakLoop
EndIf EndIf
EndLoop EndLoop
Call(SetMusicTrack, 0, SONG_TUBBA_ESCAPE, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_TUBBA_ESCAPE, 0, VOL_LEVEL_FULL)
Call(SetNpcVar, NPC_Tubba, 1, 1) Call(SetNpcVar, NPC_Tubba, 1, 1)
Wait(15) Wait(15)
Call(SetNpcAnimation, NPC_Tubba, ANIM_WorldTubba_Anim25) Call(SetNpcAnimation, NPC_Tubba, ANIM_WorldTubba_Anim25)

2
src/world/area_dro/dro_01/music.c
View File

@ -7,7 +7,7 @@ EvtScript N(EVS_SetupMusic) = {
CaseOrEq(dro_01_ENTRY_4) CaseOrEq(dro_01_ENTRY_4)
EndCaseGroup EndCaseGroup
CaseDefault CaseDefault
Call(SetMusicTrack, 0, SONG_DRY_DRY_OUTPOST, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_DRY_DRY_OUTPOST, 0, VOL_LEVEL_FULL)
EndCaseGroup EndCaseGroup
EndSwitch EndSwitch
Return Return

6
src/world/area_dro/dro_02/music.c
View File

@ -7,7 +7,7 @@ EvtScript N(EVS_SetupMusic) = {
CaseOrEq(dro_02_ENTRY_3) CaseOrEq(dro_02_ENTRY_3)
EndCaseGroup EndCaseGroup
CaseDefault CaseDefault
Call(SetMusicTrack, 0, SONG_DRY_DRY_OUTPOST, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_DRY_DRY_OUTPOST, 0, VOL_LEVEL_FULL)
EndCaseGroup EndCaseGroup
EndSwitch EndSwitch
Return Return
@ -15,13 +15,13 @@ EvtScript N(EVS_SetupMusic) = {
}; };
EvtScript N(EVS_PlayRestMusic) = { EvtScript N(EVS_PlayRestMusic) = {
Call(SetMusicTrack, 0, SONG_TAKING_REST, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_TAKING_REST, 0, VOL_LEVEL_FULL)
Return Return
End End
}; };
EvtScript N(EVS_PlayMoustafaMusic) = { EvtScript N(EVS_PlayMoustafaMusic) = {
Call(SetMusicTrack, 0, SONG_MOUSTAFA_THEME, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_MOUSTAFA_THEME, 0, VOL_LEVEL_FULL)
Return Return
End End
}; };

2
src/world/area_dro/dro_02/npc_merlee.c
View File

@ -812,7 +812,7 @@ EvtScript N(EVS_NpcInteract_Merlee) = {
Return Return
EndIf EndIf
Call(ContinueSpeech, -1, ANIM_WorldMerlee_Talk, ANIM_WorldMerlee_Idle, 0, MSG_CH2_00DA) Call(ContinueSpeech, -1, ANIM_WorldMerlee_Talk, ANIM_WorldMerlee_Idle, 0, MSG_CH2_00DA)
Call(SetMusicTrack, 0, SONG_MERLEE_SPELL, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_MERLEE_SPELL, 0, VOL_LEVEL_FULL)
Call(DisablePartnerAI, 0) Call(DisablePartnerAI, 0)
Call(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) Call(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE)
ExecGetTID(N(EVS_PerformRitual), LVar9) ExecGetTID(N(EVS_PerformRitual), LVar9)

2
src/world/area_end/end_00/allies.c
View File

@ -29,7 +29,7 @@ EvtScript N(EVS_ParadePhase_Luigi) = {
Wait(30 * DT) Wait(30 * DT)
Call(SetNpcAnimation, NPC_Luigi, ANIM_ParadeLuigi_MarchInPlace) Call(SetNpcAnimation, NPC_Luigi, ANIM_ParadeLuigi_MarchInPlace)
Wait(7 * DT) Wait(7 * DT)
Call(SetMusicTrack, 0, SONG_PARADE_DAY, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_PARADE_DAY, 0, VOL_LEVEL_FULL)
Wait(120 * DT) Wait(120 * DT)
Wait(100 * DT) Wait(100 * DT)
Call(InterpNpcYaw, NPC_Luigi, 270, 0) Call(InterpNpcYaw, NPC_Luigi, 270, 0)

2
src/world/area_end/end_01/parade_setup.c
View File

@ -735,7 +735,7 @@ EvtScript N(EVS_ParadePhase_PlayCredits) = {
EvtScript N(EVS_ManageParade) = { EvtScript N(EVS_ManageParade) = {
Call(DisablePlayerInput, TRUE) Call(DisablePlayerInput, TRUE)
Call(DisablePlayerPhysics, TRUE) Call(DisablePlayerPhysics, TRUE)
Call(SetMusicTrack, 0, SONG_PARADE_NIGHT, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_PARADE_NIGHT, 0, VOL_LEVEL_FULL)
Exec(N(EVS_SetupInitialCamera)) Exec(N(EVS_SetupInitialCamera))
Exec(N(EVS_ManageNpcPool)) Exec(N(EVS_ManageNpcPool))
ExecGetTID(N(EVS_ParadePhase_StarSpirits), LVarA) ExecGetTID(N(EVS_ParadePhase_StarSpirits), LVarA)

2
src/world/area_flo/flo_00/beanstalk.c
View File

@ -253,7 +253,7 @@ EvtScript N(EVS_Exit_Beanstalk) = {
Call(SetNpcJumpscale, NPC_PARTNER, Float(0.0)) Call(SetNpcJumpscale, NPC_PARTNER, Float(0.0))
Call(NpcJump0, NPC_PARTNER, LVarC, LVarD, LVarE, 5) Call(NpcJump0, NPC_PARTNER, LVarC, LVarD, LVarE, 5)
Call(PlaySound, SOUND_FLO_RIDE_BEANSTALK_UP_LOOP) Call(PlaySound, SOUND_FLO_RIDE_BEANSTALK_UP_LOOP)
Call(SetMusicTrack, 0, SONG_MAGIC_BEANSTALK, BGM_VARIATION_1, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_MAGIC_BEANSTALK, BGM_VARIATION_1, VOL_LEVEL_FULL)
Call(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) Call(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE)
Call(SetPlayerAnimation, ANIM_Mario1_Walk) Call(SetPlayerAnimation, ANIM_Mario1_Walk)
Call(N(GetPlayerAngles), LVar3, LVar4) Call(N(GetPlayerAngles), LVar3, LVar4)

14
src/world/area_flo/flo_00/music.c
View File

@ -5,14 +5,14 @@ EvtScript N(EVS_SetupMusic) = {
Switch(LVar0) Switch(LVar0)
CaseEq(flo_00_ENTRY_8) CaseEq(flo_00_ENTRY_8)
IfNe(AF_FLO_RidingBeanstalk, FALSE) IfNe(AF_FLO_RidingBeanstalk, FALSE)
Call(SetMusicTrack, 0, SONG_MAGIC_BEANSTALK, BGM_VARIATION_1, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_MAGIC_BEANSTALK, BGM_VARIATION_1, VOL_LEVEL_FULL)
Else Else
Call(SetMusicTrack, 0, SONG_FLOWER_FIELDS_SUNNY, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_FLOWER_FIELDS_SUNNY, 0, VOL_LEVEL_FULL)
EndIf EndIf
CaseEq(flo_00_ENTRY_9) CaseEq(flo_00_ENTRY_9)
Call(SetMusicTrack, 0, SONG_SUNSHINE_RETURNS, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_SUNSHINE_RETURNS, 0, VOL_LEVEL_FULL)
CaseEq(flo_00_ENTRY_A) CaseEq(flo_00_ENTRY_A)
Call(SetMusicTrack, 0, SONG_STAR_SPIRIT_THEME, BGM_VARIATION_1, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_STAR_SPIRIT_THEME, BGM_VARIATION_1, VOL_LEVEL_FULL)
Thread Thread
Loop(0) Loop(0)
Wait(1) Wait(1)
@ -20,16 +20,16 @@ EvtScript N(EVS_SetupMusic) = {
BreakLoop BreakLoop
EndIf EndIf
EndLoop EndLoop
Call(SetMusicTrack, 0, SONG_FLOWER_FIELDS_SUNNY, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_FLOWER_FIELDS_SUNNY, 0, VOL_LEVEL_FULL)
EndThread EndThread
CaseEq(flo_00_ENTRY_B) CaseEq(flo_00_ENTRY_B)
Call(FadeInMusic, 0, SONG_FLOWER_FIELDS_SUNNY, 0, 3000, 0, 127) Call(FadeInMusic, 0, SONG_FLOWER_FIELDS_SUNNY, 0, 3000, 0, 127)
CaseDefault CaseDefault
Switch(GB_StoryProgress) Switch(GB_StoryProgress)
CaseLt(STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) CaseLt(STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE)
Call(SetMusicTrack, 0, SONG_FLOWER_FIELDS_CLOUDY, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_FLOWER_FIELDS_CLOUDY, 0, VOL_LEVEL_FULL)
CaseDefault CaseDefault
Call(SetMusicTrack, 0, SONG_FLOWER_FIELDS_SUNNY, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_FLOWER_FIELDS_SUNNY, 0, VOL_LEVEL_FULL)
EndSwitch EndSwitch
EndSwitch EndSwitch
Return Return

10
src/world/area_flo/flo_03/music.c
View File

@ -3,19 +3,19 @@
EvtScript N(EVS_SetupMusic) = { EvtScript N(EVS_SetupMusic) = {
Call(GetEntryID, LVar0) Call(GetEntryID, LVar0)
IfEq(LVar0, flo_03_ENTRY_2) IfEq(LVar0, flo_03_ENTRY_2)
Call(SetMusicTrack, 0, SONG_SUNSHINE_RETURNS, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_SUNSHINE_RETURNS, 0, VOL_LEVEL_FULL)
Else Else
Switch(GB_StoryProgress) Switch(GB_StoryProgress)
CaseLe(STORY_CH6_ASKED_TO_DEFEAT_MONTY_MOLES) CaseLe(STORY_CH6_ASKED_TO_DEFEAT_MONTY_MOLES)
IfEq(GF_FLO03_DefeatedAll_MontyMoles, FALSE) IfEq(GF_FLO03_DefeatedAll_MontyMoles, FALSE)
Call(SetMusicTrack, 0, SONG_MONTY_MOLE_ASSAULT, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_MONTY_MOLE_ASSAULT, 0, VOL_LEVEL_FULL)
Else Else
Call(SetMusicTrack, 0, SONG_FLOWER_FIELDS_CLOUDY, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_FLOWER_FIELDS_CLOUDY, 0, VOL_LEVEL_FULL)
EndIf EndIf
CaseLt(STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) CaseLt(STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE)
Call(SetMusicTrack, 0, SONG_FLOWER_FIELDS_CLOUDY, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_FLOWER_FIELDS_CLOUDY, 0, VOL_LEVEL_FULL)
CaseDefault CaseDefault
Call(SetMusicTrack, 0, SONG_FLOWER_FIELDS_SUNNY, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_FLOWER_FIELDS_SUNNY, 0, VOL_LEVEL_FULL)
EndSwitch EndSwitch
EndIf EndIf
Return Return

6
src/world/area_flo/flo_07/music.c
View File

@ -3,13 +3,13 @@
EvtScript N(EVS_SetupMusic) = { EvtScript N(EVS_SetupMusic) = {
Call(GetEntryID, LVar0) Call(GetEntryID, LVar0)
IfEq(LVar0, flo_07_ENTRY_1) IfEq(LVar0, flo_07_ENTRY_1)
Call(SetMusicTrack, 0, SONG_SUNSHINE_RETURNS, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_SUNSHINE_RETURNS, 0, VOL_LEVEL_FULL)
Else Else
Switch(GB_StoryProgress) Switch(GB_StoryProgress)
CaseLt(STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) CaseLt(STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE)
Call(SetMusicTrack, 0, SONG_FLOWER_FIELDS_CLOUDY, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_FLOWER_FIELDS_CLOUDY, 0, VOL_LEVEL_FULL)
CaseDefault CaseDefault
Call(SetMusicTrack, 0, SONG_FLOWER_FIELDS_SUNNY, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_FLOWER_FIELDS_SUNNY, 0, VOL_LEVEL_FULL)
EndSwitch EndSwitch
EndIf EndIf
Call(PlaySound, SOUND_LOOP_FLO_WATER_FLOW_1) Call(PlaySound, SOUND_LOOP_FLO_WATER_FLOW_1)

4
src/world/area_flo/flo_08/music.c
View File

@ -3,9 +3,9 @@
EvtScript N(EVS_SetupMusic) = { EvtScript N(EVS_SetupMusic) = {
Switch(GB_StoryProgress) Switch(GB_StoryProgress)
CaseLt(STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) CaseLt(STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE)
Call(SetMusicTrack, 0, SONG_FLOWER_FIELDS_CLOUDY, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_FLOWER_FIELDS_CLOUDY, 0, VOL_LEVEL_FULL)
CaseDefault CaseDefault
Call(SetMusicTrack, 0, SONG_FLOWER_FIELDS_SUNNY, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_FLOWER_FIELDS_SUNNY, 0, VOL_LEVEL_FULL)
EndSwitch EndSwitch
Return Return
End End

4
src/world/area_flo/flo_09/music.c
View File

@ -3,9 +3,9 @@
EvtScript N(EVS_SetupMusic) = { EvtScript N(EVS_SetupMusic) = {
Switch(GB_StoryProgress) Switch(GB_StoryProgress)
CaseLt(STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) CaseLt(STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE)
Call(SetMusicTrack, 0, SONG_FLOWER_FIELDS_CLOUDY, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_FLOWER_FIELDS_CLOUDY, 0, VOL_LEVEL_FULL)
CaseDefault CaseDefault
Call(SetMusicTrack, 0, SONG_FLOWER_FIELDS_SUNNY, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_FLOWER_FIELDS_SUNNY, 0, VOL_LEVEL_FULL)
EndSwitch EndSwitch
Return Return
End End

6
src/world/area_flo/flo_10/music.c
View File

@ -3,13 +3,13 @@
EvtScript N(EVS_SetupMusic) = { EvtScript N(EVS_SetupMusic) = {
Call(GetEntryID, LVar0) Call(GetEntryID, LVar0)
IfEq(LVar0, flo_10_ENTRY_1) IfEq(LVar0, flo_10_ENTRY_1)
Call(SetMusicTrack, 0, SONG_SUNSHINE_RETURNS, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_SUNSHINE_RETURNS, 0, VOL_LEVEL_FULL)
Else Else
Switch(GB_StoryProgress) Switch(GB_StoryProgress)
CaseLt(STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) CaseLt(STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE)
Call(SetMusicTrack, 0, SONG_FLOWER_FIELDS_CLOUDY, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_FLOWER_FIELDS_CLOUDY, 0, VOL_LEVEL_FULL)
CaseDefault CaseDefault
Call(SetMusicTrack, 0, SONG_FLOWER_FIELDS_SUNNY, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_FLOWER_FIELDS_SUNNY, 0, VOL_LEVEL_FULL)
EndSwitch EndSwitch
EndIf EndIf
IfGe(GB_StoryProgress, STORY_CH6_FILLED_SPRING_WITH_WATER) IfGe(GB_StoryProgress, STORY_CH6_FILLED_SPRING_WITH_WATER)

4
src/world/area_flo/flo_11/music.c
View File

@ -3,9 +3,9 @@
EvtScript N(EVS_SetupMusic) = { EvtScript N(EVS_SetupMusic) = {
Switch(GB_StoryProgress) Switch(GB_StoryProgress)
CaseLt(STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) CaseLt(STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE)
Call(SetMusicTrack, 0, SONG_FLOWER_FIELDS_CLOUDY, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_FLOWER_FIELDS_CLOUDY, 0, VOL_LEVEL_FULL)
CaseDefault CaseDefault
Call(SetMusicTrack, 0, SONG_FLOWER_FIELDS_SUNNY, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_FLOWER_FIELDS_SUNNY, 0, VOL_LEVEL_FULL)
EndSwitch EndSwitch
Return Return
End End

6
src/world/area_flo/flo_12/music.c
View File

@ -3,13 +3,13 @@
EvtScript N(EVS_SetupMusic) = { EvtScript N(EVS_SetupMusic) = {
Call(GetEntryID, LVar0) Call(GetEntryID, LVar0)
IfEq(LVar0, flo_12_ENTRY_1) IfEq(LVar0, flo_12_ENTRY_1)
Call(SetMusicTrack, 0, SONG_SUNSHINE_RETURNS, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_SUNSHINE_RETURNS, 0, VOL_LEVEL_FULL)
Else Else
Switch(GB_StoryProgress) Switch(GB_StoryProgress)
CaseLt(STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) CaseLt(STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE)
Call(SetMusicTrack, 0, SONG_FLOWER_FIELDS_CLOUDY, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_FLOWER_FIELDS_CLOUDY, 0, VOL_LEVEL_FULL)
CaseDefault CaseDefault
Call(SetMusicTrack, 0, SONG_FLOWER_FIELDS_SUNNY, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_FLOWER_FIELDS_SUNNY, 0, VOL_LEVEL_FULL)
EndSwitch EndSwitch
EndIf EndIf
Return Return

12
src/world/area_flo/flo_13/music.c
View File

@ -8,9 +8,9 @@ EvtScript N(EVS_PlaySongForPlayerPos) = {
Label(0) Label(0)
Switch(GB_StoryProgress) Switch(GB_StoryProgress)
CaseLt(STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) CaseLt(STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE)
Call(SetMusicTrack, 0, SONG_FLOWER_FIELDS_CLOUDY, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_FLOWER_FIELDS_CLOUDY, 0, VOL_LEVEL_FULL)
CaseDefault CaseDefault
Call(SetMusicTrack, 0, SONG_FLOWER_FIELDS_SUNNY, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_FLOWER_FIELDS_SUNNY, 0, VOL_LEVEL_FULL)
EndSwitch EndSwitch
Loop(0) Loop(0)
Call(GetPlayerPos, LVar0, LVar1, LVar2) Call(GetPlayerPos, LVar0, LVar1, LVar2)
@ -22,9 +22,9 @@ EvtScript N(EVS_PlaySongForPlayerPos) = {
Label(10) Label(10)
Switch(GB_StoryProgress) Switch(GB_StoryProgress)
CaseLt(STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) CaseLt(STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE)
Call(SetMusicTrack, 0, SONG_SUN_TOWER_CLOUDY, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_SUN_TOWER_CLOUDY, 0, VOL_LEVEL_FULL)
CaseDefault CaseDefault
Call(SetMusicTrack, 0, SONG_SUN_TOWER_SUNNY, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_SUN_TOWER_SUNNY, 0, VOL_LEVEL_FULL)
EndSwitch EndSwitch
Loop(0) Loop(0)
Call(GetPlayerPos, LVar0, LVar1, LVar2) Call(GetPlayerPos, LVar0, LVar1, LVar2)
@ -45,7 +45,7 @@ EvtScript N(EVS_SetupMusic) = {
}; };
EvtScript N(EVS_PushPartnerSong) = { EvtScript N(EVS_PushPartnerSong) = {
Call(SetMusicTrack, 0, SONG_NEW_PARTNER, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_NEW_PARTNER, 0, VOL_LEVEL_FULL)
Return Return
End End
}; };
@ -53,7 +53,7 @@ EvtScript N(EVS_PushPartnerSong) = {
EvtScript N(EVS_PopSong) = { EvtScript N(EVS_PopSong) = {
Call(FadeOutMusic, 0, 500) Call(FadeOutMusic, 0, 500)
Wait(15) Wait(15)
Call(SetMusicTrack, 0, SONG_FLOWER_FIELDS_CLOUDY, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_FLOWER_FIELDS_CLOUDY, 0, VOL_LEVEL_FULL)
Return Return
End End
}; };

2
src/world/area_flo/flo_13/npc.c
View File

@ -230,7 +230,7 @@ EvtScript N(EVS_NpcIdle_Lakilester) = {
Call(AwaitPlayerApproach, 200, 20, 275) Call(AwaitPlayerApproach, 200, 20, 275)
Call(DisablePlayerInput, TRUE) Call(DisablePlayerInput, TRUE)
Call(SetNpcPos, NPC_Lakilester, -250, 120, 45) Call(SetNpcPos, NPC_Lakilester, -250, 120, 45)
Call(SetMusicTrack, 0, SONG_LAKILESTER_THEME, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_LAKILESTER_THEME, 0, VOL_LEVEL_FULL)
Call(ShowMessageAtScreenPos, MSG_CH6_00A0, 160, 40) Call(ShowMessageAtScreenPos, MSG_CH6_00A0, 160, 40)
Call(InterruptUsePartner) Call(InterruptUsePartner)
Call(SetPlayerAnimation, ANIM_Mario1_LookUp) Call(SetPlayerAnimation, ANIM_Mario1_LookUp)

4
src/world/area_flo/flo_14/music.c
View File

@ -3,9 +3,9 @@
EvtScript N(EVS_SetupMusic) = { EvtScript N(EVS_SetupMusic) = {
Switch(GB_StoryProgress) Switch(GB_StoryProgress)
CaseLt(STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) CaseLt(STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE)
Call(SetMusicTrack, 0, SONG_FLOWER_FIELDS_CLOUDY, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_FLOWER_FIELDS_CLOUDY, 0, VOL_LEVEL_FULL)
CaseDefault CaseDefault
Call(SetMusicTrack, 0, SONG_FLOWER_FIELDS_SUNNY, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_FLOWER_FIELDS_SUNNY, 0, VOL_LEVEL_FULL)
EndSwitch EndSwitch
Return Return
End End

6
src/world/area_flo/flo_15/music.c
View File

@ -3,13 +3,13 @@
EvtScript N(EVS_SetupMusic) = { EvtScript N(EVS_SetupMusic) = {
Call(GetEntryID, LVar0) Call(GetEntryID, LVar0)
IfEq(LVar0, flo_15_ENTRY_1) IfEq(LVar0, flo_15_ENTRY_1)
Call(SetMusicTrack, 0, SONG_SUNSHINE_RETURNS, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_SUNSHINE_RETURNS, 0, VOL_LEVEL_FULL)
Else Else
Switch(GB_StoryProgress) Switch(GB_StoryProgress)
CaseLt(STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) CaseLt(STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE)
Call(SetMusicTrack, 0, SONG_SUN_TOWER_CLOUDY, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_SUN_TOWER_CLOUDY, 0, VOL_LEVEL_FULL)
CaseDefault CaseDefault
Call(SetMusicTrack, 0, SONG_SUN_TOWER_SUNNY, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_SUN_TOWER_SUNNY, 0, VOL_LEVEL_FULL)
EndSwitch EndSwitch
EndIf EndIf
Return Return

4
src/world/area_flo/flo_16/music.c
View File

@ -3,9 +3,9 @@
EvtScript N(EVS_SetupMusic) = { EvtScript N(EVS_SetupMusic) = {
Switch(GB_StoryProgress) Switch(GB_StoryProgress)
CaseLt(STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) CaseLt(STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE)
Call(SetMusicTrack, 0, SONG_FLOWER_FIELDS_CLOUDY, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_FLOWER_FIELDS_CLOUDY, 0, VOL_LEVEL_FULL)
CaseDefault CaseDefault
Call(SetMusicTrack, 0, SONG_FLOWER_FIELDS_SUNNY, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_FLOWER_FIELDS_SUNNY, 0, VOL_LEVEL_FULL)
EndSwitch EndSwitch
Return Return
End End

4
src/world/area_flo/flo_17/music.c
View File

@ -3,9 +3,9 @@
EvtScript N(EVS_SetupMusic) = { EvtScript N(EVS_SetupMusic) = {
Switch(GB_StoryProgress) Switch(GB_StoryProgress)
CaseLt(STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) CaseLt(STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE)
Call(SetMusicTrack, 0, SONG_FLOWER_FIELDS_CLOUDY, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_FLOWER_FIELDS_CLOUDY, 0, VOL_LEVEL_FULL)
CaseDefault CaseDefault
Call(SetMusicTrack, 0, SONG_FLOWER_FIELDS_SUNNY, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_FLOWER_FIELDS_SUNNY, 0, VOL_LEVEL_FULL)
EndSwitch EndSwitch
Return Return
End End

4
src/world/area_flo/flo_18/music.c
View File

@ -3,10 +3,10 @@
EvtScript N(EVS_SetupMusic) = { EvtScript N(EVS_SetupMusic) = {
Switch(GB_StoryProgress) Switch(GB_StoryProgress)
CaseLt(STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) CaseLt(STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE)
Call(SetMusicTrack, 0, SONG_PUFF_PUFF_MACHINE, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_PUFF_PUFF_MACHINE, 0, VOL_LEVEL_FULL)
Call(PlaySoundAtCollider, COLLIDER_o126, SOUND_LOOP_PUFF_PUFF_MACHINE, SOUND_SPACE_DEFAULT) Call(PlaySoundAtCollider, COLLIDER_o126, SOUND_LOOP_PUFF_PUFF_MACHINE, SOUND_SPACE_DEFAULT)
CaseDefault CaseDefault
Call(SetMusicTrack, 0, SONG_FLOWER_FIELDS_SUNNY, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_FLOWER_FIELDS_SUNNY, 0, VOL_LEVEL_FULL)
EndSwitch EndSwitch
Return Return
End End

2
src/world/area_flo/flo_19/beanstalk.c
View File

@ -229,7 +229,7 @@ EvtScript N(EVS_Exit_Beanstalk) = {
Call(SetNpcJumpscale, NPC_PARTNER, Float(0.0)) Call(SetNpcJumpscale, NPC_PARTNER, Float(0.0))
Call(NpcJump0, NPC_PARTNER, LVarC, LVarD, LVarE, 5) Call(NpcJump0, NPC_PARTNER, LVarC, LVarD, LVarE, 5)
Call(PlaySound, SOUND_FLO_RIDE_BEANSTALK_DOWN_LOOP) Call(PlaySound, SOUND_FLO_RIDE_BEANSTALK_DOWN_LOOP)
Call(SetMusicTrack, 0, SONG_MAGIC_BEANSTALK, BGM_VARIATION_1, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_MAGIC_BEANSTALK, BGM_VARIATION_1, VOL_LEVEL_FULL)
Call(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) Call(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE)
Call(SetPlayerAnimation, ANIM_Mario1_Walk) Call(SetPlayerAnimation, ANIM_Mario1_Walk)
Call(N(GetPlayerAngles), LVar3, LVar4) Call(N(GetPlayerAngles), LVar3, LVar4)

2
src/world/area_flo/flo_19/music.c
View File

@ -5,7 +5,7 @@ EvtScript N(EVS_SetupMusic) = {
Switch(LVar0) Switch(LVar0)
CaseOrEq(flo_19_ENTRY_0) CaseOrEq(flo_19_ENTRY_0)
CaseOrEq(flo_19_ENTRY_1) CaseOrEq(flo_19_ENTRY_1)
Call(SetMusicTrack, 0, SONG_CLOUDY_CLIMB, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_CLOUDY_CLIMB, 0, VOL_LEVEL_FULL)
EndCaseGroup EndCaseGroup
CaseOrEq(flo_19_ENTRY_2) CaseOrEq(flo_19_ENTRY_2)
CaseOrEq(7) CaseOrEq(7)

2
src/world/area_flo/flo_21/music.c
View File

@ -4,7 +4,7 @@ EvtScript N(EVS_SetupMusic) = {
IfEq(GB_StoryProgress, STORY_CH6_DEFEATED_HUFF_N_PUFF) IfEq(GB_StoryProgress, STORY_CH6_DEFEATED_HUFF_N_PUFF)
Call(FadeOutMusic, 0, 500) Call(FadeOutMusic, 0, 500)
Else Else
Call(SetMusicTrack, 0, SONG_CLOUDY_CLIMB, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_CLOUDY_CLIMB, 0, VOL_LEVEL_FULL)
EndIf EndIf
Return Return
End End

2
src/world/area_flo/flo_21/npc.c
View File

@ -82,7 +82,7 @@ EvtScript N(EVS_Scene_HuffNPuffAmbush) = {
EndIf EndIf
Call(AwaitPlayerApproach, 650, 0, 30) Call(AwaitPlayerApproach, 650, 0, 30)
Call(DisablePlayerInput, TRUE) Call(DisablePlayerInput, TRUE)
Call(SetMusicTrack, 0, SONG_HUFF_N_PUFF_THEME, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_HUFF_N_PUFF_THEME, 0, VOL_LEVEL_FULL)
ExecGetTID(N(EVS_PlayRumbleSounds), LVar9) ExecGetTID(N(EVS_PlayRumbleSounds), LVar9)
Call(GetPartnerInUse, LVar0) Call(GetPartnerInUse, LVar0)
IfNe(LVar0, PARTNER_NONE) IfNe(LVar0, PARTNER_NONE)

4
src/world/area_flo/flo_22/music.c
View File

@ -3,9 +3,9 @@
EvtScript N(EVS_SetupMusic) = { EvtScript N(EVS_SetupMusic) = {
Switch(GB_StoryProgress) Switch(GB_StoryProgress)
CaseLt(STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) CaseLt(STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE)
Call(SetMusicTrack, 0, SONG_FLOWER_FIELDS_CLOUDY, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_FLOWER_FIELDS_CLOUDY, 0, VOL_LEVEL_FULL)
CaseDefault CaseDefault
Call(SetMusicTrack, 0, SONG_FLOWER_FIELDS_SUNNY, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_FLOWER_FIELDS_SUNNY, 0, VOL_LEVEL_FULL)
EndSwitch EndSwitch
Return Return
End End

4
src/world/area_flo/flo_23/music.c
View File

@ -3,9 +3,9 @@
EvtScript N(EVS_SetupMusic) = { EvtScript N(EVS_SetupMusic) = {
Switch(GB_StoryProgress) Switch(GB_StoryProgress)
CaseLt(STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) CaseLt(STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE)
Call(SetMusicTrack, 0, SONG_FLOWER_FIELDS_CLOUDY, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_FLOWER_FIELDS_CLOUDY, 0, VOL_LEVEL_FULL)
CaseDefault CaseDefault
Call(SetMusicTrack, 0, SONG_FLOWER_FIELDS_SUNNY, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_FLOWER_FIELDS_SUNNY, 0, VOL_LEVEL_FULL)
EndSwitch EndSwitch
Return Return
End End

4
src/world/area_flo/flo_24/music.c
View File

@ -2,9 +2,9 @@
EvtScript N(EVS_SetupMusic) = { EvtScript N(EVS_SetupMusic) = {
IfLt(GB_StoryProgress, STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) IfLt(GB_StoryProgress, STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE)
Call(SetMusicTrack, 0, SONG_FLOWER_FIELDS_CLOUDY, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_FLOWER_FIELDS_CLOUDY, 0, VOL_LEVEL_FULL)
Else Else
Call(SetMusicTrack, 0, SONG_FLOWER_FIELDS_SUNNY, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_FLOWER_FIELDS_SUNNY, 0, VOL_LEVEL_FULL)
EndIf EndIf
IfGe(GB_StoryProgress, STORY_CH6_FILLED_SPRING_WITH_WATER) IfGe(GB_StoryProgress, STORY_CH6_FILLED_SPRING_WITH_WATER)
Call(PlaySound, SOUND_LOOP_FLO_WATER_FLOW_2) Call(PlaySound, SOUND_LOOP_FLO_WATER_FLOW_2)

4
src/world/area_flo/flo_25/music.c
View File

@ -3,9 +3,9 @@
EvtScript N(EVS_SetupMusic) = { EvtScript N(EVS_SetupMusic) = {
Switch(GB_StoryProgress) Switch(GB_StoryProgress)
CaseLt(STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) CaseLt(STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE)
Call(SetMusicTrack, 0, SONG_FLOWER_FIELDS_CLOUDY, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_FLOWER_FIELDS_CLOUDY, 0, VOL_LEVEL_FULL)
CaseDefault CaseDefault
Call(SetMusicTrack, 0, SONG_FLOWER_FIELDS_SUNNY, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_FLOWER_FIELDS_SUNNY, 0, VOL_LEVEL_FULL)
EndSwitch EndSwitch
Return Return
End End

2
src/world/area_gv/gv_01/main.c
View File

@ -183,7 +183,7 @@ EvtScript N(EVS_Main) = {
Call(SetPlayerAnimation, ANIM_Mario1_Fallen) Call(SetPlayerAnimation, ANIM_Mario1_Fallen)
EndSwitch EndSwitch
EndThread EndThread
Call(SetMusicTrack, 0, SONG_GAME_OVER, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_GAME_OVER, 0, VOL_LEVEL_FULL)
Call(ClearAmbientSounds, 0) Call(ClearAmbientSounds, 0)
Thread Thread
Wait(200 * DT) Wait(200 * DT)

12
src/world/area_hos/hos_00/music.c
View File

@ -3,9 +3,9 @@
EvtScript N(EVS_PlayToadTownSong) = { EvtScript N(EVS_PlayToadTownSong) = {
Switch(GB_StoryProgress) Switch(GB_StoryProgress)
CaseRange(STORY_CH3_STAR_SPRIT_DEPARTED, STORY_CH4_STAR_SPIRIT_RESCUED) CaseRange(STORY_CH3_STAR_SPRIT_DEPARTED, STORY_CH4_STAR_SPIRIT_RESCUED)
Call(SetMusicTrack, 0, SONG_SHY_GUY_INVASION, 0, VOL_LEVEL_6) Call(SetMusic, 0, SONG_SHY_GUY_INVASION, 0, VOL_LEVEL_6)
CaseDefault CaseDefault
Call(SetMusicTrack, 0, SONG_TOAD_TOWN, 0, VOL_LEVEL_6) Call(SetMusic, 0, SONG_TOAD_TOWN, 0, VOL_LEVEL_6)
EndSwitch EndSwitch
Return Return
End End
@ -19,7 +19,7 @@ EvtScript N(EVS_PlayMusicByPosition) = {
EndCaseGroup EndCaseGroup
CaseOrEq(hos_00_ENTRY_1) CaseOrEq(hos_00_ENTRY_1)
CaseOrEq(hos_00_ENTRY_2) CaseOrEq(hos_00_ENTRY_2)
Call(SetMusicTrack, 0, SONG_SHOOTING_STAR_SUMMIT, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_SHOOTING_STAR_SUMMIT, 0, VOL_LEVEL_FULL)
EndCaseGroup EndCaseGroup
EndSwitch EndSwitch
IfNe(LVar0, 0) IfNe(LVar0, 0)
@ -31,7 +31,7 @@ EvtScript N(EVS_PlayMusicByPosition) = {
IfGt(LVar1, 210) IfGt(LVar1, 210)
Call(FadeOutMusic, 0, 833) Call(FadeOutMusic, 0, 833)
Wait(25) Wait(25)
Call(SetMusicTrack, 0, SONG_SHOOTING_STAR_SUMMIT, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_SHOOTING_STAR_SUMMIT, 0, VOL_LEVEL_FULL)
Wait(30) Wait(30)
Goto(20) Goto(20)
EndIf EndIf
@ -57,7 +57,7 @@ EvtScript N(EVS_PlayMusicByPosition) = {
EvtScript N(EVS_SetupMusic) = { EvtScript N(EVS_SetupMusic) = {
Call(GetEntryID, LVar0) Call(GetEntryID, LVar0)
IfEq(LVar0, hos_00_ENTRY_3) IfEq(LVar0, hos_00_ENTRY_3)
Call(SetMusicTrack, 0, SONG_STARSHIP_THEME, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_STARSHIP_THEME, 0, VOL_LEVEL_FULL)
Else Else
Exec(N(EVS_PlayMusicByPosition)) Exec(N(EVS_PlayMusicByPosition))
EndIf EndIf
@ -66,7 +66,7 @@ EvtScript N(EVS_SetupMusic) = {
}; };
EvtScript N(EVS_PlayKammyKoopaSong) = { EvtScript N(EVS_PlayKammyKoopaSong) = {
Call(SetMusicTrack, 0, SONG_KAMMY_KOOPA_THEME, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_KAMMY_KOOPA_THEME, 0, VOL_LEVEL_FULL)
Return Return
End End
}; };

4
src/world/area_hos/hos_00/scenes.c
View File

@ -236,7 +236,7 @@ EvtScript N(EVS_Scene_MeetingTwink) = {
Call(SetNpcRotation, NPC_Twink, 0, 0, 0) Call(SetNpcRotation, NPC_Twink, 0, 0, 0)
EndThread EndThread
Call(ShowMessageAtScreenPos, MSG_HOS_000D, 160, 40) Call(ShowMessageAtScreenPos, MSG_HOS_000D, 160, 40)
Call(SetMusicTrack, 0, SONG_TWINK_THEME, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_TWINK_THEME, 0, VOL_LEVEL_FULL)
Call(SetPlayerAnimation, ANIM_Mario1_Idle) Call(SetPlayerAnimation, ANIM_Mario1_Idle)
Call(SetNpcAnimation, NPC_Twink, ANIM_Twink_Idle) Call(SetNpcAnimation, NPC_Twink, ANIM_Twink_Idle)
Call(NpcFacePlayer, NPC_Twink, 0) Call(NpcFacePlayer, NPC_Twink, 0)
@ -458,7 +458,7 @@ EvtScript N(EVS_Scene_MeetingTwink) = {
EvtScript N(EVS_Scene_TwinkDeparts) = { EvtScript N(EVS_Scene_TwinkDeparts) = {
Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL)
Call(SetMusicTrack, 0, SONG_TWINK_THEME, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_TWINK_THEME, 0, VOL_LEVEL_FULL)
Wait(60 * DT) Wait(60 * DT)
Call(SetCamLeadPlayer, CAM_DEFAULT, TRUE) Call(SetCamLeadPlayer, CAM_DEFAULT, TRUE)
Call(GetNpcPos, NPC_Twink, LVar3, LVar1, LVar2) Call(GetNpcPos, NPC_Twink, LVar3, LVar1, LVar2)

2
src/world/area_hos/hos_01/main.c
View File

@ -99,7 +99,7 @@ EvtScript N(EVS_EnterStarBeam) = {
Call(EnablePartnerAI) Call(EnablePartnerAI)
Call(DisablePlayerPhysics, FALSE) Call(DisablePlayerPhysics, FALSE)
Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(PanToTarget, CAM_DEFAULT, 0, FALSE)
Call(SetMusicTrack, 0, SONG_SHOOTING_STAR_SUMMIT, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_SHOOTING_STAR_SUMMIT, 0, VOL_LEVEL_FULL)
Call(DisablePlayerInput, FALSE) Call(DisablePlayerInput, FALSE)
Label(20) Label(20)
Call(N(GetFloorCollider), LVar0) Call(N(GetFloorCollider), LVar0)

2
src/world/area_hos/hos_01/music.c
View File

@ -3,7 +3,7 @@
EvtScript N(EVS_SetupMusic) = { EvtScript N(EVS_SetupMusic) = {
Call(GetEntryID, LVar0) Call(GetEntryID, LVar0)
IfEq(LVar0, hos_01_ENTRY_0) IfEq(LVar0, hos_01_ENTRY_0)
Call(SetMusicTrack, 0, SONG_SHOOTING_STAR_SUMMIT, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_SHOOTING_STAR_SUMMIT, 0, VOL_LEVEL_FULL)
EndIf EndIf
Return Return
End End

4
src/world/area_hos/hos_01/npc.c
View File

@ -44,7 +44,7 @@ EvtScript N(EVS_MuteMusicOnPlayerApproach) = {
Wait(1) Wait(1)
Goto(20) Goto(20)
Label(30) Label(30)
Call(SetMusicTrack, 0, SONG_SHOOTING_STAR_SUMMIT, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_SHOOTING_STAR_SUMMIT, 0, VOL_LEVEL_FULL)
Wait(30) Wait(30)
Goto(0) Goto(0)
Return Return
@ -69,7 +69,7 @@ EvtScript N(EVS_Scene_StarSpiritsPlea) = {
Call(NpcJump0, NPC_PARTNER, LVar0, LVar1, LVar2, 15 * DT) Call(NpcJump0, NPC_PARTNER, LVar0, LVar1, LVar2, 15 * DT)
Call(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) Call(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE)
EndThread EndThread
Call(SetMusicTrack, 0, SONG_STAR_SPIRIT_THEME, BGM_VARIATION_1, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_STAR_SPIRIT_THEME, BGM_VARIATION_1, VOL_LEVEL_FULL)
Call(SpeakToPlayer, NPC_Eldstar, ANIM_WorldEldstar_Wave, ANIM_WorldEldstar_Idle, 0, MSG_HOS_0000) Call(SpeakToPlayer, NPC_Eldstar, ANIM_WorldEldstar_Wave, ANIM_WorldEldstar_Idle, 0, MSG_HOS_0000)
Wait(10 * DT) Wait(10 * DT)
Wait(1) Wait(1)

6
src/world/area_hos/hos_01/star_way.c
View File

@ -31,7 +31,7 @@ EvtScript N(EVS_Scene_StarWayOpened) = {
Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(WaitForCam, CAM_DEFAULT, Float(1.0))
Wait(10) Wait(10)
Call(ShowMessageAtScreenPos, MSG_HOS_005D, 160, 40) Call(ShowMessageAtScreenPos, MSG_HOS_005D, 160, 40)
Call(SetMusicTrack, 0, SONG_STAR_WAY_OPENS, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_STAR_WAY_OPENS, 0, VOL_LEVEL_FULL)
#if VERSION_PAL #if VERSION_PAL
Wait(30) Wait(30)
#else #else
@ -78,7 +78,7 @@ EvtScript N(EVS_Scene_StarWayOpened) = {
Call(ShowMessageAtScreenPos, MSG_HOS_005E, 160, 40) Call(ShowMessageAtScreenPos, MSG_HOS_005E, 160, 40)
Call(ResetCam, CAM_DEFAULT, Float(5.0)) Call(ResetCam, CAM_DEFAULT, Float(5.0))
Set(GB_StoryProgress, STORY_CH8_OPENED_PATH_TO_STAR_WAY) Set(GB_StoryProgress, STORY_CH8_OPENED_PATH_TO_STAR_WAY)
Call(SetMusicTrack, 0, SONG_SHOOTING_STAR_SUMMIT, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_SHOOTING_STAR_SUMMIT, 0, VOL_LEVEL_FULL)
Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Call(SetTimeFreezeMode, TIME_FREEZE_NONE)
Call(DisablePlayerInput, FALSE) Call(DisablePlayerInput, FALSE)
Return Return
@ -94,7 +94,7 @@ EvtScript N(EVS_AscendStarBeam) = {
Call(SetPlayerSpeed, Float(3.0)) Call(SetPlayerSpeed, Float(3.0))
Call(PlayerMoveTo, -30, -160, 0) Call(PlayerMoveTo, -30, -160, 0)
Call(InterpPlayerYaw, 90, 0) Call(InterpPlayerYaw, 90, 0)
Call(SetMusicTrack, 0, SONG_STAR_WAY_OPENS, BGM_VARIATION_1, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_STAR_WAY_OPENS, BGM_VARIATION_1, VOL_LEVEL_FULL)
Call(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_GRAVITY, FALSE) Call(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_GRAVITY, FALSE)
Call(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) Call(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE)
Call(SetNpcJumpscale, NPC_PARTNER, Float(1.0)) Call(SetNpcJumpscale, NPC_PARTNER, Float(1.0))

2
src/world/area_hos/hos_02/descent.c
View File

@ -1,7 +1,7 @@
#include "hos_02.h" #include "hos_02.h"
EvtScript N(EVS_DescendStarBeam) = { EvtScript N(EVS_DescendStarBeam) = {
Call(SetMusicTrack, 0, SONG_STAR_WAY_OPENS, BGM_VARIATION_2, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_STAR_WAY_OPENS, BGM_VARIATION_2, VOL_LEVEL_FULL)
Call(N(func_80240F68_A17188), MV_StarBeamEffect) Call(N(func_80240F68_A17188), MV_StarBeamEffect)
Call(SetPlayerSpeed, Float(3.0)) Call(SetPlayerSpeed, Float(3.0))
Call(PlayerMoveTo, -1105, 230, 0) Call(PlayerMoveTo, -1105, 230, 0)

2
src/world/area_hos/hos_02/main.c
View File

@ -84,7 +84,7 @@ EvtScript N(EVS_EnterStarBeam) = {
Call(EnablePartnerAI) Call(EnablePartnerAI)
Call(DisablePlayerPhysics, FALSE) Call(DisablePlayerPhysics, FALSE)
Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(PanToTarget, CAM_DEFAULT, 0, FALSE)
Call(SetMusicTrack, 0, SONG_STAR_WAY_OPENS, BGM_VARIATION_3, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_STAR_WAY_OPENS, BGM_VARIATION_3, VOL_LEVEL_FULL)
Call(DisablePlayerInput, FALSE) Call(DisablePlayerInput, FALSE)
Call(AwaitPlayerLeave, -1105, 225, 40) Call(AwaitPlayerLeave, -1105, 225, 40)
BindTrigger(Ref(N(EVS_ExitStarBeam)), TRIGGER_FLOOR_TOUCH, COLLIDER_deiliw, 1, 0) BindTrigger(Ref(N(EVS_ExitStarBeam)), TRIGGER_FLOOR_TOUCH, COLLIDER_deiliw, 1, 0)

2
src/world/area_hos/hos_02/music.c
View File

@ -3,7 +3,7 @@
EvtScript N(EVS_SetupMusic) = { EvtScript N(EVS_SetupMusic) = {
Call(GetEntryID, LVar0) Call(GetEntryID, LVar0)
IfEq(LVar0, hos_02_ENTRY_1) IfEq(LVar0, hos_02_ENTRY_1)
Call(SetMusicTrack, 0, SONG_STAR_WAY_OPENS, BGM_VARIATION_3, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_STAR_WAY_OPENS, BGM_VARIATION_3, VOL_LEVEL_FULL)
EndIf EndIf
Return Return
End End

4
src/world/area_hos/hos_03/music.c
View File

@ -1,13 +1,13 @@
#include "hos_03.h" #include "hos_03.h"
EvtScript N(EVS_SetupMusic) = { EvtScript N(EVS_SetupMusic) = {
Call(SetMusicTrack, 0, SONG_STAR_HAVEN, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_STAR_HAVEN, 0, VOL_LEVEL_FULL)
Return Return
End End
}; };
EvtScript N(EVS_PlayRestingSong) = { EvtScript N(EVS_PlayRestingSong) = {
Call(SetMusicTrack, 0, SONG_TAKING_REST, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_TAKING_REST, 0, VOL_LEVEL_FULL)
Return Return
End End
}; };

8
src/world/area_hos/hos_04/music.c
View File

@ -2,7 +2,7 @@
EvtScript N(EVS_PlayIntroSong) = { EvtScript N(EVS_PlayIntroSong) = {
Wait(80) Wait(80)
Call(SetMusicTrack, 0, SONG_INTRO_STORY, BGM_VARIATION_2, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_INTRO_STORY, BGM_VARIATION_2, VOL_LEVEL_FULL)
Return Return
End End
}; };
@ -11,15 +11,15 @@ EvtScript N(EVS_SetupMusic) = {
Call(GetEntryID, LVar0) Call(GetEntryID, LVar0)
Switch(LVar0) Switch(LVar0)
CaseEq(hos_04_ENTRY_2) CaseEq(hos_04_ENTRY_2)
Call(SetMusicTrack, 0, SONG_STARSHIP_THEME, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_STARSHIP_THEME, 0, VOL_LEVEL_FULL)
CaseEq(hos_04_ENTRY_3) CaseEq(hos_04_ENTRY_3)
CaseEq(hos_04_ENTRY_4) CaseEq(hos_04_ENTRY_4)
Exec(N(EVS_PlayIntroSong)) Exec(N(EVS_PlayIntroSong))
CaseDefault CaseDefault
IfEq(GF_HOS04_Visited, FALSE) IfEq(GF_HOS04_Visited, FALSE)
Call(SetMusicTrack, 0, SONG_STAR_SANCTUARY, BGM_VARIATION_1, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_STAR_SANCTUARY, BGM_VARIATION_1, VOL_LEVEL_FULL)
Else Else
Call(SetMusicTrack, 0, SONG_STAR_HAVEN, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_STAR_HAVEN, 0, VOL_LEVEL_FULL)
EndIf EndIf
Call(PlaySound, SOUND_LOOP_STAR_SANCTUARY_NEAR) Call(PlaySound, SOUND_LOOP_STAR_SANCTUARY_NEAR)
EndSwitch EndSwitch

8
src/world/area_hos/hos_05/music.c
View File

@ -2,9 +2,9 @@
EvtScript N(EVS_PlayIntroStoryMusic) = { EvtScript N(EVS_PlayIntroStoryMusic) = {
Wait(40) Wait(40)
Call(SetMusicTrack, 0, SONG_INTRO_STORY, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_INTRO_STORY, 0, VOL_LEVEL_FULL)
Wait(2030) Wait(2030)
Call(SetMusicTrack, 0, SONG_INTRO_STORY, BGM_VARIATION_1, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_INTRO_STORY, BGM_VARIATION_1, VOL_LEVEL_FULL)
Return Return
End End
}; };
@ -13,14 +13,14 @@ EvtScript N(EVS_SetupMusic) = {
Call(GetEntryID, LVar0) Call(GetEntryID, LVar0)
Switch(LVar0) Switch(LVar0)
CaseEq(hos_05_ENTRY_1) CaseEq(hos_05_ENTRY_1)
Call(SetMusicTrack, 0, SONG_STARSHIP_THEME, BGM_VARIATION_1, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_STARSHIP_THEME, BGM_VARIATION_1, VOL_LEVEL_FULL)
Call(PlaySound, SOUND_LOOP_STAR_SANCTUARY_INSIDE) Call(PlaySound, SOUND_LOOP_STAR_SANCTUARY_INSIDE)
CaseEq(hos_05_ENTRY_3) CaseEq(hos_05_ENTRY_3)
Exec(N(EVS_PlayIntroStoryMusic)) Exec(N(EVS_PlayIntroStoryMusic))
CaseEq(hos_05_ENTRY_4) CaseEq(hos_05_ENTRY_4)
CaseDefault CaseDefault
IfEq(AF_HOS_B5, FALSE) IfEq(AF_HOS_B5, FALSE)
Call(SetMusicTrack, 0, SONG_STAR_SANCTUARY, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_STAR_SANCTUARY, 0, VOL_LEVEL_FULL)
EndIf EndIf
Call(PlaySound, SOUND_LOOP_STAR_SANCTUARY_INSIDE) Call(PlaySound, SOUND_LOOP_STAR_SANCTUARY_INSIDE)
EndSwitch EndSwitch

6
src/world/area_hos/hos_05/star_ship.c
View File

@ -95,9 +95,9 @@ EvtScript N(EVS_Starship_Depart) = {
EndIf EndIf
Wait(20) Wait(20)
IfLt(GB_StoryProgress, STORY_UNUSED_0000005D) IfLt(GB_StoryProgress, STORY_UNUSED_0000005D)
Call(SetMusicTrack, 0, SONG_STARSHIP_THEME, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_STARSHIP_THEME, 0, VOL_LEVEL_FULL)
Else Else
Call(SetMusicTrack, 0, SONG_STARSHIP_THEME, BGM_VARIATION_1, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_STARSHIP_THEME, BGM_VARIATION_1, VOL_LEVEL_FULL)
EndIf EndIf
Thread Thread
Wait(25) Wait(25)
@ -193,7 +193,7 @@ EvtScript N(EVS_EnterStarship) = {
Call(EnablePartnerAI) Call(EnablePartnerAI)
EndThread EndThread
Call(DisablePlayerPhysics, FALSE) Call(DisablePlayerPhysics, FALSE)
Call(SetMusicTrack, 0, SONG_STAR_SANCTUARY, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_STAR_SANCTUARY, 0, VOL_LEVEL_FULL)
Call(ResetCam, CAM_DEFAULT, Float(1.0)) Call(ResetCam, CAM_DEFAULT, Float(1.0))
Call(SetCamSpeed, CAM_DEFAULT, Float(2.5)) Call(SetCamSpeed, CAM_DEFAULT, Float(2.5))
Call(DisablePlayerInput, FALSE) Call(DisablePlayerInput, FALSE)

2
src/world/area_hos/hos_06/main.c
View File

@ -68,7 +68,7 @@ EvtScript N(EVS_Main) = {
Set(LVar0, Ref(N(EVS_BindExitTriggers))) Set(LVar0, Ref(N(EVS_BindExitTriggers)))
Exec(EnterWalk) Exec(EnterWalk)
Wait(1) Wait(1)
Call(SetMusicTrack, 0, SONG_SHOOTING_STAR_SUMMIT, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_SHOOTING_STAR_SUMMIT, 0, VOL_LEVEL_FULL)
Exec(N(EVS_SetupRooms)) Exec(N(EVS_SetupRooms))
Exec(N(EVS_TexPan_Stars)) Exec(N(EVS_TexPan_Stars))
BindTrigger(Ref(N(EVS_AskForHint)), TRIGGER_WALL_PRESS_A, COLLIDER_o224, 1, 0) BindTrigger(Ref(N(EVS_AskForHint)), TRIGGER_WALL_PRESS_A, COLLIDER_o224, 1, 0)

4
src/world/area_hos/hos_06/merluvlee.c
View File

@ -566,7 +566,7 @@ API_CALLABLE(N(func_80241F98_A3B478)) {
} }
EvtScript N(EVS_PerformHintRitual) = { EvtScript N(EVS_PerformHintRitual) = {
Call(SetMusicTrack, 0, SONG_MERLEE_SPELL, BGM_VARIATION_2, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_MERLEE_SPELL, BGM_VARIATION_2, VOL_LEVEL_FULL)
Call(SetNpcAnimation, NPC_Merluvlee, ANIM_Merluvlee_Release) Call(SetNpcAnimation, NPC_Merluvlee, ANIM_Merluvlee_Release)
Call(GetModelCenter, MODEL_o100) Call(GetModelCenter, MODEL_o100)
Add(LVar1, 20) Add(LVar1, 20)
@ -642,7 +642,7 @@ EvtScript N(EVS_PerformHintRitual) = {
Wait(46) Wait(46)
Call(ResetCam, CAM_DEFAULT, Float(5.0)) Call(ResetCam, CAM_DEFAULT, Float(5.0))
Call(SetNpcAnimation, NPC_Merluvlee, ANIM_Merluvlee_Idle) Call(SetNpcAnimation, NPC_Merluvlee, ANIM_Merluvlee_Idle)
Call(SetMusicTrack, 0, SONG_SHOOTING_STAR_SUMMIT, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_SHOOTING_STAR_SUMMIT, 0, VOL_LEVEL_FULL)
Return Return
End End
}; };

4
src/world/area_hos/hos_10/music.c
View File

@ -4,7 +4,7 @@ EvtScript N(EVS_SetupMusic) = {
Call(GetEntryID, LVar0) Call(GetEntryID, LVar0)
Switch(LVar0) Switch(LVar0)
CaseOrEq(hos_10_ENTRY_1) CaseOrEq(hos_10_ENTRY_1)
Call(SetMusicTrack, 0, SONG_INTRO_STORY, BGM_VARIATION_3, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_INTRO_STORY, BGM_VARIATION_3, VOL_LEVEL_FULL)
EndCaseGroup EndCaseGroup
CaseOrEq(hos_10_ENTRY_2) CaseOrEq(hos_10_ENTRY_2)
EndCaseGroup EndCaseGroup
@ -14,7 +14,7 @@ EvtScript N(EVS_SetupMusic) = {
CaseEq(hos_10_ENTRY_5) CaseEq(hos_10_ENTRY_5)
Thread Thread
Wait(10) Wait(10)
Call(SetMusicTrack, 0, SONG_MARIO_FALLS, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_MARIO_FALLS, 0, VOL_LEVEL_FULL)
EndThread EndThread
EndSwitch EndSwitch
Return Return

8
src/world/area_isk/isk_01/music.c
View File

@ -19,15 +19,15 @@ EvtScript N(EVS_SetupMusic) = {
Return Return
EndIf EndIf
#if VERSION_PAL #if VERSION_PAL
Call(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL)
#else #else
Switch(GB_StoryProgress) Switch(GB_StoryProgress)
CaseLt(STORY_CH2_SOLVED_ARTIFACT_PUZZLE) CaseLt(STORY_CH2_SOLVED_ARTIFACT_PUZZLE)
Call(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL)
CaseLt(STORY_CH2_DEFEATED_TUTANKOOPA) CaseLt(STORY_CH2_DEFEATED_TUTANKOOPA)
Call(SetMusicTrack, 0, SONG_RUINS_BASEMENT, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_RUINS_BASEMENT, 0, VOL_LEVEL_FULL)
CaseGe(STORY_CH2_DEFEATED_TUTANKOOPA) CaseGe(STORY_CH2_DEFEATED_TUTANKOOPA)
Call(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL)
EndSwitch EndSwitch
#endif #endif
Return Return

8
src/world/area_isk/isk_02/main.c
View File

@ -21,15 +21,15 @@ EvtScript N(EVS_Main) = {
ExecWait(N(EVS_SetupLock)) ExecWait(N(EVS_SetupLock))
Exec(N(EVS_SetupSarcophagi)) Exec(N(EVS_SetupSarcophagi))
#if VERSION_PAL #if VERSION_PAL
Call(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL)
#else #else
Switch(GB_StoryProgress) Switch(GB_StoryProgress)
CaseLt(STORY_CH2_SOLVED_ARTIFACT_PUZZLE) CaseLt(STORY_CH2_SOLVED_ARTIFACT_PUZZLE)
Call(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL)
CaseLt(STORY_CH2_DEFEATED_TUTANKOOPA) CaseLt(STORY_CH2_DEFEATED_TUTANKOOPA)
Call(SetMusicTrack, 0, SONG_RUINS_BASEMENT, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_RUINS_BASEMENT, 0, VOL_LEVEL_FULL)
CaseGe(STORY_CH2_DEFEATED_TUTANKOOPA) CaseGe(STORY_CH2_DEFEATED_TUTANKOOPA)
Call(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL)
EndSwitch EndSwitch
#endif #endif
Set(LVar0, Ref(N(EVS_BindExitTriggers))) Set(LVar0, Ref(N(EVS_BindExitTriggers)))

8
src/world/area_isk/isk_03/main.c
View File

@ -27,15 +27,15 @@ EvtScript N(EVS_Main) = {
Exec(N(EVS_SetupSand)) Exec(N(EVS_SetupSand))
Exec(N(EVS_SetupSwitch)) Exec(N(EVS_SetupSwitch))
#if VERSION_PAL #if VERSION_PAL
Call(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL)
#else #else
Switch(GB_StoryProgress) Switch(GB_StoryProgress)
CaseLt(STORY_CH2_SOLVED_ARTIFACT_PUZZLE) CaseLt(STORY_CH2_SOLVED_ARTIFACT_PUZZLE)
Call(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL)
CaseLt(STORY_CH2_DEFEATED_TUTANKOOPA) CaseLt(STORY_CH2_DEFEATED_TUTANKOOPA)
Call(SetMusicTrack, 0, SONG_RUINS_BASEMENT, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_RUINS_BASEMENT, 0, VOL_LEVEL_FULL)
CaseGe(STORY_CH2_DEFEATED_TUTANKOOPA) CaseGe(STORY_CH2_DEFEATED_TUTANKOOPA)
Call(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL)
EndSwitch EndSwitch
#endif #endif
Set(LVar0, Ref(N(EVS_BindExitTriggers))) Set(LVar0, Ref(N(EVS_BindExitTriggers)))

8
src/world/area_isk/isk_04/music.c
View File

@ -19,15 +19,15 @@ EvtScript N(EVS_SetupMusic) = {
Return Return
EndIf EndIf
#if VERSION_PAL #if VERSION_PAL
Call(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL)
#else #else
Switch(GB_StoryProgress) Switch(GB_StoryProgress)
CaseLt(STORY_CH2_SOLVED_ARTIFACT_PUZZLE) CaseLt(STORY_CH2_SOLVED_ARTIFACT_PUZZLE)
Call(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL)
CaseLt(STORY_CH2_DEFEATED_TUTANKOOPA) CaseLt(STORY_CH2_DEFEATED_TUTANKOOPA)
Call(SetMusicTrack, 0, SONG_RUINS_BASEMENT, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_RUINS_BASEMENT, 0, VOL_LEVEL_FULL)
CaseGe(STORY_CH2_DEFEATED_TUTANKOOPA) CaseGe(STORY_CH2_DEFEATED_TUTANKOOPA)
Call(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL)
EndSwitch EndSwitch
#endif #endif
Return Return

8
src/world/area_isk/isk_05/main.c
View File

@ -24,15 +24,15 @@ EvtScript N(EVS_Main) = {
Call(MakeNpcs, TRUE, Ref(N(DefaultNPCs))) Call(MakeNpcs, TRUE, Ref(N(DefaultNPCs)))
ExecWait(N(EVS_MakeEntities)) ExecWait(N(EVS_MakeEntities))
#if VERSION_PAL #if VERSION_PAL
Call(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL)
#else #else
Switch(GB_StoryProgress) Switch(GB_StoryProgress)
CaseLt(STORY_CH2_SOLVED_ARTIFACT_PUZZLE) CaseLt(STORY_CH2_SOLVED_ARTIFACT_PUZZLE)
Call(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL)
CaseLt(STORY_CH2_DEFEATED_TUTANKOOPA) CaseLt(STORY_CH2_DEFEATED_TUTANKOOPA)
Call(SetMusicTrack, 0, SONG_RUINS_BASEMENT, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_RUINS_BASEMENT, 0, VOL_LEVEL_FULL)
CaseGe(STORY_CH2_DEFEATED_TUTANKOOPA) CaseGe(STORY_CH2_DEFEATED_TUTANKOOPA)
Call(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL)
EndSwitch EndSwitch
#endif #endif
Call(TranslateGroup, MODEL_g304, 0, 65, 0) Call(TranslateGroup, MODEL_g304, 0, 65, 0)

8
src/world/area_isk/isk_06/main.c
View File

@ -24,15 +24,15 @@ EvtScript N(EVS_Main) = {
Exec(N(EVS_SetupSand)) Exec(N(EVS_SetupSand))
Exec(N(EVS_SetupSwitch)) Exec(N(EVS_SetupSwitch))
#if VERSION_PAL #if VERSION_PAL
Call(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL)
#else #else
Switch(GB_StoryProgress) Switch(GB_StoryProgress)
CaseLt(STORY_CH2_SOLVED_ARTIFACT_PUZZLE) CaseLt(STORY_CH2_SOLVED_ARTIFACT_PUZZLE)
Call(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL)
CaseLt(STORY_CH2_DEFEATED_TUTANKOOPA) CaseLt(STORY_CH2_DEFEATED_TUTANKOOPA)
Call(SetMusicTrack, 0, SONG_RUINS_BASEMENT, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_RUINS_BASEMENT, 0, VOL_LEVEL_FULL)
CaseGe(STORY_CH2_DEFEATED_TUTANKOOPA) CaseGe(STORY_CH2_DEFEATED_TUTANKOOPA)
Call(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL)
EndSwitch EndSwitch
#endif #endif
Set(LVar0, Ref(N(EVS_BindExitTriggers))) Set(LVar0, Ref(N(EVS_BindExitTriggers)))

8
src/world/area_isk/isk_07/main.c
View File

@ -23,15 +23,15 @@ EvtScript N(EVS_Main) = {
Exec(N(EVS_SetupSwitch)) Exec(N(EVS_SetupSwitch))
Exec(N(EVS_SetupSarcophagi)) Exec(N(EVS_SetupSarcophagi))
#if VERSION_PAL #if VERSION_PAL
Call(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL)
#else #else
Switch(GB_StoryProgress) Switch(GB_StoryProgress)
CaseLt(STORY_CH2_SOLVED_ARTIFACT_PUZZLE) CaseLt(STORY_CH2_SOLVED_ARTIFACT_PUZZLE)
Call(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL)
CaseLt(STORY_CH2_DEFEATED_TUTANKOOPA) CaseLt(STORY_CH2_DEFEATED_TUTANKOOPA)
Call(SetMusicTrack, 0, SONG_RUINS_BASEMENT, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_RUINS_BASEMENT, 0, VOL_LEVEL_FULL)
CaseGe(STORY_CH2_DEFEATED_TUTANKOOPA) CaseGe(STORY_CH2_DEFEATED_TUTANKOOPA)
Call(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL)
EndSwitch EndSwitch
#endif #endif
Set(LVar0, Ref(N(EVS_BindExitTriggers))) Set(LVar0, Ref(N(EVS_BindExitTriggers)))

8
src/world/area_isk/isk_08/main.c
View File

@ -22,15 +22,15 @@ EvtScript N(EVS_Main) = {
ExecWait(N(EVS_SetupFlames)) ExecWait(N(EVS_SetupFlames))
ExecWait(N(EVS_SetupBombableWall)) ExecWait(N(EVS_SetupBombableWall))
#if VERSION_PAL #if VERSION_PAL
Call(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL)
#else #else
Switch(GB_StoryProgress) Switch(GB_StoryProgress)
CaseLt(STORY_CH2_SOLVED_ARTIFACT_PUZZLE) CaseLt(STORY_CH2_SOLVED_ARTIFACT_PUZZLE)
Call(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL)
CaseLt(STORY_CH2_DEFEATED_TUTANKOOPA) CaseLt(STORY_CH2_DEFEATED_TUTANKOOPA)
Call(SetMusicTrack, 0, SONG_RUINS_BASEMENT, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_RUINS_BASEMENT, 0, VOL_LEVEL_FULL)
CaseGe(STORY_CH2_DEFEATED_TUTANKOOPA) CaseGe(STORY_CH2_DEFEATED_TUTANKOOPA)
Call(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL)
EndSwitch EndSwitch
#endif #endif
Set(LVar0, Ref(N(EVS_BindExitTriggers))) Set(LVar0, Ref(N(EVS_BindExitTriggers)))

8
src/world/area_isk/isk_09/music.c
View File

@ -19,15 +19,15 @@ EvtScript N(EVS_SetupMusic) = {
Return Return
EndIf EndIf
#if VERSION_PAL #if VERSION_PAL
Call(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL)
#else #else
Switch(GB_StoryProgress) Switch(GB_StoryProgress)
CaseLt(STORY_CH2_SOLVED_ARTIFACT_PUZZLE) CaseLt(STORY_CH2_SOLVED_ARTIFACT_PUZZLE)
Call(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL)
CaseLt(STORY_CH2_DEFEATED_TUTANKOOPA) CaseLt(STORY_CH2_DEFEATED_TUTANKOOPA)
Call(SetMusicTrack, 0, SONG_RUINS_BASEMENT, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_RUINS_BASEMENT, 0, VOL_LEVEL_FULL)
CaseGe(STORY_CH2_DEFEATED_TUTANKOOPA) CaseGe(STORY_CH2_DEFEATED_TUTANKOOPA)
Call(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL)
EndSwitch EndSwitch
#endif #endif
Return Return

8
src/world/area_isk/isk_10/main.c
View File

@ -21,15 +21,15 @@ EvtScript N(EVS_Main) = {
ExecWait(N(EVS_MakeEntities)) ExecWait(N(EVS_MakeEntities))
ExecWait(N(EVS_SetupBombableWall)) ExecWait(N(EVS_SetupBombableWall))
#if VERSION_PAL #if VERSION_PAL
Call(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL)
#else #else
Switch(GB_StoryProgress) Switch(GB_StoryProgress)
CaseLt(STORY_CH2_SOLVED_ARTIFACT_PUZZLE) CaseLt(STORY_CH2_SOLVED_ARTIFACT_PUZZLE)
Call(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL)
CaseLt(STORY_CH2_DEFEATED_TUTANKOOPA) CaseLt(STORY_CH2_DEFEATED_TUTANKOOPA)
Call(SetMusicTrack, 0, SONG_RUINS_BASEMENT, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_RUINS_BASEMENT, 0, VOL_LEVEL_FULL)
CaseGe(STORY_CH2_DEFEATED_TUTANKOOPA) CaseGe(STORY_CH2_DEFEATED_TUTANKOOPA)
Call(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL)
EndSwitch EndSwitch
#endif #endif
Set(LVar0, Ref(N(EVS_BindExitTriggers))) Set(LVar0, Ref(N(EVS_BindExitTriggers)))

6
src/world/area_isk/isk_11/music.c
View File

@ -20,11 +20,11 @@ EvtScript N(EVS_SetupMusic) = {
EndIf EndIf
Switch(GB_StoryProgress) Switch(GB_StoryProgress)
CaseLt(STORY_CH2_SOLVED_ARTIFACT_PUZZLE) CaseLt(STORY_CH2_SOLVED_ARTIFACT_PUZZLE)
Call(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL)
CaseLt(STORY_CH2_DEFEATED_TUTANKOOPA) CaseLt(STORY_CH2_DEFEATED_TUTANKOOPA)
Call(SetMusicTrack, 0, SONG_RUINS_BASEMENT, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_RUINS_BASEMENT, 0, VOL_LEVEL_FULL)
CaseGe(STORY_CH2_DEFEATED_TUTANKOOPA) CaseGe(STORY_CH2_DEFEATED_TUTANKOOPA)
Call(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL)
EndSwitch EndSwitch
Return Return
End End

2
src/world/area_isk/isk_11/scene.c
View File

@ -196,7 +196,7 @@ EvtScript N(EVS_ManageSecretPassage) = {
Wait(1) Wait(1)
Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(PanToTarget, CAM_DEFAULT, 0, FALSE)
Set(GB_StoryProgress, STORY_CH2_SOLVED_ARTIFACT_PUZZLE) Set(GB_StoryProgress, STORY_CH2_SOLVED_ARTIFACT_PUZZLE)
Call(SetMusicTrack, 0, SONG_RUINS_BASEMENT, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_RUINS_BASEMENT, 0, VOL_LEVEL_FULL)
Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o2186, COLLIDER_FLAGS_UPPER_MASK) Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o2186, COLLIDER_FLAGS_UPPER_MASK)
Call(DisablePlayerPhysics, FALSE) Call(DisablePlayerPhysics, FALSE)
Call(DisablePlayerInput, FALSE) Call(DisablePlayerInput, FALSE)

8
src/world/area_isk/isk_12/main.c
View File

@ -28,15 +28,15 @@ EvtScript N(EVS_Main) = {
Exec(N(EVS_SetupSand)) Exec(N(EVS_SetupSand))
Exec(N(EVS_SetupSwitches)) Exec(N(EVS_SetupSwitches))
#if VERSION_PAL #if VERSION_PAL
Call(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL)
#else #else
Switch(GB_StoryProgress) Switch(GB_StoryProgress)
CaseLt(STORY_CH2_SOLVED_ARTIFACT_PUZZLE) CaseLt(STORY_CH2_SOLVED_ARTIFACT_PUZZLE)
Call(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL)
CaseLt(STORY_CH2_DEFEATED_TUTANKOOPA) CaseLt(STORY_CH2_DEFEATED_TUTANKOOPA)
Call(SetMusicTrack, 0, SONG_RUINS_BASEMENT, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_RUINS_BASEMENT, 0, VOL_LEVEL_FULL)
CaseGe(STORY_CH2_DEFEATED_TUTANKOOPA) CaseGe(STORY_CH2_DEFEATED_TUTANKOOPA)
Call(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL)
EndSwitch EndSwitch
#endif #endif
Set(LVar0, Ref(N(EVS_BindExitTriggers))) Set(LVar0, Ref(N(EVS_BindExitTriggers)))

8
src/world/area_isk/isk_13/main.c
View File

@ -15,15 +15,15 @@ EvtScript N(EVS_Main) = {
Call(MakeNpcs, TRUE, Ref(N(DefaultNPCs))) Call(MakeNpcs, TRUE, Ref(N(DefaultNPCs)))
ExecWait(N(EVS_MakeEntities)) ExecWait(N(EVS_MakeEntities))
#if VERSION_PAL #if VERSION_PAL
Call(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL)
#else #else
Switch(GB_StoryProgress) Switch(GB_StoryProgress)
CaseLt(STORY_CH2_SOLVED_ARTIFACT_PUZZLE) CaseLt(STORY_CH2_SOLVED_ARTIFACT_PUZZLE)
Call(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL)
CaseLt(STORY_CH2_DEFEATED_TUTANKOOPA) CaseLt(STORY_CH2_DEFEATED_TUTANKOOPA)
Call(SetMusicTrack, 0, SONG_RUINS_BASEMENT, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_RUINS_BASEMENT, 0, VOL_LEVEL_FULL)
CaseGe(STORY_CH2_DEFEATED_TUTANKOOPA) CaseGe(STORY_CH2_DEFEATED_TUTANKOOPA)
Call(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL)
EndSwitch EndSwitch
#endif #endif
Set(LVar0, Ref(N(EVS_BindExitTriggers))) Set(LVar0, Ref(N(EVS_BindExitTriggers)))

8
src/world/area_isk/isk_14/main.c
View File

@ -15,15 +15,15 @@ EvtScript N(EVS_Main) = {
Call(MakeNpcs, TRUE, Ref(N(DefaultNPCs))) Call(MakeNpcs, TRUE, Ref(N(DefaultNPCs)))
ExecWait(N(EVS_MakeEntities)) ExecWait(N(EVS_MakeEntities))
#if VERSION_PAL #if VERSION_PAL
Call(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL)
#else #else
Switch(GB_StoryProgress) Switch(GB_StoryProgress)
CaseLt(STORY_CH2_SOLVED_ARTIFACT_PUZZLE) CaseLt(STORY_CH2_SOLVED_ARTIFACT_PUZZLE)
Call(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL)
CaseLt(STORY_CH2_DEFEATED_TUTANKOOPA) CaseLt(STORY_CH2_DEFEATED_TUTANKOOPA)
Call(SetMusicTrack, 0, SONG_RUINS_BASEMENT, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_RUINS_BASEMENT, 0, VOL_LEVEL_FULL)
CaseGe(STORY_CH2_DEFEATED_TUTANKOOPA) CaseGe(STORY_CH2_DEFEATED_TUTANKOOPA)
Call(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL)
EndSwitch EndSwitch
#endif #endif
Set(LVar0, Ref(N(EVS_BindExitTriggers))) Set(LVar0, Ref(N(EVS_BindExitTriggers)))

2
src/world/area_isk/isk_16/main.c
View File

@ -93,7 +93,7 @@ EvtScript N(EVS_Main) = {
EndIf EndIf
Switch(GB_StoryProgress) Switch(GB_StoryProgress)
CaseLt(STORY_CH2_DEFEATED_TUTANKOOPA) CaseLt(STORY_CH2_DEFEATED_TUTANKOOPA)
Call(SetMusicTrack, 0, SONG_TUTANKOOPA_REVEALED, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_TUTANKOOPA_REVEALED, 0, VOL_LEVEL_FULL)
CaseEq(STORY_CH2_DEFEATED_TUTANKOOPA) CaseEq(STORY_CH2_DEFEATED_TUTANKOOPA)
Call(FadeOutMusic, 0, 500) Call(FadeOutMusic, 0, 500)
CaseGt(STORY_CH2_DEFEATED_TUTANKOOPA) CaseGt(STORY_CH2_DEFEATED_TUTANKOOPA)

8
src/world/area_isk/isk_18/main.c
View File

@ -17,15 +17,15 @@ EvtScript N(EVS_Main) = {
Call(MakeNpcs, TRUE, Ref(N(DefaultNPCs))) Call(MakeNpcs, TRUE, Ref(N(DefaultNPCs)))
ExecWait(N(EVS_SetupFlames)) ExecWait(N(EVS_SetupFlames))
#if VERSION_PAL #if VERSION_PAL
Call(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL)
#else #else
Switch(GB_StoryProgress) Switch(GB_StoryProgress)
CaseLt(STORY_CH2_SOLVED_ARTIFACT_PUZZLE) CaseLt(STORY_CH2_SOLVED_ARTIFACT_PUZZLE)
Call(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL)
CaseLt(STORY_CH2_DEFEATED_TUTANKOOPA) CaseLt(STORY_CH2_DEFEATED_TUTANKOOPA)
Call(SetMusicTrack, 0, SONG_RUINS_BASEMENT, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_RUINS_BASEMENT, 0, VOL_LEVEL_FULL)
CaseGe(STORY_CH2_DEFEATED_TUTANKOOPA) CaseGe(STORY_CH2_DEFEATED_TUTANKOOPA)
Call(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL) Call(SetMusic, 0, SONG_DRY_DRY_RUINS, 0, VOL_LEVEL_FULL)
EndSwitch EndSwitch
#endif #endif
IfLt(GB_StoryProgress, STORY_CH2_DRAINED_THIRD_SAND_ROOM) IfLt(GB_StoryProgress, STORY_CH2_DRAINED_THIRD_SAND_ROOM)

Some files were not shown because too many files have changed in this diff Show More