isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2026-02-01 04:31:16 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Decomp marker corrections

Browse Source
This commit is contained in:
disinvite 2024-01-13 15:09:36 -05:00
parent 06160d429b
commit 5aa590d767
21 changed files with 90 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
LEGO1/define.cpp
View File

@ -10,20 +10,20 @@ MxS32 g_mxcoreCount[101] = {0, -6643, -5643, -5058, -4643, -4321, -4058, -38
-358, -340, -321, -304, -286, -268, -251, -234, -217, -200, -184, -168, -152, -358, -340, -321, -304, -286, -268, -251, -234, -217, -200, -184, -168, -152,
-136, -120, -104, -89, -74, -58, -43, -29, -14, 0}; -136, -120, -104, -89, -74, -58, -43, -29, -14, 0};
// GLOBAL: LEGO1 0x10101eac // GLOBAL: LEGO1 0x10102048
const char* g_parseExtraTokens = ":;"; const char* g_strACTION = "ACTION";
// GLOBAL: LEGO1 0x10101edc // GLOBAL: LEGO1 0x1010209c
const char* g_strWORLD = "WORLD";
// GLOBAL: LEGO1 0x10101f20
const char* g_strSOUND = "SOUND";
// GLOBAL: LEGO1 0x10101f58
const char* g_strOBJECT = "OBJECT"; const char* g_strOBJECT = "OBJECT";
// GLOBAL: LEGO1 0x10102040 // GLOBAL: LEGO1 0x101020b0
const char* g_strACTION = "ACTION"; const char* g_strSOUND = "SOUND";
// GLOBAL: LEGO1 0x101020cc // GLOBAL: LEGO1 0x101020cc
const char* g_strVISIBILITY = "VISIBILITY"; const char* g_strVISIBILITY = "VISIBILITY";
// GLOBAL: LEGO1 0x101020d0
const char* g_strWORLD = "WORLD";
// GLOBAL: LEGO1 0x101020e4
const char* g_parseExtraTokens = ":;";

6
LEGO1/lego/legoomni/include/legounknown100d9d00.h
View File

@ -27,9 +27,15 @@ class LegoUnknown100d9d00 : public MxList<LegoUnknown100d7c88*> {
// TEMPLATE: LEGO1 0x1007b300 // TEMPLATE: LEGO1 0x1007b300
// MxCollection<LegoUnknown100d7c88 *>::Compare // MxCollection<LegoUnknown100d7c88 *>::Compare
// TEMPLATE: LEGO1 0x1007b310
// MxCollection<LegoUnknown100d7c88 *>::~MxCollection<LegoUnknown100d7c88 *>
// TEMPLATE: LEGO1 0x1007b360 // TEMPLATE: LEGO1 0x1007b360
// MxCollection<LegoUnknown100d7c88 *>::Destroy // MxCollection<LegoUnknown100d7c88 *>::Destroy
// TEMPLATE: LEGO1 0x1007b370
// MxList<LegoUnknown100d7c88 *>::~MxList<LegoUnknown100d7c88 *>
// SYNTHETIC: LEGO1 0x1007b400 // SYNTHETIC: LEGO1 0x1007b400
// LegoUnknown100d9d00::`scalar deleting destructor' // LegoUnknown100d9d00::`scalar deleting destructor'

1
LEGO1/lego/legoomni/src/common/gifmanager.cpp
View File

@ -6,6 +6,7 @@ DECOMP_SIZE_ASSERT(GifMap, 0x08);
DECOMP_SIZE_ASSERT(GifManagerBase, 0x14); DECOMP_SIZE_ASSERT(GifManagerBase, 0x14);
DECOMP_SIZE_ASSERT(GifManager, 0x30); DECOMP_SIZE_ASSERT(GifManager, 0x30);
// GLOBAL: LEGO1 0x100f0100
GifMapEntry* g_unk0x100f0100; GifMapEntry* g_unk0x100f0100;
// FUNCTION: LEGO1 0x10001cc0 // FUNCTION: LEGO1 0x10001cc0

5
LEGO1/lego/legoomni/src/common/legobackgroundcolor.cpp
View File

@ -7,8 +7,13 @@
DECOMP_SIZE_ASSERT(LegoBackgroundColor, 0x30) DECOMP_SIZE_ASSERT(LegoBackgroundColor, 0x30)
// GLOBAL: LEGO1 0x100f3fb0
const char* g_delimiter = "\t"; const char* g_delimiter = "\t";
// GLOBAL: LEGO1 0x100f3fb4
const char* g_set = "set"; const char* g_set = "set";
// GLOBAL: LEGO1 0x100f3fb8
const char* g_reset = "reset"; const char* g_reset = "reset";
// FUNCTION: LEGO1 0x1003bfb0 // FUNCTION: LEGO1 0x1003bfb0

4
LEGO1/lego/legoomni/src/common/legofullscreenmovie.cpp
View File

@ -7,10 +7,10 @@
DECOMP_SIZE_ASSERT(LegoFullScreenMovie, 0x24) DECOMP_SIZE_ASSERT(LegoFullScreenMovie, 0x24)
// GLOBAL: LEGO1 0x100f3be8 // GLOBAL: LEGO1 0x100f3fbc
const char* g_strEnable = "enable"; const char* g_strEnable = "enable";
// GLOBAL: LEGO1 0x100f3bf4 // GLOBAL: LEGO1 0x100f3fc0
const char* g_strDisable = "disable"; const char* g_strDisable = "disable";
// FUNCTION: LEGO1 0x1003c500 // FUNCTION: LEGO1 0x1003c500

12
LEGO1/lego/legoomni/src/common/legogamestate.cpp
View File

@ -15,15 +15,15 @@
// There may be other members that come after. // There may be other members that come after.
DECOMP_SIZE_ASSERT(LegoGameState, 0x430) DECOMP_SIZE_ASSERT(LegoGameState, 0x430)
// GLOBAL: LEGO1 0x100f3e24
const char* g_historyGSI = "History.gsi";
// GLOBAL: LEGO1 0x100f3e30
const char* g_playersGSI = "Players.gsi";
// GLOBAL: LEGO1 0x100f3e40 // GLOBAL: LEGO1 0x100f3e40
const char* g_fileExtensionGS = ".GS"; const char* g_fileExtensionGS = ".GS";
// GLOBAL: LEGO1 0x100f3e44
const char* g_playersGSI = "Players.gsi";
// GLOBAL: LEGO1 0x100f3e48
const char* g_historyGSI = "History.gsi";
// GLOBAL: LEGO1 0x100f3e58 // GLOBAL: LEGO1 0x100f3e58
ColorStringStruct g_colorSaveData[43] = { ColorStringStruct g_colorSaveData[43] = {
{"c_dbbkfny0", "lego red"}, {"c_dbbkxly0", "lego white"}, {"c_chbasey0", "lego black"}, {"c_dbbkfny0", "lego red"}, {"c_dbbkxly0", "lego white"}, {"c_chbasey0", "lego black"},

4
LEGO1/library_msvc.h
View File

@ -18,6 +18,10 @@
// LIBRARY: LEGO1 0x1008a1c0 // LIBRARY: LEGO1 0x1008a1c0
// _free // _free
// LIBRARY: ISLE 0x407ec0
// LIBRARY: LEGO1 0x1008b020
// ___CxxFrameHandler
// LIBRARY: ISLE 0x408220 // LIBRARY: ISLE 0x408220
// LIBRARY: LEGO1 0x1008b400 // LIBRARY: LEGO1 0x1008b400
// _atol // _atol

1
LEGO1/omni/include/mxdsevent.h
View File

@ -3,6 +3,7 @@
#include "mxdsmediaaction.h" #include "mxdsmediaaction.h"
// VTABLE: LEGO1 0x100dce18
class MxDSEvent : public MxDSMediaAction { class MxDSEvent : public MxDSMediaAction {
public: public:
MxDSEvent(); MxDSEvent();

6
LEGO1/omni/include/mxnotificationmanager.h
View File

@ -52,4 +52,10 @@ class MxNotificationManager : public MxCore {
void FlushPending(MxCore* p_listener); void FlushPending(MxCore* p_listener);
}; };
// FUNCTION: LEGO1 0x100ac3b0
// MxIdList::~MxIdList
// TEMPLATE: LEGO1 0x100ac540
// List<MxNotification *>::~List<MxNotification *>
#endif // MXNOTIFICATIONMANAGER_H #endif // MXNOTIFICATIONMANAGER_H

1
LEGO1/omni/include/mxomnicreateparam.h
View File

@ -8,6 +8,7 @@
#include <windows.h> #include <windows.h>
// VTABLE: LEGO1 0x100dc218
class MxOmniCreateParam : public MxParam { class MxOmniCreateParam : public MxParam {
public: public:
__declspec(dllexport) MxOmniCreateParam( __declspec(dllexport) MxOmniCreateParam(

2
LEGO1/omni/include/mxparam.h
View File

@ -1,8 +1,10 @@
#ifndef MXPARAM_H #ifndef MXPARAM_H
#define MXPARAM_H #define MXPARAM_H
// VTABLE: LEGO1 0x100d56e8
class MxParam { class MxParam {
public: public:
// FUNCTION: LEGO1 0x10010360
virtual ~MxParam() {} virtual ~MxParam() {}
}; };

1
LEGO1/omni/include/mxsemaphore.h
View File

@ -6,6 +6,7 @@
#include <windows.h> #include <windows.h>
// SIZE 0x08 // SIZE 0x08
// VTABLE: LEGO1 0x100dccf0
class MxSemaphore { class MxSemaphore {
public: public:
MxSemaphore(); MxSemaphore();

1
LEGO1/omni/include/mxstreamer.h
View File

@ -48,6 +48,7 @@ class MxStreamerSubClass3 : public MxStreamerSubClass1 {
inline MxStreamerSubClass3() : MxStreamerSubClass1(0x80) {} inline MxStreamerSubClass3() : MxStreamerSubClass1(0x80) {}
}; };
// VTABLE: LEGO1 0x100dc760
class MxStreamerNotification : public MxNotificationParam { class MxStreamerNotification : public MxNotificationParam {
public: public:
inline MxStreamerNotification(NotificationId p_type, MxCore* p_sender, MxStreamController* p_ctrlr) inline MxStreamerNotification(NotificationId p_type, MxCore* p_sender, MxStreamController* p_ctrlr)

15
LEGO1/omni/include/mxstringlist.h
View File

@ -14,18 +14,33 @@ class MxStringListCursor : public MxListCursor<MxString> {
MxStringListCursor(MxStringList* p_list) : MxListCursor<MxString>(p_list){}; MxStringListCursor(MxStringList* p_list) : MxListCursor<MxString>(p_list){};
}; };
// VTABLE: LEGO1 0x100dd010
// class MxCollection<MxString>
// VTABLE: LEGO1 0x100dd028
// class MxList<MxString>
// VTABLE: LEGO1 0x100dd070 // VTABLE: LEGO1 0x100dd070
// class MxListCursor<MxString> // class MxListCursor<MxString>
// TEMPLATE: LEGO1 0x100cb3c0 // TEMPLATE: LEGO1 0x100cb3c0
// MxCollection<MxString>::Compare // MxCollection<MxString>::Compare
// TEMPLATE: LEGO1 0x100cb420
// MxCollection<MxString>::~MxCollection<MxString>
// TEMPLATE: LEGO1 0x100cb470 // TEMPLATE: LEGO1 0x100cb470
// MxCollection<MxString>::Destroy // MxCollection<MxString>::Destroy
// TEMPLATE: LEGO1 0x100cb4c0 // TEMPLATE: LEGO1 0x100cb4c0
// MxList<MxString>::~MxList<MxString> // MxList<MxString>::~MxList<MxString>
// SYNTHETIC: LEGO1 0x100cb590
// MxCollection<MxString>::`scalar deleting destructor'
// SYNTHETIC: LEGO1 0x100cb600
// MxList<MxString>::`scalar deleting destructor'
// TEMPLATE: LEGO1 0x100cbb40 // TEMPLATE: LEGO1 0x100cbb40
// MxList<MxString>::Append // MxList<MxString>::Append

3
LEGO1/omni/include/mxticklemanager.h
View File

@ -50,4 +50,7 @@ class MxTickleManager : public MxCore {
#define TICKLE_MANAGER_NOT_FOUND 0x80000000 #define TICKLE_MANAGER_NOT_FOUND 0x80000000
// TEMPLATE: LEGO1 0x1005a530
// List<MxTickleClient *>::~List<MxTickleClient *>
#endif // MXTICKLEMANAGER_H #endif // MXTICKLEMANAGER_H

3
LEGO1/omni/include/mxvariabletable.h
View File

@ -26,6 +26,9 @@ class MxVariableTable : public MxHashTable<MxVariable*> {
// VTABLE: LEGO1 0x100dc1e8 // VTABLE: LEGO1 0x100dc1e8
// class MxHashTable<MxVariable *> // class MxHashTable<MxVariable *>
// VTABLE: LEGO1 0x100dc680
// class MxHashTableCursor<MxVariable *>
// TEMPLATE: LEGO1 0x100afcd0 // TEMPLATE: LEGO1 0x100afcd0
// MxCollection<MxVariable *>::Compare // MxCollection<MxVariable *>::Compare

2
LEGO1/omni/include/mxvideopresenter.h
View File

@ -80,7 +80,7 @@ class MxVideoPresenter : public MxMediaPresenter {
// FUNCTION: LEGO1 0x1000c800 // FUNCTION: LEGO1 0x1000c800
virtual MxS32 GetHeight() { return m_alpha ? m_alpha->m_height : m_bitmap->GetBmiHeightAbs(); }; // vtable+0x84 virtual MxS32 GetHeight() { return m_alpha ? m_alpha->m_height : m_bitmap->GetBmiHeightAbs(); }; // vtable+0x84
// SIZE 0xc // VTABLE: LEGO1 0x100dc2bc
struct AlphaMask { struct AlphaMask {
MxU8* m_bitmask; MxU8* m_bitmask;
MxU16 m_width; MxU16 m_width;

1
LEGO1/omni/src/video/mxdisplaysurface.cpp
View File

@ -7,6 +7,7 @@
DECOMP_SIZE_ASSERT(MxDisplaySurface, 0xac); DECOMP_SIZE_ASSERT(MxDisplaySurface, 0xac);
// GLOBAL: LEGO1 0x1010215c
MxU32 g_unk0x1010215c = 0; MxU32 g_unk0x1010215c = 0;
// FUNCTION: LEGO1 0x100ba500 // FUNCTION: LEGO1 0x100ba500

2
LEGO1/omni/src/video/mxstillpresenter.cpp
View File

@ -10,7 +10,7 @@
DECOMP_SIZE_ASSERT(MxStillPresenter, 0x6c); DECOMP_SIZE_ASSERT(MxStillPresenter, 0x6c);
// GLOBAL: LEGO1 0x10101eb0 // GLOBAL: LEGO1 0x101020e0
const char* g_strBmpIsmap = "BMP_ISMAP"; const char* g_strBmpIsmap = "BMP_ISMAP";
// FUNCTION: LEGO1 0x100b9c70 // FUNCTION: LEGO1 0x100b9c70

18
LEGO1/tgl/d3drm/impl.h
View File

@ -36,7 +36,7 @@ class MeshImpl;
class TextureImpl; class TextureImpl;
class UnkImpl; class UnkImpl;
// VTABLE 0x100db910 // VTABLE: LEGO1 0x100db910
class RendererImpl : public Renderer { class RendererImpl : public Renderer {
public: public:
RendererImpl() : m_data(0) {} RendererImpl() : m_data(0) {}
@ -105,7 +105,7 @@ void RendererImpl::Destroy()
} }
} }
// VTABLE 0x100db988 // VTABLE: LEGO1 0x100db988
class DeviceImpl : public Device { class DeviceImpl : public Device {
public: public:
DeviceImpl() : m_data(0) {} DeviceImpl() : m_data(0) {}
@ -142,7 +142,7 @@ class DeviceImpl : public Device {
IDirect3DRMDevice2* m_data; IDirect3DRMDevice2* m_data;
}; };
// VTABLE 0x100db9e8 // VTABLE: LEGO1 0x100db9e8
class ViewImpl : public View { class ViewImpl : public View {
public: public:
ViewImpl() : m_data(0) {} ViewImpl() : m_data(0) {}
@ -194,7 +194,7 @@ class ViewImpl : public View {
IDirect3DRMViewport* m_data; IDirect3DRMViewport* m_data;
}; };
// VTABLE 0x100dbad8 // VTABLE: LEGO1 0x100dbad8
class CameraImpl : public Camera { class CameraImpl : public Camera {
public: public:
CameraImpl() : m_data(0) {} CameraImpl() : m_data(0) {}
@ -219,7 +219,7 @@ class CameraImpl : public Camera {
IDirect3DRMFrame2* m_data; IDirect3DRMFrame2* m_data;
}; };
// VTABLE 0x100dbaf8 // VTABLE: LEGO1 0x100dbaf8
class LightImpl : public Light { class LightImpl : public Light {
public: public:
LightImpl() : m_data(0) {} LightImpl() : m_data(0) {}
@ -245,7 +245,7 @@ class LightImpl : public Light {
IDirect3DRMFrame2* m_data; IDirect3DRMFrame2* m_data;
}; };
// VTABLE 0x100dbb88 // VTABLE: LEGO1 0x100dbb88
class MeshImpl : public Mesh { class MeshImpl : public Mesh {
public: public:
MeshImpl() : m_data(0) {} MeshImpl() : m_data(0) {}
@ -285,7 +285,7 @@ class MeshImpl : public Mesh {
MeshData* m_data; MeshData* m_data;
}; };
// VTABLE 0x100dba68 // VTABLE: LEGO1 0x100dba68
class GroupImpl : public Group { class GroupImpl : public Group {
public: public:
GroupImpl() : m_data(0) {} GroupImpl() : m_data(0) {}
@ -324,7 +324,7 @@ class GroupImpl : public Group {
IDirect3DRMFrame2* m_data; IDirect3DRMFrame2* m_data;
}; };
// VTABLE 0x100dbb18 // VTABLE: LEGO1 0x100dbb18
class UnkImpl : public Unk { class UnkImpl : public Unk {
public: public:
UnkImpl() : m_data(0) {} UnkImpl() : m_data(0) {}
@ -384,7 +384,7 @@ class TglD3DRMIMAGE {
int m_texelsAllocatedByClient; int m_texelsAllocatedByClient;
}; };
// VTABLE 0x100dbb48 // VTABLE: LEGO1 0x100dbb48
class TextureImpl : public Texture { class TextureImpl : public Texture {
public: public:
TextureImpl() : m_data(0) {} TextureImpl() : m_data(0) {}

20
LEGO1/tgl/tgl.h
View File

@ -98,7 +98,7 @@ class Mesh;
class Texture; class Texture;
class Unk; class Unk;
// VTABLE 0x100db980 // VTABLE: LEGO1 0x100db980
class Object { class Object {
public: public:
virtual ~Object() {} virtual ~Object() {}
@ -106,7 +106,7 @@ class Object {
virtual void* ImplementationDataPtr() = 0; virtual void* ImplementationDataPtr() = 0;
}; };
// VTABLE 0x100db948 // VTABLE: LEGO1 0x100db948
class Renderer : public Object { class Renderer : public Object {
public: public:
// vtable+0x08 // vtable+0x08
@ -146,7 +146,7 @@ class Renderer : public Object {
Renderer* CreateRenderer(); Renderer* CreateRenderer();
// VTABLE 0x100db9b8 // VTABLE: LEGO1 0x100db9b8
class Device : public Object { class Device : public Object {
public: public:
// vtable+0x08 // vtable+0x08
@ -165,7 +165,7 @@ class Device : public Object {
virtual void InitFromWindowsDevice(Device*) = 0; virtual void InitFromWindowsDevice(Device*) = 0;
}; };
// VTABLE 0x100dba28 // VTABLE: LEGO1 0x100dba28
class View : public Object { class View : public Object {
public: public:
virtual Result Add(const Light*) = 0; virtual Result Add(const Light*) = 0;
@ -219,20 +219,20 @@ class View : public Object {
) = 0; ) = 0;
}; };
// VTABLE 0x100dbae8 // VTABLE: LEGO1 0x100dbae8
class Camera : public Object { class Camera : public Object {
public: public:
virtual Result SetTransformation(FloatMatrix4&) = 0; virtual Result SetTransformation(FloatMatrix4&) = 0;
}; };
// VTABLE 0x100dbb08 // VTABLE: LEGO1 0x100dbb08
class Light : public Object { class Light : public Object {
public: public:
virtual Result SetTransformation(FloatMatrix4&) = 0; virtual Result SetTransformation(FloatMatrix4&) = 0;
virtual Result SetColor(float r, float g, float b) = 0; virtual Result SetColor(float r, float g, float b) = 0;
}; };
// VTABLE 0x100dbbb0 // VTABLE: LEGO1 0x100dbbb0
class Mesh : public Object { class Mesh : public Object {
public: public:
virtual Result SetColor(float r, float g, float b, float a) = 0; virtual Result SetColor(float r, float g, float b, float a) = 0;
@ -249,7 +249,7 @@ class Mesh : public Object {
virtual Mesh* ShallowClone(Unk*) = 0; virtual Mesh* ShallowClone(Unk*) = 0;
}; };
// VTABLE 0x100dbaa0 // VTABLE: LEGO1 0x100dbaa0
class Group : public Object { class Group : public Object {
public: public:
virtual Result SetTransformation(FloatMatrix4&) = 0; virtual Result SetTransformation(FloatMatrix4&) = 0;
@ -271,7 +271,7 @@ class Group : public Object {
// Don't know what this is. Seems like another Tgl object which // Don't know what this is. Seems like another Tgl object which
// was not in the leaked Tgl code. My suspicion is that it's // was not in the leaked Tgl code. My suspicion is that it's
// some kind of builder class for creating meshes. // some kind of builder class for creating meshes.
// VTABLE 0x100dbb30 // VTABLE: LEGO1 0x100dbb30
class Unk : public Object { class Unk : public Object {
public: public:
virtual Result SetMeshData( virtual Result SetMeshData(
@ -287,7 +287,7 @@ class Unk : public Object {
virtual Unk* Clone() = 0; virtual Unk* Clone() = 0;
}; };
// VTABLE 0x100dbb68 // VTABLE: LEGO1 0x100dbb68
class Texture : public Object { class Texture : public Object {
public: public:
// vtable+0x08 // vtable+0x08