diff --git a/LEGO1/lego/legoomni/include/jukebox.h b/LEGO1/lego/legoomni/include/jukebox.h index c9424051..430e922c 100644 --- a/LEGO1/lego/legoomni/include/jukebox.h +++ b/LEGO1/lego/legoomni/include/jukebox.h @@ -2,6 +2,8 @@ #define JUKEBOX_H #include "decomp.h" +#include "jukebox_actions.h" +#include "jukeboxw_actions.h" #include "jukeboxstate.h" #include "legocontrolmanager.h" #include "legogamestate.h" @@ -11,89 +13,6 @@ // SIZE 0x104 class JukeBox : public LegoWorld { public: - // JUKEBOXW.SI - enum JukeBoxWorldScript { - c_volDownCtl = 1, - c_volUpCtl = 2, - c_dBackCtl = 3, - c_dFwdCtl = 4, - c_noteCtl = 5 - }; - - // JUKEBOX.SI (the actual audio) - enum JukeBoxScript { - e_mamaPapaBrickolini, - e_jailUnused, - e_act2Cave, - e_bricksterChase, - e_brickHunt, - e_residentialArea, - e_beachBlvd, - e_cave, - e_centralRoads, - e_jail, - e_hospital, - e_informationCenter, - e_policeStation, - e_park, - e_centralNorthRoad, - e_garageArea, - e_raceTrack, - e_beach, - e_quietChirping, - e_jetskiRace, - e_act3Pursuit, - - e_legoRadioReminder1, - e_legoRadioJingle1, - e_legoRadioJingle2, - e_legoRadioJingle3, - e_legoRadioJingle4, - e_legoRadioReminder2, - - e_legoRadioRacingAd, - e_legoRadioNews1, - e_legoRadioNews2, - e_legoRadioPizzaAd1, - e_legoRadioBricksterPSA, - e_legoRadioSports1, - e_legoRadioIntermission1, - e_legoRadioIntermission2, - e_legoRadioPizzaAd2, - e_legoRadioWeatherReport, - e_legoRadioSports2, - e_legoRadioPizzaAd3, - e_legoRadioIntermission3, - e_legoRadioSuperStoreAd, - - e_legoRadioLuckyYou, - e_legoRadioJazzInterlude, - e_legoRadioPianoInterlude1, - e_legoRadioPoliceStation, - e_legoRadioPianoInterlude2, - e_legoRadioCredits, - - e_helicopterBuild, - e_padding1, - e_duneBuggyBuild, - e_padding2, - e_jetskiBuild, - e_padding3, - e_raceCarBuild, - e_padding4, - - e_jukeBoxMamaPapaBrickolini, - e_jukeBoxBrickByBrick, - e_jukeBoxTheBrickster, - e_jukeBoxBuildMeABridgeToday, - e_jukeBoxBaroqueInBrick, - e_jukeBoxMantaRay, - - e_observationDeck, - e_elevator, - e_pizzaMission, - }; - JukeBox(); ~JukeBox() override; diff --git a/LEGO1/lego/legoomni/src/actors/helicopter.cpp b/LEGO1/lego/legoomni/src/actors/helicopter.cpp index 00ac8649..c3b4d222 100644 --- a/LEGO1/lego/legoomni/src/actors/helicopter.cpp +++ b/LEGO1/lego/legoomni/src/actors/helicopter.cpp @@ -118,7 +118,7 @@ MxU32 Helicopter::VTable0xcc() FUN_10015820(TRUE, 0); TransitionManager()->StartTransition(MxTransitionManager::e_pixelation, 50, FALSE, TRUE); SetUnknownDC(4); - PlayMusic(JukeBox::e_jail); + PlayMusic(JukeboxScript::c_Jail_Music); break; case LegoGameState::e_act2: m_script = *g_act2mainScript; diff --git a/LEGO1/lego/legoomni/src/isle/radiostate.cpp b/LEGO1/lego/legoomni/src/isle/radiostate.cpp index faae33c7..a766e4b1 100644 --- a/LEGO1/lego/legoomni/src/isle/radiostate.cpp +++ b/LEGO1/lego/legoomni/src/isle/radiostate.cpp @@ -6,44 +6,44 @@ #include "mxtimer.h" // GLOBAL: LEGO1 0x100f3218 -JukeBox::JukeBoxScript g_unk0x100f3218[6] = { - JukeBox::e_legoRadioReminder1, - JukeBox::e_legoRadioJingle1, - JukeBox::e_legoRadioJingle2, - JukeBox::e_legoRadioJingle3, - JukeBox::e_legoRadioJingle4, - JukeBox::e_legoRadioReminder2 +JukeboxScript::Script g_unk0x100f3218[6] = { + JukeboxScript::c_sns002ra_Audio, + JukeboxScript::c_sns001ja_Audio, + JukeboxScript::c_snsc01js_Audio, + JukeboxScript::c_snsb01js_Audio, + JukeboxScript::c_snsa01js_Audio, + JukeboxScript::c_sns009ra_Audio }; // GLOBAL: LEGO1 0x100f3230 -JukeBox::JukeBoxScript g_unk0x100f3230[14] = { - JukeBox::e_legoRadioRacingAd, - JukeBox::e_legoRadioNews1, - JukeBox::e_legoRadioNews2, - JukeBox::e_legoRadioPizzaAd1, - JukeBox::e_legoRadioBricksterPSA, - JukeBox::e_legoRadioSports1, - JukeBox::e_legoRadioIntermission1, - JukeBox::e_legoRadioIntermission2, - JukeBox::e_legoRadioPizzaAd2, - JukeBox::e_legoRadioWeatherReport, - JukeBox::e_legoRadioSports2, - JukeBox::e_legoRadioPizzaAd3, - JukeBox::e_legoRadioIntermission3, - JukeBox::e_legoRadioSuperStoreAd, +JukeboxScript::Script g_unk0x100f3230[14] = { + JukeboxScript::c_ham035ra_Audio, + JukeboxScript::c_ham039ra_Audio, + JukeboxScript::c_sns005ra_Audio, + JukeboxScript::c_sns078pa_Audio, + JukeboxScript::c_ham036ra_Audio, + JukeboxScript::c_sns006ra_Audio, + JukeboxScript::c_sns013ra_Audio, + JukeboxScript::c_sns004ra_Audio, + JukeboxScript::c_sns079pa_Audio, + JukeboxScript::c_sns007ra_Audio, + JukeboxScript::c_sns008ra_Audio, + JukeboxScript::c_hpz037ma_Audio, + JukeboxScript::c_sns003ra_Audio, + JukeboxScript::c_sns010ra_Audio, }; // GLOBAL: LEGO1 0x100f3268 -JukeBox::JukeBoxScript g_unk0x100f3268[9] = { - JukeBox::e_centralRoads, - JukeBox::e_beachBlvd, - JukeBox::e_residentialArea, - JukeBox::e_legoRadioLuckyYou, - JukeBox::e_legoRadioJazzInterlude, - JukeBox::e_legoRadioPianoInterlude1, - JukeBox::e_legoRadioPoliceStation, - JukeBox::e_legoRadioPianoInterlude2, - JukeBox::e_legoRadioCredits, +JukeboxScript::Script g_unk0x100f3268[9] = { + JukeboxScript::c_CentralRoads_Music, + JukeboxScript::c_Beach_Music, + JukeboxScript::c_ResidentalArea_Music, + JukeboxScript::c_Radio1_Music, + JukeboxScript::c_Radio2_Music, + JukeboxScript::c_Radio3_Music, + JukeboxScript::c_Radio4_Music, + JukeboxScript::c_Radio5_Music, + JukeboxScript::c_Radio6_Music, }; // FUNCTION: LEGO1 0x1002ce10 diff --git a/LEGO1/lego/legoomni/src/worlds/elevatorbottom.cpp b/LEGO1/lego/legoomni/src/worlds/elevatorbottom.cpp index 3c5c7e27..2c7fe1d6 100644 --- a/LEGO1/lego/legoomni/src/worlds/elevatorbottom.cpp +++ b/LEGO1/lego/legoomni/src/worlds/elevatorbottom.cpp @@ -72,7 +72,7 @@ MxLong ElevatorBottom::Notify(MxParam& p_param) void ElevatorBottom::ReadyWorld() { LegoWorld::ReadyWorld(); - PlayMusic(JukeBox::e_informationCenter); + PlayMusic(JukeboxScript::c_InformationCenter_Music); FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen); } diff --git a/LEGO1/lego/legoomni/src/worlds/historybook.cpp b/LEGO1/lego/legoomni/src/worlds/historybook.cpp index 954df038..88198683 100644 --- a/LEGO1/lego/legoomni/src/worlds/historybook.cpp +++ b/LEGO1/lego/legoomni/src/worlds/historybook.cpp @@ -143,7 +143,7 @@ void HistoryBook::ReadyWorld() scoreY += 0x1b; } - PlayMusic(JukeBox::e_informationCenter); + PlayMusic(JukeboxScript::c_InformationCenter_Music); } // FUNCTION: LEGO1 0x10082a10 diff --git a/LEGO1/lego/legoomni/src/worlds/infocenter.cpp b/LEGO1/lego/legoomni/src/worlds/infocenter.cpp index 61f5080d..7ebf7ba7 100644 --- a/LEGO1/lego/legoomni/src/worlds/infocenter.cpp +++ b/LEGO1/lego/legoomni/src/worlds/infocenter.cpp @@ -204,7 +204,7 @@ MxLong Infocenter::HandleEndAction(MxEndActionNotificationParam& p_param) } if (!m_unk0x1d4) { - PlayMusic(JukeBox::e_informationCenter); + PlayMusic(JukeboxScript::c_InformationCenter_Music); GameState()->SetActor(m_selectedCharacter); switch (m_selectedCharacter) { @@ -319,7 +319,7 @@ MxLong Infocenter::HandleEndAction(MxEndActionNotificationParam& p_param) m_currentInfomainScript != InfomainScript::c_Papa_All_Movie && m_currentInfomainScript != InfomainScript::c_Pepper_All_Movie && m_currentInfomainScript != InfomainScript::c_Nick_All_Movie && m_currentInfomainScript != InfomainScript::c_Laura_All_Movie) { m_infoManDialogueTimer = 1; - PlayMusic(JukeBox::e_informationCenter); + PlayMusic(JukeboxScript::c_InformationCenter_Music); } m_infocenterState->SetUnknown0x74(2); @@ -364,12 +364,12 @@ void Infocenter::ReadyWorld() } PlayAction(InfomainScript::c_iicx18in_RunAnim); - PlayMusic(JukeBox::e_informationCenter); + PlayMusic(JukeboxScript::c_InformationCenter_Music); FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen); break; case 5: default: { - PlayMusic(JukeBox::e_informationCenter); + PlayMusic(JukeboxScript::c_InformationCenter_Music); InfomainScript::Script script = (InfomainScript::Script) m_infocenterState->GetReturnDialogue(GameState()->GetCurrentAct()).Next(); @@ -390,7 +390,7 @@ void Infocenter::ReadyWorld() break; } case 8: - PlayMusic(JukeBox::e_informationCenter); + PlayMusic(JukeboxScript::c_InformationCenter_Music); PlayAction(InfomainScript::c_iic043in_RunAnim); FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen); break; @@ -401,14 +401,14 @@ void Infocenter::ReadyWorld() } PlayAction(InfomainScript::c_iicx17in_RunAnim); - PlayMusic(JukeBox::e_informationCenter); + PlayMusic(JukeboxScript::c_InformationCenter_Music); FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen); break; } return; case LegoGameState::e_act2: { if (m_infocenterState->GetUnknown0x74() == 8) { - PlayMusic(JukeBox::e_informationCenter); + PlayMusic(JukeboxScript::c_InformationCenter_Music); bgRed->Enable(TRUE); PlayAction(InfomainScript::c_iic043in_RunAnim); FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen); @@ -446,7 +446,7 @@ void Infocenter::ReadyWorld() return; } - PlayMusic(JukeBox::e_informationCenter); + PlayMusic(JukeboxScript::c_InformationCenter_Music); InfomainScript::Script script = (InfomainScript::Script) m_infocenterState->GetReturnDialogue(GameState()->GetCurrentAct()).Next(); PlayAction(script); @@ -455,7 +455,7 @@ void Infocenter::ReadyWorld() } case LegoGameState::e_act3: { if (m_infocenterState->GetUnknown0x74() == 8) { - PlayMusic(JukeBox::e_informationCenter); + PlayMusic(JukeboxScript::c_InformationCenter_Music); bgRed->Enable(TRUE); PlayAction(InfomainScript::c_iic043in_RunAnim); FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen); @@ -502,7 +502,7 @@ void Infocenter::ReadyWorld() return; } - PlayMusic(JukeBox::e_informationCenter); + PlayMusic(JukeboxScript::c_InformationCenter_Music); InfomainScript::Script script = (InfomainScript::Script) m_infocenterState->GetReturnDialogue(GameState()->GetCurrentAct()).Next(); PlayAction(script); diff --git a/LEGO1/lego/legoomni/src/worlds/infocenterdoor.cpp b/LEGO1/lego/legoomni/src/worlds/infocenterdoor.cpp index 5654fd34..43fe2430 100644 --- a/LEGO1/lego/legoomni/src/worlds/infocenterdoor.cpp +++ b/LEGO1/lego/legoomni/src/worlds/infocenterdoor.cpp @@ -82,7 +82,7 @@ MxLong InfocenterDoor::Notify(MxParam& p_param) void InfocenterDoor::ReadyWorld() { LegoWorld::ReadyWorld(); - PlayMusic(JukeBox::e_informationCenter); + PlayMusic(JukeboxScript::c_InformationCenter_Music); FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen); } diff --git a/LEGO1/lego/legoomni/src/worlds/jukebox.cpp b/LEGO1/lego/legoomni/src/worlds/jukebox.cpp index 63011a31..3376c732 100644 --- a/LEGO1/lego/legoomni/src/worlds/jukebox.cpp +++ b/LEGO1/lego/legoomni/src/worlds/jukebox.cpp @@ -123,41 +123,41 @@ MxBool JukeBox::HandleClick(LegoControlManagerEvent& p_param) if (p_param.GetUnknown0x28() == 1) { switch (p_param.GetClickedObjectId()) { - case c_dBackCtl: + case JukeboxwScript::c_Dback_Ctl: switch (m_state->GetState()) { - case JukeBoxScript::e_mamaPapaBrickolini: - m_state->SetState(JukeBoxScript::e_residentialArea); + case JukeboxScript::c_MusicTheme1: + m_state->SetState(JukeboxScript::c_ResidentalArea_Music); presenter = (MxStillPresenter*) Find("MxStillPresenter", "Torpedos_Bitmap"); presenter->Enable(TRUE); break; - case JukeBoxScript::e_jailUnused: - m_state->SetState(JukeBoxScript::e_mamaPapaBrickolini); + case JukeboxScript::c_Jail_Music: + m_state->SetState(JukeboxScript::c_MusicTheme1); presenter = (MxStillPresenter*) Find("MxStillPresenter", "Right_Bitmap"); presenter->Enable(FALSE); break; - case JukeBoxScript::e_act2Cave: - m_state->SetState(JukeBoxScript::e_jailUnused); + case JukeboxScript::c_Act2Cave: + m_state->SetState(JukeboxScript::c_Jail_Music); presenter = (MxStillPresenter*) Find("MxStillPresenter", "Decal_Bitmap"); presenter->Enable(FALSE); presenter = (MxStillPresenter*) Find("MxStillPresenter", "Right_Bitmap"); presenter->Enable(TRUE); break; - case JukeBoxScript::e_bricksterChase: - m_state->SetState(JukeBoxScript::e_act2Cave); + case JukeboxScript::c_BrickstrChase: + m_state->SetState(JukeboxScript::c_Act2Cave); presenter = (MxStillPresenter*) Find("MxStillPresenter", "Wallis_Bitmap"); presenter->Enable(FALSE); presenter = (MxStillPresenter*) Find("MxStillPresenter", "Decal_Bitmap"); presenter->Enable(TRUE); break; - case JukeBoxScript::e_brickHunt: - m_state->SetState(JukeBoxScript::e_bricksterChase); + case JukeboxScript::c_BrickHunt: + m_state->SetState(JukeboxScript::c_BrickstrChase); presenter = (MxStillPresenter*) Find("MxStillPresenter", "Nelson_Bitmap"); presenter->Enable(FALSE); presenter = (MxStillPresenter*) Find("MxStillPresenter", "Wallis_Bitmap"); presenter->Enable(TRUE); break; - case JukeBoxScript::e_residentialArea: - m_state->SetState(JukeBoxScript::e_brickHunt); + case JukeboxScript::c_ResidentalArea_Music: + m_state->SetState(JukeboxScript::c_BrickHunt); presenter = (MxStillPresenter*) Find("MxStillPresenter", "Torpedos_Bitmap"); presenter->Enable(FALSE); presenter = (MxStillPresenter*) Find("MxStillPresenter", "Nelson_Bitmap"); @@ -165,49 +165,49 @@ MxBool JukeBox::HandleClick(LegoControlManagerEvent& p_param) break; } break; - case JukeBoxWorldScript::c_dFwdCtl: + case JukeboxwScript::c_Dfwd_Ctl: switch (m_state->GetState()) { - case JukeBoxScript::e_mamaPapaBrickolini: - m_state->SetState(JukeBoxScript::e_jailUnused); + case JukeboxScript::c_MusicTheme1: + m_state->SetState(JukeboxScript::c_Jail_Music); presenter = (MxStillPresenter*) Find("MxStillPresenter", "Right_Bitmap"); presenter->Enable(TRUE); break; - case JukeBoxScript::e_jailUnused: - m_state->SetState(JukeBoxScript::e_act2Cave); + case JukeboxScript::c_Jail_Music: + m_state->SetState(JukeboxScript::c_Act2Cave); presenter = (MxStillPresenter*) Find("MxStillPresenter", "Right_Bitmap"); presenter->Enable(FALSE); presenter = (MxStillPresenter*) Find("MxStillPresenter", "Decal_Bitmap"); presenter->Enable(TRUE); break; - case JukeBoxScript::e_act2Cave: - m_state->SetState(JukeBoxScript::e_bricksterChase); + case JukeboxScript::c_Act2Cave: + m_state->SetState(JukeboxScript::c_BrickstrChase); presenter = (MxStillPresenter*) Find("MxStillPresenter", "Decal_Bitmap"); presenter->Enable(FALSE); presenter = (MxStillPresenter*) Find("MxStillPresenter", "Wallis_Bitmap"); presenter->Enable(TRUE); break; - case JukeBoxScript::e_bricksterChase: - m_state->SetState(JukeBoxScript::e_brickHunt); + case JukeboxScript::c_BrickstrChase: + m_state->SetState(JukeboxScript::c_BrickHunt); presenter = (MxStillPresenter*) Find("MxStillPresenter", "Wallis_Bitmap"); presenter->Enable(FALSE); presenter = (MxStillPresenter*) Find("MxStillPresenter", "Nelson_Bitmap"); presenter->Enable(TRUE); break; - case JukeBoxScript::e_brickHunt: - m_state->SetState(JukeBoxScript::e_residentialArea); + case JukeboxScript::c_BrickHunt: + m_state->SetState(JukeboxScript::c_ResidentalArea_Music); presenter = (MxStillPresenter*) Find("MxStillPresenter", "Nelson_Bitmap"); presenter->Enable(FALSE); presenter = (MxStillPresenter*) Find("MxStillPresenter", "Torpedos_Bitmap"); presenter->Enable(TRUE); break; - case JukeBoxScript::e_residentialArea: - m_state->SetState(JukeBoxScript::e_mamaPapaBrickolini); + case JukeboxScript::c_ResidentalArea_Music: + m_state->SetState(JukeboxScript::c_MusicTheme1); presenter = (MxStillPresenter*) Find("MxStillPresenter", "Torpedos_Bitmap"); presenter->Enable(FALSE); break; } break; - case JukeBoxWorldScript::c_noteCtl: + case JukeboxwScript::c_Note_Ctl: LegoGameState* gameState = GameState(); Act1State* act1State = (Act1State*) gameState->GetState("Act1State"); act1State->SetUnknown18(11); diff --git a/LEGO1/lego/legoomni/src/worlds/police.cpp b/LEGO1/lego/legoomni/src/worlds/police.cpp index fb5dd53e..30bf5c3c 100644 --- a/LEGO1/lego/legoomni/src/worlds/police.cpp +++ b/LEGO1/lego/legoomni/src/worlds/police.cpp @@ -94,7 +94,7 @@ MxLong Police::Notify(MxParam& p_param) void Police::ReadyWorld() { LegoWorld::ReadyWorld(); - PlayMusic(JukeBox::e_policeStation); + PlayMusic(JukeboxScript::c_PoliceStation_Music); FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen); } diff --git a/LEGO1/lego/legoomni/src/worlds/score.cpp b/LEGO1/lego/legoomni/src/worlds/score.cpp index 187c9918..8d39d049 100644 --- a/LEGO1/lego/legoomni/src/worlds/score.cpp +++ b/LEGO1/lego/legoomni/src/worlds/score.cpp @@ -125,7 +125,7 @@ MxLong Score::FUN_10001510(MxEndActionNotificationParam& p_param) TransitionManager()->StartTransition(MxTransitionManager::e_pixelation, 0x32, 0, 0); break; case 0x1f5: - PlayMusic(JukeBox::e_informationCenter); + PlayMusic(JukeboxScript::c_InformationCenter_Music); m_state->SetTutorialFlag(FALSE); } } @@ -151,7 +151,7 @@ void Score::ReadyWorld() Start(&action); } else { - PlayMusic(JukeBox::e_informationCenter); + PlayMusic(JukeboxScript::c_InformationCenter_Music); } FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);