ObscureVantage0x58::FUN_00472bc0 (isledecomp#251)

foxtacles · web-flow · commit 41b4d51fa7c9 · 2026-05-13T02:02:11.000+02:00
diff --git a/LEGORacers/include/imaginarycube0x3c34.h b/LEGORacers/include/imaginarycube0x3c34.h
@@ -23,10 +23,10 @@ class ImaginaryCube0x3c34 : public ImaginaryShape0x2b20 {
 		undefined4,
 		undefined4
 	) override;                                                                        // vtable+0x1c
-	void VTable0x20(undefined4) override;                                              // vtable+0x20
-	void VTable0x24(undefined4) override;                                              // vtable+0x24
+	void VTable0x20(ObscureVantage0x58*) override;                                     // vtable+0x20
+	void VTable0x24(ObscureVantage0x58*) override;                                     // vtable+0x24
 	undefined4 VTable0x28(ObscureIcon0x1a8*, void*, undefined4, undefined4) override;  // vtable+0x28
-	void VTable0x34(undefined4) override;                                              // vtable+0x34
+	void VTable0x34(ObscureIcon0x1a8*) override;                                       // vtable+0x34
 	void VTable0x38(ObscureVantage0x58*) override;                                     // vtable+0x38
 	void VTable0x44(undefined4) override;                                              // vtable+0x44
 	void VTable0x4c() override;                                                        // vtable+0x4c
diff --git a/LEGORacers/include/imaginarydrillfieldat0x498.h b/LEGORacers/include/imaginarydrillfieldat0x498.h
@@ -18,7 +18,7 @@ class ImaginaryDrillFieldAt0x498 : public ObscureIcon0x1a8 {
 	void VTable0x10(Rect*) override;                                                       // vtable+0x10
 	undefined4 VTable0x34(OnyxCircularBuffer0x1c::Item*, undefined4, undefined4) override; // vtable+0x34
 	undefined4 VTable0x38(Rect*, Rect*) override;                                          // vtable+0x38
-	void VTable0x40(undefined4) override;                                                  // vtable+0x40
+	void VTable0x40(ImaginaryInterface*) override;                                         // vtable+0x40
 
 	// SYNTHETIC: LEGORACERS 0x00482400
 	// ImaginaryDrillFieldAt0x498::`scalar deleting destructor'
diff --git a/LEGORacers/include/imaginaryinterface.h b/LEGORacers/include/imaginaryinterface.h
@@ -12,7 +12,7 @@ class ObscureVantage0x58;
 // VTABLE: LEGORACERS 0x004b2388
 class ImaginaryInterface {
 public:
-	virtual void VTable0x00(undefined4) = 0;                                             // vtable+0x00
+	virtual void VTable0x00(ObscureVantage0x58*) = 0;                                    // vtable+0x00
 	virtual void VTable0x04(ObscureVantage0x58*) = 0;                                    // vtable+0x04
 	virtual void VTable0x08(ObscureVantage0x58*) = 0;                                    // vtable+0x08
 	virtual void VTable0x0c(ObscureVantage0x58*) = 0;                                    // vtable+0x0c
@@ -30,15 +30,15 @@ class ImaginaryInterface {
 		undefined4,
 		undefined4
 	) = 0;                                                                               // vtable+0x1c
-	virtual void VTable0x20(undefined4) = 0;                                             // vtable+0x20
-	virtual void VTable0x24(undefined4) = 0;                                             // vtable+0x24
+	virtual void VTable0x20(ObscureVantage0x58*) = 0;                                    // vtable+0x20
+	virtual void VTable0x24(ObscureVantage0x58*) = 0;                                    // vtable+0x24
 	virtual undefined4 VTable0x28(ObscureIcon0x1a8*, void*, undefined4, undefined4) = 0; // vtable+0x28
-	virtual void VTable0x2c(undefined4) = 0;                                             // vtable+0x2c
-	virtual void VTable0x30(undefined4) = 0;                                             // vtable+0x30
-	virtual void VTable0x34(undefined4) = 0;                                             // vtable+0x34
+	virtual void VTable0x2c(ObscureIcon0x1a8*) = 0;                                      // vtable+0x2c
+	virtual void VTable0x30(ObscureIcon0x1a8*) = 0;                                      // vtable+0x30
+	virtual void VTable0x34(ObscureIcon0x1a8*) = 0;                                      // vtable+0x34
 	virtual void VTable0x38(ObscureVantage0x58*) = 0;                                    // vtable+0x38
-	virtual void VTable0x3c(undefined4) = 0;                                             // vtable+0x3c
-	virtual void VTable0x40(undefined4) = 0;                                             // vtable+0x40
+	virtual void VTable0x3c(ObscureIcon0x1a8*) = 0;                                      // vtable+0x3c
+	virtual void VTable0x40(ObscureIcon0x1a8*) = 0;                                      // vtable+0x40
 	virtual void VTable0x44(undefined4) = 0;                                             // vtable+0x44
 	virtual void VTable0x48(undefined4) = 0;                                             // vtable+0x48
 };
diff --git a/LEGORacers/include/imaginarynotion0x290.h b/LEGORacers/include/imaginarynotion0x290.h
@@ -40,7 +40,7 @@ class ImaginaryNotion0x290 : public ImaginaryInterface {
 
 	ImaginaryNotion0x290();
 
-	void VTable0x00(undefined4) override;                                             // vtable+0x00
+	void VTable0x00(ObscureVantage0x58*) override;                                    // vtable+0x00
 	void VTable0x04(ObscureVantage0x58*) override;                                    // vtable+0x04
 	void VTable0x08(ObscureVantage0x58*) override;                                    // vtable+0x08
 	void VTable0x0c(ObscureVantage0x58*) override;                                    // vtable+0x0c
@@ -58,15 +58,15 @@ class ImaginaryNotion0x290 : public ImaginaryInterface {
 		undefined4,
 		undefined4
 	) override;                                                                       // vtable+0x1c
-	void VTable0x20(undefined4) override;                                             // vtable+0x20
-	void VTable0x24(undefined4) override;                                             // vtable+0x24
+	void VTable0x20(ObscureVantage0x58*) override;                                    // vtable+0x20
+	void VTable0x24(ObscureVantage0x58*) override;                                    // vtable+0x24
 	undefined4 VTable0x28(ObscureIcon0x1a8*, void*, undefined4, undefined4) override; // vtable+0x28
-	void VTable0x2c(undefined4) override;                                             // vtable+0x2c
-	void VTable0x30(undefined4) override;                                             // vtable+0x30
-	void VTable0x34(undefined4) override;                                             // vtable+0x34
+	void VTable0x2c(ObscureIcon0x1a8*) override;                                      // vtable+0x2c
+	void VTable0x30(ObscureIcon0x1a8*) override;                                      // vtable+0x30
+	void VTable0x34(ObscureIcon0x1a8*) override;                                      // vtable+0x34
 	void VTable0x38(ObscureVantage0x58*) override;                                    // vtable+0x38
-	void VTable0x3c(undefined4) override;                                             // vtable+0x3c
-	void VTable0x40(undefined4) override;                                             // vtable+0x40
+	void VTable0x3c(ObscureIcon0x1a8*) override;                                      // vtable+0x3c
+	void VTable0x40(ObscureIcon0x1a8*) override;                                      // vtable+0x40
 	void VTable0x44(undefined4) override;                                             // vtable+0x44
 	void VTable0x48(undefined4) override;                                             // vtable+0x48
 	virtual void VTable0x4c() = 0;                                                    // vtable+0x4c
diff --git a/LEGORacers/include/imaginaryring0x3360.h b/LEGORacers/include/imaginaryring0x3360.h
@@ -23,7 +23,7 @@ class ImaginaryRing0x3360 : public ImaginaryTool0x368 {
 		undefined4,
 		undefined4
 	) override;                                                                        // vtable+0x1c
-	void VTable0x34(undefined4) override;                                              // vtable+0x34
+	void VTable0x34(ObscureIcon0x1a8*) override;                                       // vtable+0x34
 	void VTable0x38(ObscureVantage0x58*) override;                                     // vtable+0x38
 	void VTable0x44(undefined4) override;                                              // vtable+0x44
 	void VTable0x4c() override;                                                        // vtable+0x4c
diff --git a/LEGORacers/include/imaginaryruler0x2e60.h b/LEGORacers/include/imaginaryruler0x2e60.h
@@ -12,7 +12,7 @@ class ImaginaryRuler0x2e60 : public ImaginaryGizmo0x1908 {
 	ImaginaryRuler0x2e60();
 
 	void VTable0x38(ObscureVantage0x58*) override;                                     // vtable+0x38
-	void VTable0x3c(undefined4) override;                                              // vtable+0x3c
+	void VTable0x3c(ObscureIcon0x1a8*) override;                                       // vtable+0x3c
 	void VTable0x44(undefined4) override;                                              // vtable+0x44
 	void VTable0x4c() override;                                                        // vtable+0x4c
 	void Reset() override;                                                             // vtable+0x54
diff --git a/LEGORacers/include/imaginarytool0x368.h b/LEGORacers/include/imaginarytool0x368.h
@@ -92,9 +92,9 @@ class ImaginaryTool0x368 : public ImaginaryNotion0x290 {
 		undefined4,
 		undefined4
 	) override;                                         // vtable+0x1c
-	void VTable0x34(undefined4) override;               // vtable+0x34
-	void VTable0x3c(undefined4) override;               // vtable+0x3c
-	void VTable0x40(undefined4) override;               // vtable+0x40
+	void VTable0x34(ObscureIcon0x1a8*) override;        // vtable+0x34
+	void VTable0x3c(ObscureIcon0x1a8*) override;        // vtable+0x3c
+	void VTable0x40(ObscureIcon0x1a8*) override;        // vtable+0x40
 	void Reset() override;                              // vtable+0x54
 	CeruleanEmperor0x4c* GetMenuStyles() override;      // vtable+0x5c
 	CeruleanQueen0x58* GetMenuInputBindings() override; // vtable+0x64
@@ -132,7 +132,7 @@ class ImaginaryTool0x368 : public ImaginaryNotion0x290 {
 	FieldAt0x340 m_unk0x340;          // 0x340
 	FieldAt0x350 m_unk0x350;          // 0x350
 	MenuToolContext0x4bc8* m_context; // 0x354
-	undefined4 m_unk0x358;            // 0x358
+	ObscureIcon0x1a8* m_unk0x358;     // 0x358
 	ObscureVantage0x58* m_unk0x35c;   // 0x35c
 	LegoU16 m_unk0x360;               // 0x360
 	LegoU16 m_menuId;                 // 0x362
diff --git a/LEGORacers/include/imaginarywrench0x23bc.h b/LEGORacers/include/imaginarywrench0x23bc.h
@@ -13,8 +13,8 @@ class ImaginaryWrench0x23bc : public ImaginaryTool0x368 {
 	ImaginaryWrench0x23bc();
 
 	void VTable0x38(ObscureVantage0x58*) override;                                     // vtable+0x38
-	void VTable0x3c(undefined4) override;                                              // vtable+0x3c
-	void VTable0x40(undefined4) override;                                              // vtable+0x40
+	void VTable0x3c(ObscureIcon0x1a8*) override;                                       // vtable+0x3c
+	void VTable0x40(ObscureIcon0x1a8*) override;                                       // vtable+0x40
 	void VTable0x44(undefined4) override;                                              // vtable+0x44
 	void VTable0x4c() override;                                                        // vtable+0x4c
 	void Reset() override;                                                             // vtable+0x54
diff --git a/LEGORacers/include/obscureicon0x1a8.h b/LEGORacers/include/obscureicon0x1a8.h
@@ -53,7 +53,7 @@ class ObscureIcon0x1a8 : public ObscureVantage0x58 {
 	undefined4 VTable0x34(OnyxCircularBuffer0x1c::Item*, undefined4, undefined4) override; // vtable+0x34
 	undefined4 VTable0x38(Rect*, Rect*) override;                                          // vtable+0x38
 	undefined4 VTable0x3c(undefined4) override;                                            // vtable+0x3c
-	virtual void VTable0x40(undefined4);
+	virtual void VTable0x40(ImaginaryInterface*);
 	virtual void VTable0x44(undefined4);
 	virtual void VTable0x48(undefined4);
 	virtual void VTable0x4c(undefined4);
diff --git a/LEGORacers/include/obscurevantage0x58.h b/LEGORacers/include/obscurevantage0x58.h
@@ -85,6 +85,8 @@ class ObscureVantage0x58 {
 
 protected:
 	LegoBool32 FUN_00472a60(CreateParams0x30* p_createParams);
+	void FUN_00472bc0();
+	void FUN_00472c10();
 };
 
 #endif // OBSCUREVANTAGE0X58_H
diff --git a/LEGORacers/src/imaginarycube0x3c34.cpp b/LEGORacers/src/imaginarycube0x3c34.cpp
@@ -48,13 +48,13 @@ undefined4 ImaginaryCube0x3c34::VTable0x1c(ObscureIcon0x1a8*, OnyxCircularBuffer
 }
 
 // STUB: LEGORACERS 0x004745e0
-void ImaginaryCube0x3c34::VTable0x20(undefined4)
+void ImaginaryCube0x3c34::VTable0x20(ObscureVantage0x58*)
 {
 	STUB(0x004745e0);
 }
 
 // STUB: LEGORACERS 0x00474640
-void ImaginaryCube0x3c34::VTable0x24(undefined4)
+void ImaginaryCube0x3c34::VTable0x24(ObscureVantage0x58*)
 {
 	STUB(0x00474640);
 }
@@ -67,7 +67,7 @@ undefined4 ImaginaryCube0x3c34::VTable0x28(ObscureIcon0x1a8*, void*, undefined4,
 }
 
 // STUB: LEGORACERS 0x00474710
-void ImaginaryCube0x3c34::VTable0x34(undefined4)
+void ImaginaryCube0x3c34::VTable0x34(ObscureIcon0x1a8*)
 {
 	STUB(0x00474710);
 }
diff --git a/LEGORacers/src/imaginarydrillfieldat0x498.cpp b/LEGORacers/src/imaginarydrillfieldat0x498.cpp
@@ -45,7 +45,7 @@ void ImaginaryDrillFieldAt0x498::VTable0x10(Rect*)
 }
 
 // STUB: LEGORACERS 0x004828f0
-void ImaginaryDrillFieldAt0x498::VTable0x40(undefined4)
+void ImaginaryDrillFieldAt0x498::VTable0x40(ImaginaryInterface*)
 {
 	STUB(0x004828f0);
 }
diff --git a/LEGORacers/src/imaginarynotion0x290.cpp b/LEGORacers/src/imaginarynotion0x290.cpp
@@ -30,7 +30,7 @@ undefined4 ImaginaryNotion0x290::VTable0x50()
 }
 
 // STUB: LEGORACERS 0x0044f590 FOLDED
-void ImaginaryNotion0x290::VTable0x00(undefined4)
+void ImaginaryNotion0x290::VTable0x00(ObscureVantage0x58*)
 {
 	// TODO
 	STUB(0x0044f590);
@@ -65,35 +65,35 @@ void ImaginaryNotion0x290::VTable0x10(undefined4)
 }
 
 // STUB: LEGORACERS 0x0044f590 FOLDED
-void ImaginaryNotion0x290::VTable0x20(undefined4)
+void ImaginaryNotion0x290::VTable0x20(ObscureVantage0x58*)
 {
 	// TODO
 	STUB(0x0044f590);
 }
 
 // STUB: LEGORACERS 0x0044f590 FOLDED
-void ImaginaryNotion0x290::VTable0x24(undefined4)
+void ImaginaryNotion0x290::VTable0x24(ObscureVantage0x58*)
 {
 	// TODO
 	STUB(0x0044f590);
 }
 
 // STUB: LEGORACERS 0x0044f590 FOLDED
-void ImaginaryNotion0x290::VTable0x2c(undefined4)
+void ImaginaryNotion0x290::VTable0x2c(ObscureIcon0x1a8*)
 {
 	// TODO
 	STUB(0x0044f590);
 }
 
 // STUB: LEGORACERS 0x0044f590 FOLDED
-void ImaginaryNotion0x290::VTable0x30(undefined4)
+void ImaginaryNotion0x290::VTable0x30(ObscureIcon0x1a8*)
 {
 	// TODO
 	STUB(0x0044f590);
 }
 
 // STUB: LEGORACERS 0x0044f590 FOLDED
-void ImaginaryNotion0x290::VTable0x34(undefined4)
+void ImaginaryNotion0x290::VTable0x34(ObscureIcon0x1a8*)
 {
 	// TODO
 	STUB(0x0044f590);
@@ -107,14 +107,14 @@ void ImaginaryNotion0x290::VTable0x38(ObscureVantage0x58*)
 }
 
 // STUB: LEGORACERS 0x0044f590 FOLDED
-void ImaginaryNotion0x290::VTable0x3c(undefined4)
+void ImaginaryNotion0x290::VTable0x3c(ObscureIcon0x1a8*)
 {
 	// TODO
 	STUB(0x0044f590);
 }
 
 // STUB: LEGORACERS 0x0044f590 FOLDED
-void ImaginaryNotion0x290::VTable0x40(undefined4)
+void ImaginaryNotion0x290::VTable0x40(ObscureIcon0x1a8*)
 {
 	// TODO
 	STUB(0x0044f590);
diff --git a/LEGORacers/src/imaginaryring0x3360.cpp b/LEGORacers/src/imaginaryring0x3360.cpp
@@ -46,7 +46,7 @@ void ImaginaryRing0x3360::VTable0x44(undefined4)
 }
 
 // STUB: LEGORACERS 0x0047abd0
-void ImaginaryRing0x3360::VTable0x34(undefined4)
+void ImaginaryRing0x3360::VTable0x34(ObscureIcon0x1a8*)
 {
 	STUB(0x0047abd0);
 }
diff --git a/LEGORacers/src/imaginaryruler0x2e60.cpp b/LEGORacers/src/imaginaryruler0x2e60.cpp
@@ -34,7 +34,7 @@ LegoBool32 ImaginaryRuler0x2e60::VTable0x8c(MenuToolContext0x4bc8*, MenuToolCrea
 }
 
 // STUB: LEGORACERS 0x00487d10
-void ImaginaryRuler0x2e60::VTable0x3c(undefined4)
+void ImaginaryRuler0x2e60::VTable0x3c(ObscureIcon0x1a8*)
 {
 	STUB(0x00487d10);
 }
diff --git a/LEGORacers/src/imaginarytool0x368.cpp b/LEGORacers/src/imaginarytool0x368.cpp
@@ -54,7 +54,7 @@ void ImaginaryTool0x368::Reset()
 	m_menuId = 0;
 	m_context = NULL;
 	m_unk0x35c = NULL;
-	m_unk0x358 = 0;
+	m_unk0x358 = NULL;
 	m_unk0x364 = FALSE;
 	ImaginaryNotion0x290::Reset();
 }
@@ -172,13 +172,13 @@ void ImaginaryTool0x368::FUN_004804c0(MenuToolContext0x4bc8* p_context)
 }
 
 // FUNCTION: LEGORACERS 0x00480500 FOLDED
-void ImaginaryTool0x368::VTable0x34(undefined4)
+void ImaginaryTool0x368::VTable0x34(ObscureIcon0x1a8*)
 {
 	m_unk0x364 = FALSE;
 }
 
 // FUNCTION: LEGORACERS 0x00480510 FOLDED
-void ImaginaryTool0x368::VTable0x3c(undefined4 p_unk0x04)
+void ImaginaryTool0x368::VTable0x3c(ObscureIcon0x1a8* p_unk0x04)
 {
 	m_unk0x358 = p_unk0x04;
 }
@@ -194,7 +194,7 @@ LegoBool32 ImaginaryTool0x368::VTable0x78(undefined4)
 }
 
 // STUB: LEGORACERS 0x00487d30 FOLDED
-void ImaginaryTool0x368::VTable0x40(undefined4)
+void ImaginaryTool0x368::VTable0x40(ObscureIcon0x1a8*)
 {
 	// TODO
 	STUB(0x00487d30);
diff --git a/LEGORacers/src/imaginarywrench0x23bc.cpp b/LEGORacers/src/imaginarywrench0x23bc.cpp
@@ -95,14 +95,14 @@ void ImaginaryWrench0x23bc::VTable0x38(ObscureVantage0x58*)
 }
 
 // STUB: LEGORACERS 0x0047b9c0
-void ImaginaryWrench0x23bc::VTable0x40(undefined4)
+void ImaginaryWrench0x23bc::VTable0x40(ObscureIcon0x1a8*)
 {
 	// TODO
 	STUB(0x0047b9c0);
 }
 
 // STUB: LEGORACERS 0x0047b9e0
-void ImaginaryWrench0x23bc::VTable0x3c(undefined4)
+void ImaginaryWrench0x23bc::VTable0x3c(ObscureIcon0x1a8*)
 {
 	// TODO
 	STUB(0x0047b9e0);
diff --git a/LEGORacers/src/obscureicon0x1a8.cpp b/LEGORacers/src/obscureicon0x1a8.cpp
diff --git a/LEGORacers/src/obscurevantage0x58.cpp b/LEGORacers/src/obscurevantage0x58.cpp
