From 40bb4eb1f26c35ec2884cb75811ecf0660aab499 Mon Sep 17 00:00:00 2001
From: disinvite <disinvite@users.noreply.github.com>
Date: Wed, 16 Apr 2025 23:43:23 -0400
Subject: [PATCH] Swap addrs for LightImpl and MeshBuilderImpl

---
 LEGO1/tgl/d3drm/impl.h          | 24 ++++++++++++------------
 LEGO1/tgl/d3drm/light.cpp       |  2 +-
 LEGO1/tgl/d3drm/meshbuilder.cpp |  2 +-
 LEGO1/tgl/tgl.h                 | 16 ++++++++--------
 4 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/LEGO1/tgl/d3drm/impl.h b/LEGO1/tgl/d3drm/impl.h
index 987c1d3a..b1aa95dc 100644
--- a/LEGO1/tgl/d3drm/impl.h
+++ b/LEGO1/tgl/d3drm/impl.h
@@ -301,13 +301,13 @@ void CameraImpl::Destroy()
 }
 
 // VTABLE: LEGO1 0x100dbaf8
-// VTABLE: BETA10 0x101c31e0
+// VTABLE: BETA10 0x101c3270
 class LightImpl : public Light {
 public:
-	// FUNCTION: BETA10 0x1016b260
+	// FUNCTION: BETA10 0x1016b460
 	LightImpl() : m_data(0) {}
 
-	// FUNCTION: BETA10 0x1016c7e0
+	// FUNCTION: BETA10 0x1016f5c0
 	~LightImpl() override { Destroy(); }
 
 	void* ImplementationDataPtr() override;
@@ -329,13 +329,13 @@ class LightImpl : public Light {
 	LightDataType m_data;
 };
 
-// FUNCTION: BETA10 0x10170390
+// FUNCTION: BETA10 0x10171220
 inline void LightDestroy(IDirect3DRMFrame2* pLight)
 {
 	pLight->Release();
 }
 
-// FUNCTION: BETA10 0x10170350
+// FUNCTION: BETA10 0x101711e0
 void LightImpl::Destroy()
 {
 	if (m_data) {
@@ -459,13 +459,13 @@ void GroupImpl::Destroy()
 }
 
 // VTABLE: LEGO1 0x100dbb18
-// VTABLE: BETA10 0x101c3270
+// VTABLE: BETA10 0x101c31e0
 class MeshBuilderImpl : public MeshBuilder {
 public:
-	// FUNCTION: BETA10 0x1016b460
+	// FUNCTION: BETA10 0x1016b260
 	MeshBuilderImpl() : m_data(0) {}
 
-	// FUNCTION: BETA10 0x1016f5c0
+	// FUNCTION: BETA10 0x1016c7e0
 	~MeshBuilderImpl() override { Destroy(); }
 
 	void* ImplementationDataPtr() override;
@@ -508,13 +508,13 @@ class MeshBuilderImpl : public MeshBuilder {
 	IDirect3DRMMesh* m_data;
 };
 
-// FUNCTION: BETA10 0x10171220
+// FUNCTION: BETA10 0x10170390
 inline void MeshBuilderDestroy(IDirect3DRMMesh* pMeshBuilder)
 {
 	pMeshBuilder->Release();
 }
 
-// FUNCTION: BETA10 0x101711e0
+// FUNCTION: BETA10 0x10170350
 void MeshBuilderImpl::Destroy()
 {
 	if (m_data) {
@@ -723,11 +723,11 @@ inline D3DRMLIGHTTYPE Translate(LightType tglLightType)
 // TglImpl::CameraImpl::`scalar deleting destructor'
 
 // SYNTHETIC: LEGO1 0x100a2640
-// SYNTHETIC: BETA10 0x1016b5f0
+// SYNTHETIC: BETA10 0x1016ba30
 // TglImpl::LightImpl::`scalar deleting destructor'
 
 // SYNTHETIC: LEGO1 0x100a2720
-// SYNTHETIC: BETA10 0x1016ba30
+// SYNTHETIC: BETA10 0x1016b5f0
 // TglImpl::MeshBuilderImpl::`scalar deleting destructor'
 
 // SYNTHETIC: LEGO1 0x100a2800
diff --git a/LEGO1/tgl/d3drm/light.cpp b/LEGO1/tgl/d3drm/light.cpp
index 3452fbc2..50d8271e 100644
--- a/LEGO1/tgl/d3drm/light.cpp
+++ b/LEGO1/tgl/d3drm/light.cpp
@@ -6,7 +6,7 @@ DECOMP_SIZE_ASSERT(Light, 0x04);
 DECOMP_SIZE_ASSERT(LightImpl, 0x08);
 
 // FUNCTION: LEGO1 0x100a3770
-// FUNCTION: BETA10 0x1016c9f0
+// FUNCTION: BETA10 0x1016f630
 void* LightImpl::ImplementationDataPtr()
 {
 	return reinterpret_cast<void*>(&m_data);
diff --git a/LEGO1/tgl/d3drm/meshbuilder.cpp b/LEGO1/tgl/d3drm/meshbuilder.cpp
index 6b8b8113..4db21f0d 100644
--- a/LEGO1/tgl/d3drm/meshbuilder.cpp
+++ b/LEGO1/tgl/d3drm/meshbuilder.cpp
@@ -6,7 +6,7 @@ DECOMP_SIZE_ASSERT(MeshBuilder, 0x04);
 DECOMP_SIZE_ASSERT(MeshBuilderImpl, 0x08);
 
 // FUNCTION: LEGO1 0x100a3830
-// FUNCTION: BETA10 0x1016f630
+// FUNCTION: BETA10 0x1016c9f0
 void* MeshBuilderImpl::ImplementationDataPtr()
 {
 	return reinterpret_cast<void*>(&m_data);
diff --git a/LEGO1/tgl/tgl.h b/LEGO1/tgl/tgl.h
index 8ba3493b..c519cf05 100644
--- a/LEGO1/tgl/tgl.h
+++ b/LEGO1/tgl/tgl.h
@@ -285,21 +285,21 @@ class Camera : public Object {
 };
 
 // VTABLE: LEGO1 0x100dbb08
-// VTABLE: BETA10 0x101c32a0
+// VTABLE: BETA10 0x101c3330
 class Light : public Object {
 public:
 	virtual Result SetTransformation(FloatMatrix4&) = 0;
 	virtual Result SetColor(float r, float g, float b) = 0;
 
-	// SYNTHETIC: BETA10 0x1016b630
+	// SYNTHETIC: BETA10 0x1016ba70
 	// Tgl::Light::Light
 
 	// SYNTHETIC: LEGO1 0x100a26d0
-	// SYNTHETIC: BETA10 0x1016b6a0
+	// SYNTHETIC: BETA10 0x1016bae0
 	// Tgl::Light::~Light
 
 	// SYNTHETIC: LEGO1 0x100a2aa0
-	// SYNTHETIC: BETA10 0x1016bb80
+	// SYNTHETIC: BETA10 0x1016bc80
 	// Tgl::Light::`scalar deleting destructor'
 };
 
@@ -367,7 +367,7 @@ class Group : public Object {
 // was not in the leaked Tgl code. My suspicion is that it's
 // some kind of builder class for creating meshes.
 // VTABLE: LEGO1 0x100dbb30
-// VTABLE: BETA10 0x101c3330
+// VTABLE: BETA10 0x101c32a0
 class MeshBuilder : public Object {
 public:
 	virtual Mesh* CreateMesh(
@@ -383,15 +383,15 @@ class MeshBuilder : public Object {
 	virtual Result GetBoundingBox(float min[3], float max[3]) const = 0;
 	virtual MeshBuilder* Clone() = 0;
 
-	// SYNTHETIC: BETA10 0x1016ba70
+	// SYNTHETIC: BETA10 0x1016b630
 	// Tgl::MeshBuilder::MeshBuilder
 
 	// SYNTHETIC: LEGO1 0x100a27b0
-	// SYNTHETIC: BETA10 0x1016bae0
+	// SYNTHETIC: BETA10 0x1016b6a0
 	// Tgl::MeshBuilder::~MeshBuilder
 
 	// SYNTHETIC: LEGO1 0x100a2b10
-	// SYNTHETIC: BETA10 0x1016bc80
+	// SYNTHETIC: BETA10 0x1016bb80
 	// Tgl::MeshBuilder::`scalar deleting destructor'
 };