From cf7466f9016cfdf72f25a81fb8330608751cd322 Mon Sep 17 00:00:00 2001 From: Ramen2X <64166386+Ramen2X@users.noreply.github.com> Date: Wed, 17 Jan 2024 14:08:05 -0500 Subject: [PATCH] name nearly every infomain action (#449) * name nearly every infomain action * label two more unused actions --- LEGO1/lego/legoomni/include/infocenter.h | 71 +++++++++++++++++-- .../legoomni/src/infocenter/infocenter.cpp | 12 ++-- 2 files changed, 71 insertions(+), 12 deletions(-) diff --git a/LEGO1/lego/legoomni/include/infocenter.h b/LEGO1/lego/legoomni/include/infocenter.h index fc7a55b3..da17941b 100644 --- a/LEGO1/lego/legoomni/include/infocenter.h +++ b/LEGO1/lego/legoomni/include/infocenter.h @@ -30,18 +30,77 @@ class Infocenter : public LegoWorld { enum InfomainScript { c_noInfomain = -1, + c_welcomeDialogue = 500, - c_randomDialogue1 = 502, - c_letsGetStarted = 504, - c_returnBack = 514, - c_exitConfirmation = 522, + c_goodJobDialogue = 501, + + c_clickOnInfomanDialogue = 502, + c_tickleInfomanDialogue = 503, + + c_letsGetStartedDialogue = 504, + + c_clickOnObjectsGuidanceDialogue = 505, + c_arrowNavigationGuidanceDialogue = 506, + c_elevatorGuidanceDialogue = 507, + c_radioGuidanceDialogue = 508, + c_exitGuidanceDialogue1 = 509, + c_exitGuidanceDialogue2 = 510, + c_goOutsideGuidanceDialogue = 511, + c_experimentGuidanceDialogue = 512, + c_returnBackGuidanceDialogue1 = 513, + c_returnBackGuidanceDialogue2 = 514, + c_bricksterWarningDialogue = 515, + c_newGameGuidanceDialogue = 516, + c_returnBackGuidanceDialogue3 = 517, + + c_reenterInfoCenterDialogue1 = 518, + c_reenterInfoCenterDialogue2 = 519, + c_reenterInfoCenterDialogue3 = 520, + c_reenterInfoCenterDialogue4 = 521, + + c_exitConfirmationDialogue = 522, + c_saveGameOptionsDialogueUnused = 523, + c_exitGameDialogue = 524, + + c_bricksterEscapedDialogue1 = 525, + c_bricksterEscapedDialogue2 = 526, + c_bricksterEscapedDialogue3 = 527, + c_bricksterEscapedDialogue4 = 528, + c_bricksterEscapedDialogue5 = 529, + c_bricksterEscapedDialogue6 = 530, + c_bricksterEscapedDialogue7 = 531, + + c_infomanHiccup = 532, + c_infomanWalkOffScreenLeftUnused = 533, + c_infomanSneeze = 534, + c_infomanWalkOffScreenRightUnused = 535, + c_infomanLaughs = 536, + c_infomanLooksBehindAtScreenUnused = 537, + c_infomanReturnsFromScreenUnused = 538, + c_goodEndingDialogue = 539, c_badEndingDialogue = 540, + c_pepperCharacterSelect = 541, c_mamaCharacterSelect = 542, c_papaCharacterSelect = 543, - c_officierCharacterSelect = 544, - c_loraCharacterSelect = 545, + c_nickCharacterSelect = 544, + c_lauraCharacterSelect = 545, + + c_creditsDialogue = 551, + + c_noCDDialogueUnused1 = 552, + c_noCDDialogueUnused2 = 553, + + c_leaveInfoCenterDialogue1 = 562, + c_leaveInfoCenterDialogue2 = 563, + c_leaveInfoCenterDialogue3 = 564, + c_leaveInfoCenterDialogue4 = 565, + + c_registerToContinueDialogue = 573, + + c_bricksterDialogue = 574, + c_bricksterLaughs = 575, }; enum SndAmimScript { diff --git a/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp b/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp index 935f0ad8..0cba8908 100644 --- a/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp +++ b/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp @@ -159,10 +159,10 @@ MxLong Infocenter::HandleEndAction(MxParam& p_param) PlayDialogue(c_papaCharacterSelect); break; case 4: - PlayDialogue(c_officierCharacterSelect); + PlayDialogue(c_nickCharacterSelect); break; case 5: - PlayDialogue(c_loraCharacterSelect); + PlayDialogue(c_lauraCharacterSelect); break; default: break; @@ -177,7 +177,7 @@ MxLong Infocenter::HandleEndAction(MxParam& p_param) if (result || (action->GetAtomId() != m_atom && action->GetAtomId() != *g_introScript)) return result; - if (action->GetObjectId() == c_returnBack) { + if (action->GetObjectId() == c_returnBackGuidanceDialogue2) { ControlManager()->FUN_100293c0(0x10, action->GetAtomId(), 0); m_unk0x1d6 = 0; } @@ -302,7 +302,7 @@ void Infocenter::VTable0x50() m_unk0x1d2 = 1; } - PlayDialogue(c_letsGetStarted); + PlayDialogue(c_letsGetStartedDialogue); PlayMusic(11); FUN_10015820(0, 7); return; @@ -312,7 +312,7 @@ void Infocenter::VTable0x50() break; case 8: PlayMusic(11); - PlayDialogue(c_exitConfirmation); + PlayDialogue(c_exitConfirmationDialogue); FUN_10015820(0, 7); return; case 0xf: @@ -320,7 +320,7 @@ void Infocenter::VTable0x50() m_unk0x1d2 = 1; } - PlayDialogue(c_randomDialogue1); + PlayDialogue(c_clickOnInfomanDialogue); PlayMusic(11); FUN_10015820(0, 7); return;