diff --git a/LEGO1/lego/legoomni/include/act3.h b/LEGO1/lego/legoomni/include/act3.h index 2abc9a51..fad19342 100644 --- a/LEGO1/lego/legoomni/include/act3.h +++ b/LEGO1/lego/legoomni/include/act3.h @@ -158,12 +158,12 @@ class Act3 : public LegoWorld { Helicopter* m_copter; // 0x420c Act3Shark* m_shark; // 0x4210 MxFloat m_time; // 0x4214 - undefined m_unk0x4218; // 0x4218 - undefined m_unk0x4219; // 0x4219 - undefined m_unk0x421a; // 0x421a - undefined m_unk0x421b; // 0x421b - undefined m_unk0x421c; // 0x421c - undefined m_unk0x421d; // 0x421d + MxU8 m_unk0x4218; // 0x4218 + MxU8 m_unk0x4219; // 0x4219 + MxU8 m_unk0x421a; // 0x421a + MxU8 m_unk0x421b; // 0x421b + MxU8 m_unk0x421c; // 0x421c + MxU8 m_unk0x421d; // 0x421d undefined m_unk0x421e; // 0x421e Act3List m_unk0x4220; // 0x4220 MxPresenter* m_helicopterDots[15]; // 0x4230 diff --git a/LEGO1/lego/legoomni/src/worlds/act3.cpp b/LEGO1/lego/legoomni/src/worlds/act3.cpp index 6a5f0a03..03769ec9 100644 --- a/LEGO1/lego/legoomni/src/worlds/act3.cpp +++ b/LEGO1/lego/legoomni/src/worlds/act3.cpp @@ -419,9 +419,7 @@ void Act3::FUN_10072ad0(undefined4 p_param1) m_unk0x4218 = 0; } - Act3Script::Script objectId = g_unk0x100d94f8[m_unk0x4218]; - m_unk0x4218++; - m_unk0x4220.Insert(objectId, 3); + m_unk0x4220.Insert(g_unk0x100d94f8[m_unk0x4218++], 3); break; } case 2: { @@ -429,9 +427,7 @@ void Act3::FUN_10072ad0(undefined4 p_param1) m_unk0x4219 = 0; } - Act3Script::Script objectId = g_unk0x100d9538[m_unk0x4219]; - m_unk0x4219++; - m_unk0x4220.Insert(objectId, 3); + m_unk0x4220.Insert(g_unk0x100d9538[m_unk0x4219++], 3); break; } case 3: { @@ -439,9 +435,7 @@ void Act3::FUN_10072ad0(undefined4 p_param1) m_unk0x421a = 0; } - Act3Script::Script objectId = g_unk0x100d9550[m_unk0x421a]; - m_unk0x421a++; - m_unk0x4220.Insert(objectId, 3); + m_unk0x4220.Insert(g_unk0x100d9550[m_unk0x421a++], 3); break; } case 4: { @@ -449,9 +443,7 @@ void Act3::FUN_10072ad0(undefined4 p_param1) m_unk0x421b = 0; } - Act3Script::Script objectId = g_unk0x100d9570[m_unk0x421b]; - m_unk0x421b++; - m_unk0x4220.Insert(objectId, 3); + m_unk0x4220.Insert(g_unk0x100d9570[m_unk0x421b++], 3); break; } case 5: { @@ -459,9 +451,7 @@ void Act3::FUN_10072ad0(undefined4 p_param1) m_unk0x421c = 0; } - Act3Script::Script objectId = g_unk0x100d9588[m_unk0x421c]; - m_unk0x421c++; - m_unk0x4220.Insert(objectId, 3); + m_unk0x4220.Insert(g_unk0x100d9588[m_unk0x421c++], 3); break; } case 6: {