Implement/match Infocenter::Reset (#532)

* Implement Infocenter::Reset

* Move code

* Move function

* Fix bug

* Fix another bug
This commit is contained in:
Christian Semmler
2024-02-05 12:35:26 -05:00
committed by GitHub
parent a2c1bd66b3
commit 03423b2ffa
11 changed files with 129 additions and 62 deletions

View File

@@ -33,6 +33,15 @@ public:
e_goodEndMovie
};
enum Character {
e_noCharacter = 0,
e_pepper,
e_mama,
e_papa,
e_nick,
e_laura
};
enum InfomainScript {
c_noInfomain = -1,
@@ -135,7 +144,7 @@ public:
c_gasCtlDescription = 555,
c_medCtlDescription = 556,
c_unk557 = 557,
c_infoCtlDescription = 557,
c_boatCtlDescription = 558,
c_copCtlDescription = 559,
c_pizzaCtlDescription = 560,
@@ -204,7 +213,7 @@ private:
MxLong HandleNotification0(MxNotificationParam& p_param);
void UpdateFrameHot(MxBool p_display);
void FUN_10070e90();
void Reset();
void PlayCutscene(Cutscene p_entityId, MxBool p_scale);
void StopCutscene();
@@ -221,7 +230,7 @@ private:
void StopBookAnimation();
InfomainScript m_currentInfomainScript; // 0xf8
MxS16 m_unk0xfc; // 0xfc
MxS16 m_selectedCharacter; // 0xfc
InfocenterState* m_infocenterState; // 0x100
undefined4 m_transitionDestination; // 0x104
Cutscene m_currentCutscene; // 0x108

View File

@@ -23,6 +23,7 @@ public:
void FUN_1002fa00();
void FUN_1002fb30();
void FUN_10030590();
// SYNTHETIC: LEGO1 0x1002f940
// LegoBuildingManager::`scalar deleting destructor'

View File

@@ -46,8 +46,9 @@ public:
inline void SetCurrentArea(MxU32 p_currentArea) { m_currentArea = p_currentArea; }
inline void SetPreviousArea(MxU32 p_previousArea) { m_previousArea = p_previousArea; }
inline void SetUnknown0x0c(MxU8 p_unk0x0c) { m_unk0x0c = p_unk0x0c; }
inline void SetUnknown0x42c(undefined4 p_unk0x42c) { m_unk0x42c = p_unk0x42c; }
void SetSomeEnumState(undefined4 p_state);
void FUN_1003cea0(undefined4 p_state);
void FUN_1003ceb0();
void FUN_10039780(MxU8);
void FUN_10039940();

View File

@@ -22,6 +22,7 @@ public:
void FUN_10026360(undefined4 p_world);
void FUN_100263a0(undefined4 p_und);
void FUN_10027120();
// SYNTHETIC: LEGO1 0x100262a0
// LegoPlantManager::`scalar deleting destructor'

View File

@@ -37,6 +37,7 @@ class LegoUnkSaveDataWriter {
public:
MxResult WriteSaveData3(LegoStorage* p_stream);
AutoROI* FUN_10083500(undefined4, undefined4);
void FUN_100832a0();
void FUN_10083db0(LegoROI* p_roi);
};