ImaginaryDrill0x2450 (isledecomp#244)

* `ImaginaryDrill0x2450`

* Fix class layout

* Update CLAUDE.md

Author: foxtacles

CLAUDE.md

@@ -157,6 +157,7 @@ Keep original types at API boundaries (Win32, DirectX, CRT); `void*` can remain.
 
 - **Every type must be corroborated by matched code.** A type is proven only when a `// FUNCTION:` using it reaches 100%. Until then, `undefined`/`undefined4`.
 - **No raw pointer arithmetic as a substitute for types.** Casts + subtractions mean the types are wrong; find the real class so the cast is legitimate C++ (including multi-inheritance cross-casts — define the inheritance, don't fake the adjustment).
+- **Split mixed compilation units until unexplained address gaps are gone.** A large non-FOLDED address jump usually means one of the functions is assigned to the wrong class/type, or that multiple whole classes have been mashed into one source unit. Fix this by correcting ownership and moving whole classes or cohesive groups of whole classes into address-local implementation units. The exceptions are intentional FOLDED functions, which stay with the class they logically belong to, and single classes whose methods genuinely span a wide address range; never split one class's methods across `.cpp` files just to make address order look cleaner.
 - **One root type per header.** A header should define at most one top-level class or struct; forward declarations do not count. If a second concrete root type is needed, move it to its own header and include that header.
 - **Nest one-owner helper types.** Loader params, callback shims, small related records, and similar one-owner types belong inside the primary class that owns or consumes them instead of becoming top-level classes/structs.
 - **Ground polymorphic classes.** When a concrete polymorphic class is identified, add its `VTABLE`, ctor, dtor, and scalar-deleting-destructor annotations instead of leaving it as an unannotated interface shape.

CMakeLists.txt

@@ -220,6 +220,7 @@ set_property(TARGET goldp PROPERTY SUFFIX ".dll")
 # --- LEGORacers.exe target ---
 add_executable(legoracers WIN32
   LEGORacers/src/main.cpp
+  LEGORacers/src/gamemain.cpp
   LEGORacers/src/cactusinterface0x4.cpp
   LEGORacers/src/legoracers.cpp
   LEGORacers/src/win32golapp.cpp
@@ -272,6 +273,7 @@ add_executable(legoracers WIN32
   LEGORacers/src/obscureanchor0x5c.cpp
   LEGORacers/src/obscureanthem0x58.cpp
   LEGORacers/src/obscureicon0x1a8.cpp
+  LEGORacers/src/obscurelink0x1c.cpp
   LEGORacers/src/obscurerune0x4d8.cpp
   LEGORacers/src/obscuresigil0xdc.cpp
   LEGORacers/src/obscuretome0x3dc.cpp
@@ -283,10 +285,14 @@ add_executable(legoracers WIN32
   LEGORacers/src/imaginarybolt0x4774.cpp
   LEGORacers/src/imaginarybrush0x6410.cpp
   LEGORacers/src/imaginarychisel0x658.cpp
+  LEGORacers/src/imaginarychisel0x658helperat0x368.cpp
   LEGORacers/src/imaginaryclaw0x15ec.cpp
   LEGORacers/src/imaginarycrowbar0x6750.cpp
   LEGORacers/src/imaginarycube0x3c34.cpp
   LEGORacers/src/imaginarydrill0x2450.cpp
+  LEGORacers/src/imaginarydrillfieldat0x22dc.cpp
+  LEGORacers/src/imaginarydrillfieldat0x420.cpp
+  LEGORacers/src/imaginarydrillfieldat0x498.cpp
   LEGORacers/src/imaginaryfeather0x658.cpp
   LEGORacers/src/imaginarygear0x4c8c.cpp
   LEGORacers/src/imaginarygizmo0x1908.cpp
@@ -301,11 +307,17 @@ add_executable(legoracers WIN32
   LEGORacers/src/imaginaryspool0x2cc4.cpp
   LEGORacers/src/imaginaryspring0x658.cpp
   LEGORacers/src/imaginarytool0x368.cpp
+  LEGORacers/src/imaginarytool0x368fieldat0x2e0.cpp
+  LEGORacers/src/imaginarytool0x368fieldat0x340.cpp
+  LEGORacers/src/imaginarytool0x368fieldat0x350.cpp
   LEGORacers/src/imaginarywrench0x23bc.cpp
   LEGORacers/src/onyxbreeze0x248.cpp
   LEGORacers/src/onyxcircularbuffer0x1c.cpp
   LEGORacers/src/peridottraceroot0x108.cpp
   LEGORacers/src/peridottrace0x4e0.cpp
+  LEGORacers/src/peridottrace0x4a8.cpp
+  LEGORacers/src/peridottraceactionbase0x34.cpp
+  LEGORacers/src/peridottracestate0x438.cpp
   LEGORacers/src/citrinegrove0x1f4c.cpp
   LEGORacers/src/topazburst0x14.cpp
   LEGORacers/src/legopiecelibrary.cpp

LEGORacers/include/audio/directsoundgroup.h

@@ -27,22 +27,22 @@ class DirectSoundGroup : public SoundGroup {
 	~DirectSoundGroup();
 	void Load(const LegoChar* p_name) override; // vtable+0x00
 	void Unload() override;                     // vtable+0x04
-	virtual LegoBool32 IsLoaded();              // vtable+0x08
-	virtual LegoU32 GetSoundCount();            // vtable+0x0c
-	virtual void PlaySpatialSound(
+	LegoBool32 IsLoaded() override;             // vtable+0x08
+	LegoU32 GetSoundCount() override;           // vtable+0x0c
+	void PlaySpatialSound(
 		LegoU32 p_index,
 		SoundNode* p_node,
 		LegoFloat p_minDistance,
 		LegoFloat p_maxDistance,
 		LegoFloat p_volume,
 		LegoFloat p_frequencyScale
-	);                                                                             // vtable+0x10
-	virtual void PlaySoundByIndex(LegoU32 p_index);                                // vtable+0x14
-	virtual SoundInstance* CreateSoundInstance(LegoU32 p_index);                   // vtable+0x18
-	virtual void DestroySoundInstance(SoundInstance* p_sound);                     // vtable+0x1c
-	virtual StreamingSoundInstance* CreateStreamingSoundInstance(LegoU32 p_index); // vtable+0x20
-	virtual void DestroyStreamingSoundInstance(StreamingSoundInstance* p_sound);   // vtable+0x24
-	virtual SoundManager* GetSoundManager();                                       // vtable+0x28
+	) override;                                                                     // vtable+0x10
+	void PlaySoundByIndex(LegoU32 p_index) override;                                // vtable+0x14
+	SoundInstance* CreateSoundInstance(LegoU32 p_index) override;                   // vtable+0x18
+	void DestroySoundInstance(SoundInstance* p_sound) override;                     // vtable+0x1c
+	StreamingSoundInstance* CreateStreamingSoundInstance(LegoU32 p_index) override; // vtable+0x20
+	void DestroyStreamingSoundInstance(StreamingSoundInstance* p_sound) override;   // vtable+0x24
+	SoundManager* GetSoundManager() override;                                       // vtable+0x28
 
 private:
 	undefined4 m_unk0x10;                                      // 0x10

LEGORacers/include/audio/nullsoundgroup.h

@@ -21,22 +21,22 @@ class NullSoundGroup : public SoundGroup {
 	~NullSoundGroup();
 	void Load(const LegoChar* p_name) override; // vtable+0x00
 	void Unload() override;                     // vtable+0x04
-	virtual LegoBool32 IsLoaded();              // vtable+0x08
-	virtual LegoU32 GetSoundCount();            // vtable+0x0c
-	virtual void PlaySpatialSound(
+	LegoBool32 IsLoaded() override;             // vtable+0x08
+	LegoU32 GetSoundCount() override;           // vtable+0x0c
+	void PlaySpatialSound(
 		LegoU32 p_index,
 		SoundNode* p_node,
 		LegoFloat p_minDistance,
 		LegoFloat p_maxDistance,
 		LegoFloat p_volume,
 		LegoFloat p_frequencyScale
-	);                                                                             // vtable+0x10
-	virtual void PlaySoundByIndex(LegoU32 p_index);                                // vtable+0x14
-	virtual SoundInstance* CreateSoundInstance(LegoU32 p_index);                   // vtable+0x18
-	virtual void DestroySoundInstance(SoundInstance* p_sound);                     // vtable+0x1c
-	virtual StreamingSoundInstance* CreateStreamingSoundInstance(LegoU32 p_index); // vtable+0x20
-	virtual void DestroyStreamingSoundInstance(StreamingSoundInstance* p_sound);   // vtable+0x24
-	virtual SoundManager* GetSoundManager();                                       // vtable+0x28
+	) override;                                                                     // vtable+0x10
+	void PlaySoundByIndex(LegoU32 p_index) override;                                // vtable+0x14
+	SoundInstance* CreateSoundInstance(LegoU32 p_index) override;                   // vtable+0x18
+	void DestroySoundInstance(SoundInstance* p_sound) override;                     // vtable+0x1c
+	StreamingSoundInstance* CreateStreamingSoundInstance(LegoU32 p_index) override; // vtable+0x20
+	void DestroyStreamingSoundInstance(StreamingSoundInstance* p_sound) override;   // vtable+0x24
+	SoundManager* GetSoundManager() override;                                       // vtable+0x28
 
 private:
 	GolList<NullSoundInstance> m_soundInstances;                   // 0x10

LEGORacers/include/audio/soundgroup.h

@@ -6,6 +6,9 @@
 #include "types.h"
 
 class SoundManager;
+class SoundInstance;
+class StreamingSoundInstance;
+struct SoundNode;
 
 // SIZE 0x10
 class SoundGroup : public GolListLink {
@@ -14,6 +17,22 @@ class SoundGroup : public GolListLink {
 
 	virtual void Load(const LegoChar* p_name) = 0; // vtable+0x00
 	virtual void Unload() = 0;                     // vtable+0x04
+	virtual LegoBool32 IsLoaded() = 0;             // vtable+0x08
+	virtual LegoU32 GetSoundCount() = 0;           // vtable+0x0c
+	virtual void PlaySpatialSound(
+		LegoU32 p_index,
+		SoundNode* p_node,
+		LegoFloat p_minDistance,
+		LegoFloat p_maxDistance,
+		LegoFloat p_volume,
+		LegoFloat p_frequencyScale
+	) = 0;                                                                     // vtable+0x10
+	virtual void PlaySoundByIndex(LegoU32 p_index) = 0;                        // vtable+0x14
+	virtual SoundInstance* CreateSoundInstance(LegoU32 p_index) = 0;           // vtable+0x18
+	virtual void DestroySoundInstance(SoundInstance* p_sound) = 0;             // vtable+0x1c
+	virtual StreamingSoundInstance* CreateStreamingSoundInstance(LegoU32) = 0; // vtable+0x20
+	virtual void DestroyStreamingSoundInstance(StreamingSoundInstance*) = 0;   // vtable+0x24
+	virtual SoundManager* GetSoundManager() = 0;                               // vtable+0x28
 
 	void SetSoundManager(SoundManager* p_soundManager) { m_soundManager = p_soundManager; }
 

LEGORacers/include/audio/soundgroupbinding.h

@@ -15,6 +15,7 @@ class SoundGroupBinding {
 
 	LegoBool32 SetSoundGroup(SoundManager* p_soundManager, SoundGroup* p_soundGroup, undefined4 p_unk0x0c);
 	LegoBool32 ResetSoundGroup();
+	void FUN_0046e970(LegoU32 p_index);
 
 private:
 	void Reset();

LEGORacers/include/ceruleanqueen0x58.h

@@ -31,6 +31,19 @@ class CeruleanQueen0x58 : public CeruleanKnight0x20 {
 		undefined m_unk0x40[0x74 - 0x40]; // 0x40
 	};
 
+	// SIZE 0x84
+	class Entry0x84 {
+	public:
+		undefined m_unk0x00[0x38 - 0x00]; // 0x00
+		LegoU8 m_unk0x38;                 // 0x38
+		undefined m_unk0x39[0x52 - 0x39]; // 0x39
+		LegoS8 m_unk0x52[6][4];           // 0x52
+		undefined m_unk0x6a[0x74 - 0x6a]; // 0x6a
+		undefined4 m_unk0x74;             // 0x74
+		undefined4 m_unk0x78;             // 0x78
+		undefined m_unk0x7c[0x84 - 0x7c]; // 0x7c
+	};
+
 	// SIZE 0x0c
 	struct ResourceLoadParams {
 		BronzeFalcon0xc8770* m_renderer; // 0x00
@@ -51,6 +64,7 @@ class CeruleanQueen0x58 : public CeruleanKnight0x20 {
 
 private:
 	void FUN_00469900(ResourceLoadParams* p_params);
+	void FUN_00469a20(Entry0x84* p_entry);
 	void FUN_0046a750();
 	void FUN_0046a800();
 	void FUN_0046a8a0();
@@ -66,6 +80,9 @@ class CeruleanQueen0x58 : public CeruleanKnight0x20 {
 	void FUN_0046aea0();
 
 protected:
+	static void __stdcall FUN_00469b20(Entry0x84* p_entry);
+	void FUN_00469b50(Entry0x84* p_entry);
+
 	undefined* m_unk0x20;   // 0x20
 	undefined* m_unk0x24;   // 0x24
 	undefined* m_unk0x28;   // 0x28

LEGORacers/include/citrinegrove0x1f4c.h

@@ -30,7 +30,7 @@ class CitrineGrove0x1f4c {
 	void FUN_004435c0();
 	void FUN_00443620(const LegoChar*, PeridotTrace0x4a8*);
 	void FUN_004436e0();
-	void FUN_00450fc0(const LegoChar* p_path);
+	LegoU32 FUN_00443760();
 
 private:
 	MarigoldTrail0x108 m_unk0x00;        // 0x00

LEGORacers/include/crimsonsun0xa4.h

@@ -12,6 +12,7 @@ class CrimsonSun0xa4 {
 
 	LegoS32 Reset();
 	LegoS32 FUN_00468ab0();
+	void FUN_00468cf0();
 	void FUN_00468da0(LegoU32 p_unk0x04);
 	void FUN_00468e20();
 	LegoBool FUN_00468af0(void* p_unk0x04, LegoS32 p_unk0x08, void* p_unk0x0c);

LEGORacers/include/imaginaryaxe0x36c4.h

@@ -11,7 +11,7 @@ class ImaginaryAxe0x36c4 : public ImaginaryTool0x368 {
 public:
 	ImaginaryAxe0x36c4();
 
-	void VTable0x38(undefined4) override;                                              // vtable+0x38
+	void VTable0x38(ObscureVantage0x58*) override;                                     // vtable+0x38
 	void VTable0x44(undefined4) override;                                              // vtable+0x44
 	void VTable0x4c() override;                                                        // vtable+0x4c
 	void Reset() override;                                                             // vtable+0x54