From daa967a55d6b7479831be42caddde6c20e1e2a22 Mon Sep 17 00:00:00 2001 From: Anonymous Maarten Date: Sun, 2 Jul 2023 05:47:39 +0200 Subject: [PATCH] Use DECOMP_SIZE_ASSERT macro + convert to hexadecimal --- LEGO1/mxaudiopresenter.cpp | 2 +- LEGO1/mxcompositepresenter.cpp | 2 +- LEGO1/mxeventpresenter.cpp | 2 +- LEGO1/mxflcpresenter.cpp | 2 +- LEGO1/mxloopingflcpresenter.cpp | 2 +- LEGO1/mxloopingmidipresenter.cpp | 2 +- LEGO1/mxloopingsmkpresenter.cpp | 2 +- LEGO1/mxmediapresenter.cpp | 2 +- LEGO1/mxmidipresenter.cpp | 2 +- LEGO1/mxobjectfactory.cpp | 2 +- LEGO1/mxpresenter.cpp | 2 +- LEGO1/mxsmkpresenter.cpp | 2 +- LEGO1/mxstillpresenter.cpp | 2 +- LEGO1/mxvideopresenter.cpp | 2 +- LEGO1/mxwavepresenter.cpp | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/LEGO1/mxaudiopresenter.cpp b/LEGO1/mxaudiopresenter.cpp index dcb43b86..ac634362 100644 --- a/LEGO1/mxaudiopresenter.cpp +++ b/LEGO1/mxaudiopresenter.cpp @@ -2,4 +2,4 @@ #include "decomp.h" -DECOMP_STATIC_ASSERT(sizeof(MxAudioPresenter) == 84); +DECOMP_SIZE_ASSERT(MxAudioPresenter, 0x54); diff --git a/LEGO1/mxcompositepresenter.cpp b/LEGO1/mxcompositepresenter.cpp index 9bbe594b..342f3d96 100644 --- a/LEGO1/mxcompositepresenter.cpp +++ b/LEGO1/mxcompositepresenter.cpp @@ -2,7 +2,7 @@ #include "decomp.h" -DECOMP_STATIC_ASSERT(sizeof(MxCompositePresenter) == 76); +DECOMP_SIZE_ASSERT(MxCompositePresenter, 0x4c); // OFFSET: LEGO1 0x100b60b0 STUB MxCompositePresenter::MxCompositePresenter() diff --git a/LEGO1/mxeventpresenter.cpp b/LEGO1/mxeventpresenter.cpp index 12cc37db..88c20ce3 100644 --- a/LEGO1/mxeventpresenter.cpp +++ b/LEGO1/mxeventpresenter.cpp @@ -2,7 +2,7 @@ #include "decomp.h" -DECOMP_STATIC_ASSERT(sizeof(MxEventPresenter) == 84); +DECOMP_SIZE_ASSERT(MxEventPresenter, 0x54); // OFFSET: LEGO1 0x100c2b70 MxEventPresenter::MxEventPresenter() diff --git a/LEGO1/mxflcpresenter.cpp b/LEGO1/mxflcpresenter.cpp index 40b786ea..8bd23d22 100644 --- a/LEGO1/mxflcpresenter.cpp +++ b/LEGO1/mxflcpresenter.cpp @@ -2,7 +2,7 @@ #include "decomp.h" -DECOMP_STATIC_ASSERT(sizeof(MxFlcPresenter) == 104); +DECOMP_SIZE_ASSERT(MxFlcPresenter, 0x68); // OFFSET: LEGO1 0x100b3310 STUB MxFlcPresenter::MxFlcPresenter() diff --git a/LEGO1/mxloopingflcpresenter.cpp b/LEGO1/mxloopingflcpresenter.cpp index ad46a6d2..041ae6a5 100644 --- a/LEGO1/mxloopingflcpresenter.cpp +++ b/LEGO1/mxloopingflcpresenter.cpp @@ -2,7 +2,7 @@ #include "decomp.h" -DECOMP_STATIC_ASSERT(sizeof(MxLoopingFlcPresenter) == 108); +DECOMP_SIZE_ASSERT(MxLoopingFlcPresenter, 0x6c); // OFFSET: LEGO1 0x100b4310 STUB MxLoopingFlcPresenter::MxLoopingFlcPresenter() diff --git a/LEGO1/mxloopingmidipresenter.cpp b/LEGO1/mxloopingmidipresenter.cpp index 43dc613c..ebeed4b4 100644 --- a/LEGO1/mxloopingmidipresenter.cpp +++ b/LEGO1/mxloopingmidipresenter.cpp @@ -2,4 +2,4 @@ #include "decomp.h" -DECOMP_STATIC_ASSERT(sizeof(MxLoopingMIDIPresenter) == 88); +DECOMP_SIZE_ASSERT(MxLoopingMIDIPresenter, 0x58); diff --git a/LEGO1/mxloopingsmkpresenter.cpp b/LEGO1/mxloopingsmkpresenter.cpp index 45e26828..da9223df 100644 --- a/LEGO1/mxloopingsmkpresenter.cpp +++ b/LEGO1/mxloopingsmkpresenter.cpp @@ -2,7 +2,7 @@ #include "decomp.h" -DECOMP_STATIC_ASSERT(sizeof(MxLoopingSmkPresenter) == 1828); +DECOMP_SIZE_ASSERT(MxLoopingSmkPresenter, 0x724); // OFFSET: LEGO1 0x100b48b0 MxLoopingSmkPresenter::MxLoopingSmkPresenter() diff --git a/LEGO1/mxmediapresenter.cpp b/LEGO1/mxmediapresenter.cpp index a43092a0..9df33285 100644 --- a/LEGO1/mxmediapresenter.cpp +++ b/LEGO1/mxmediapresenter.cpp @@ -1,6 +1,6 @@ #include "mxmediapresenter.h" -DECOMP_STATIC_ASSERT(sizeof(MxMediaPresenter) == 80); +DECOMP_SIZE_ASSERT(MxMediaPresenter, 0x50); // OFFSET: LEGO1 0x100b5d10 STUB long MxMediaPresenter::Tickle() diff --git a/LEGO1/mxmidipresenter.cpp b/LEGO1/mxmidipresenter.cpp index 94fa0a42..98868f8a 100644 --- a/LEGO1/mxmidipresenter.cpp +++ b/LEGO1/mxmidipresenter.cpp @@ -2,7 +2,7 @@ #include "decomp.h" -DECOMP_STATIC_ASSERT(sizeof(MxMIDIPresenter) == 88); +DECOMP_SIZE_ASSERT(MxMIDIPresenter, 0x58); // OFFSET: LEGO1 0x100c25e0 MxMIDIPresenter::MxMIDIPresenter() { diff --git a/LEGO1/mxobjectfactory.cpp b/LEGO1/mxobjectfactory.cpp index 1a3a9138..d52e4dac 100644 --- a/LEGO1/mxobjectfactory.cpp +++ b/LEGO1/mxobjectfactory.cpp @@ -15,7 +15,7 @@ #include "decomp.h" -DECOMP_STATIC_ASSERT(sizeof(MxObjectFactory) == 56); // 100af1db +DECOMP_SIZE_ASSERT(MxObjectFactory, 0x38); // 100af1db // OFFSET: LEGO1 0x100b0d80 MxObjectFactory::MxObjectFactory() diff --git a/LEGO1/mxpresenter.cpp b/LEGO1/mxpresenter.cpp index 17cf2f07..5ef01c64 100644 --- a/LEGO1/mxpresenter.cpp +++ b/LEGO1/mxpresenter.cpp @@ -2,7 +2,7 @@ #include "decomp.h" -DECOMP_STATIC_ASSERT(sizeof(MxPresenter) == 64); +DECOMP_SIZE_ASSERT(MxPresenter, 0x40); // OFFSET: LEGO1 0x1000bee0 STUB void MxPresenter::DoneTickle() diff --git a/LEGO1/mxsmkpresenter.cpp b/LEGO1/mxsmkpresenter.cpp index f5316a3c..cc7efec1 100644 --- a/LEGO1/mxsmkpresenter.cpp +++ b/LEGO1/mxsmkpresenter.cpp @@ -2,7 +2,7 @@ #include "decomp.h" -DECOMP_STATIC_ASSERT(sizeof(MxSmkPresenter) == 1824); +DECOMP_SIZE_ASSERT(MxSmkPresenter, 0x720); // OFFSET: LEGO1 0x100b3650 STUB MxSmkPresenter::MxSmkPresenter() diff --git a/LEGO1/mxstillpresenter.cpp b/LEGO1/mxstillpresenter.cpp index 11a0e252..351971f0 100644 --- a/LEGO1/mxstillpresenter.cpp +++ b/LEGO1/mxstillpresenter.cpp @@ -2,4 +2,4 @@ #include "decomp.h" -DECOMP_STATIC_ASSERT(sizeof(MxStillPresenter) == 108); +DECOMP_SIZE_ASSERT(MxStillPresenter, 0x6c); diff --git a/LEGO1/mxvideopresenter.cpp b/LEGO1/mxvideopresenter.cpp index d9cb65e4..ee12968a 100644 --- a/LEGO1/mxvideopresenter.cpp +++ b/LEGO1/mxvideopresenter.cpp @@ -1,6 +1,6 @@ #include "mxvideopresenter.h" -DECOMP_STATIC_ASSERT(sizeof(MxVideoPresenter) == 100); +DECOMP_SIZE_ASSERT(MxVideoPresenter, 0x64); // OFFSET: LEGO1 0x100b2760 STUB void MxVideoPresenter::Init() { diff --git a/LEGO1/mxwavepresenter.cpp b/LEGO1/mxwavepresenter.cpp index 3ab719c9..cba9106e 100644 --- a/LEGO1/mxwavepresenter.cpp +++ b/LEGO1/mxwavepresenter.cpp @@ -2,7 +2,7 @@ #include "decomp.h" -DECOMP_STATIC_ASSERT(sizeof(MxWavePresenter) == 108); +DECOMP_SIZE_ASSERT(MxWavePresenter, 0x6c); // OFFSET: LEGO1 0x100b1ad0 void MxWavePresenter::Init()