From 59a312e30a396996bf559f61b267e37be3a99ecc Mon Sep 17 00:00:00 2001 From: Yanis <35189056+Yanis002@users.noreply.github.com> Date: Mon, 13 Apr 2026 18:55:04 +0200 Subject: [PATCH] Start MapObject documentation (#47) * set the right base class size * actor and map object changes * rename id getters functions * document unknown file system used in mapobjectprofile * start to document MapObjectProfile --- config/eur/arm9/delinks.txt | 23 ++- config/eur/arm9/dtcm/symbols.txt | 4 +- config/eur/arm9/itcm/symbols.txt | 6 +- config/eur/arm9/overlays/ov000/relocs.txt | 32 +-- config/eur/arm9/overlays/ov000/symbols.txt | 2 +- config/eur/arm9/overlays/ov001/relocs.txt | 8 +- config/eur/arm9/overlays/ov012/relocs.txt | 2 +- config/eur/arm9/overlays/ov024/relocs.txt | 2 +- config/eur/arm9/overlays/ov026/relocs.txt | 2 +- config/eur/arm9/overlays/ov028/relocs.txt | 2 +- config/eur/arm9/overlays/ov031/relocs.txt | 2 +- config/eur/arm9/overlays/ov088/relocs.txt | 2 +- config/eur/arm9/overlays/ov089/relocs.txt | 2 +- config/eur/arm9/relocs.txt | 18 +- config/eur/arm9/symbols.txt | 62 +++--- config/jp/arm9/delinks.txt | 23 ++- config/jp/arm9/dtcm/symbols.txt | 4 +- config/jp/arm9/itcm/symbols.txt | 6 +- config/jp/arm9/overlays/ov000/relocs.txt | 32 +-- config/jp/arm9/overlays/ov000/symbols.txt | 2 +- config/jp/arm9/overlays/ov001/relocs.txt | 8 +- config/jp/arm9/overlays/ov012/relocs.txt | 2 +- config/jp/arm9/overlays/ov024/relocs.txt | 2 +- config/jp/arm9/overlays/ov026/relocs.txt | 2 +- config/jp/arm9/overlays/ov028/relocs.txt | 2 +- config/jp/arm9/overlays/ov031/relocs.txt | 2 +- config/jp/arm9/overlays/ov088/relocs.txt | 2 +- config/jp/arm9/overlays/ov089/relocs.txt | 2 +- config/jp/arm9/relocs.txt | 18 +- config/jp/arm9/symbols.txt | 60 +++--- include/Actor/Actor.hpp | 3 + include/Actor/ActorId.hpp | 4 +- include/Actor/ActorManager.hpp | 6 +- include/Actor/ActorRupee.hpp | 2 +- include/Actor/ActorUnk_ov000_020a8bb0.hpp | 4 - include/Map/MapObjectId.hpp | 4 +- include/MapObject/MapObject.hpp | 64 +++++- include/MapObject/MapObjectManager.hpp | 29 +++ include/MapObject/MapObjectProfile.hpp | 185 +++++++++++++++++- include/MapObject/MapObjectUnkARWL.hpp | 4 +- include/MapObject/MapObjectUnkBAPL.hpp | 4 +- include/MapObject/MapObjectUnkBBFL.hpp | 4 +- include/MapObject/MapObjectUnkBFFL.hpp | 4 +- include/MapObject/MapObjectUnkBFSP.hpp | 4 +- include/MapObject/MapObjectUnkBLCC.hpp | 4 +- include/MapObject/MapObjectUnkBLCE.hpp | 4 +- include/MapObject/MapObjectUnkBLCK.hpp | 4 +- include/MapObject/MapObjectUnkBLCM.hpp | 4 +- include/MapObject/MapObjectUnkBLCT.hpp | 4 +- include/MapObject/MapObjectUnkBLHL.hpp | 4 +- include/MapObject/MapObjectUnkBLRB.hpp | 4 +- include/MapObject/MapObjectUnkBLSR.hpp | 4 +- include/MapObject/MapObjectUnkBMFL.hpp | 4 +- include/MapObject/MapObjectUnkBOGN.hpp | 4 +- include/MapObject/MapObjectUnkBREX.hpp | 4 +- include/MapObject/MapObjectUnkBRGL.hpp | 4 +- include/MapObject/MapObjectUnkBRGS.hpp | 4 +- include/MapObject/MapObjectUnkBRGW.hpp | 4 +- include/MapObject/MapObjectUnkCLMN.hpp | 4 +- include/MapObject/MapObjectUnkCRWL.hpp | 4 +- include/MapObject/MapObjectUnkCSTL.hpp | 4 +- include/MapObject/MapObjectUnkCTPT.hpp | 4 +- include/MapObject/MapObjectUnkDFNC.hpp | 4 +- include/MapObject/MapObjectUnkDOPA.hpp | 4 +- include/MapObject/MapObjectUnkDRBK.hpp | 4 +- include/MapObject/MapObjectUnkDRBR.hpp | 4 +- include/MapObject/MapObjectUnkDRCK.hpp | 4 +- include/MapObject/MapObjectUnkDRDS.hpp | 4 +- include/MapObject/MapObjectUnkDRGN.hpp | 4 +- include/MapObject/MapObjectUnkDRHS.hpp | 4 +- include/MapObject/MapObjectUnkDRKY.hpp | 4 +- include/MapObject/MapObjectUnkDRMC.hpp | 4 +- include/MapObject/MapObjectUnkDRRS.hpp | 4 +- include/MapObject/MapObjectUnkDRSN.hpp | 4 +- include/MapObject/MapObjectUnkDRST.hpp | 4 +- include/MapObject/MapObjectUnkDRSW.hpp | 4 +- include/MapObject/MapObjectUnkDRTC.hpp | 4 +- include/MapObject/MapObjectUnkDRTK.hpp | 4 +- include/MapObject/MapObjectUnkDRTW.hpp | 4 +- include/MapObject/MapObjectUnkDRTY.hpp | 10 +- include/MapObject/MapObjectUnkDRVC.hpp | 4 +- include/MapObject/MapObjectUnkDRVT.hpp | 4 +- include/MapObject/MapObjectUnkEBRD.hpp | 4 +- include/MapObject/MapObjectUnkEFRF.hpp | 4 +- include/MapObject/MapObjectUnkEFRS.hpp | 4 +- include/MapObject/MapObjectUnkETDD.hpp | 4 +- include/MapObject/MapObjectUnkETDK.hpp | 4 +- include/MapObject/MapObjectUnkETET.hpp | 4 +- include/MapObject/MapObjectUnkETFD.hpp | 4 +- include/MapObject/MapObjectUnkETMW.hpp | 4 +- include/MapObject/MapObjectUnkETNL.hpp | 4 +- include/MapObject/MapObjectUnkETNM.hpp | 4 +- include/MapObject/MapObjectUnkETNS.hpp | 4 +- include/MapObject/MapObjectUnkETSD.hpp | 4 +- include/MapObject/MapObjectUnkETSW.hpp | 4 +- include/MapObject/MapObjectUnkETTV.hpp | 4 +- include/MapObject/MapObjectUnkETUS.hpp | 4 +- include/MapObject/MapObjectUnkETYG.hpp | 4 +- include/MapObject/MapObjectUnkEXCT.hpp | 4 +- include/MapObject/MapObjectUnkEXHS.hpp | 4 +- include/MapObject/MapObjectUnkEXIT.hpp | 4 +- include/MapObject/MapObjectUnkEXTR.hpp | 4 +- include/MapObject/MapObjectUnkFLSP.hpp | 4 +- include/MapObject/MapObjectUnkFNCE.hpp | 4 +- include/MapObject/MapObjectUnkFRAI.hpp | 4 +- include/MapObject/MapObjectUnkFRSH.hpp | 4 +- include/MapObject/MapObjectUnkFRWL.hpp | 4 +- include/MapObject/MapObjectUnkFSCT.hpp | 4 +- include/MapObject/MapObjectUnkFSFR.hpp | 4 +- include/MapObject/MapObjectUnkFSFS.hpp | 4 +- include/MapObject/MapObjectUnkFSPS.hpp | 4 +- include/MapObject/MapObjectUnkFSSN.hpp | 4 +- include/MapObject/MapObjectUnkFSSV.hpp | 4 +- include/MapObject/MapObjectUnkFSTA.hpp | 4 +- include/MapObject/MapObjectUnkFSVC.hpp | 4 +- include/MapObject/MapObjectUnkFSWT.hpp | 4 +- include/MapObject/MapObjectUnkGATE.hpp | 4 +- include/MapObject/MapObjectUnkGBDR.hpp | 4 +- include/MapObject/MapObjectUnkGELG.hpp | 4 +- include/MapObject/MapObjectUnkGRSG.hpp | 4 +- include/MapObject/MapObjectUnkGRSS.hpp | 4 +- include/MapObject/MapObjectUnkGRSV.hpp | 4 +- include/MapObject/MapObjectUnkGSST.hpp | 4 +- include/MapObject/MapObjectUnkGTAT.hpp | 4 +- include/MapObject/MapObjectUnkGTRB.hpp | 4 +- include/MapObject/MapObjectUnkGTRK.hpp | 4 +- include/MapObject/MapObjectUnkGTSN.hpp | 4 +- include/MapObject/MapObjectUnkGTTN.hpp | 4 +- include/MapObject/MapObjectUnkHOF0.hpp | 4 +- include/MapObject/MapObjectUnkHOF1.hpp | 4 +- include/MapObject/MapObjectUnkHOL0.hpp | 4 +- include/MapObject/MapObjectUnkHOL1.hpp | 4 +- include/MapObject/MapObjectUnkHOL2.hpp | 4 +- include/MapObject/MapObjectUnkHOLB.hpp | 4 +- include/MapObject/MapObjectUnkHOSB.hpp | 4 +- include/MapObject/MapObjectUnkHOSO.hpp | 4 +- include/MapObject/MapObjectUnkHOST.hpp | 4 +- include/MapObject/MapObjectUnkHOUS.hpp | 4 +- include/MapObject/MapObjectUnkHOW0.hpp | 4 +- include/MapObject/MapObjectUnkHOW1.hpp | 4 +- include/MapObject/MapObjectUnkICEB.hpp | 4 +- include/MapObject/MapObjectUnkICGR.hpp | 4 +- include/MapObject/MapObjectUnkITFL.hpp | 4 +- include/MapObject/MapObjectUnkKNBN.hpp | 4 +- include/MapObject/MapObjectUnkLEVN.hpp | 4 +- include/MapObject/MapObjectUnkLEVS.hpp | 4 +- include/MapObject/MapObjectUnkLTRW.hpp | 4 +- include/MapObject/MapObjectUnkLVCM.hpp | 4 +- include/MapObject/MapObjectUnkLVVT.hpp | 4 +- include/MapObject/MapObjectUnkMBBS.hpp | 4 +- include/MapObject/MapObjectUnkMBRG.hpp | 4 +- include/MapObject/MapObjectUnkMLVC.hpp | 4 +- include/MapObject/MapObjectUnkMSCL.hpp | 4 +- include/MapObject/MapObjectUnkMTFS.hpp | 4 +- include/MapObject/MapObjectUnkMTGT.hpp | 4 +- include/MapObject/MapObjectUnkMTIC.hpp | 4 +- include/MapObject/MapObjectUnkMTIR.hpp | 4 +- include/MapObject/MapObjectUnkMTJR.hpp | 4 +- include/MapObject/MapObjectUnkMTOR.hpp | 4 +- include/MapObject/MapObjectUnkMTWD.hpp | 4 +- include/MapObject/MapObjectUnkMTWR.hpp | 4 +- include/MapObject/MapObjectUnkMZFE.hpp | 4 +- include/MapObject/MapObjectUnkMZFX.hpp | 4 +- include/MapObject/MapObjectUnkMZTR.hpp | 4 +- include/MapObject/MapObjectUnkNPST.hpp | 4 +- include/MapObject/MapObjectUnkPLCT.hpp | 4 +- include/MapObject/MapObjectUnkPLFA.hpp | 4 +- include/MapObject/MapObjectUnkPLFM.hpp | 4 +- include/MapObject/MapObjectUnkPLFR.hpp | 4 +- include/MapObject/MapObjectUnkPLV2.hpp | 4 +- include/MapObject/MapObjectUnkPRSH.hpp | 4 +- include/MapObject/MapObjectUnkPTFL.hpp | 4 +- include/MapObject/MapObjectUnkRBBL.hpp | 4 +- include/MapObject/MapObjectUnkRBMR.hpp | 4 +- include/MapObject/MapObjectUnkRBRC.hpp | 4 +- include/MapObject/MapObjectUnkRBSR.hpp | 4 +- include/MapObject/MapObjectUnkRCFL.hpp | 4 +- include/MapObject/MapObjectUnkRDSD.hpp | 4 +- include/MapObject/MapObjectUnkRKAG.hpp | 4 +- include/MapObject/MapObjectUnkRLPT.hpp | 4 +- include/MapObject/MapObjectUnkRLSG.hpp | 4 +- include/MapObject/MapObjectUnkRNBO.hpp | 4 +- include/MapObject/MapObjectUnkRPFL.hpp | 4 +- include/MapObject/MapObjectUnkSAND.hpp | 4 +- include/MapObject/MapObjectUnkSBDE.hpp | 4 +- include/MapObject/MapObjectUnkSHWB.hpp | 4 +- include/MapObject/MapObjectUnkSKBN.hpp | 4 +- include/MapObject/MapObjectUnkSKDI.hpp | 4 +- include/MapObject/MapObjectUnkSPTB.hpp | 4 +- include/MapObject/MapObjectUnkSTAL.hpp | 4 +- include/MapObject/MapObjectUnkSTAT.hpp | 4 +- include/MapObject/MapObjectUnkSTDE.hpp | 4 +- include/MapObject/MapObjectUnkSTDS.hpp | 4 +- include/MapObject/MapObjectUnkSTIR.hpp | 4 +- include/MapObject/MapObjectUnkSTNE.hpp | 4 +- include/MapObject/MapObjectUnkSTSD.hpp | 4 +- include/MapObject/MapObjectUnkSTSF.hpp | 4 +- include/MapObject/MapObjectUnkSTSH.hpp | 4 +- include/MapObject/MapObjectUnkSTSP.hpp | 4 +- include/MapObject/MapObjectUnkSTSS.hpp | 4 +- include/MapObject/MapObjectUnkSTSV.hpp | 4 +- include/MapObject/MapObjectUnkSTTR.hpp | 4 +- include/MapObject/MapObjectUnkSWBR.hpp | 4 +- include/MapObject/MapObjectUnkSWCB.hpp | 4 +- include/MapObject/MapObjectUnkSWCR.hpp | 4 +- include/MapObject/MapObjectUnkSWEY.hpp | 4 +- include/MapObject/MapObjectUnkSWFS.hpp | 4 +- include/MapObject/MapObjectUnkSWHT.hpp | 4 +- include/MapObject/MapObjectUnkSWRA.hpp | 4 +- include/MapObject/MapObjectUnkSWRB.hpp | 4 +- include/MapObject/MapObjectUnkSWST.hpp | 4 +- include/MapObject/MapObjectUnkSWSW.hpp | 4 +- include/MapObject/MapObjectUnkSWWN.hpp | 4 +- include/MapObject/MapObjectUnkTATZ.hpp | 4 +- include/MapObject/MapObjectUnkTBSD.hpp | 4 +- include/MapObject/MapObjectUnkTBSF.hpp | 4 +- include/MapObject/MapObjectUnkTBSS.hpp | 4 +- include/MapObject/MapObjectUnkTCBT.hpp | 4 +- include/MapObject/MapObjectUnkTDBP.hpp | 4 +- include/MapObject/MapObjectUnkTDBR.hpp | 4 +- include/MapObject/MapObjectUnkTDDR.hpp | 4 +- include/MapObject/MapObjectUnkTHAW.hpp | 4 +- include/MapObject/MapObjectUnkTMDE.hpp | 4 +- include/MapObject/MapObjectUnkTMFR.hpp | 4 +- include/MapObject/MapObjectUnkTMLV.hpp | 4 +- include/MapObject/MapObjectUnkTMSB.hpp | 4 +- include/MapObject/MapObjectUnkTMSN.hpp | 4 +- include/MapObject/MapObjectUnkTMWT.hpp | 4 +- include/MapObject/MapObjectUnkTRBL.hpp | 4 +- include/MapObject/MapObjectUnkTRBM.hpp | 4 +- include/MapObject/MapObjectUnkTRBR.hpp | 4 +- include/MapObject/MapObjectUnkTRCC.hpp | 4 +- include/MapObject/MapObjectUnkTRDA.hpp | 4 +- include/MapObject/MapObjectUnkTRDR.hpp | 4 +- include/MapObject/MapObjectUnkTRDT.hpp | 4 +- include/MapObject/MapObjectUnkTRED.hpp | 4 +- include/MapObject/MapObjectUnkTREE.hpp | 4 +- include/MapObject/MapObjectUnkTREN.hpp | 4 +- include/MapObject/MapObjectUnkTRES.hpp | 4 +- include/MapObject/MapObjectUnkTRET.hpp | 4 +- include/MapObject/MapObjectUnkTREW.hpp | 4 +- include/MapObject/MapObjectUnkTRFI.hpp | 4 +- include/MapObject/MapObjectUnkTRFO.hpp | 4 +- include/MapObject/MapObjectUnkTRFS.hpp | 4 +- include/MapObject/MapObjectUnkTRFV.hpp | 4 +- include/MapObject/MapObjectUnkTRGM.hpp | 4 +- include/MapObject/MapObjectUnkTRGW.hpp | 4 +- include/MapObject/MapObjectUnkTRH0.hpp | 4 +- include/MapObject/MapObjectUnkTRH1.hpp | 4 +- include/MapObject/MapObjectUnkTRH2.hpp | 4 +- include/MapObject/MapObjectUnkTRH3.hpp | 4 +- include/MapObject/MapObjectUnkTRLD.hpp | 4 +- include/MapObject/MapObjectUnkTRLN.hpp | 4 +- include/MapObject/MapObjectUnkTRLS.hpp | 4 +- include/MapObject/MapObjectUnkTRLW.hpp | 4 +- include/MapObject/MapObjectUnkTRMA.hpp | 4 +- include/MapObject/MapObjectUnkTRMR.hpp | 4 +- include/MapObject/MapObjectUnkTRPI.hpp | 4 +- include/MapObject/MapObjectUnkTRPT.hpp | 4 +- include/MapObject/MapObjectUnkTRRA.hpp | 4 +- include/MapObject/MapObjectUnkTRRC.hpp | 4 +- include/MapObject/MapObjectUnkTRRD.hpp | 4 +- include/MapObject/MapObjectUnkTRRS.hpp | 4 +- include/MapObject/MapObjectUnkTRRW.hpp | 4 +- include/MapObject/MapObjectUnkTRSA.hpp | 4 +- include/MapObject/MapObjectUnkTRSD.hpp | 4 +- include/MapObject/MapObjectUnkTRSH.hpp | 4 +- include/MapObject/MapObjectUnkTRSR.hpp | 4 +- include/MapObject/MapObjectUnkTRSS.hpp | 4 +- include/MapObject/MapObjectUnkTRST.hpp | 4 +- include/MapObject/MapObjectUnkTRSW.hpp | 4 +- include/MapObject/MapObjectUnkTRTF.hpp | 4 +- include/MapObject/MapObjectUnkTRTS.hpp | 4 +- include/MapObject/MapObjectUnkTRWA.hpp | 4 +- include/MapObject/MapObjectUnkTRWS.hpp | 4 +- include/MapObject/MapObjectUnkTSGM.hpp | 4 +- include/MapObject/MapObjectUnkTSUB.hpp | 4 +- include/MapObject/MapObjectUnkTWGS.hpp | 4 +- include/MapObject/MapObjectUnkTWPC.hpp | 4 +- include/MapObject/MapObjectUnkTWPG.hpp | 4 +- include/MapObject/MapObjectUnkWDST.hpp | 4 +- include/MapObject/MapObjectUnkWHSW.hpp | 4 +- include/MapObject/MapObjectUnkWLMP.hpp | 4 +- include/MapObject/MapObjectUnkWLMS.hpp | 4 +- include/MapObject/MapObjectUnkWPHL.hpp | 5 +- include/Unknown/Common.hpp | 18 +- include/Unknown/UnkFileSystem.hpp | 97 +++++++++ include/Unknown/UnkStruct_027e0ce8.hpp | 49 ----- include/Unknown/UnkStruct_ov000_020b4f84.hpp | 48 +---- src/000_Second/Actor/ActorManager.cpp | 2 +- src/000_Second/Actor/ActorUnkSWOB.cpp | 2 +- .../Actor/ActorUnk_ov000_020a8bb0.cpp | 2 +- src/001_SceneInit/Actor/ActorManager_001.cpp | 4 +- src/031_Land/Actor/ActorRupee.cpp | 14 +- src/110_PlayerGet/PlayerGet.cpp | 45 +++-- .../PlayerSceneChange.cpp | 38 ++-- src/Main/UnkFileSystem.cpp | 119 +++++++++++ src/Main/UnkStruct_ov000_020b4f84_00_Base.cpp | 61 ------ tools/configure.py | 2 +- 299 files changed, 1230 insertions(+), 899 deletions(-) create mode 100644 include/MapObject/MapObjectManager.hpp create mode 100644 include/Unknown/UnkFileSystem.hpp delete mode 100644 include/Unknown/UnkStruct_027e0ce8.hpp create mode 100644 src/Main/UnkFileSystem.cpp delete mode 100644 src/Main/UnkStruct_ov000_020b4f84_00_Base.cpp diff --git a/config/eur/arm9/delinks.txt b/config/eur/arm9/delinks.txt index 5ad6125d..50a22bdb 100644 --- a/config/eur/arm9/delinks.txt +++ b/config/eur/arm9/delinks.txt @@ -25,10 +25,9 @@ src/Main/Player/TouchControl.cpp: src/Main/System/OverlayManager.cpp: .text start:0x020147fc end:0x02014944 -src/Main/UnkStruct_ov000_020b4f84_00_Base.cpp: - complete - .text start:0x02015528 end:0x02015628 - .data start:0x02043f00 end:0x02043f1c +src/Main/UnkFileSystem.cpp: + .text start:0x02015518 end:0x02015788 + .data start:0x02043f00 end:0x02043f8c src/Main/System/Random.cpp: .text start:0x02016384 end:0x02016404 @@ -68,6 +67,14 @@ libs/c/src/ansi_files.c: .data start:0x020446a8 end:0x0204478c .bss start:0x020517a0 end:0x02051aa0 +libs/c/src/float.c: + complete + .data start:0x0204478c end:0x02044790 + +libs/c/src/locale.c: + complete + .data start:0x02044790 end:0x020449ac + libs/c/src/arith.c: complete .text start:0x020338d4 end:0x020338ec @@ -114,14 +121,6 @@ libs/c/src/wmem.c: complete .text start:0x020341f8 end:0x02034230 -libs/c/src/float.c: - complete - .data start:0x0204478c end:0x02044790 - -libs/c/src/locale.c: - complete - .data start:0x02044790 end:0x020449ac - libs/c/src/wprintf.c: .text start:0x02034230 end:0x0203615c .data start:0x020449ac end:0x02044a2c diff --git a/config/eur/arm9/dtcm/symbols.txt b/config/eur/arm9/dtcm/symbols.txt index 8949fc00..1e2a81cd 100644 --- a/config/eur/arm9/dtcm/symbols.txt +++ b/config/eur/arm9/dtcm/symbols.txt @@ -107,8 +107,8 @@ data_027e0ccc kind:bss addr:0x027e0ccc data_027e0cd8 kind:bss addr:0x027e0cd8 data_027e0cdc kind:bss addr:0x027e0cdc data_027e0ce0 kind:bss addr:0x027e0ce0 -gActorManager kind:bss addr:0x027e0ce4 -data_027e0ce8 kind:bss addr:0x027e0ce8 +gpActorManager kind:bss addr:0x027e0ce4 +gpMapObjManager kind:bss addr:0x027e0ce8 data_027e0cec kind:bss addr:0x027e0cec data_027e0cf0 kind:bss addr:0x027e0cf0 data_027e0cf4 kind:bss addr:0x027e0cf4 diff --git a/config/eur/arm9/itcm/symbols.txt b/config/eur/arm9/itcm/symbols.txt index bb7832d1..fe758a88 100644 --- a/config/eur/arm9/itcm/symbols.txt +++ b/config/eur/arm9/itcm/symbols.txt @@ -202,12 +202,12 @@ func_01fff2fc kind:function(arm,size=0x54) addr:0x01fff2fc func_01fff350 kind:function(arm,size=0x64) addr:0x01fff350 _ZN12ActorManager13func_01fff3b4Ei kind:function(arm,size=0x8c) addr:0x01fff3b4 func_01fff440 kind:function(arm,size=0x18) addr:0x01fff440 -func_01fff458 kind:function(arm,size=0xc) addr:0x01fff458 +_ZN5Actor10GetActorIdEv kind:function(arm,size=0xc) addr:0x01fff458 _ZN5Actor8vfunc_10Ev kind:function(arm,size=0x34) addr:0x01fff464 -func_01fff498 kind:function(arm,size=0x34) addr:0x01fff498 +_ZN16MapObjectManager13func_01fff498Eii kind:function(arm,size=0x34) addr:0x01fff498 func_01fff4cc kind:function(arm,size=0x54) addr:0x01fff4cc func_01fff520 kind:function(arm,size=0x64) addr:0x01fff520 -func_01fff584 kind:function(arm,size=0xc) addr:0x01fff584 +_ZN9MapObject14GetMapObjectIdEv kind:function(arm,size=0xc) addr:0x01fff584 func_01fff590 kind:function(arm,size=0x40) addr:0x01fff590 _ZN10ActorRupee13func_01fff5d0Eii kind:function(arm,size=0x3c) addr:0x01fff5d0 func_01fff60c kind:function(arm,size=0x8c) addr:0x01fff60c diff --git a/config/eur/arm9/overlays/ov000/relocs.txt b/config/eur/arm9/overlays/ov000/relocs.txt index a3e26c44..c487eb8f 100644 --- a/config/eur/arm9/overlays/ov000/relocs.txt +++ b/config/eur/arm9/overlays/ov000/relocs.txt @@ -389,10 +389,10 @@ from:0x02058578 kind:thumb_call to:0x020153fc module:main from:0x02058596 kind:thumb_call to:0x02015550 module:main from:0x020585aa kind:thumb_call_arm to:0x0203d160 module:main from:0x020585b4 kind:load to:0x020b1b14 module:overlay(0) -from:0x020585b8 kind:load to:0x02043f40 module:main +from:0x020585b8 kind:load to:0x02043f38 add:0x8 module:main from:0x020585bc kind:load to:0x0201568d module:main from:0x020585c0 kind:load to:0x020585c5 module:overlay(0) -from:0x020585d4 kind:load to:0x02043f40 module:main +from:0x020585d4 kind:load to:0x02043f38 add:0x8 module:main from:0x020585e0 kind:thumb_call to:0x020589e4 module:overlay(0) from:0x020585ee kind:thumb_call_arm to:0x0203d210 module:main from:0x020585f6 kind:thumb_call to:0x0201556c module:main @@ -575,8 +575,8 @@ from:0x0205957a kind:thumb_call to:0x02012fa8 module:main from:0x020595d6 kind:thumb_call to:0x02059714 module:overlay(0) from:0x020595e0 kind:load to:0x020b4ed4 module:overlay(0) from:0x020595e4 kind:load to:0x020b1b78 module:overlay(0) -from:0x020595e8 kind:load to:0x02043f78 module:main -from:0x020595ec kind:load to:0x02043f40 module:main +from:0x020595e8 kind:load to:0x02043f70 add:0x8 module:main +from:0x020595ec kind:load to:0x02043f38 add:0x8 module:main from:0x020595f0 kind:load to:0x020b1b84 module:overlay(0) from:0x020595f4 kind:load to:0x020b1b8c module:overlay(0) from:0x020595f8 kind:load to:0x020b1b94 module:overlay(0) @@ -589,8 +589,8 @@ from:0x020596b6 kind:thumb_call_arm to:0x02033f7c module:main from:0x020596c6 kind:thumb_call_arm to:0x02034060 module:main from:0x020596f6 kind:thumb_call to:0x02059714 module:overlay(0) from:0x02059700 kind:load to:0x020b4ed4 module:overlay(0) -from:0x02059704 kind:load to:0x02043f78 module:main -from:0x02059708 kind:load to:0x02043f40 module:main +from:0x02059704 kind:load to:0x02043f70 add:0x8 module:main +from:0x02059708 kind:load to:0x02043f38 add:0x8 module:main from:0x0205970c kind:load to:0x020b1b84 module:overlay(0) from:0x02059710 kind:load to:0x020b1b9c module:overlay(0) from:0x02059722 kind:thumb_call to:0x02012fa8 module:main @@ -1180,7 +1180,7 @@ from:0x0206026c kind:arm_call to:0x0201c780 module:main from:0x02060274 kind:arm_call_thumb to:0x0201568c module:main from:0x02060280 kind:load to:0x020b1c90 module:overlay(0) from:0x02060284 kind:load to:0x020b1c94 module:overlay(0) -from:0x02060288 kind:load to:0x02043f40 module:main +from:0x02060288 kind:load to:0x02043f38 add:0x8 module:main from:0x0206028c kind:load to:0x0204a480 module:main from:0x02060290 kind:load to:0x020b1c9c module:overlay(0) from:0x0206029c kind:arm_call to:0x0205fdd0 module:overlay(0) @@ -1226,7 +1226,7 @@ from:0x0206061c kind:arm_call to:0x0201c780 module:main from:0x02060624 kind:arm_call_thumb to:0x0201568c module:main from:0x02060630 kind:load to:0x020b1c90 module:overlay(0) from:0x02060634 kind:load to:0x020b1c94 module:overlay(0) -from:0x02060638 kind:load to:0x02043f40 module:main +from:0x02060638 kind:load to:0x02043f38 add:0x8 module:main from:0x0206063c kind:load to:0x0204a480 module:main from:0x02060640 kind:load to:0x020b1c9c module:overlay(0) from:0x02060644 kind:load to:0x020b1ca0 module:overlay(0) @@ -4356,7 +4356,7 @@ from:0x02080240 kind:arm_call to:0x02026800 module:main from:0x02080264 kind:arm_call_thumb to:0x020156ac module:main from:0x02080270 kind:arm_call_thumb to:0x0201568c module:main from:0x02080280 kind:load to:0x020b28e0 module:overlay(0) -from:0x02080284 kind:load to:0x02043f40 module:main +from:0x02080284 kind:load to:0x02043f38 add:0x8 module:main from:0x02080444 kind:arm_call to:0x0207fc90 module:overlay(0) from:0x02080458 kind:arm_call to:0x0209718c module:overlay(0) from:0x0208046c kind:arm_call to:0x020c6dec module:overlay(24) @@ -4435,7 +4435,7 @@ from:0x02081444 kind:arm_call to:0x0208146c module:overlay(0) from:0x0208144c kind:arm_call_thumb to:0x0201568c module:main from:0x0208145c kind:load to:0x020b28f8 module:overlay(0) from:0x02081460 kind:load to:0x020b290c module:overlay(0) -from:0x02081464 kind:load to:0x02043f40 module:main +from:0x02081464 kind:load to:0x02043f38 add:0x8 module:main from:0x02081468 kind:load to:0x027e09a0 module:dtcm from:0x020814b0 kind:arm_call to:0x02081150 module:overlay(0) from:0x020814e0 kind:arm_call to:0x02081b24 module:overlay(0) @@ -7404,7 +7404,7 @@ from:0x0209ed0c kind:load to:0x020b4174 module:overlay(0) from:0x0209ed10 kind:load to:0x020b3cb4 module:overlay(0) from:0x0209ed14 kind:load to:0x020b41a0 module:overlay(0) from:0x0209ed18 kind:load to:0x0204a110 module:main -from:0x0209ed1c kind:load to:0x02043f40 module:main +from:0x0209ed1c kind:load to:0x02043f38 add:0x8 module:main from:0x0209ed20 kind:load to:0x0204a120 module:main from:0x0209ed4c kind:arm_call to:0x02034060 module:main from:0x0209ed58 kind:arm_call to:0x02033f7c module:main @@ -7421,7 +7421,7 @@ from:0x0209ee08 kind:arm_call_thumb to:0x0201568c module:main from:0x0209ee14 kind:load to:0x020b4174 module:overlay(0) from:0x0209ee18 kind:load to:0x020b3cb4 module:overlay(0) from:0x0209ee1c kind:load to:0x020b41a0 module:overlay(0) -from:0x0209ee20 kind:load to:0x02043f40 module:main +from:0x0209ee20 kind:load to:0x02043f38 add:0x8 module:main from:0x0209ee2c kind:arm_call to:0x0209f10c module:overlay(0) from:0x0209ee3c kind:arm_call_thumb to:0x0201c9e4 module:main from:0x0209ee4c kind:load to:0x0204a120 module:main @@ -7439,7 +7439,7 @@ from:0x0209ef30 kind:arm_call_thumb to:0x0201568c module:main from:0x0209ef4c kind:load to:0x020b3cb4 module:overlay(0) from:0x0209ef50 kind:load to:0x020b4174 module:overlay(0) from:0x0209ef54 kind:load to:0x020b41a8 module:overlay(0) -from:0x0209ef58 kind:load to:0x02043f40 module:main +from:0x0209ef58 kind:load to:0x02043f38 add:0x8 module:main from:0x0209ef84 kind:arm_call to:0x02032db0 module:main from:0x0209efac kind:arm_call to:0x02034060 module:main from:0x0209efb8 kind:arm_call to:0x02033f7c module:main @@ -7456,7 +7456,7 @@ from:0x0209f074 kind:arm_call_thumb to:0x0201568c module:main from:0x0209f090 kind:load to:0x020b3cb4 module:overlay(0) from:0x0209f094 kind:load to:0x020b4174 module:overlay(0) from:0x0209f098 kind:load to:0x020b41a8 module:overlay(0) -from:0x0209f09c kind:load to:0x02043f40 module:main +from:0x0209f09c kind:load to:0x02043f38 add:0x8 module:main from:0x0209f0a0 kind:load to:0x0204a480 module:main from:0x0209f0cc kind:arm_call to:0x020575e0 module:overlay(0) from:0x0209f0e8 kind:arm_call to:0x02057610 module:overlay(0) @@ -7514,7 +7514,7 @@ from:0x0209f584 kind:load to:0x0204a120 module:main from:0x0209f588 kind:load to:0x020b43b0 module:overlay(0) from:0x0209f58c kind:load to:0x020b4888 module:overlay(0) from:0x0209f590 kind:load to:0x020b488c module:overlay(0) -from:0x0209f594 kind:load to:0x02043f40 module:main +from:0x0209f594 kind:load to:0x02043f38 add:0x8 module:main from:0x0209f598 kind:load to:0x0204a480 module:main from:0x0209f5c0 kind:arm_call_thumb to:0x020154b0 module:main from:0x0209f5cc kind:arm_call to:0x02016620 module:main @@ -7555,7 +7555,7 @@ from:0x0209f8cc kind:arm_call_thumb to:0x0201568c module:main from:0x0209f8d8 kind:load to:0x020b43b0 module:overlay(0) from:0x0209f8dc kind:load to:0x020b4888 module:overlay(0) from:0x0209f8e0 kind:load to:0x020b488c module:overlay(0) -from:0x0209f8e4 kind:load to:0x02043f40 module:main +from:0x0209f8e4 kind:load to:0x02043f38 add:0x8 module:main from:0x0209f8e8 kind:load to:0x0204a480 module:main from:0x0209f8f8 kind:arm_call to:0x0209f958 module:overlay(0) from:0x0209f914 kind:arm_call to:0x0209ee50 module:overlay(0) diff --git a/config/eur/arm9/overlays/ov000/symbols.txt b/config/eur/arm9/overlays/ov000/symbols.txt index 630d536f..42c7cb04 100644 --- a/config/eur/arm9/overlays/ov000/symbols.txt +++ b/config/eur/arm9/overlays/ov000/symbols.txt @@ -2263,7 +2263,7 @@ func_ov000_020975c0 kind:function(arm,size=0x1c) addr:0x020975c0 func_ov000_020975dc kind:function(arm,size=0x1c) addr:0x020975dc _ZN8Actor_5c19func_ov000_020975f8Ev kind:function(arm,size=0x78) addr:0x020975f8 func_ov000_02097670 kind:function(arm,size=0xc) addr:0x02097670 -_ZN12ActorProfileC2E7ActorId kind:function(arm,size=0xa8) addr:0x0209767c +_ZN12ActorProfileC2Ej kind:function(arm,size=0xa8) addr:0x0209767c _ZN12ActorProfileD2Ev kind:function(arm,size=0x28) addr:0x02097724 _ZN12ActorProfile8vfunc_04Ev kind:function(arm,size=0x8) addr:0x0209774c _ZN12ActorProfile8vfunc_08Ev kind:function(arm,size=0x7c) addr:0x02097754 diff --git a/config/eur/arm9/overlays/ov001/relocs.txt b/config/eur/arm9/overlays/ov001/relocs.txt index c5da053b..13dc20b1 100644 --- a/config/eur/arm9/overlays/ov001/relocs.txt +++ b/config/eur/arm9/overlays/ov001/relocs.txt @@ -385,10 +385,10 @@ from:0x020b7a3c kind:thumb_call to:0x020154c4 module:main from:0x020b7a44 kind:load to:0x027e09a0 module:dtcm from:0x020b7a48 kind:load to:0x020c2970 module:overlay(1) from:0x020b7a4c kind:load to:0x020c2984 module:overlay(1) -from:0x020b7a50 kind:load to:0x02043f78 module:main +from:0x020b7a50 kind:load to:0x02043f70 add:0x8 module:main from:0x020b7a54 kind:load to:0x020c2988 module:overlay(1) from:0x020b7a58 kind:load to:0x020c29a4 module:overlay(1) -from:0x020b7a5c kind:load to:0x02043f40 module:main +from:0x020b7a5c kind:load to:0x02043f38 add:0x8 module:main from:0x020b7a60 kind:load to:0x027e0ce4 module:dtcm from:0x020b7a64 kind:load to:0x020c29bc module:overlay(1) from:0x020b7a68 kind:load to:0x020c29d8 module:overlay(1) @@ -629,7 +629,7 @@ from:0x020b8880 kind:load to:0x020c2a90 module:overlay(1) from:0x020b8884 kind:load to:0x027e09a0 module:dtcm from:0x020b8888 kind:load to:0x020c2a98 module:overlay(1) from:0x020b888c kind:load to:0x020c2aac module:overlay(1) -from:0x020b8890 kind:load to:0x02043f40 module:main +from:0x020b8890 kind:load to:0x02043f38 add:0x8 module:main from:0x020b8894 kind:load to:0x027e09c0 module:dtcm from:0x020b8898 kind:load to:0x020c2ac0 module:overlay(1) from:0x020b889c kind:load to:0x027e0ce8 module:dtcm @@ -666,7 +666,7 @@ from:0x020b8a00 kind:thumb_call_arm to:0x0200e6a0 module:main from:0x020b8a12 kind:thumb_call to:0x0201568c module:main from:0x020b8a1c kind:load to:0x027e09a0 module:dtcm from:0x020b8a20 kind:load to:0x020c2b0c module:overlay(1) -from:0x020b8a24 kind:load to:0x02043f40 module:main +from:0x020b8a24 kind:load to:0x02043f38 add:0x8 module:main from:0x020b8a28 kind:load to:0x020c2b24 module:overlay(1) from:0x020b8a54 kind:load to:0x027e0994 module:dtcm from:0x020b8ac6 kind:thumb_call to:0x020b8a5c module:overlay(1) diff --git a/config/eur/arm9/overlays/ov012/relocs.txt b/config/eur/arm9/overlays/ov012/relocs.txt index 08fcaba0..fd75c5c6 100644 --- a/config/eur/arm9/overlays/ov012/relocs.txt +++ b/config/eur/arm9/overlays/ov012/relocs.txt @@ -112,7 +112,7 @@ from:0x020b6d44 kind:thumb_call_arm to:0x0201665c module:main from:0x020b6d4a kind:thumb_call to:0x020154c4 module:main from:0x020b6d54 kind:load to:0x020b4464 module:overlay(0) from:0x020b6d58 kind:load to:0x020b8450 module:overlay(12) -from:0x020b6d5c kind:load to:0x02043f40 module:main +from:0x020b6d5c kind:load to:0x02043f38 add:0x8 module:main from:0x020b6d64 kind:load to:0x0204a480 module:main from:0x020b6d68 kind:load to:0x020b8460 module:overlay(12) from:0x020b6d70 kind:load to:0x020b45f4 module:overlay(0) diff --git a/config/eur/arm9/overlays/ov024/relocs.txt b/config/eur/arm9/overlays/ov024/relocs.txt index 03e7830b..dd6b039e 100644 --- a/config/eur/arm9/overlays/ov024/relocs.txt +++ b/config/eur/arm9/overlays/ov024/relocs.txt @@ -2053,7 +2053,7 @@ from:0x020d269c kind:load to:0x020d8268 module:overlay(24) from:0x020d26a0 kind:load to:0x027e09a0 module:dtcm from:0x020d26a4 kind:load to:0x020d8270 module:overlay(24) from:0x020d26a8 kind:load to:0x020d8288 module:overlay(24) -from:0x020d26ac kind:load to:0x02043f40 module:main +from:0x020d26ac kind:load to:0x02043f38 add:0x8 module:main from:0x020d2760 kind:arm_call to:0x02011f3c module:main from:0x020d2774 kind:arm_call to:0x020d27cc module:overlay(24) from:0x020d27a4 kind:arm_call to:0x02011ff4 module:main diff --git a/config/eur/arm9/overlays/ov026/relocs.txt b/config/eur/arm9/overlays/ov026/relocs.txt index 88702eb1..8a7a63b5 100644 --- a/config/eur/arm9/overlays/ov026/relocs.txt +++ b/config/eur/arm9/overlays/ov026/relocs.txt @@ -4611,7 +4611,7 @@ from:0x02105f30 kind:arm_call_thumb to:0x0201568c module:main from:0x02105f3c kind:load to:0x027e09a4 module:dtcm from:0x02105f40 kind:load to:0x027e09a0 module:dtcm from:0x02105f44 kind:load to:0x02136750 module:overlay(26) -from:0x02105f48 kind:load to:0x02043f40 module:main +from:0x02105f48 kind:load to:0x02043f38 add:0x8 module:main from:0x02106078 kind:arm_call to:0x020c6770 module:overlay(24) from:0x02106090 kind:arm_call_thumb to:0x020b8a5c module:overlay(1) from:0x021060e4 kind:load to:0x027e09a4 module:dtcm diff --git a/config/eur/arm9/overlays/ov028/relocs.txt b/config/eur/arm9/overlays/ov028/relocs.txt index 3d34a058..48bac9b4 100644 --- a/config/eur/arm9/overlays/ov028/relocs.txt +++ b/config/eur/arm9/overlays/ov028/relocs.txt @@ -302,7 +302,7 @@ from:0x02143f1c kind:arm_call_thumb to:0x020156f4 module:main from:0x02143f24 kind:arm_call_thumb to:0x0201568c module:main from:0x02143f30 kind:load to:0x02147320 module:overlay(28) from:0x02143f34 kind:load to:0x021473b4 module:overlay(28) -from:0x02143f38 kind:load to:0x02043f40 module:main +from:0x02143f38 kind:load to:0x02043f38 add:0x8 module:main from:0x02143f50 kind:arm_call_thumb to:0x0205777c module:overlay(0) from:0x02143f58 kind:arm_call to:0x02011ff4 module:main from:0x0214401c kind:arm_call to:0x0200eab0 module:main diff --git a/config/eur/arm9/overlays/ov031/relocs.txt b/config/eur/arm9/overlays/ov031/relocs.txt index 1496fecb..647dc43b 100644 --- a/config/eur/arm9/overlays/ov031/relocs.txt +++ b/config/eur/arm9/overlays/ov031/relocs.txt @@ -29,7 +29,7 @@ from:0x020d8ad0 kind:load to:0x02110651 module:overlay(31) from:0x020d8ad4 kind:load to:0x0211296c module:overlay(31) from:0x020d8ad8 kind:load to:0x02112958 module:overlay(31) from:0x020d8adc kind:load to:0x02112a50 module:overlay(31) -from:0x020d8ae0 kind:load to:0x02043f40 module:main +from:0x020d8ae0 kind:load to:0x02043f38 add:0x8 module:main from:0x020d8b10 kind:arm_call to:0x0200f218 module:main from:0x020d8b38 kind:arm_call to:0x0200b578 module:main from:0x020d8b48 kind:load to:0x02110640 module:overlay(31) diff --git a/config/eur/arm9/overlays/ov088/relocs.txt b/config/eur/arm9/overlays/ov088/relocs.txt index ff95f170..2fc4f280 100644 --- a/config/eur/arm9/overlays/ov088/relocs.txt +++ b/config/eur/arm9/overlays/ov088/relocs.txt @@ -1223,7 +1223,7 @@ from:0x0216f5a4 kind:load to:0x020b64f8 module:overlay(0) from:0x0216f5b0 kind:arm_call_thumb to:0x0205866c module:overlay(0) from:0x0216f5f8 kind:arm_call_thumb to:0x02015550 module:main from:0x0216f608 kind:arm_call to:0x02016620 module:main -from:0x0216f614 kind:load to:0x02043f40 module:main +from:0x0216f614 kind:load to:0x02043f38 add:0x8 module:main from:0x0216f620 kind:arm_call to:0x0216f7b4 module:overlay(88) from:0x0216f628 kind:arm_call to:0x0201665c module:main from:0x0216f630 kind:arm_call_thumb to:0x0201556c module:main diff --git a/config/eur/arm9/overlays/ov089/relocs.txt b/config/eur/arm9/overlays/ov089/relocs.txt index 100dfe8a..6fa20915 100644 --- a/config/eur/arm9/overlays/ov089/relocs.txt +++ b/config/eur/arm9/overlays/ov089/relocs.txt @@ -61,7 +61,7 @@ from:0x021660d8 kind:load to:0x02049be0 module:main from:0x021660dc kind:load to:0x02170e50 module:overlay(89) from:0x021660e0 kind:load to:0x02170e68 module:overlay(89) from:0x021660e4 kind:load to:0x02170628 module:overlay(89) -from:0x021660e8 kind:load to:0x02043f40 module:main +from:0x021660e8 kind:load to:0x02043f38 add:0x8 module:main from:0x021660ec kind:load to:0x02170e6c module:overlay(89) from:0x02166118 kind:arm_call_thumb to:0x0201547c module:main from:0x02166134 kind:arm_call to:0x02167f60 module:overlay(89) diff --git a/config/eur/arm9/relocs.txt b/config/eur/arm9/relocs.txt index 42a75ede..47e5fd5c 100644 --- a/config/eur/arm9/relocs.txt +++ b/config/eur/arm9/relocs.txt @@ -1964,8 +1964,8 @@ from:0x0201569c kind:thumb_call to:0x02015528 module:main from:0x020156a2 kind:thumb_call_arm to:0x02011ff4 module:main from:0x020156bc kind:thumb_call to:0x02012f6c module:main from:0x020156de kind:thumb_call_arm to:0x02015380 module:main -from:0x020156ec kind:load to:0x02043f78 module:main -from:0x020156f0 kind:load to:0x02043f5c module:main +from:0x020156ec kind:load to:0x02043f70 add:0x8 module:main +from:0x020156f0 kind:load to:0x02043f54 add:0x8 module:main from:0x020156fa kind:thumb_call_arm to:0x020153c4 module:main from:0x02015700 kind:thumb_call to:0x02015528 module:main from:0x0201570e kind:thumb_call_arm to:0x020153c4 module:main @@ -2010,7 +2010,7 @@ from:0x0201632c kind:load to:0x02043f90 module:main from:0x0201635c kind:arm_call_thumb to:0x020164a0 module:main from:0x0201636c kind:arm_call to:0x02028c30 module:main from:0x02016374 kind:arm_call_thumb to:0x0201568c module:main -from:0x02016380 kind:load to:0x02043f40 module:main +from:0x02016380 kind:load to:0x02043f38 add:0x8 module:main from:0x02016398 kind:arm_call to:0x02028450 module:main from:0x020163b0 kind:arm_call to:0x02032920 module:main from:0x02016426 kind:thumb_call to:0x02016404 module:main @@ -2100,7 +2100,7 @@ from:0x0201711c kind:arm_call to:0x01ffb9cc module:itcm from:0x02017138 kind:arm_call to:0x01fff520 module:itcm from:0x02017154 kind:load to:0x027e0ce8 module:dtcm from:0x0201718c kind:load to:0x0203e330 module:main -from:0x0201722c kind:load to:0x02043f40 module:main +from:0x0201722c kind:load to:0x02043f38 add:0x8 module:main from:0x020172a0 kind:arm_call to:0x02034060 module:main from:0x020172a8 kind:arm_call to:0x02033f7c module:main from:0x020172bc kind:arm_call to:0x02034060 module:main @@ -2113,7 +2113,7 @@ from:0x02017340 kind:arm_call to:0x02034060 module:main from:0x02017348 kind:arm_call to:0x02033f7c module:main from:0x0201735c kind:arm_call to:0x02034060 module:main from:0x02017378 kind:arm_call_thumb to:0x020164a0 module:main -from:0x0201738c kind:load to:0x02043f40 module:main +from:0x0201738c kind:load to:0x02043f38 add:0x8 module:main from:0x02017390 kind:load to:0x02043f98 module:main from:0x02017394 kind:load to:0x02043fa0 module:main from:0x02017398 kind:load to:0x02043fa8 module:main @@ -2129,7 +2129,7 @@ from:0x020174c4 kind:arm_call to:0x02034060 module:main from:0x020174cc kind:arm_call to:0x02033f7c module:main from:0x020174e0 kind:arm_call to:0x02034060 module:main from:0x020174fc kind:arm_call_thumb to:0x020164a0 module:main -from:0x02017510 kind:load to:0x02043f40 module:main +from:0x02017510 kind:load to:0x02043f38 add:0x8 module:main from:0x02017514 kind:load to:0x02043f98 module:main from:0x02017518 kind:load to:0x02043fa0 module:main from:0x0201751c kind:load to:0x02043fa8 module:main @@ -2373,7 +2373,7 @@ from:0x020195dc kind:arm_call to:0x02027654 module:main from:0x02019604 kind:arm_call to:0x02025000 module:main from:0x0201960c kind:arm_call to:0x02025050 module:main from:0x02019614 kind:arm_call_thumb to:0x0201568c module:main -from:0x02019620 kind:load to:0x02043f40 module:main +from:0x02019620 kind:load to:0x02043f38 add:0x8 module:main from:0x02019644 kind:arm_call to:0x0201ce60 module:main from:0x02019670 kind:arm_call to:0x0201cea0 module:main from:0x020196a4 kind:arm_call to:0x0201e610 module:main @@ -2600,8 +2600,8 @@ from:0x0201b244 kind:arm_call_thumb to:0x02000cdc module:main from:0x0201b24c kind:arm_call_thumb to:0x0201568c module:main from:0x0201b254 kind:arm_call_thumb to:0x0201568c module:main from:0x0201b260 kind:load to:0x0203e3dc module:main -from:0x0201b268 kind:load to:0x02043f78 module:main -from:0x0201b26c kind:load to:0x02043f40 module:main +from:0x0201b268 kind:load to:0x02043f70 add:0x8 module:main +from:0x0201b26c kind:load to:0x02043f38 add:0x8 module:main from:0x0201b270 kind:load to:0x0204d9d0 module:main from:0x0201b274 kind:load to:0x0204dfdc module:main from:0x0201b298 kind:arm_call to:0x02027654 module:main diff --git a/config/eur/arm9/symbols.txt b/config/eur/arm9/symbols.txt index f5ed6f44..0fc94f5a 100644 --- a/config/eur/arm9/symbols.txt +++ b/config/eur/arm9/symbols.txt @@ -750,7 +750,7 @@ func_02015338 kind:function(arm,size=0x10) addr:0x02015338 _ZN18SomeSaveFileStructC1Ei kind:function(arm,size=0x38) addr:0x02015348 func_02015380 kind:function(arm,size=0x24) addr:0x02015380 _ZN18SomeSaveFileStructD1Ev kind:function(arm,size=0x20) addr:0x020153a4 -func_020153c4 kind:function(arm,size=0x20) addr:0x020153c4 +_ZN17UnkFileSystem2_10D1Ev kind:function(arm,size=0x20) addr:0x020153c4 func_020153e4 kind:function(arm,size=0x18) addr:0x020153e4 func_020153fc kind:function(thumb,size=0x12) addr:0x020153fc _ZN10UnkSystem313func_02015410EPKci kind:function(thumb,size=0xc) addr:0x02015410 @@ -762,31 +762,31 @@ _ZN10UnkStruct2C1EPKci kind:function(thumb,size=0x14) addr:0x020154b0 _ZN10UnkStruct2D1Ev kind:function(thumb,size=0x14) addr:0x020154c4 func_020154d8 kind:function(thumb,size=0x14) addr:0x020154d8 _ZN10UnkStruct213func_020154ecEPKc kind:function(thumb,size=0x2a) addr:0x020154ec -func_02015518 kind:function(thumb,size=0x2) addr:0x02015518 -_ZN13func_0201551cD0Ev kind:function(thumb,size=0xc) addr:0x0201551c -_ZN32UnkStruct_ov000_020b4f84_00_Base13func_02015528Ev kind:function(thumb,size=0x2) addr:0x02015528 -_ZN32UnkStruct_ov000_020b4f84_00_Base13func_0201552cEv kind:function(thumb,size=0x8) addr:0x0201552c -_ZN32UnkStruct_ov000_020b4f84_00_Base13func_02015534Ev kind:function(thumb,size=0x4) addr:0x02015534 -_ZN32UnkStruct_ov000_020b4f84_00_BaseC1Ev kind:function(thumb,size=0x18) addr:0x02015538 -_ZN32UnkStruct_ov000_020b4f84_00_BaseC1EPviih kind:function(thumb,size=0x1c) addr:0x02015550 -_ZN32UnkStruct_ov000_020b4f84_00_BaseD1Ev kind:function(thumb,size=0x1c) addr:0x0201556c -_ZN32UnkStruct_ov000_020b4f84_00_BaseD0Ev kind:function(thumb,size=0x24) addr:0x02015588 -_ZN32UnkStruct_ov000_020b4f84_00_Base8vfunc_08Ei kind:function(thumb,size=0x2a) addr:0x020155ac -_ZN32UnkStruct_ov000_020b4f84_00_Base8vfunc_0CEv kind:function(thumb,size=0x18) addr:0x020155d8 -_ZN32UnkStruct_ov000_020b4f84_00_Base8vfunc_10Ei kind:function(thumb,size=0x38) addr:0x020155f0 -func_02015628 kind:function(thumb,size=0x1c) addr:0x02015628 -func_02015644 kind:function(thumb,size=0xc) addr:0x02015644 -func_02015650 kind:function(thumb,size=0x12) addr:0x02015650 -func_02015664 kind:function(thumb,size=0x26) addr:0x02015664 -_ZN10UnkSystem4D1Ev kind:function(thumb,size=0xc) addr:0x0201568c -func_02015698 kind:function(thumb,size=0x12) addr:0x02015698 -func_020156ac kind:function(thumb,size=0x1a) addr:0x020156ac -func_020156c8 kind:function(thumb,size=0x2c) addr:0x020156c8 -func_020156f4 kind:function(thumb,size=0x14) addr:0x020156f4 -func_02015708 kind:function(thumb,size=0x1a) addr:0x02015708 -func_02015724 kind:function(thumb,size=0x2a) addr:0x02015724 -func_02015750 kind:function(thumb,size=0x6) addr:0x02015750 -func_02015758 kind:function(thumb,size=0x30) addr:0x02015758 +_ZN14UnkFileSystem1D1Ev kind:function(thumb,size=0x2) addr:0x02015518 +_ZN14UnkFileSystem1D0Ev kind:function(thumb,size=0xc) addr:0x0201551c +_ZN14UnkFileSystem1D2Ev kind:function(thumb,size=0x2) addr:0x02015528 +_ZN14UnkFileSystem18vfunc_0CEv kind:function(thumb,size=0x8) addr:0x0201552c +_ZN14UnkFileSystem18vfunc_10Ei kind:function(thumb,size=0x4) addr:0x02015534 +_ZN14UnkFileSystem5C1Ev kind:function(thumb,size=0x18) addr:0x02015538 +_ZN14UnkFileSystem5C1EPviih kind:function(thumb,size=0x1c) addr:0x02015550 +_ZN14UnkFileSystem5D1Ev kind:function(thumb,size=0x1c) addr:0x0201556c +_ZN14UnkFileSystem5D0Ev kind:function(thumb,size=0x24) addr:0x02015588 +_ZN14UnkFileSystem58vfunc_08Ei kind:function(thumb,size=0x2a) addr:0x020155ac +_ZN14UnkFileSystem58vfunc_0CEv kind:function(thumb,size=0x18) addr:0x020155d8 +_ZN14UnkFileSystem58vfunc_10Ei kind:function(thumb,size=0x38) addr:0x020155f0 +_ZN14UnkFileSystem4C1EPviii kind:function(thumb,size=0x1c) addr:0x02015628 +_ZN14UnkFileSystem4D1Ev kind:function(thumb,size=0xc) addr:0x02015644 +_ZN14UnkFileSystem4D0Ev kind:function(thumb,size=0x12) addr:0x02015650 +_ZN14UnkFileSystem48vfunc_08Ei kind:function(thumb,size=0x26) addr:0x02015664 +_ZN14UnkFileSystem3D1Ev kind:function(thumb,size=0xc) addr:0x0201568c +_ZN14UnkFileSystem3D0Ev kind:function(thumb,size=0x12) addr:0x02015698 +_ZN14UnkFileSystem38vfunc_08Ei kind:function(thumb,size=0x1a) addr:0x020156ac +_ZN14UnkFileSystem2C1EPvi kind:function(thumb,size=0x2c) addr:0x020156c8 +_ZN14UnkFileSystem2D1Ev kind:function(thumb,size=0x14) addr:0x020156f4 +_ZN14UnkFileSystem2D0Ev kind:function(thumb,size=0x1a) addr:0x02015708 +_ZN14UnkFileSystem28vfunc_08Ei kind:function(thumb,size=0x2a) addr:0x02015724 +_ZN14UnkFileSystem28vfunc_0CEv kind:function(thumb,size=0x6) addr:0x02015750 +_ZN14UnkFileSystem28vfunc_10Ei kind:function(thumb,size=0x30) addr:0x02015758 func_02015788 kind:function(arm,size=0x38) addr:0x02015788 func_020157c0 kind:function(arm,size=0x30) addr:0x020157c0 func_020157f0 kind:function(arm,size=0x30) addr:0x020157f0 @@ -2525,11 +2525,11 @@ data_02043ed0 kind:data(any) addr:0x02043ed0 data_02043ed8 kind:data(any) addr:0x02043ed8 data_02043ee0 kind:data(any) addr:0x02043ee0 data_02043efc kind:data(any) addr:0x02043efc -_ZTV32UnkStruct_ov000_020b4f84_00_Base kind:data(any) addr:0x02043f00 -data_02043f24 kind:data(any) addr:0x02043f1c -data_02043f40 kind:data(any) addr:0x02043f40 -data_02043f5c kind:data(any) addr:0x02043f5c -data_02043f78 kind:data(any) addr:0x02043f78 +_ZTV14UnkFileSystem5 kind:data(any) addr:0x02043f00 +_ZTV14UnkFileSystem4 kind:data(any) addr:0x02043f1c +_ZTV14UnkFileSystem3 kind:data(any) addr:0x02043f38 +_ZTV14UnkFileSystem2 kind:data(any) addr:0x02043f54 +_ZTV14UnkFileSystem1 kind:data(any) addr:0x02043f70 data_02043f8c kind:data(any) addr:0x02043f8c data_02043f90 kind:data(any) addr:0x02043f90 data_02043f98 kind:data(any) addr:0x02043f98 diff --git a/config/jp/arm9/delinks.txt b/config/jp/arm9/delinks.txt index de672397..76ae5ea3 100644 --- a/config/jp/arm9/delinks.txt +++ b/config/jp/arm9/delinks.txt @@ -25,10 +25,9 @@ src/Main/Player/TouchControl.cpp: src/Main/System/OverlayManager.cpp: .text start:0x02014800 end:0x02014948 -src/Main/UnkStruct_ov000_020b4f84_00_Base.cpp: - complete - .text start:0x020154c0 end:0x020155c0 - .data start:0x02045444 end:0x02045460 +src/Main/UnkFileSystem.cpp: + .text start:0x020154b0 end:0x02015720 + .data start:0x02045444 end:0x020454d0 src/Main/System/Random.cpp: .text start:0x0201631c end:0x0201639c @@ -68,6 +67,14 @@ libs/c/src/ansi_files.c: .data start:0x02045c1c end:0x02045d00 .bss start:0x02052d20 end:0x02053020 +libs/c/src/float.c: + complete + .data start:0x02045d00 end:0x02045d04 + +libs/c/src/locale.c: + complete + .data start:0x02045d04 end:0x02045f20 + libs/c/src/arith.c: complete .text start:0x02034e04 end:0x02034e1c @@ -114,14 +121,6 @@ libs/c/src/wmem.c: complete .text start:0x02035728 end:0x02035760 -libs/c/src/float.c: - complete - .data start:0x02045d00 end:0x02045d04 - -libs/c/src/locale.c: - complete - .data start:0x02045d04 end:0x02045f20 - libs/c/src/wprintf.c: .text start:0x02035760 end:0x0203768c .data start:0x02045f20 end:0x02045fa0 diff --git a/config/jp/arm9/dtcm/symbols.txt b/config/jp/arm9/dtcm/symbols.txt index 8949fc00..1e2a81cd 100644 --- a/config/jp/arm9/dtcm/symbols.txt +++ b/config/jp/arm9/dtcm/symbols.txt @@ -107,8 +107,8 @@ data_027e0ccc kind:bss addr:0x027e0ccc data_027e0cd8 kind:bss addr:0x027e0cd8 data_027e0cdc kind:bss addr:0x027e0cdc data_027e0ce0 kind:bss addr:0x027e0ce0 -gActorManager kind:bss addr:0x027e0ce4 -data_027e0ce8 kind:bss addr:0x027e0ce8 +gpActorManager kind:bss addr:0x027e0ce4 +gpMapObjManager kind:bss addr:0x027e0ce8 data_027e0cec kind:bss addr:0x027e0cec data_027e0cf0 kind:bss addr:0x027e0cf0 data_027e0cf4 kind:bss addr:0x027e0cf4 diff --git a/config/jp/arm9/itcm/symbols.txt b/config/jp/arm9/itcm/symbols.txt index bb7832d1..fe758a88 100644 --- a/config/jp/arm9/itcm/symbols.txt +++ b/config/jp/arm9/itcm/symbols.txt @@ -202,12 +202,12 @@ func_01fff2fc kind:function(arm,size=0x54) addr:0x01fff2fc func_01fff350 kind:function(arm,size=0x64) addr:0x01fff350 _ZN12ActorManager13func_01fff3b4Ei kind:function(arm,size=0x8c) addr:0x01fff3b4 func_01fff440 kind:function(arm,size=0x18) addr:0x01fff440 -func_01fff458 kind:function(arm,size=0xc) addr:0x01fff458 +_ZN5Actor10GetActorIdEv kind:function(arm,size=0xc) addr:0x01fff458 _ZN5Actor8vfunc_10Ev kind:function(arm,size=0x34) addr:0x01fff464 -func_01fff498 kind:function(arm,size=0x34) addr:0x01fff498 +_ZN16MapObjectManager13func_01fff498Eii kind:function(arm,size=0x34) addr:0x01fff498 func_01fff4cc kind:function(arm,size=0x54) addr:0x01fff4cc func_01fff520 kind:function(arm,size=0x64) addr:0x01fff520 -func_01fff584 kind:function(arm,size=0xc) addr:0x01fff584 +_ZN9MapObject14GetMapObjectIdEv kind:function(arm,size=0xc) addr:0x01fff584 func_01fff590 kind:function(arm,size=0x40) addr:0x01fff590 _ZN10ActorRupee13func_01fff5d0Eii kind:function(arm,size=0x3c) addr:0x01fff5d0 func_01fff60c kind:function(arm,size=0x8c) addr:0x01fff60c diff --git a/config/jp/arm9/overlays/ov000/relocs.txt b/config/jp/arm9/overlays/ov000/relocs.txt index 74e33faf..51868d31 100644 --- a/config/jp/arm9/overlays/ov000/relocs.txt +++ b/config/jp/arm9/overlays/ov000/relocs.txt @@ -389,10 +389,10 @@ from:0x02059af8 kind:thumb_call to:0x02015394 module:main from:0x02059b16 kind:thumb_call to:0x020154e8 module:main from:0x02059b2a kind:thumb_call_arm to:0x0203e690 module:main from:0x02059b34 kind:load to:0x020b3314 module:overlay(0) -from:0x02059b38 kind:load to:0x02045484 module:main +from:0x02059b38 kind:load to:0x0204547c add:0x8 module:main from:0x02059b3c kind:load to:0x02015625 module:main from:0x02059b40 kind:load to:0x02059b45 module:overlay(0) -from:0x02059b54 kind:load to:0x02045484 module:main +from:0x02059b54 kind:load to:0x0204547c add:0x8 module:main from:0x02059b60 kind:thumb_call to:0x02059f64 module:overlay(0) from:0x02059b6e kind:thumb_call_arm to:0x0203e740 module:main from:0x02059b76 kind:thumb_call to:0x02015504 module:main @@ -575,8 +575,8 @@ from:0x0205ab02 kind:thumb_call to:0x02012fa8 module:main from:0x0205ab5e kind:thumb_call to:0x0205ac9c module:overlay(0) from:0x0205ab68 kind:load to:0x020b66d4 module:overlay(0) from:0x0205ab6c kind:load to:0x020b3378 module:overlay(0) -from:0x0205ab70 kind:load to:0x020454bc module:main -from:0x0205ab74 kind:load to:0x02045484 module:main +from:0x0205ab70 kind:load to:0x020454b4 add:0x8 module:main +from:0x0205ab74 kind:load to:0x0204547c add:0x8 module:main from:0x0205ab78 kind:load to:0x020b3384 module:overlay(0) from:0x0205ab7c kind:load to:0x020b338c module:overlay(0) from:0x0205ab80 kind:load to:0x020b3394 module:overlay(0) @@ -589,8 +589,8 @@ from:0x0205ac3e kind:thumb_call_arm to:0x020354ac module:main from:0x0205ac4e kind:thumb_call_arm to:0x02035590 module:main from:0x0205ac7e kind:thumb_call to:0x0205ac9c module:overlay(0) from:0x0205ac88 kind:load to:0x020b66d4 module:overlay(0) -from:0x0205ac8c kind:load to:0x020454bc module:main -from:0x0205ac90 kind:load to:0x02045484 module:main +from:0x0205ac8c kind:load to:0x020454b4 add:0x8 module:main +from:0x0205ac90 kind:load to:0x0204547c add:0x8 module:main from:0x0205ac94 kind:load to:0x020b3384 module:overlay(0) from:0x0205ac98 kind:load to:0x020b339c module:overlay(0) from:0x0205acaa kind:thumb_call to:0x02012fa8 module:main @@ -1180,7 +1180,7 @@ from:0x020617f4 kind:arm_call to:0x0201c570 module:main from:0x020617fc kind:arm_call_thumb to:0x02015624 module:main from:0x02061808 kind:load to:0x020b3490 module:overlay(0) from:0x0206180c kind:load to:0x020b3494 module:overlay(0) -from:0x02061810 kind:load to:0x02045484 module:main +from:0x02061810 kind:load to:0x0204547c add:0x8 module:main from:0x02061814 kind:load to:0x0204ba00 module:main from:0x02061818 kind:load to:0x020b349c module:overlay(0) from:0x02061824 kind:arm_call to:0x02061358 module:overlay(0) @@ -1226,7 +1226,7 @@ from:0x02061ba4 kind:arm_call to:0x0201c570 module:main from:0x02061bac kind:arm_call_thumb to:0x02015624 module:main from:0x02061bb8 kind:load to:0x020b3490 module:overlay(0) from:0x02061bbc kind:load to:0x020b3494 module:overlay(0) -from:0x02061bc0 kind:load to:0x02045484 module:main +from:0x02061bc0 kind:load to:0x0204547c add:0x8 module:main from:0x02061bc4 kind:load to:0x0204ba00 module:main from:0x02061bc8 kind:load to:0x020b349c module:overlay(0) from:0x02061bcc kind:load to:0x020b34a0 module:overlay(0) @@ -4356,7 +4356,7 @@ from:0x020818f8 kind:arm_call to:0x02027d30 module:main from:0x0208191c kind:arm_call_thumb to:0x02015644 module:main from:0x02081928 kind:arm_call_thumb to:0x02015624 module:main from:0x02081938 kind:load to:0x020b40e0 module:overlay(0) -from:0x0208193c kind:load to:0x02045484 module:main +from:0x0208193c kind:load to:0x0204547c add:0x8 module:main from:0x02081afc kind:arm_call to:0x02081348 module:overlay(0) from:0x02081b10 kind:arm_call to:0x02098940 module:overlay(0) from:0x02081b24 kind:arm_call to:0x020c863c module:overlay(24) @@ -4435,7 +4435,7 @@ from:0x02082afc kind:arm_call to:0x02082b24 module:overlay(0) from:0x02082b04 kind:arm_call_thumb to:0x02015624 module:main from:0x02082b14 kind:load to:0x020b40f8 module:overlay(0) from:0x02082b18 kind:load to:0x020b410c module:overlay(0) -from:0x02082b1c kind:load to:0x02045484 module:main +from:0x02082b1c kind:load to:0x0204547c add:0x8 module:main from:0x02082b20 kind:load to:0x027e09a0 module:dtcm from:0x02082b68 kind:arm_call to:0x02082808 module:overlay(0) from:0x02082b98 kind:arm_call to:0x020831dc module:overlay(0) @@ -7405,7 +7405,7 @@ from:0x020a04e4 kind:load to:0x020b5974 module:overlay(0) from:0x020a04e8 kind:load to:0x020b54b4 module:overlay(0) from:0x020a04ec kind:load to:0x020b59a0 module:overlay(0) from:0x020a04f0 kind:load to:0x0204b690 module:main -from:0x020a04f4 kind:load to:0x02045484 module:main +from:0x020a04f4 kind:load to:0x0204547c add:0x8 module:main from:0x020a04f8 kind:load to:0x0204b6a0 module:main from:0x020a0524 kind:arm_call to:0x02035590 module:main from:0x020a0530 kind:arm_call to:0x020354ac module:main @@ -7422,7 +7422,7 @@ from:0x020a05e0 kind:arm_call_thumb to:0x02015624 module:main from:0x020a05ec kind:load to:0x020b5974 module:overlay(0) from:0x020a05f0 kind:load to:0x020b54b4 module:overlay(0) from:0x020a05f4 kind:load to:0x020b59a0 module:overlay(0) -from:0x020a05f8 kind:load to:0x02045484 module:main +from:0x020a05f8 kind:load to:0x0204547c add:0x8 module:main from:0x020a0604 kind:arm_call to:0x020a08e4 module:overlay(0) from:0x020a0614 kind:arm_call_thumb to:0x0201c7d4 module:main from:0x020a0624 kind:load to:0x0204b6a0 module:main @@ -7440,7 +7440,7 @@ from:0x020a0708 kind:arm_call_thumb to:0x02015624 module:main from:0x020a0724 kind:load to:0x020b54b4 module:overlay(0) from:0x020a0728 kind:load to:0x020b5974 module:overlay(0) from:0x020a072c kind:load to:0x020b59a8 module:overlay(0) -from:0x020a0730 kind:load to:0x02045484 module:main +from:0x020a0730 kind:load to:0x0204547c add:0x8 module:main from:0x020a075c kind:arm_call to:0x020342e0 module:main from:0x020a0784 kind:arm_call to:0x02035590 module:main from:0x020a0790 kind:arm_call to:0x020354ac module:main @@ -7457,7 +7457,7 @@ from:0x020a084c kind:arm_call_thumb to:0x02015624 module:main from:0x020a0868 kind:load to:0x020b54b4 module:overlay(0) from:0x020a086c kind:load to:0x020b5974 module:overlay(0) from:0x020a0870 kind:load to:0x020b59a8 module:overlay(0) -from:0x020a0874 kind:load to:0x02045484 module:main +from:0x020a0874 kind:load to:0x0204547c add:0x8 module:main from:0x020a0878 kind:load to:0x0204ba00 module:main from:0x020a08a4 kind:arm_call to:0x02058b60 module:overlay(0) from:0x020a08c0 kind:arm_call to:0x02058b90 module:overlay(0) @@ -7515,7 +7515,7 @@ from:0x020a0d5c kind:load to:0x0204b6a0 module:main from:0x020a0d60 kind:load to:0x020b5bb0 module:overlay(0) from:0x020a0d64 kind:load to:0x020b6088 module:overlay(0) from:0x020a0d68 kind:load to:0x020b608c module:overlay(0) -from:0x020a0d6c kind:load to:0x02045484 module:main +from:0x020a0d6c kind:load to:0x0204547c add:0x8 module:main from:0x020a0d70 kind:load to:0x0204ba00 module:main from:0x020a0d98 kind:arm_call_thumb to:0x02015448 module:main from:0x020a0da4 kind:arm_call to:0x020165b8 module:main @@ -7556,7 +7556,7 @@ from:0x020a10a4 kind:arm_call_thumb to:0x02015624 module:main from:0x020a10b0 kind:load to:0x020b5bb0 module:overlay(0) from:0x020a10b4 kind:load to:0x020b6088 module:overlay(0) from:0x020a10b8 kind:load to:0x020b608c module:overlay(0) -from:0x020a10bc kind:load to:0x02045484 module:main +from:0x020a10bc kind:load to:0x0204547c add:0x8 module:main from:0x020a10c0 kind:load to:0x0204ba00 module:main from:0x020a10d0 kind:arm_call to:0x020a1130 module:overlay(0) from:0x020a10ec kind:arm_call to:0x020a0628 module:overlay(0) diff --git a/config/jp/arm9/overlays/ov000/symbols.txt b/config/jp/arm9/overlays/ov000/symbols.txt index 0f8dc189..b137dcfd 100644 --- a/config/jp/arm9/overlays/ov000/symbols.txt +++ b/config/jp/arm9/overlays/ov000/symbols.txt @@ -2260,7 +2260,7 @@ func_ov000_02098cfc kind:function(arm,size=0x78) addr:0x02098cfc func_ov000_02098d74 kind:function(arm,size=0x1c) addr:0x02098d74 func_ov000_02098d90 kind:function(arm,size=0x1c) addr:0x02098d90 _ZN8Actor_5c19func_ov000_020975f8Ev kind:function(arm,size=0x78) addr:0x02098dac -_ZN12ActorProfileC2E7ActorId kind:function(arm,size=0xa8) addr:0x02098e24 +_ZN12ActorProfileC2Ej kind:function(arm,size=0xa8) addr:0x02098e24 _ZN12ActorProfileD2Ev kind:function(arm,size=0x28) addr:0x02098ecc _ZN12ActorProfile8vfunc_04Ev kind:function(arm,size=0x8) addr:0x02098ef4 _ZN12ActorProfile8vfunc_08Ev kind:function(arm,size=0x7c) addr:0x02098efc diff --git a/config/jp/arm9/overlays/ov001/relocs.txt b/config/jp/arm9/overlays/ov001/relocs.txt index b426c448..1a196265 100644 --- a/config/jp/arm9/overlays/ov001/relocs.txt +++ b/config/jp/arm9/overlays/ov001/relocs.txt @@ -385,10 +385,10 @@ from:0x020b9264 kind:thumb_call to:0x0201545c module:main from:0x020b926c kind:load to:0x027e09a0 module:dtcm from:0x020b9270 kind:load to:0x020c41b0 module:overlay(1) from:0x020b9274 kind:load to:0x020c41c4 module:overlay(1) -from:0x020b9278 kind:load to:0x020454bc module:main +from:0x020b9278 kind:load to:0x020454b4 add:0x8 module:main from:0x020b927c kind:load to:0x020c41c8 module:overlay(1) from:0x020b9280 kind:load to:0x020c41e4 module:overlay(1) -from:0x020b9284 kind:load to:0x02045484 module:main +from:0x020b9284 kind:load to:0x0204547c add:0x8 module:main from:0x020b9288 kind:load to:0x027e0ce4 module:dtcm from:0x020b928c kind:load to:0x020c41fc module:overlay(1) from:0x020b9290 kind:load to:0x020c4218 module:overlay(1) @@ -629,7 +629,7 @@ from:0x020ba0c0 kind:load to:0x020c42d0 module:overlay(1) from:0x020ba0c4 kind:load to:0x027e09a0 module:dtcm from:0x020ba0c8 kind:load to:0x020c42d8 module:overlay(1) from:0x020ba0cc kind:load to:0x020c42ec module:overlay(1) -from:0x020ba0d0 kind:load to:0x02045484 module:main +from:0x020ba0d0 kind:load to:0x0204547c add:0x8 module:main from:0x020ba0d4 kind:load to:0x027e09c0 module:dtcm from:0x020ba0d8 kind:load to:0x020c4300 module:overlay(1) from:0x020ba0dc kind:load to:0x027e0ce8 module:dtcm @@ -666,7 +666,7 @@ from:0x020ba240 kind:thumb_call_arm to:0x0200e6a0 module:main from:0x020ba252 kind:thumb_call to:0x02015624 module:main from:0x020ba25c kind:load to:0x027e09a0 module:dtcm from:0x020ba260 kind:load to:0x020c434c module:overlay(1) -from:0x020ba264 kind:load to:0x02045484 module:main +from:0x020ba264 kind:load to:0x0204547c add:0x8 module:main from:0x020ba268 kind:load to:0x020c4364 module:overlay(1) from:0x020ba294 kind:load to:0x027e0994 module:dtcm from:0x020ba306 kind:thumb_call to:0x020ba29c module:overlay(1) diff --git a/config/jp/arm9/overlays/ov012/relocs.txt b/config/jp/arm9/overlays/ov012/relocs.txt index 9cab7da2..9988c541 100644 --- a/config/jp/arm9/overlays/ov012/relocs.txt +++ b/config/jp/arm9/overlays/ov012/relocs.txt @@ -112,7 +112,7 @@ from:0x020b8564 kind:thumb_call_arm to:0x020165f4 module:main from:0x020b856a kind:thumb_call to:0x0201545c module:main from:0x020b8574 kind:load to:0x020b5c64 module:overlay(0) from:0x020b8578 kind:load to:0x020b9c70 module:overlay(12) -from:0x020b857c kind:load to:0x02045484 module:main +from:0x020b857c kind:load to:0x0204547c add:0x8 module:main from:0x020b8584 kind:load to:0x0204ba00 module:main from:0x020b8588 kind:load to:0x020b9c80 module:overlay(12) from:0x020b8590 kind:load to:0x020b5df4 module:overlay(0) diff --git a/config/jp/arm9/overlays/ov024/relocs.txt b/config/jp/arm9/overlays/ov024/relocs.txt index 3a4a2a26..d9134711 100644 --- a/config/jp/arm9/overlays/ov024/relocs.txt +++ b/config/jp/arm9/overlays/ov024/relocs.txt @@ -2058,7 +2058,7 @@ from:0x020d3ff0 kind:load to:0x020d9c08 module:overlay(24) from:0x020d3ff4 kind:load to:0x027e09a0 module:dtcm from:0x020d3ff8 kind:load to:0x020d9c10 module:overlay(24) from:0x020d3ffc kind:load to:0x020d9c28 module:overlay(24) -from:0x020d4000 kind:load to:0x02045484 module:main +from:0x020d4000 kind:load to:0x0204547c add:0x8 module:main from:0x020d40b4 kind:arm_call to:0x02011f3c module:main from:0x020d40c8 kind:arm_call to:0x020d4120 module:overlay(24) from:0x020d40f8 kind:arm_call to:0x02011ff4 module:main diff --git a/config/jp/arm9/overlays/ov026/relocs.txt b/config/jp/arm9/overlays/ov026/relocs.txt index 38d0b26f..2403f26a 100644 --- a/config/jp/arm9/overlays/ov026/relocs.txt +++ b/config/jp/arm9/overlays/ov026/relocs.txt @@ -4673,7 +4673,7 @@ from:0x0210818c kind:arm_call_thumb to:0x02015624 module:main from:0x02108198 kind:load to:0x027e09a4 module:dtcm from:0x0210819c kind:load to:0x027e09a0 module:dtcm from:0x021081a0 kind:load to:0x02138ad0 module:overlay(26) -from:0x021081a4 kind:load to:0x02045484 module:main +from:0x021081a4 kind:load to:0x0204547c add:0x8 module:main from:0x021082d4 kind:arm_call to:0x020c7f90 module:overlay(24) from:0x021082ec kind:arm_call_thumb to:0x020ba29c module:overlays(1,2) from:0x02108340 kind:load to:0x027e09a4 module:dtcm diff --git a/config/jp/arm9/overlays/ov028/relocs.txt b/config/jp/arm9/overlays/ov028/relocs.txt index 3b1443c1..be72e648 100644 --- a/config/jp/arm9/overlays/ov028/relocs.txt +++ b/config/jp/arm9/overlays/ov028/relocs.txt @@ -302,7 +302,7 @@ from:0x0214629c kind:arm_call_thumb to:0x0201568c module:main from:0x021462a4 kind:arm_call_thumb to:0x02015624 module:main from:0x021462b0 kind:load to:0x021496a0 module:overlay(28) from:0x021462b4 kind:load to:0x02149734 module:overlay(28) -from:0x021462b8 kind:load to:0x02045484 module:main +from:0x021462b8 kind:load to:0x0204547c add:0x8 module:main from:0x021462d0 kind:arm_call_thumb to:0x02058cfc module:overlay(0) from:0x021462d8 kind:arm_call to:0x02011ff4 module:main from:0x0214639c kind:arm_call to:0x0200eab0 module:main diff --git a/config/jp/arm9/overlays/ov031/relocs.txt b/config/jp/arm9/overlays/ov031/relocs.txt index 99e47382..0e05471f 100644 --- a/config/jp/arm9/overlays/ov031/relocs.txt +++ b/config/jp/arm9/overlays/ov031/relocs.txt @@ -29,7 +29,7 @@ from:0x020da470 kind:load to:0x021123c1 module:overlay(31) from:0x020da474 kind:load to:0x0211470c module:overlay(31) from:0x020da478 kind:load to:0x021146f8 module:overlay(31) from:0x020da47c kind:load to:0x021147f0 module:overlay(31) -from:0x020da480 kind:load to:0x02045484 module:main +from:0x020da480 kind:load to:0x0204547c add:0x8 module:main from:0x020da4b0 kind:arm_call to:0x0200f218 module:main from:0x020da4d8 kind:arm_call to:0x0200b578 module:main from:0x020da4e8 kind:load to:0x021123b0 module:overlay(31) diff --git a/config/jp/arm9/overlays/ov088/relocs.txt b/config/jp/arm9/overlays/ov088/relocs.txt index e19d87d2..7c7627d4 100644 --- a/config/jp/arm9/overlays/ov088/relocs.txt +++ b/config/jp/arm9/overlays/ov088/relocs.txt @@ -1223,7 +1223,7 @@ from:0x02171804 kind:load to:0x020b7d08 module:overlay(0) from:0x02171810 kind:arm_call_thumb to:0x02059bec module:overlay(0) from:0x02171858 kind:arm_call_thumb to:0x020154e8 module:main from:0x02171868 kind:arm_call to:0x020165b8 module:main -from:0x02171874 kind:load to:0x02045484 module:main +from:0x02171874 kind:load to:0x0204547c add:0x8 module:main from:0x02171880 kind:arm_call to:0x02171a14 module:overlay(88) from:0x02171888 kind:arm_call to:0x020165f4 module:main from:0x02171890 kind:arm_call_thumb to:0x02015504 module:main diff --git a/config/jp/arm9/overlays/ov089/relocs.txt b/config/jp/arm9/overlays/ov089/relocs.txt index fc748770..8e612de9 100644 --- a/config/jp/arm9/overlays/ov089/relocs.txt +++ b/config/jp/arm9/overlays/ov089/relocs.txt @@ -61,7 +61,7 @@ from:0x02168338 kind:load to:0x0204b15c module:main from:0x0216833c kind:load to:0x021730b0 module:overlay(89) from:0x02168340 kind:load to:0x021730c8 module:overlay(89) from:0x02168344 kind:load to:0x02172888 module:overlay(89) -from:0x02168348 kind:load to:0x02045484 module:main +from:0x02168348 kind:load to:0x0204547c add:0x8 module:main from:0x0216834c kind:load to:0x021730cc module:overlay(89) from:0x02168378 kind:arm_call_thumb to:0x02015414 module:main from:0x02168394 kind:arm_call to:0x0216a1c0 module:overlay(89) diff --git a/config/jp/arm9/relocs.txt b/config/jp/arm9/relocs.txt index 4ee401e7..2480b335 100644 --- a/config/jp/arm9/relocs.txt +++ b/config/jp/arm9/relocs.txt @@ -1964,8 +1964,8 @@ from:0x02015634 kind:thumb_call to:0x020154c0 module:main from:0x0201563a kind:thumb_call_arm to:0x02011ff4 module:main from:0x02015654 kind:thumb_call to:0x02012f6c module:main from:0x02015676 kind:thumb_call_arm to:0x02015318 module:main -from:0x02015684 kind:load to:0x020454bc module:main -from:0x02015688 kind:load to:0x020454a0 module:main +from:0x02015684 kind:load to:0x020454b4 add:0x8 module:main +from:0x02015688 kind:load to:0x02045498 add:0x8 module:main from:0x02015692 kind:thumb_call_arm to:0x0201535c module:main from:0x02015698 kind:thumb_call to:0x020154c0 module:main from:0x020156a6 kind:thumb_call_arm to:0x0201535c module:main @@ -2010,7 +2010,7 @@ from:0x020162c4 kind:load to:0x020454d4 module:main from:0x020162f4 kind:arm_call_thumb to:0x02016438 module:main from:0x02016304 kind:arm_call to:0x0202a160 module:main from:0x0201630c kind:arm_call_thumb to:0x02015624 module:main -from:0x02016318 kind:load to:0x02045484 module:main +from:0x02016318 kind:load to:0x0204547c add:0x8 module:main from:0x02016330 kind:arm_call to:0x02029980 module:main from:0x02016348 kind:arm_call to:0x02033e50 module:main from:0x020163be kind:thumb_call to:0x0201639c module:main @@ -2100,7 +2100,7 @@ from:0x020170b4 kind:arm_call to:0x01ffb9cc module:itcm from:0x020170d0 kind:arm_call to:0x01fff520 module:itcm from:0x020170ec kind:load to:0x027e0ce8 module:dtcm from:0x02017124 kind:load to:0x0203f87c module:main -from:0x020171c4 kind:load to:0x02045484 module:main +from:0x020171c4 kind:load to:0x0204547c add:0x8 module:main from:0x02017238 kind:arm_call to:0x02035590 module:main from:0x02017240 kind:arm_call to:0x020354ac module:main from:0x02017254 kind:arm_call to:0x02035590 module:main @@ -2113,7 +2113,7 @@ from:0x020172d8 kind:arm_call to:0x02035590 module:main from:0x020172e0 kind:arm_call to:0x020354ac module:main from:0x020172f4 kind:arm_call to:0x02035590 module:main from:0x02017310 kind:arm_call_thumb to:0x02016438 module:main -from:0x02017324 kind:load to:0x02045484 module:main +from:0x02017324 kind:load to:0x0204547c add:0x8 module:main from:0x02017328 kind:load to:0x020454dc module:main from:0x0201732c kind:load to:0x020454e4 module:main from:0x02017330 kind:load to:0x020454ec module:main @@ -2129,7 +2129,7 @@ from:0x0201745c kind:arm_call to:0x02035590 module:main from:0x02017464 kind:arm_call to:0x020354ac module:main from:0x02017478 kind:arm_call to:0x02035590 module:main from:0x02017494 kind:arm_call_thumb to:0x02016438 module:main -from:0x020174a8 kind:load to:0x02045484 module:main +from:0x020174a8 kind:load to:0x0204547c add:0x8 module:main from:0x020174ac kind:load to:0x020454dc module:main from:0x020174b0 kind:load to:0x020454e4 module:main from:0x020174b4 kind:load to:0x020454ec module:main @@ -2373,7 +2373,7 @@ from:0x02019574 kind:arm_call to:0x02028b84 module:main from:0x0201959c kind:arm_call to:0x02026530 module:main from:0x020195a4 kind:arm_call to:0x02026580 module:main from:0x020195ac kind:arm_call_thumb to:0x02015624 module:main -from:0x020195b8 kind:load to:0x02045484 module:main +from:0x020195b8 kind:load to:0x0204547c add:0x8 module:main from:0x020195dc kind:arm_call to:0x0201cc50 module:main from:0x02019608 kind:arm_call to:0x0201cc90 module:main from:0x0201963c kind:arm_call to:0x0201e400 module:main @@ -2600,8 +2600,8 @@ from:0x0201b136 kind:thumb_call to:0x02000cdc module:main from:0x0201b13c kind:thumb_call to:0x02015624 module:main from:0x0201b142 kind:thumb_call to:0x02015624 module:main from:0x0201b14c kind:load to:0x0203f928 module:main -from:0x0201b154 kind:load to:0x020454bc module:main -from:0x0201b158 kind:load to:0x02045484 module:main +from:0x0201b154 kind:load to:0x020454b4 add:0x8 module:main +from:0x0201b158 kind:load to:0x0204547c add:0x8 module:main from:0x0201b15c kind:load to:0x0204ef50 module:main from:0x0201b160 kind:load to:0x0204f55c module:main from:0x0201b176 kind:thumb_call_arm to:0x02028b84 module:main diff --git a/config/jp/arm9/symbols.txt b/config/jp/arm9/symbols.txt index 0abd4440..2cfbf5a0 100644 --- a/config/jp/arm9/symbols.txt +++ b/config/jp/arm9/symbols.txt @@ -762,31 +762,31 @@ _ZN10UnkStruct2C1EPKci kind:function(thumb,size=0x14) addr:0x02015448 _ZN10UnkStruct2D1Ev kind:function(thumb,size=0x14) addr:0x0201545c func_02015470 kind:function(thumb,size=0x14) addr:0x02015470 _ZN10UnkStruct213func_020154ecEPKc kind:function(thumb,size=0x2a) addr:0x02015484 -func_020154b0 kind:function(thumb,size=0x2) addr:0x020154b0 -_ZN13func_020154b4D0Ev kind:function(thumb,size=0xc) addr:0x020154b4 -_ZN32UnkStruct_ov000_020b4f84_00_Base13func_02015528Ev kind:function(thumb,size=0x2) addr:0x020154c0 -_ZN32UnkStruct_ov000_020b4f84_00_Base13func_0201552cEv kind:function(thumb,size=0x8) addr:0x020154c4 -_ZN32UnkStruct_ov000_020b4f84_00_Base13func_02015534Ev kind:function(thumb,size=0x4) addr:0x020154cc -_ZN32UnkStruct_ov000_020b4f84_00_BaseC1Ev kind:function(thumb,size=0x18) addr:0x020154d0 -_ZN32UnkStruct_ov000_020b4f84_00_BaseC1EPviih kind:function(thumb,size=0x1c) addr:0x020154e8 -_ZN32UnkStruct_ov000_020b4f84_00_BaseD1Ev kind:function(thumb,size=0x1c) addr:0x02015504 -_ZN32UnkStruct_ov000_020b4f84_00_BaseD0Ev kind:function(thumb,size=0x24) addr:0x02015520 -_ZN32UnkStruct_ov000_020b4f84_00_Base8vfunc_08Ei kind:function(thumb,size=0x2a) addr:0x02015544 -_ZN32UnkStruct_ov000_020b4f84_00_Base8vfunc_0CEv kind:function(thumb,size=0x18) addr:0x02015570 -_ZN32UnkStruct_ov000_020b4f84_00_Base8vfunc_10Ei kind:function(thumb,size=0x38) addr:0x02015588 -func_020155c0 kind:function(thumb,size=0x1c) addr:0x020155c0 -func_020155dc kind:function(thumb,size=0xc) addr:0x020155dc -func_020155e8 kind:function(thumb,size=0x12) addr:0x020155e8 -func_020155fc kind:function(thumb,size=0x26) addr:0x020155fc -_ZN10UnkSystem4D1Ev kind:function(thumb,size=0xc) addr:0x02015624 -func_02015630 kind:function(thumb,size=0x12) addr:0x02015630 -func_02015644 kind:function(thumb,size=0x1a) addr:0x02015644 -func_02015660 kind:function(thumb,size=0x2c) addr:0x02015660 -func_0201568c kind:function(thumb,size=0x14) addr:0x0201568c -func_020156a0 kind:function(thumb,size=0x1a) addr:0x020156a0 -func_020156bc kind:function(thumb,size=0x2a) addr:0x020156bc -func_020156e8 kind:function(thumb,size=0x6) addr:0x020156e8 -func_020156f0 kind:function(thumb,size=0x30) addr:0x020156f0 +_ZN14UnkFileSystem1D1Ev kind:function(thumb,size=0x2) addr:0x020154b0 +_ZN14UnkFileSystem1D0Ev kind:function(thumb,size=0xc) addr:0x020154b4 +_ZN14UnkFileSystem1D2Ev kind:function(thumb,size=0x2) addr:0x020154c0 +_ZN14UnkFileSystem18vfunc_0CEv kind:function(thumb,size=0x8) addr:0x020154c4 +_ZN14UnkFileSystem18vfunc_10Ei kind:function(thumb,size=0x4) addr:0x020154cc +_ZN14UnkFileSystem5C1Ev kind:function(thumb,size=0x18) addr:0x020154d0 +_ZN14UnkFileSystem5C1EPviih kind:function(thumb,size=0x1c) addr:0x020154e8 +_ZN14UnkFileSystem5D1Ev kind:function(thumb,size=0x1c) addr:0x02015504 +_ZN14UnkFileSystem5D0Ev kind:function(thumb,size=0x24) addr:0x02015520 +_ZN14UnkFileSystem58vfunc_08Ei kind:function(thumb,size=0x2a) addr:0x02015544 +_ZN14UnkFileSystem58vfunc_0CEv kind:function(thumb,size=0x18) addr:0x02015570 +_ZN14UnkFileSystem58vfunc_10Ei kind:function(thumb,size=0x38) addr:0x02015588 +_ZN14UnkFileSystem4C1EPviii kind:function(thumb,size=0x1c) addr:0x020155c0 +_ZN14UnkFileSystem4D1Ev kind:function(thumb,size=0xc) addr:0x020155dc +_ZN14UnkFileSystem4D0Ev kind:function(thumb,size=0x12) addr:0x020155e8 +_ZN14UnkFileSystem48vfunc_08Ei kind:function(thumb,size=0x26) addr:0x020155fc +_ZN14UnkFileSystem3D1Ev kind:function(thumb,size=0xc) addr:0x02015624 +_ZN14UnkFileSystem3D0Ev kind:function(thumb,size=0x12) addr:0x02015630 +_ZN14UnkFileSystem38vfunc_08Ei kind:function(thumb,size=0x1a) addr:0x02015644 +_ZN14UnkFileSystem2C1EPvi kind:function(thumb,size=0x2c) addr:0x02015660 +_ZN14UnkFileSystem2D1Ev kind:function(thumb,size=0x14) addr:0x0201568c +_ZN14UnkFileSystem2D0Ev kind:function(thumb,size=0x1a) addr:0x020156a0 +_ZN14UnkFileSystem28vfunc_08Ei kind:function(thumb,size=0x2a) addr:0x020156bc +_ZN14UnkFileSystem28vfunc_0CEv kind:function(thumb,size=0x6) addr:0x020156e8 +_ZN14UnkFileSystem28vfunc_10Ei kind:function(thumb,size=0x30) addr:0x020156f0 func_02015720 kind:function(arm,size=0x38) addr:0x02015720 func_02015758 kind:function(arm,size=0x30) addr:0x02015758 func_02015788 kind:function(arm,size=0x30) addr:0x02015788 @@ -2544,11 +2544,11 @@ data_02045408 kind:data(any) addr:0x02045408 data_02045418 kind:data(any) addr:0x02045418 data_02045424 kind:data(any) addr:0x02045424 data_02045440 kind:data(any) addr:0x02045440 -_ZTV32UnkStruct_ov000_020b4f84_00_Base kind:data(any) addr:0x02045444 -data_02045468 kind:data(any) addr:0x02045460 -data_02045484 kind:data(any) addr:0x02045484 -data_020454a0 kind:data(any) addr:0x020454a0 -data_020454bc kind:data(any) addr:0x020454bc +_ZTV14UnkFileSystem5 kind:data(any) addr:0x02045444 +_ZTV14UnkFileSystem4 kind:data(any) addr:0x02045460 +_ZTV14UnkFileSystem3 kind:data(any) addr:0x0204547c +_ZTV14UnkFileSystem2 kind:data(any) addr:0x02045498 +_ZTV14UnkFileSystem1 kind:data(any) addr:0x020454b4 data_020454d0 kind:data(any) addr:0x020454d0 data_020454d4 kind:data(any) addr:0x020454d4 data_020454dc kind:data(any) addr:0x020454dc diff --git a/include/Actor/Actor.hpp b/include/Actor/Actor.hpp index eb4a58be..e4f14a52 100644 --- a/include/Actor/Actor.hpp +++ b/include/Actor/Actor.hpp @@ -170,6 +170,9 @@ public: } Actor(); + + ActorId GetActorId(); + void func_ov000_0209848c(ActorProfile *param1); void func_ov000_020984b0(); void func_ov000_020984b4(); diff --git a/include/Actor/ActorId.hpp b/include/Actor/ActorId.hpp index a5ee0961..ab9378d9 100644 --- a/include/Actor/ActorId.hpp +++ b/include/Actor/ActorId.hpp @@ -3,7 +3,9 @@ #include "types.h" #include "versions.h" -enum ActorId { +typedef u32 ActorId; +enum ActorId_ { + ActorId_None = 0, #define DEFINE_ACTOR_TYPE(id, name) ActorId_##name = id, #include "Actor/ActorTable.inl" #undef DEFINE_ACTOR_TYPE diff --git a/include/Actor/ActorManager.hpp b/include/Actor/ActorManager.hpp index 731a6255..2141bfa2 100644 --- a/include/Actor/ActorManager.hpp +++ b/include/Actor/ActorManager.hpp @@ -16,7 +16,7 @@ class ActorManager : public SysObject { public: /* 00 */ Actor **mActorTable; /* 04 */ Actor **mActorTableEnd; - /* 08 */ Actor **mUnk_08; + /* 08 */ Actor **mUnk_08; // pointer to first available slot? /* 0c */ unk16 mActorCount; /* 0e */ unk16 mNextActorId; /* 10 */ unk8 mUnk_10; @@ -41,7 +41,7 @@ public: ActorManager(); ~ActorManager(); - ActorUnk_ov000_020a8bb0 *func_01fff3b4(unk32 param1); + Actor *func_01fff3b4(unk32 param1); Actor **func_01fff350(void *param1, Actor **ppActorTable); void func_ov000_02096e44(int index); @@ -65,4 +65,4 @@ public: static void func_ov001_020bb844(); }; -extern ActorManager *gActorManager; +extern ActorManager *gpActorManager; diff --git a/include/Actor/ActorRupee.hpp b/include/Actor/ActorRupee.hpp index afe77403..586cb5e5 100644 --- a/include/Actor/ActorRupee.hpp +++ b/include/Actor/ActorRupee.hpp @@ -76,7 +76,7 @@ public: /* 2c */ virtual void vfunc_2c(unk32 param1) override; /* 4c */ virtual ~ActorRupee() override; - void func_ov017_020bf9c8(ActorUnk_ov000_020a8bb0 *param1); + void func_ov017_020bf9c8(Actor *param1); void func_ov031_020e8d2c(Vec3p *param1, u8 param2, unk32 param3, unk32 param4); void func_ov031_020e8fec(); diff --git a/include/Actor/ActorUnk_ov000_020a8bb0.hpp b/include/Actor/ActorUnk_ov000_020a8bb0.hpp index 5da89a9c..c2408b0c 100644 --- a/include/Actor/ActorUnk_ov000_020a8bb0.hpp +++ b/include/Actor/ActorUnk_ov000_020a8bb0.hpp @@ -143,8 +143,6 @@ public: /* b8 */ virtual void vfunc_b8(); /* bc */ - ActorId func_01fff458(); - void func_ov000_020a8ae0(q20 param1); ActorUnk_ov000_020a8bb0(ActorUnk_ov000_020a8bb0_a4_00 *param1, unk32 param2); unk32 func_ov000_020a8db0(); @@ -167,6 +165,4 @@ public: void func_ov000_020a9afc(); void func_ov031_020e3ca4(); - - void func_ov062_02158ce8(); }; diff --git a/include/Map/MapObjectId.hpp b/include/Map/MapObjectId.hpp index cc23e51a..ed0f5ec4 100644 --- a/include/Map/MapObjectId.hpp +++ b/include/Map/MapObjectId.hpp @@ -2,7 +2,9 @@ #include "types.h" -enum MapObjectId { +typedef u32 MapObjectId; +enum MapObjectId_ { + MapObjectId_None = 0, #define DEFINE_MAP_OBJECT_TYPE(id, name) MapObjectId_##name = id, #include "Map/MapObjectTable.inl" #undef DEFINE_MAP_OBJECT_TYPE diff --git a/include/MapObject/MapObject.hpp b/include/MapObject/MapObject.hpp index 8a3fbeb0..d0d89f6d 100644 --- a/include/MapObject/MapObject.hpp +++ b/include/MapObject/MapObject.hpp @@ -1,8 +1,7 @@ #pragma once -#include "Actor/ActorProfile.hpp" -#include "Actor/ActorRef.hpp" #include "Map/MapObjectId.hpp" +#include "MapObject/MapObjectProfile.hpp" #include "Physics/Cylinder.hpp" #include "System/SysNew.hpp" #include "flags.h" @@ -10,9 +9,63 @@ #include "nitro/math.h" #include "types.h" +typedef u32 MapObjFlags; +enum MapObjFlag_ { + MapObjFlag_Alive = FLAG(0, 0), + MapObjFlag_1 = FLAG(0, 1), + MapObjFlag_2 = FLAG(0, 2), + MapObjFlag_3 = FLAG(0, 3), + MapObjFlag_4 = FLAG(0, 4), + MapObjFlag_5 = FLAG(0, 5), + MapObjFlag_6 = FLAG(0, 6), + MapObjFlag_7 = FLAG(0, 7), + MapObjFlag_8 = FLAG(0, 8), + MapObjFlag_9 = FLAG(0, 9), + MapObjFlag_10 = FLAG(0, 10), + MapObjFlag_11 = FLAG(0, 11), + MapObjFlag_12 = FLAG(0, 12), + MapObjFlag_13 = FLAG(0, 13), + MapObjFlag_14 = FLAG(0, 14), + MapObjFlag_15 = FLAG(0, 15), + MapObjFlag_16 = FLAG(0, 16), + MapObjFlag_17 = FLAG(0, 17), + MapObjFlag_18 = FLAG(0, 18), + MapObjFlag_19 = FLAG(0, 19), + MapObjFlag_20 = FLAG(0, 20), + MapObjFlag_21 = FLAG(0, 21), + MapObjFlag_22 = FLAG(0, 22), + MapObjFlag_23 = FLAG(0, 23), + MapObjFlag_24 = FLAG(0, 24), + MapObjFlag_25 = FLAG(0, 25), + MapObjFlag_26 = FLAG(0, 26), + MapObjFlag_27 = FLAG(0, 27), + MapObjFlag_28 = FLAG(0, 28), + MapObjFlag_29 = FLAG(0, 29), + MapObjFlag_30 = FLAG(0, 30), + MapObjFlag_31 = FLAG(0, 31), +}; + class MapObject : public SysObject { public: /* 00 (vtable) */ + /* 04 */ Vec3p mPos; + /* 10 */ void *mUnk_10; + /* 14 */ unk16 mUnk_14; + /* 16 */ unk16 mUnk_16; + /* 18 */ unk8 mUnk_18; // bool? when set Link walks to the map object when touched + /* 19 */ unk8 mUnk_19; + /* 1A */ unk8 mUnk_1A; + /* 1B */ unk8 mUnk_1B; + /* 1C */ MapObjFlags mFlags[1]; + /* 20 */ unk32 mUnk_20; + /* 20 */ unk32 mUnk_24; + /* 20 */ unk32 mUnk_28; + /* 20 */ unk32 mUnk_2C; + /* 20 */ unk32 mUnk_30; + /* 20 */ unk32 mUnk_34; + /* 38 */ unk32 mUnk_38; + /* 3C */ MapObjectProfile *mpProfile; + /* 40 */ /* 00 */ virtual void vfunc_00(); /* 04 */ virtual bool vfunc_04(); @@ -27,7 +80,12 @@ public: /* 28 */ virtual void vfunc_28(); /* 2c */ virtual void vfunc_2c(); /* 30 */ virtual ~MapObject(); - /* 34 */ + /* 38 */ MapObject(); + + MapObjectId GetMapObjectId(); + + void func_ov000_0209d6ac(Vec3p *param1); + void func_ov031_02103878(); }; diff --git a/include/MapObject/MapObjectManager.hpp b/include/MapObject/MapObjectManager.hpp new file mode 100644 index 00000000..5a29fe23 --- /dev/null +++ b/include/MapObject/MapObjectManager.hpp @@ -0,0 +1,29 @@ +#pragma once + +#include "MapObject/MapObject.hpp" +#include "Unknown/UnkStruct_ov000_020b34c4.hpp" +#include "types.h" + +class MapObjectManager { +public: + /* 00 */ MapObject **mMapObjTable; + /* 04 */ MapObject **mMapObjTableEnd; + /* 08 */ MapObject **mUnk_08; // pointer to first available slot? + /* 0C */ void **mUnk_0C; // unknown table + /* 10 */ void **mUnk_10; // unknown table end + /* 14 */ void *mUnk_14; + /* 18 */ unk16 mUnk_18; + /* 1A */ unk16 mUnk_1A; + /* 1C */ unk16 mUnk_1C; + /* 1E */ unk16 mUnk_1E; + /* 20 */ unk16 mUnk_20; + /* 22 */ unk16 mUnk_22; + /* 24 */ STRUCT_PAD(0x24, 0x6C); + /* 6C */ void *mUnk_6C; + /* 70 */ + + MapObject **func_01fff520(UnkStruct_ov000_020b34c4 *param1, void *); + MapObject *func_01fff498(unk32 param1, unk32 param2); +}; + +extern MapObjectManager *gpMapObjManager; diff --git a/include/MapObject/MapObjectProfile.hpp b/include/MapObject/MapObjectProfile.hpp index 0cb9709e..55e7112f 100644 --- a/include/MapObject/MapObjectProfile.hpp +++ b/include/MapObject/MapObjectProfile.hpp @@ -3,23 +3,204 @@ #include "Map/MapObjectId.hpp" #include "Physics/Cylinder.hpp" #include "System/SysNew.hpp" +#include "Unknown/Common.hpp" +#include "Unknown/UnkStruct_ov000_020b4f84.hpp" #include "profile.hpp" #include "types.h" class MapObject; +class MapObjectProfile_D4_Base { +public: + /* 00 (vtable) */ + /* 04 */ unk8 mUnk_04; + /* 05 */ unk8 mUnk_05; + /* 06 */ unk8 mUnk_06; + /* 07 */ unk8 mUnk_07; + /* 08 */ unk32 mUnk_08; + /* 0C */ + + MapObjectProfile_D4_Base(); // func_ov000_0207c018 + + // data_ov000_020b2854 + /* 00 */ virtual void vfunc_00(void) = 0; + /* 04 */ virtual void vfunc_04(void) = 0; + /* 08 */ virtual void vfunc_08(void) = 0; + /* 0C */ virtual void vfunc_0C(void) = 0; + /* 10 */ virtual void vfunc_10(void) = 0; + /* 14 */ virtual void vfunc_14(void) = 0; + /* 18 */ virtual void vfunc_18(void) = 0; + /* 1C */ virtual void vfunc_1C(void) = 0; + /* 20 */ +}; + +class MapObjectProfile_D4 : public MapObjectProfile_D4_Base { +public: + /* 00 (base) */ + /* 0C */ + + MapObjectProfile_D4() {} + + /* 00 */ virtual void vfunc_00(void); + /* 04 */ virtual void vfunc_04(void); + /* 08 */ virtual void vfunc_08(void); + /* 0C */ virtual void vfunc_0C(void); + /* 10 */ virtual void vfunc_10(void); + /* 14 */ virtual void vfunc_14(void); + /* 18 */ virtual void vfunc_18(void); + /* 1C */ virtual void vfunc_1C(void); +}; + class MapObjectProfile : public SysObject { public: /* 00 (vtable) */ + /* 04 */ unk8 mUnk_04[2]; + /* 06 */ u8 mUnk_06; + /* 07 */ unk8 mUnk_07; + /* 08 */ unk32 mUnk_08; + /* 0C */ unk16 mUnk_0C; + /* 0E */ unk8 mUnk_0E; + /* 0F */ unk8 mUnk_0F; + /* 10 */ MapObjectId mMapObjId; + /* 14 */ unk32 mUnk_14; + /* 18 */ unk32 mUnk_18; + /* 1C */ unk8 mUnk_1C; + /* 1D */ unk8 mUnk_1D; + /* 1E */ unk16 mUnk_1E; + /* 20 */ - MapObjectProfile(MapObjectId actorId); + MapObjectProfile(MapObjectId mapObjId); // func_ov000_0209c828 + // data_ov000_020b3524 /* 00 */ virtual MapObject *Create() = 0; /* 04 */ virtual void vfunc_04(); /* 08 */ virtual void vfunc_08(); - /* 0c */ virtual void vfunc_0c(); + /* 0C */ virtual void vfunc_0C(); /* 10 */ virtual void vfunc_10(); /* 14 */ }; +class MapObjectProfile_Derived1_20 { +public: + /* 00 */ unk32 mUnk_00; + + MapObjectProfile_Derived1_20() { + this->mUnk_00 = 0; + } +}; + +class MapObjectProfile_Derived1 : public MapObjectProfile { +public: + /* 00 (base) */ + /* 20 */ MapObjectProfile_Derived1_20 mUnk_20[16]; + /* 60 */ unk32 mUnk_60; + /* 64 */ unk16 mUnk_64; + /* 66 */ unk16 mUnk_66; + /* 68 */ MapObjectProfile_D4 mUnk_68; + /* 74 */ unk32 mUnk_74; + /* 78 */ unk32 mUnk_78; + /* 7C */ unk32 mUnk_7C; + /* 80 */ unk32 mUnk_80; + /* 84 */ unk32 mUnk_84; + /* 88 */ + + MapObjectProfile_Derived1(MapObjectId mapObjId); // func_ov000_0209cb4c +}; + +class MapObjectProfile_Derived2_20_Base_18 { +public: + /* 00 */ unk32 mUnk_00; + /* 04 */ unk32 mUnk_04; + /* 08 */ + + MapObjectProfile_Derived2_20_Base_18(); // func_02016620 +}; + +class MapObjectProfile_Derived2_20_Base_20 { +public: + /* 00 */ unk32 mUnk_00; + /* 04 */ unk32 mUnk_04; + /* 08 */ unk32 mUnk_08; + /* 0C */ + + MapObjectProfile_Derived2_20_Base_20(unk32 param1, unk32 param2, unk32 param3, unk32 param4, + unk32 param5); // func_020153fc +}; + +class MapObjectProfile_Derived2_20_Base_54 { +public: + /* 00 */ unk32 mUnk_00; + /* 04 */ unk32 mUnk_04; + /* 08 */ unk32 mUnk_08; + /* 0C */ unk32 mUnk_0C; + /* 10 */ + + MapObjectProfile_Derived2_20_Base_54(); + ~MapObjectProfile_Derived2_20_Base_54(); +}; + +class MapObjectProfile_Derived2_20_Base { +public: + /* 00 (vtable) */ + /* 04 */ unk32 mUnk_04; + /* 08 */ unk32 mUnk_08; + /* 0C */ unk32 mUnk_0C; + /* 10 */ unk32 mUnk_10; + /* 14 */ unk8 mUnk_14; // bool? + /* 15 */ unk8 mUnk_15; // bool? + /* 16 */ unk8 mUnk_16; // bool? + /* 17 */ unk8 mUnk_17; // pad? + /* 18 */ MapObjectProfile_Derived2_20_Base_18 mUnk_18; + /* 20 */ MapObjectProfile_Derived2_20_Base_20 mUnk_20; + /* 2C */ UnkFileSystem3 mUnk_2C; + /* 3C */ UnkFileSystem5 mUnk_3C; + /* 50 */ unk32 mUnk_50; + /* 54 */ MapObjectProfile_Derived2_20_Base_54 mUnk_54[4]; + /* 94 */ + + MapObjectProfile_Derived2_20_Base(const char *directory, void *param2, void *param3, void *param4, unk32 param5, + unk32 param6); // func_ov000_02058540 + + // data_ov000_020b1b14 + /* 00 */ virtual ~MapObjectProfile_Derived2_20_Base(); + /* 08 */ +}; + +class MapObjectProfile_Derived2_20 : public MapObjectProfile_Derived2_20_Base { +public: + /* 00 (base) */ + /* 94 */ unk16 mUnk_94; + /* 96 */ unk16 mUnk_96; + /* 98 */ unk16 mUnk_98; + /* 9A */ unk16 mUnk_9A; + /* 9C */ UnkFileSystem5 mUnk_9C; + /* B0 */ unk8 mUnk_B0; // bool? + /* B1 */ unk8 mUnk_B1; // bool? + /* B2 */ unk8 mUnk_B2; // pad? + /* B3 */ unk8 mUnk_B3; // pad? + /* B4 */ + + MapObjectProfile_Derived2_20(MapObjectId mapObjId2); // func_ov000_0209ce08 + + // data_ov000_020b3568 + /* 00 */ virtual ~MapObjectProfile_Derived2_20() override; +}; + +class MapObjectProfile_Derived2 : public MapObjectProfile { +public: + /* 00 (base) */ + /* 20 */ MapObjectProfile_Derived2_20 mUnk_20; + /* D4 */ MapObjectProfile_D4 mUnk_D4; + /* E0 */ Vec3p mUnk_E0; + /* EC */ Vec3p mUnk_EC; + /* F8 */ + + MapObjectProfile_Derived2(MapObjectId mapObjId1, MapObjectId mapObjId2); // func_ov000_0209c9a8 + + // data_ov000_020b3508 + /* 04 */ virtual void vfunc_04() override; + /* 08 */ virtual void vfunc_08() override; + /* 0C */ virtual void vfunc_0C() override; +}; + typedef MapObjectProfile *(*GetMapObjectProfile)(); diff --git a/include/MapObject/MapObjectUnkARWL.hpp b/include/MapObject/MapObjectUnkARWL.hpp index 9f1d179d..5f9c3043 100644 --- a/include/MapObject/MapObjectUnkARWL.hpp +++ b/include/MapObject/MapObjectUnkARWL.hpp @@ -10,11 +10,11 @@ class MapObjectUnkARWL : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkARWL(); - /* 4C */ virtual ~MapObjectUnkARWL() override; + /* 30 */ virtual ~MapObjectUnkARWL() override; void func_ov070_02146230(void); void func_ov070_02146258(void); diff --git a/include/MapObject/MapObjectUnkBAPL.hpp b/include/MapObject/MapObjectUnkBAPL.hpp index f8b89347..0c982f08 100644 --- a/include/MapObject/MapObjectUnkBAPL.hpp +++ b/include/MapObject/MapObjectUnkBAPL.hpp @@ -10,11 +10,11 @@ class MapObjectUnkBAPL : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkBAPL(); - /* 4C */ virtual ~MapObjectUnkBAPL() override; + /* 30 */ virtual ~MapObjectUnkBAPL() override; void func_ov021_020f49f4(void); void func_ov021_020f4b4c(void); diff --git a/include/MapObject/MapObjectUnkBBFL.hpp b/include/MapObject/MapObjectUnkBBFL.hpp index 2e58f730..c02c882f 100644 --- a/include/MapObject/MapObjectUnkBBFL.hpp +++ b/include/MapObject/MapObjectUnkBBFL.hpp @@ -10,11 +10,11 @@ class MapObjectUnkBBFL : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkBBFL(); - /* 4C */ virtual ~MapObjectUnkBBFL() override; + /* 30 */ virtual ~MapObjectUnkBBFL() override; void func_ov058_0214fff4(void); void func_ov058_021501ec(void); diff --git a/include/MapObject/MapObjectUnkBFFL.hpp b/include/MapObject/MapObjectUnkBFFL.hpp index 1da4fbf3..b1a75ec9 100644 --- a/include/MapObject/MapObjectUnkBFFL.hpp +++ b/include/MapObject/MapObjectUnkBFFL.hpp @@ -10,11 +10,11 @@ class MapObjectUnkBFFL : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkBFFL(); - /* 4C */ virtual ~MapObjectUnkBFFL() override; + /* 30 */ virtual ~MapObjectUnkBFFL() override; void func_ov021_020f5b9c(void); void func_ov021_020f5c08(void); diff --git a/include/MapObject/MapObjectUnkBFSP.hpp b/include/MapObject/MapObjectUnkBFSP.hpp index 574f2cd9..6d0e0050 100644 --- a/include/MapObject/MapObjectUnkBFSP.hpp +++ b/include/MapObject/MapObjectUnkBFSP.hpp @@ -10,11 +10,11 @@ class MapObjectUnkBFSP : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkBFSP(); - /* 4C */ virtual ~MapObjectUnkBFSP() override; + /* 30 */ virtual ~MapObjectUnkBFSP() override; void func_ov021_020f6308(void); void func_ov021_020f6334(void); diff --git a/include/MapObject/MapObjectUnkBLCC.hpp b/include/MapObject/MapObjectUnkBLCC.hpp index 22e8f3dd..3cb3b1b5 100644 --- a/include/MapObject/MapObjectUnkBLCC.hpp +++ b/include/MapObject/MapObjectUnkBLCC.hpp @@ -10,11 +10,11 @@ class MapObjectUnkBLCC : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkBLCC(); - /* 4C */ virtual ~MapObjectUnkBLCC() override; + /* 30 */ virtual ~MapObjectUnkBLCC() override; void func_ov031_02109ac4(void); void func_ov031_02109b94(void); diff --git a/include/MapObject/MapObjectUnkBLCE.hpp b/include/MapObject/MapObjectUnkBLCE.hpp index d0f86c1b..a6c42418 100644 --- a/include/MapObject/MapObjectUnkBLCE.hpp +++ b/include/MapObject/MapObjectUnkBLCE.hpp @@ -10,11 +10,11 @@ class MapObjectUnkBLCE : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkBLCE(); - /* 4C */ virtual ~MapObjectUnkBLCE() override; + /* 30 */ virtual ~MapObjectUnkBLCE() override; void func_ov071_02161a40(void); }; diff --git a/include/MapObject/MapObjectUnkBLCK.hpp b/include/MapObject/MapObjectUnkBLCK.hpp index ba0fad4d..1105682f 100644 --- a/include/MapObject/MapObjectUnkBLCK.hpp +++ b/include/MapObject/MapObjectUnkBLCK.hpp @@ -10,11 +10,11 @@ class MapObjectUnkBLCK : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkBLCK(); - /* 4C */ virtual ~MapObjectUnkBLCK() override; + /* 30 */ virtual ~MapObjectUnkBLCK() override; void func_ov070_021440ac(void); void func_ov070_02144174(void); diff --git a/include/MapObject/MapObjectUnkBLCM.hpp b/include/MapObject/MapObjectUnkBLCM.hpp index 3a7451d2..755e949d 100644 --- a/include/MapObject/MapObjectUnkBLCM.hpp +++ b/include/MapObject/MapObjectUnkBLCM.hpp @@ -10,11 +10,11 @@ class MapObjectUnkBLCM : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkBLCM(); - /* 4C */ virtual ~MapObjectUnkBLCM() override; + /* 30 */ virtual ~MapObjectUnkBLCM() override; void func_ov000_0209e4b0(void); void func_ov000_0209e6ac(void); diff --git a/include/MapObject/MapObjectUnkBLCT.hpp b/include/MapObject/MapObjectUnkBLCT.hpp index 23587980..d11a2149 100644 --- a/include/MapObject/MapObjectUnkBLCT.hpp +++ b/include/MapObject/MapObjectUnkBLCT.hpp @@ -10,11 +10,11 @@ class MapObjectUnkBLCT : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkBLCT(); - /* 4C */ virtual ~MapObjectUnkBLCT() override; + /* 30 */ virtual ~MapObjectUnkBLCT() override; void func_ov071_021630e8(void); void func_ov071_0216322c(void); diff --git a/include/MapObject/MapObjectUnkBLHL.hpp b/include/MapObject/MapObjectUnkBLHL.hpp index 677a5174..409c86c8 100644 --- a/include/MapObject/MapObjectUnkBLHL.hpp +++ b/include/MapObject/MapObjectUnkBLHL.hpp @@ -10,11 +10,11 @@ class MapObjectUnkBLHL : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkBLHL(); - /* 4C */ virtual ~MapObjectUnkBLHL() override; + /* 30 */ virtual ~MapObjectUnkBLHL() override; void func_ov079_0215673c(void); void func_ov079_02156780(void); diff --git a/include/MapObject/MapObjectUnkBLRB.hpp b/include/MapObject/MapObjectUnkBLRB.hpp index 54ade8b5..0c926098 100644 --- a/include/MapObject/MapObjectUnkBLRB.hpp +++ b/include/MapObject/MapObjectUnkBLRB.hpp @@ -10,11 +10,11 @@ class MapObjectUnkBLRB : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkBLRB(); - /* 4C */ virtual ~MapObjectUnkBLRB() override; + /* 30 */ virtual ~MapObjectUnkBLRB() override; void func_ov070_021454b8(void); void func_ov070_021454cc(void); diff --git a/include/MapObject/MapObjectUnkBLSR.hpp b/include/MapObject/MapObjectUnkBLSR.hpp index 736080ea..b3b585b0 100644 --- a/include/MapObject/MapObjectUnkBLSR.hpp +++ b/include/MapObject/MapObjectUnkBLSR.hpp @@ -10,11 +10,11 @@ class MapObjectUnkBLSR : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkBLSR(); - /* 4C */ virtual ~MapObjectUnkBLSR() override; + /* 30 */ virtual ~MapObjectUnkBLSR() override; void func_ov038_0211e548(void); void func_ov038_0211e6a0(void); diff --git a/include/MapObject/MapObjectUnkBMFL.hpp b/include/MapObject/MapObjectUnkBMFL.hpp index e7514ee0..d752c387 100644 --- a/include/MapObject/MapObjectUnkBMFL.hpp +++ b/include/MapObject/MapObjectUnkBMFL.hpp @@ -10,11 +10,11 @@ class MapObjectUnkBMFL : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkBMFL(); - /* 4C */ virtual ~MapObjectUnkBMFL() override; + /* 30 */ virtual ~MapObjectUnkBMFL() override; void func_ov031_021025c4(void); void func_ov031_02102708(void); diff --git a/include/MapObject/MapObjectUnkBOGN.hpp b/include/MapObject/MapObjectUnkBOGN.hpp index 5df7a48d..29639f2a 100644 --- a/include/MapObject/MapObjectUnkBOGN.hpp +++ b/include/MapObject/MapObjectUnkBOGN.hpp @@ -10,11 +10,11 @@ class MapObjectUnkBOGN : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkBOGN(); - /* 4C */ virtual ~MapObjectUnkBOGN() override; + /* 30 */ virtual ~MapObjectUnkBOGN() override; void func_ov091_021688e0(void); void func_ov091_02168910(void); diff --git a/include/MapObject/MapObjectUnkBREX.hpp b/include/MapObject/MapObjectUnkBREX.hpp index ac73d492..8602a5fc 100644 --- a/include/MapObject/MapObjectUnkBREX.hpp +++ b/include/MapObject/MapObjectUnkBREX.hpp @@ -10,11 +10,11 @@ class MapObjectUnkBREX : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkBREX(); - /* 4C */ virtual ~MapObjectUnkBREX() override; + /* 30 */ virtual ~MapObjectUnkBREX() override; void func_ov031_021076b8(void); void func_ov031_02107b04(void); diff --git a/include/MapObject/MapObjectUnkBRGL.hpp b/include/MapObject/MapObjectUnkBRGL.hpp index 1e17c7db..c20f86d6 100644 --- a/include/MapObject/MapObjectUnkBRGL.hpp +++ b/include/MapObject/MapObjectUnkBRGL.hpp @@ -10,11 +10,11 @@ class MapObjectUnkBRGL : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkBRGL(); - /* 4C */ virtual ~MapObjectUnkBRGL() override; + /* 30 */ virtual ~MapObjectUnkBRGL() override; void func_ov067_0215b180(void); void func_ov067_0215b268(void); diff --git a/include/MapObject/MapObjectUnkBRGS.hpp b/include/MapObject/MapObjectUnkBRGS.hpp index d3045afe..69501b85 100644 --- a/include/MapObject/MapObjectUnkBRGS.hpp +++ b/include/MapObject/MapObjectUnkBRGS.hpp @@ -10,11 +10,11 @@ class MapObjectUnkBRGS : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkBRGS(); - /* 4C */ virtual ~MapObjectUnkBRGS() override; + /* 30 */ virtual ~MapObjectUnkBRGS() override; void func_ov071_021621a4(void); void func_ov071_02162480(void); diff --git a/include/MapObject/MapObjectUnkBRGW.hpp b/include/MapObject/MapObjectUnkBRGW.hpp index a33ce2f9..6baee382 100644 --- a/include/MapObject/MapObjectUnkBRGW.hpp +++ b/include/MapObject/MapObjectUnkBRGW.hpp @@ -10,11 +10,11 @@ class MapObjectUnkBRGW : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkBRGW(); - /* 4C */ virtual ~MapObjectUnkBRGW() override; + /* 30 */ virtual ~MapObjectUnkBRGW() override; void func_ov094_02174a04(void); void func_ov094_02174c88(void); diff --git a/include/MapObject/MapObjectUnkCLMN.hpp b/include/MapObject/MapObjectUnkCLMN.hpp index 5f7c0108..d4d6e50f 100644 --- a/include/MapObject/MapObjectUnkCLMN.hpp +++ b/include/MapObject/MapObjectUnkCLMN.hpp @@ -10,11 +10,11 @@ class MapObjectUnkCLMN : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkCLMN(); - /* 4C */ virtual ~MapObjectUnkCLMN() override; + /* 30 */ virtual ~MapObjectUnkCLMN() override; void func_ov094_0217195c(void); }; diff --git a/include/MapObject/MapObjectUnkCRWL.hpp b/include/MapObject/MapObjectUnkCRWL.hpp index b70ce5f0..546e9415 100644 --- a/include/MapObject/MapObjectUnkCRWL.hpp +++ b/include/MapObject/MapObjectUnkCRWL.hpp @@ -10,11 +10,11 @@ class MapObjectUnkCRWL : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkCRWL(); - /* 4C */ virtual ~MapObjectUnkCRWL() override; + /* 30 */ virtual ~MapObjectUnkCRWL() override; void func_ov031_02106ff4(void); void func_ov031_02107198(void); diff --git a/include/MapObject/MapObjectUnkCSTL.hpp b/include/MapObject/MapObjectUnkCSTL.hpp index f72a59cd..e3f7f590 100644 --- a/include/MapObject/MapObjectUnkCSTL.hpp +++ b/include/MapObject/MapObjectUnkCSTL.hpp @@ -10,11 +10,11 @@ class MapObjectUnkCSTL : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkCSTL(); - /* 4C */ virtual ~MapObjectUnkCSTL() override; + /* 30 */ virtual ~MapObjectUnkCSTL() override; void func_ov027_02143c70(void); void func_ov027_02143d5c(void); diff --git a/include/MapObject/MapObjectUnkCTPT.hpp b/include/MapObject/MapObjectUnkCTPT.hpp index 1c2aca88..2d21472e 100644 --- a/include/MapObject/MapObjectUnkCTPT.hpp +++ b/include/MapObject/MapObjectUnkCTPT.hpp @@ -10,11 +10,11 @@ class MapObjectUnkCTPT : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkCTPT(); - /* 4C */ virtual ~MapObjectUnkCTPT() override; + /* 30 */ virtual ~MapObjectUnkCTPT() override; void func_ov085_02153388(void); void func_ov085_0215339c(void); diff --git a/include/MapObject/MapObjectUnkDFNC.hpp b/include/MapObject/MapObjectUnkDFNC.hpp index 91e8a222..e8a0af3d 100644 --- a/include/MapObject/MapObjectUnkDFNC.hpp +++ b/include/MapObject/MapObjectUnkDFNC.hpp @@ -10,11 +10,11 @@ class MapObjectUnkDFNC : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkDFNC(); - /* 4C */ virtual ~MapObjectUnkDFNC() override; + /* 30 */ virtual ~MapObjectUnkDFNC() override; void func_ov060_02160664(void); void func_ov060_021606b4(void); diff --git a/include/MapObject/MapObjectUnkDOPA.hpp b/include/MapObject/MapObjectUnkDOPA.hpp index 3954b36e..d058ffc5 100644 --- a/include/MapObject/MapObjectUnkDOPA.hpp +++ b/include/MapObject/MapObjectUnkDOPA.hpp @@ -10,11 +10,11 @@ class MapObjectUnkDOPA : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkDOPA(); - /* 4C */ virtual ~MapObjectUnkDOPA() override; + /* 30 */ virtual ~MapObjectUnkDOPA() override; void func_ov033_02119e7c(void); void func_ov033_02119ee0(void); diff --git a/include/MapObject/MapObjectUnkDRBK.hpp b/include/MapObject/MapObjectUnkDRBK.hpp index 2539068c..53967c67 100644 --- a/include/MapObject/MapObjectUnkDRBK.hpp +++ b/include/MapObject/MapObjectUnkDRBK.hpp @@ -10,11 +10,11 @@ class MapObjectUnkDRBK : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkDRBK(); - /* 4C */ virtual ~MapObjectUnkDRBK() override; + /* 30 */ virtual ~MapObjectUnkDRBK() override; void func_ov041_0212ba90(void); void func_ov041_0212bac8(void); diff --git a/include/MapObject/MapObjectUnkDRBR.hpp b/include/MapObject/MapObjectUnkDRBR.hpp index 513018c5..46d7d5c7 100644 --- a/include/MapObject/MapObjectUnkDRBR.hpp +++ b/include/MapObject/MapObjectUnkDRBR.hpp @@ -10,11 +10,11 @@ class MapObjectUnkDRBR : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkDRBR(); - /* 4C */ virtual ~MapObjectUnkDRBR() override; + /* 30 */ virtual ~MapObjectUnkDRBR() override; void func_ov086_0215e1bc(void); }; diff --git a/include/MapObject/MapObjectUnkDRCK.hpp b/include/MapObject/MapObjectUnkDRCK.hpp index 0ba3d2c9..bce04e80 100644 --- a/include/MapObject/MapObjectUnkDRCK.hpp +++ b/include/MapObject/MapObjectUnkDRCK.hpp @@ -10,11 +10,11 @@ class MapObjectUnkDRCK : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkDRCK(); - /* 4C */ virtual ~MapObjectUnkDRCK() override; + /* 30 */ virtual ~MapObjectUnkDRCK() override; void func_ov031_020ff598(void); void func_ov031_020ff6a8(void); diff --git a/include/MapObject/MapObjectUnkDRDS.hpp b/include/MapObject/MapObjectUnkDRDS.hpp index 31e9652c..dbcc7ae3 100644 --- a/include/MapObject/MapObjectUnkDRDS.hpp +++ b/include/MapObject/MapObjectUnkDRDS.hpp @@ -10,11 +10,11 @@ class MapObjectUnkDRDS : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkDRDS(); - /* 4C */ virtual ~MapObjectUnkDRDS() override; + /* 30 */ virtual ~MapObjectUnkDRDS() override; void func_ov031_020fd234(void); void func_ov031_020fd284(void); diff --git a/include/MapObject/MapObjectUnkDRGN.hpp b/include/MapObject/MapObjectUnkDRGN.hpp index a913a9ca..76d57082 100644 --- a/include/MapObject/MapObjectUnkDRGN.hpp +++ b/include/MapObject/MapObjectUnkDRGN.hpp @@ -10,11 +10,11 @@ class MapObjectUnkDRGN : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkDRGN(); - /* 4C */ virtual ~MapObjectUnkDRGN() override; + /* 30 */ virtual ~MapObjectUnkDRGN() override; void func_ov067_0215bb08(void); void func_ov067_0215bce0(void); diff --git a/include/MapObject/MapObjectUnkDRHS.hpp b/include/MapObject/MapObjectUnkDRHS.hpp index 5c875e49..536f5e43 100644 --- a/include/MapObject/MapObjectUnkDRHS.hpp +++ b/include/MapObject/MapObjectUnkDRHS.hpp @@ -10,11 +10,11 @@ class MapObjectUnkDRHS : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkDRHS(); - /* 4C */ virtual ~MapObjectUnkDRHS() override; + /* 30 */ virtual ~MapObjectUnkDRHS() override; void func_ov058_0214f964(void); void func_ov058_0214f9f4(void); diff --git a/include/MapObject/MapObjectUnkDRKY.hpp b/include/MapObject/MapObjectUnkDRKY.hpp index 9476806a..f31ed079 100644 --- a/include/MapObject/MapObjectUnkDRKY.hpp +++ b/include/MapObject/MapObjectUnkDRKY.hpp @@ -10,11 +10,11 @@ class MapObjectUnkDRKY : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkDRKY(); - /* 4C */ virtual ~MapObjectUnkDRKY() override; + /* 30 */ virtual ~MapObjectUnkDRKY() override; void func_ov031_020fe86c(void); void func_ov031_020fe888(void); diff --git a/include/MapObject/MapObjectUnkDRMC.hpp b/include/MapObject/MapObjectUnkDRMC.hpp index e38c3dd3..46b8e917 100644 --- a/include/MapObject/MapObjectUnkDRMC.hpp +++ b/include/MapObject/MapObjectUnkDRMC.hpp @@ -10,11 +10,11 @@ class MapObjectUnkDRMC : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkDRMC(); - /* 4C */ virtual ~MapObjectUnkDRMC() override; + /* 30 */ virtual ~MapObjectUnkDRMC() override; void func_ov041_0212d050(void); void func_ov041_0212d074(void); diff --git a/include/MapObject/MapObjectUnkDRRS.hpp b/include/MapObject/MapObjectUnkDRRS.hpp index 76dec0a9..742ccf6f 100644 --- a/include/MapObject/MapObjectUnkDRRS.hpp +++ b/include/MapObject/MapObjectUnkDRRS.hpp @@ -10,11 +10,11 @@ class MapObjectUnkDRRS : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkDRRS(); - /* 4C */ virtual ~MapObjectUnkDRRS() override; + /* 30 */ virtual ~MapObjectUnkDRRS() override; void func_ov086_0215e778(void); void func_ov086_0215e78c(void); diff --git a/include/MapObject/MapObjectUnkDRSN.hpp b/include/MapObject/MapObjectUnkDRSN.hpp index 9ae66bf5..184b3069 100644 --- a/include/MapObject/MapObjectUnkDRSN.hpp +++ b/include/MapObject/MapObjectUnkDRSN.hpp @@ -10,11 +10,11 @@ class MapObjectUnkDRSN : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkDRSN(); - /* 4C */ virtual ~MapObjectUnkDRSN() override; + /* 30 */ virtual ~MapObjectUnkDRSN() override; void func_ov079_021569b4(void); void func_ov079_02156a90(void); diff --git a/include/MapObject/MapObjectUnkDRST.hpp b/include/MapObject/MapObjectUnkDRST.hpp index 5b1f2719..f63f35c2 100644 --- a/include/MapObject/MapObjectUnkDRST.hpp +++ b/include/MapObject/MapObjectUnkDRST.hpp @@ -10,11 +10,11 @@ class MapObjectUnkDRST : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkDRST(); - /* 4C */ virtual ~MapObjectUnkDRST() override; + /* 30 */ virtual ~MapObjectUnkDRST() override; void func_ov070_02148cf0(void); void func_ov070_02148d0c(void); diff --git a/include/MapObject/MapObjectUnkDRSW.hpp b/include/MapObject/MapObjectUnkDRSW.hpp index b8778b0b..ff7f9c4e 100644 --- a/include/MapObject/MapObjectUnkDRSW.hpp +++ b/include/MapObject/MapObjectUnkDRSW.hpp @@ -10,11 +10,11 @@ class MapObjectUnkDRSW : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkDRSW(); - /* 4C */ virtual ~MapObjectUnkDRSW() override; + /* 30 */ virtual ~MapObjectUnkDRSW() override; void func_ov031_020feee4(void); void func_ov031_020fefac(void); diff --git a/include/MapObject/MapObjectUnkDRTC.hpp b/include/MapObject/MapObjectUnkDRTC.hpp index c5ab98e0..c8e08662 100644 --- a/include/MapObject/MapObjectUnkDRTC.hpp +++ b/include/MapObject/MapObjectUnkDRTC.hpp @@ -10,11 +10,11 @@ class MapObjectUnkDRTC : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkDRTC(); - /* 4C */ virtual ~MapObjectUnkDRTC() override; + /* 30 */ virtual ~MapObjectUnkDRTC() override; void func_ov031_021002fc(void); void func_ov031_02100314(void); diff --git a/include/MapObject/MapObjectUnkDRTK.hpp b/include/MapObject/MapObjectUnkDRTK.hpp index 685a3545..974852ca 100644 --- a/include/MapObject/MapObjectUnkDRTK.hpp +++ b/include/MapObject/MapObjectUnkDRTK.hpp @@ -10,11 +10,11 @@ class MapObjectUnkDRTK : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkDRTK(); - /* 4C */ virtual ~MapObjectUnkDRTK() override; + /* 30 */ virtual ~MapObjectUnkDRTK() override; void func_ov041_0212c96c(void); void func_ov041_0212c9e0(void); diff --git a/include/MapObject/MapObjectUnkDRTW.hpp b/include/MapObject/MapObjectUnkDRTW.hpp index ae2fc149..22d46bce 100644 --- a/include/MapObject/MapObjectUnkDRTW.hpp +++ b/include/MapObject/MapObjectUnkDRTW.hpp @@ -10,11 +10,11 @@ class MapObjectUnkDRTW : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkDRTW(); - /* 4C */ virtual ~MapObjectUnkDRTW() override; + /* 30 */ virtual ~MapObjectUnkDRTW() override; void func_ov048_02133dc4(void); void func_ov048_02133e94(void); diff --git a/include/MapObject/MapObjectUnkDRTY.hpp b/include/MapObject/MapObjectUnkDRTY.hpp index 6d211b4a..66925460 100644 --- a/include/MapObject/MapObjectUnkDRTY.hpp +++ b/include/MapObject/MapObjectUnkDRTY.hpp @@ -4,17 +4,21 @@ #include "MapObject/MapObject.hpp" #include "MapObject/MapObjectProfile.hpp" +#include "MapObject/MapObjectUnkWPHL.hpp" #include "global.h" #include "types.h" -class MapObjectUnkDRTY : public MapObject { +class MapObjectUnkDRTY : public MapObjectUnkWPHL { //! TODO: fake? public: /* 00 (base) */ - /* 94 */ + /* 8C */ STRUCT_PAD(0x8C, 0xCC); + /* CC */ unk32 mUnk_CC; + /* D0 */ STRUCT_PAD(0xD0, 0xF4); + /* F4 */ MapObjectUnkDRTY(); - /* 4C */ virtual ~MapObjectUnkDRTY() override; + /* 30 */ virtual ~MapObjectUnkDRTY() override; void func_ov061_02159660(void); void func_ov061_0215978c(void); diff --git a/include/MapObject/MapObjectUnkDRVC.hpp b/include/MapObject/MapObjectUnkDRVC.hpp index 8a14c3d3..0f7b7b68 100644 --- a/include/MapObject/MapObjectUnkDRVC.hpp +++ b/include/MapObject/MapObjectUnkDRVC.hpp @@ -10,11 +10,11 @@ class MapObjectUnkDRVC : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkDRVC(); - /* 4C */ virtual ~MapObjectUnkDRVC() override; + /* 30 */ virtual ~MapObjectUnkDRVC() override; void func_ov068_02160be8(void); void func_ov068_02160c64(void); diff --git a/include/MapObject/MapObjectUnkDRVT.hpp b/include/MapObject/MapObjectUnkDRVT.hpp index 1035566d..4c685964 100644 --- a/include/MapObject/MapObjectUnkDRVT.hpp +++ b/include/MapObject/MapObjectUnkDRVT.hpp @@ -10,11 +10,11 @@ class MapObjectUnkDRVT : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkDRVT(); - /* 4C */ virtual ~MapObjectUnkDRVT() override; + /* 30 */ virtual ~MapObjectUnkDRVT() override; void func_ov067_0215c27c(void); void func_ov067_0215c318(void); diff --git a/include/MapObject/MapObjectUnkEBRD.hpp b/include/MapObject/MapObjectUnkEBRD.hpp index 27ed4c45..7ee1ae73 100644 --- a/include/MapObject/MapObjectUnkEBRD.hpp +++ b/include/MapObject/MapObjectUnkEBRD.hpp @@ -10,11 +10,11 @@ class MapObjectUnkEBRD : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkEBRD(); - /* 4C */ virtual ~MapObjectUnkEBRD() override; + /* 30 */ virtual ~MapObjectUnkEBRD() override; void func_ov026_0210aa20(void); void func_ov026_0210ab3c(void); diff --git a/include/MapObject/MapObjectUnkEFRF.hpp b/include/MapObject/MapObjectUnkEFRF.hpp index d619a878..138f92b9 100644 --- a/include/MapObject/MapObjectUnkEFRF.hpp +++ b/include/MapObject/MapObjectUnkEFRF.hpp @@ -10,11 +10,11 @@ class MapObjectUnkEFRF : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkEFRF(); - /* 4C */ virtual ~MapObjectUnkEFRF() override; + /* 30 */ virtual ~MapObjectUnkEFRF() override; void func_ov028_02145b2c(void); void func_ov028_02145b7c(void); diff --git a/include/MapObject/MapObjectUnkEFRS.hpp b/include/MapObject/MapObjectUnkEFRS.hpp index 7a38f0b4..dc367cbd 100644 --- a/include/MapObject/MapObjectUnkEFRS.hpp +++ b/include/MapObject/MapObjectUnkEFRS.hpp @@ -10,11 +10,11 @@ class MapObjectUnkEFRS : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkEFRS(); - /* 4C */ virtual ~MapObjectUnkEFRS() override; + /* 30 */ virtual ~MapObjectUnkEFRS() override; void func_ov026_0210e944(void); void func_ov026_0210e9bc(void); diff --git a/include/MapObject/MapObjectUnkETDD.hpp b/include/MapObject/MapObjectUnkETDD.hpp index fdfad91f..1e1d287c 100644 --- a/include/MapObject/MapObjectUnkETDD.hpp +++ b/include/MapObject/MapObjectUnkETDD.hpp @@ -10,11 +10,11 @@ class MapObjectUnkETDD : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkETDD(); - /* 4C */ virtual ~MapObjectUnkETDD() override; + /* 30 */ virtual ~MapObjectUnkETDD() override; void func_ov092_02168130(void); void func_ov092_021681bc(void); diff --git a/include/MapObject/MapObjectUnkETDK.hpp b/include/MapObject/MapObjectUnkETDK.hpp index 5803850f..3a23aedb 100644 --- a/include/MapObject/MapObjectUnkETDK.hpp +++ b/include/MapObject/MapObjectUnkETDK.hpp @@ -10,11 +10,11 @@ class MapObjectUnkETDK : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkETDK(); - /* 4C */ virtual ~MapObjectUnkETDK() override; + /* 30 */ virtual ~MapObjectUnkETDK() override; void func_ov027_021430dc(void); void func_ov027_021432cc(void); diff --git a/include/MapObject/MapObjectUnkETET.hpp b/include/MapObject/MapObjectUnkETET.hpp index 6877187c..e04a28b7 100644 --- a/include/MapObject/MapObjectUnkETET.hpp +++ b/include/MapObject/MapObjectUnkETET.hpp @@ -10,11 +10,11 @@ class MapObjectUnkETET : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkETET(); - /* 4C */ virtual ~MapObjectUnkETET() override; + /* 30 */ virtual ~MapObjectUnkETET() override; void func_ov092_02166b7c(void); void func_ov092_02166cd8(void); diff --git a/include/MapObject/MapObjectUnkETFD.hpp b/include/MapObject/MapObjectUnkETFD.hpp index 07d2e4f2..e6b770ce 100644 --- a/include/MapObject/MapObjectUnkETFD.hpp +++ b/include/MapObject/MapObjectUnkETFD.hpp @@ -10,11 +10,11 @@ class MapObjectUnkETFD : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkETFD(); - /* 4C */ virtual ~MapObjectUnkETFD() override; + /* 30 */ virtual ~MapObjectUnkETFD() override; void func_ov092_02166f5c(void); void func_ov092_02166ffc(void); diff --git a/include/MapObject/MapObjectUnkETMW.hpp b/include/MapObject/MapObjectUnkETMW.hpp index 5d4ce2f5..9e71151a 100644 --- a/include/MapObject/MapObjectUnkETMW.hpp +++ b/include/MapObject/MapObjectUnkETMW.hpp @@ -10,11 +10,11 @@ class MapObjectUnkETMW : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkETMW(); - /* 4C */ virtual ~MapObjectUnkETMW() override; + /* 30 */ virtual ~MapObjectUnkETMW() override; void func_ov092_021673e4(void); void func_ov092_021674a8(void); diff --git a/include/MapObject/MapObjectUnkETNL.hpp b/include/MapObject/MapObjectUnkETNL.hpp index 29317657..36f71a54 100644 --- a/include/MapObject/MapObjectUnkETNL.hpp +++ b/include/MapObject/MapObjectUnkETNL.hpp @@ -10,11 +10,11 @@ class MapObjectUnkETNL : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkETNL(); - /* 4C */ virtual ~MapObjectUnkETNL() override; + /* 30 */ virtual ~MapObjectUnkETNL() override; void func_ov026_0210ac24(void); void func_ov026_0210ac7c(void); diff --git a/include/MapObject/MapObjectUnkETNM.hpp b/include/MapObject/MapObjectUnkETNM.hpp index 73ae1664..2fa75ba8 100644 --- a/include/MapObject/MapObjectUnkETNM.hpp +++ b/include/MapObject/MapObjectUnkETNM.hpp @@ -10,11 +10,11 @@ class MapObjectUnkETNM : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkETNM(); - /* 4C */ virtual ~MapObjectUnkETNM() override; + /* 30 */ virtual ~MapObjectUnkETNM() override; void func_ov090_021752cc(void); }; diff --git a/include/MapObject/MapObjectUnkETNS.hpp b/include/MapObject/MapObjectUnkETNS.hpp index 77ae58db..fc02251b 100644 --- a/include/MapObject/MapObjectUnkETNS.hpp +++ b/include/MapObject/MapObjectUnkETNS.hpp @@ -10,11 +10,11 @@ class MapObjectUnkETNS : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkETNS(); - /* 4C */ virtual ~MapObjectUnkETNS() override; + /* 30 */ virtual ~MapObjectUnkETNS() override; void func_ov028_0214568c(void); }; diff --git a/include/MapObject/MapObjectUnkETSD.hpp b/include/MapObject/MapObjectUnkETSD.hpp index 787c5bf0..f646e765 100644 --- a/include/MapObject/MapObjectUnkETSD.hpp +++ b/include/MapObject/MapObjectUnkETSD.hpp @@ -10,11 +10,11 @@ class MapObjectUnkETSD : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkETSD(); - /* 4C */ virtual ~MapObjectUnkETSD() override; + /* 30 */ virtual ~MapObjectUnkETSD() override; void func_ov026_0210edcc(void); void func_ov026_0210f02c(void); diff --git a/include/MapObject/MapObjectUnkETSW.hpp b/include/MapObject/MapObjectUnkETSW.hpp index c0069708..66fe35df 100644 --- a/include/MapObject/MapObjectUnkETSW.hpp +++ b/include/MapObject/MapObjectUnkETSW.hpp @@ -10,11 +10,11 @@ class MapObjectUnkETSW : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkETSW(); - /* 4C */ virtual ~MapObjectUnkETSW() override; + /* 30 */ virtual ~MapObjectUnkETSW() override; void func_ov028_021457e0(void); void func_ov028_02145958(void); diff --git a/include/MapObject/MapObjectUnkETTV.hpp b/include/MapObject/MapObjectUnkETTV.hpp index 71752534..9bbd67a0 100644 --- a/include/MapObject/MapObjectUnkETTV.hpp +++ b/include/MapObject/MapObjectUnkETTV.hpp @@ -10,11 +10,11 @@ class MapObjectUnkETTV : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkETTV(); - /* 4C */ virtual ~MapObjectUnkETTV() override; + /* 30 */ virtual ~MapObjectUnkETTV() override; void func_ov030_02141f54(void); void func_ov030_02141f68(void); diff --git a/include/MapObject/MapObjectUnkETUS.hpp b/include/MapObject/MapObjectUnkETUS.hpp index 334d9ab4..621982e1 100644 --- a/include/MapObject/MapObjectUnkETUS.hpp +++ b/include/MapObject/MapObjectUnkETUS.hpp @@ -10,11 +10,11 @@ class MapObjectUnkETUS : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkETUS(); - /* 4C */ virtual ~MapObjectUnkETUS() override; + /* 30 */ virtual ~MapObjectUnkETUS() override; void func_ov091_021686a4(void); void func_ov091_0216872c(void); diff --git a/include/MapObject/MapObjectUnkETYG.hpp b/include/MapObject/MapObjectUnkETYG.hpp index 101546aa..ebbe0080 100644 --- a/include/MapObject/MapObjectUnkETYG.hpp +++ b/include/MapObject/MapObjectUnkETYG.hpp @@ -10,11 +10,11 @@ class MapObjectUnkETYG : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkETYG(); - /* 4C */ virtual ~MapObjectUnkETYG() override; + /* 30 */ virtual ~MapObjectUnkETYG() override; void func_ov092_021676e8(void); void func_ov092_021677e4(void); diff --git a/include/MapObject/MapObjectUnkEXCT.hpp b/include/MapObject/MapObjectUnkEXCT.hpp index 56cc98b0..3e9cde6e 100644 --- a/include/MapObject/MapObjectUnkEXCT.hpp +++ b/include/MapObject/MapObjectUnkEXCT.hpp @@ -10,11 +10,11 @@ class MapObjectUnkEXCT : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkEXCT(); - /* 4C */ virtual ~MapObjectUnkEXCT() override; + /* 30 */ virtual ~MapObjectUnkEXCT() override; void func_ov060_02160a84(void); }; diff --git a/include/MapObject/MapObjectUnkEXHS.hpp b/include/MapObject/MapObjectUnkEXHS.hpp index 7f5000c9..7846a846 100644 --- a/include/MapObject/MapObjectUnkEXHS.hpp +++ b/include/MapObject/MapObjectUnkEXHS.hpp @@ -10,11 +10,11 @@ class MapObjectUnkEXHS : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkEXHS(); - /* 4C */ virtual ~MapObjectUnkEXHS() override; + /* 30 */ virtual ~MapObjectUnkEXHS() override; void func_ov058_0214fdc0(void); }; diff --git a/include/MapObject/MapObjectUnkEXIT.hpp b/include/MapObject/MapObjectUnkEXIT.hpp index cb5ab347..edb7cea1 100644 --- a/include/MapObject/MapObjectUnkEXIT.hpp +++ b/include/MapObject/MapObjectUnkEXIT.hpp @@ -10,11 +10,11 @@ class MapObjectUnkEXIT : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkEXIT(); - /* 4C */ virtual ~MapObjectUnkEXIT() override; + /* 30 */ virtual ~MapObjectUnkEXIT() override; void func_ov031_021005fc(void); void func_ov031_021006d4(void); diff --git a/include/MapObject/MapObjectUnkEXTR.hpp b/include/MapObject/MapObjectUnkEXTR.hpp index 2c269c85..cac43c7b 100644 --- a/include/MapObject/MapObjectUnkEXTR.hpp +++ b/include/MapObject/MapObjectUnkEXTR.hpp @@ -10,11 +10,11 @@ class MapObjectUnkEXTR : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkEXTR(); - /* 4C */ virtual ~MapObjectUnkEXTR() override; + /* 30 */ virtual ~MapObjectUnkEXTR() override; void func_ov059_02162d44(void); }; diff --git a/include/MapObject/MapObjectUnkFLSP.hpp b/include/MapObject/MapObjectUnkFLSP.hpp index cdc45c81..ee42d4ab 100644 --- a/include/MapObject/MapObjectUnkFLSP.hpp +++ b/include/MapObject/MapObjectUnkFLSP.hpp @@ -10,11 +10,11 @@ class MapObjectUnkFLSP : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkFLSP(); - /* 4C */ virtual ~MapObjectUnkFLSP() override; + /* 30 */ virtual ~MapObjectUnkFLSP() override; void func_ov070_021442f4(void); void func_ov070_0214433c(void); diff --git a/include/MapObject/MapObjectUnkFNCE.hpp b/include/MapObject/MapObjectUnkFNCE.hpp index 449567a1..c22b04a6 100644 --- a/include/MapObject/MapObjectUnkFNCE.hpp +++ b/include/MapObject/MapObjectUnkFNCE.hpp @@ -10,11 +10,11 @@ class MapObjectUnkFNCE : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkFNCE(); - /* 4C */ virtual ~MapObjectUnkFNCE() override; + /* 30 */ virtual ~MapObjectUnkFNCE() override; void func_ov094_02170b14(void); void func_ov094_02170b58(void); diff --git a/include/MapObject/MapObjectUnkFRAI.hpp b/include/MapObject/MapObjectUnkFRAI.hpp index db4ff855..ace57f0f 100644 --- a/include/MapObject/MapObjectUnkFRAI.hpp +++ b/include/MapObject/MapObjectUnkFRAI.hpp @@ -10,11 +10,11 @@ class MapObjectUnkFRAI : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkFRAI(); - /* 4C */ virtual ~MapObjectUnkFRAI() override; + /* 30 */ virtual ~MapObjectUnkFRAI() override; void func_ov040_0212d81c(void); void func_ov040_0212d9a4(void); diff --git a/include/MapObject/MapObjectUnkFRSH.hpp b/include/MapObject/MapObjectUnkFRSH.hpp index 4e8f34ab..e73f0b8f 100644 --- a/include/MapObject/MapObjectUnkFRSH.hpp +++ b/include/MapObject/MapObjectUnkFRSH.hpp @@ -10,11 +10,11 @@ class MapObjectUnkFRSH : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkFRSH(); - /* 4C */ virtual ~MapObjectUnkFRSH() override; + /* 30 */ virtual ~MapObjectUnkFRSH() override; void func_ov091_02167a90(void); }; diff --git a/include/MapObject/MapObjectUnkFRWL.hpp b/include/MapObject/MapObjectUnkFRWL.hpp index 5d654c3d..5ac27455 100644 --- a/include/MapObject/MapObjectUnkFRWL.hpp +++ b/include/MapObject/MapObjectUnkFRWL.hpp @@ -10,11 +10,11 @@ class MapObjectUnkFRWL : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkFRWL(); - /* 4C */ virtual ~MapObjectUnkFRWL() override; + /* 30 */ virtual ~MapObjectUnkFRWL() override; void func_ov070_02149248(void); void func_ov070_021494a8(void); diff --git a/include/MapObject/MapObjectUnkFSCT.hpp b/include/MapObject/MapObjectUnkFSCT.hpp index 9a5523df..267c387c 100644 --- a/include/MapObject/MapObjectUnkFSCT.hpp +++ b/include/MapObject/MapObjectUnkFSCT.hpp @@ -10,11 +10,11 @@ class MapObjectUnkFSCT : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkFSCT(); - /* 4C */ virtual ~MapObjectUnkFSCT() override; + /* 30 */ virtual ~MapObjectUnkFSCT() override; void func_ov061_021594d0(void); void func_ov061_02159520(void); diff --git a/include/MapObject/MapObjectUnkFSFR.hpp b/include/MapObject/MapObjectUnkFSFR.hpp index d134bd65..ea994e55 100644 --- a/include/MapObject/MapObjectUnkFSFR.hpp +++ b/include/MapObject/MapObjectUnkFSFR.hpp @@ -10,11 +10,11 @@ class MapObjectUnkFSFR : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkFSFR(); - /* 4C */ virtual ~MapObjectUnkFSFR() override; + /* 30 */ virtual ~MapObjectUnkFSFR() override; void func_ov064_021591c4(void); void func_ov064_02159214(void); diff --git a/include/MapObject/MapObjectUnkFSFS.hpp b/include/MapObject/MapObjectUnkFSFS.hpp index fd459fa2..a99bcfdb 100644 --- a/include/MapObject/MapObjectUnkFSFS.hpp +++ b/include/MapObject/MapObjectUnkFSFS.hpp @@ -10,11 +10,11 @@ class MapObjectUnkFSFS : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkFSFS(); - /* 4C */ virtual ~MapObjectUnkFSFS() override; + /* 30 */ virtual ~MapObjectUnkFSFS() override; void func_ov062_0215b458(void); void func_ov062_0215b4a8(void); diff --git a/include/MapObject/MapObjectUnkFSPS.hpp b/include/MapObject/MapObjectUnkFSPS.hpp index 59e8d4d0..61a691e2 100644 --- a/include/MapObject/MapObjectUnkFSPS.hpp +++ b/include/MapObject/MapObjectUnkFSPS.hpp @@ -10,11 +10,11 @@ class MapObjectUnkFSPS : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkFSPS(); - /* 4C */ virtual ~MapObjectUnkFSPS() override; + /* 30 */ virtual ~MapObjectUnkFSPS() override; void func_ov070_02145200(void); void func_ov070_0214520c(void); diff --git a/include/MapObject/MapObjectUnkFSSN.hpp b/include/MapObject/MapObjectUnkFSSN.hpp index b3b552a3..f6412d97 100644 --- a/include/MapObject/MapObjectUnkFSSN.hpp +++ b/include/MapObject/MapObjectUnkFSSN.hpp @@ -10,11 +10,11 @@ class MapObjectUnkFSSN : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkFSSN(); - /* 4C */ virtual ~MapObjectUnkFSSN() override; + /* 30 */ virtual ~MapObjectUnkFSSN() override; void func_ov038_0211ef08(void); void func_ov038_0211ef88(void); diff --git a/include/MapObject/MapObjectUnkFSSV.hpp b/include/MapObject/MapObjectUnkFSSV.hpp index a2767f9c..f0d51e82 100644 --- a/include/MapObject/MapObjectUnkFSSV.hpp +++ b/include/MapObject/MapObjectUnkFSSV.hpp @@ -10,11 +10,11 @@ class MapObjectUnkFSSV : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkFSSV(); - /* 4C */ virtual ~MapObjectUnkFSSV() override; + /* 30 */ virtual ~MapObjectUnkFSSV() override; void func_ov079_0215704c(void); void func_ov079_021570cc(void); diff --git a/include/MapObject/MapObjectUnkFSTA.hpp b/include/MapObject/MapObjectUnkFSTA.hpp index 2530d857..75c29e23 100644 --- a/include/MapObject/MapObjectUnkFSTA.hpp +++ b/include/MapObject/MapObjectUnkFSTA.hpp @@ -10,11 +10,11 @@ class MapObjectUnkFSTA : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkFSTA(); - /* 4C */ virtual ~MapObjectUnkFSTA() override; + /* 30 */ virtual ~MapObjectUnkFSTA() override; void func_ov040_0212d450(void); void func_ov040_0212d64c(void); diff --git a/include/MapObject/MapObjectUnkFSVC.hpp b/include/MapObject/MapObjectUnkFSVC.hpp index 59647f9e..fea1e216 100644 --- a/include/MapObject/MapObjectUnkFSVC.hpp +++ b/include/MapObject/MapObjectUnkFSVC.hpp @@ -10,11 +10,11 @@ class MapObjectUnkFSVC : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkFSVC(); - /* 4C */ virtual ~MapObjectUnkFSVC() override; + /* 30 */ virtual ~MapObjectUnkFSVC() override; void func_ov056_0213aacc(void); void func_ov056_0213ab1c(void); diff --git a/include/MapObject/MapObjectUnkFSWT.hpp b/include/MapObject/MapObjectUnkFSWT.hpp index 408fdcdb..fa4acfc6 100644 --- a/include/MapObject/MapObjectUnkFSWT.hpp +++ b/include/MapObject/MapObjectUnkFSWT.hpp @@ -10,11 +10,11 @@ class MapObjectUnkFSWT : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkFSWT(); - /* 4C */ virtual ~MapObjectUnkFSWT() override; + /* 30 */ virtual ~MapObjectUnkFSWT() override; void func_ov066_0215ca5c(void); void func_ov066_0215caac(void); diff --git a/include/MapObject/MapObjectUnkGATE.hpp b/include/MapObject/MapObjectUnkGATE.hpp index 009b69e3..55e57ced 100644 --- a/include/MapObject/MapObjectUnkGATE.hpp +++ b/include/MapObject/MapObjectUnkGATE.hpp @@ -10,11 +10,11 @@ class MapObjectUnkGATE : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkGATE(); - /* 4C */ virtual ~MapObjectUnkGATE() override; + /* 30 */ virtual ~MapObjectUnkGATE() override; void func_ov031_02100890(void); void func_ov031_02100a28(void); diff --git a/include/MapObject/MapObjectUnkGBDR.hpp b/include/MapObject/MapObjectUnkGBDR.hpp index e782c973..1eac5173 100644 --- a/include/MapObject/MapObjectUnkGBDR.hpp +++ b/include/MapObject/MapObjectUnkGBDR.hpp @@ -10,11 +10,11 @@ class MapObjectUnkGBDR : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkGBDR(); - /* 4C */ virtual ~MapObjectUnkGBDR() override; + /* 30 */ virtual ~MapObjectUnkGBDR() override; void func_ov062_0215be70(void); void func_ov062_0215bfc8(void); diff --git a/include/MapObject/MapObjectUnkGELG.hpp b/include/MapObject/MapObjectUnkGELG.hpp index 9447419c..60853edb 100644 --- a/include/MapObject/MapObjectUnkGELG.hpp +++ b/include/MapObject/MapObjectUnkGELG.hpp @@ -10,11 +10,11 @@ class MapObjectUnkGELG : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkGELG(); - /* 4C */ virtual ~MapObjectUnkGELG() override; + /* 30 */ virtual ~MapObjectUnkGELG() override; void func_ov034_0212200c(void); void func_ov034_0212202c(void); diff --git a/include/MapObject/MapObjectUnkGRSG.hpp b/include/MapObject/MapObjectUnkGRSG.hpp index b2aa89a0..8a651e45 100644 --- a/include/MapObject/MapObjectUnkGRSG.hpp +++ b/include/MapObject/MapObjectUnkGRSG.hpp @@ -10,11 +10,11 @@ class MapObjectUnkGRSG : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkGRSG(); - /* 4C */ virtual ~MapObjectUnkGRSG() override; + /* 30 */ virtual ~MapObjectUnkGRSG() override; void func_ov086_0215e398(void); void func_ov086_0215e534(void); diff --git a/include/MapObject/MapObjectUnkGRSS.hpp b/include/MapObject/MapObjectUnkGRSS.hpp index d2a44864..4a452c10 100644 --- a/include/MapObject/MapObjectUnkGRSS.hpp +++ b/include/MapObject/MapObjectUnkGRSS.hpp @@ -10,11 +10,11 @@ class MapObjectUnkGRSS : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkGRSS(); - /* 4C */ virtual ~MapObjectUnkGRSS() override; + /* 30 */ virtual ~MapObjectUnkGRSS() override; void func_ov031_021010e0(void); void func_ov031_02101170(void); diff --git a/include/MapObject/MapObjectUnkGRSV.hpp b/include/MapObject/MapObjectUnkGRSV.hpp index 48469070..f4da4ae8 100644 --- a/include/MapObject/MapObjectUnkGRSV.hpp +++ b/include/MapObject/MapObjectUnkGRSV.hpp @@ -10,11 +10,11 @@ class MapObjectUnkGRSV : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkGRSV(); - /* 4C */ virtual ~MapObjectUnkGRSV() override; + /* 30 */ virtual ~MapObjectUnkGRSV() override; void func_ov058_02151558(void); void func_ov058_02151874(void); diff --git a/include/MapObject/MapObjectUnkGSST.hpp b/include/MapObject/MapObjectUnkGSST.hpp index aaed5ee9..105ea016 100644 --- a/include/MapObject/MapObjectUnkGSST.hpp +++ b/include/MapObject/MapObjectUnkGSST.hpp @@ -10,11 +10,11 @@ class MapObjectUnkGSST : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkGSST(); - /* 4C */ virtual ~MapObjectUnkGSST() override; + /* 30 */ virtual ~MapObjectUnkGSST() override; void func_ov031_0210bc94(void); void func_ov031_0210bdf8(void); diff --git a/include/MapObject/MapObjectUnkGTAT.hpp b/include/MapObject/MapObjectUnkGTAT.hpp index d5f1626c..579c8bd7 100644 --- a/include/MapObject/MapObjectUnkGTAT.hpp +++ b/include/MapObject/MapObjectUnkGTAT.hpp @@ -10,11 +10,11 @@ class MapObjectUnkGTAT : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkGTAT(); - /* 4C */ virtual ~MapObjectUnkGTAT() override; + /* 30 */ virtual ~MapObjectUnkGTAT() override; void func_ov039_0211c7ac(void); void func_ov039_0211c960(void); diff --git a/include/MapObject/MapObjectUnkGTRB.hpp b/include/MapObject/MapObjectUnkGTRB.hpp index c607e495..4da81084 100644 --- a/include/MapObject/MapObjectUnkGTRB.hpp +++ b/include/MapObject/MapObjectUnkGTRB.hpp @@ -10,11 +10,11 @@ class MapObjectUnkGTRB : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkGTRB(); - /* 4C */ virtual ~MapObjectUnkGTRB() override; + /* 30 */ virtual ~MapObjectUnkGTRB() override; void func_ov069_0215a97c(void); void func_ov069_0215a9cc(void); diff --git a/include/MapObject/MapObjectUnkGTRK.hpp b/include/MapObject/MapObjectUnkGTRK.hpp index 71664103..16c51c9d 100644 --- a/include/MapObject/MapObjectUnkGTRK.hpp +++ b/include/MapObject/MapObjectUnkGTRK.hpp @@ -10,11 +10,11 @@ class MapObjectUnkGTRK : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkGTRK(); - /* 4C */ virtual ~MapObjectUnkGTRK() override; + /* 30 */ virtual ~MapObjectUnkGTRK() override; void func_ov077_0215af58(void); void func_ov077_0215b018(void); diff --git a/include/MapObject/MapObjectUnkGTSN.hpp b/include/MapObject/MapObjectUnkGTSN.hpp index 073da99f..95596788 100644 --- a/include/MapObject/MapObjectUnkGTSN.hpp +++ b/include/MapObject/MapObjectUnkGTSN.hpp @@ -10,11 +10,11 @@ class MapObjectUnkGTSN : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkGTSN(); - /* 4C */ virtual ~MapObjectUnkGTSN() override; + /* 30 */ virtual ~MapObjectUnkGTSN() override; void func_ov079_02156e14(void); void func_ov079_02156f24(void); diff --git a/include/MapObject/MapObjectUnkGTTN.hpp b/include/MapObject/MapObjectUnkGTTN.hpp index f1c39b9f..63f8a22c 100644 --- a/include/MapObject/MapObjectUnkGTTN.hpp +++ b/include/MapObject/MapObjectUnkGTTN.hpp @@ -10,11 +10,11 @@ class MapObjectUnkGTTN : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkGTTN(); - /* 4C */ virtual ~MapObjectUnkGTTN() override; + /* 30 */ virtual ~MapObjectUnkGTTN() override; void func_ov050_021363c4(void); void func_ov050_021363d8(void); diff --git a/include/MapObject/MapObjectUnkHOF0.hpp b/include/MapObject/MapObjectUnkHOF0.hpp index 2976f9ec..ca533d6c 100644 --- a/include/MapObject/MapObjectUnkHOF0.hpp +++ b/include/MapObject/MapObjectUnkHOF0.hpp @@ -10,11 +10,11 @@ class MapObjectUnkHOF0 : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkHOF0(); - /* 4C */ virtual ~MapObjectUnkHOF0() override; + /* 30 */ virtual ~MapObjectUnkHOF0() override; void func_ov064_0215a0b8(void); void func_ov064_0215a0c4(void); diff --git a/include/MapObject/MapObjectUnkHOF1.hpp b/include/MapObject/MapObjectUnkHOF1.hpp index ff16aaea..3e44d845 100644 --- a/include/MapObject/MapObjectUnkHOF1.hpp +++ b/include/MapObject/MapObjectUnkHOF1.hpp @@ -10,11 +10,11 @@ class MapObjectUnkHOF1 : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkHOF1(); - /* 4C */ virtual ~MapObjectUnkHOF1() override; + /* 30 */ virtual ~MapObjectUnkHOF1() override; void func_ov064_02159f4c(void); }; diff --git a/include/MapObject/MapObjectUnkHOL0.hpp b/include/MapObject/MapObjectUnkHOL0.hpp index 88f4a005..b16932ef 100644 --- a/include/MapObject/MapObjectUnkHOL0.hpp +++ b/include/MapObject/MapObjectUnkHOL0.hpp @@ -10,11 +10,11 @@ class MapObjectUnkHOL0 : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkHOL0(); - /* 4C */ virtual ~MapObjectUnkHOL0() override; + /* 30 */ virtual ~MapObjectUnkHOL0() override; void func_ov062_0215b8e8(void); void func_ov062_0215b938(void); diff --git a/include/MapObject/MapObjectUnkHOL1.hpp b/include/MapObject/MapObjectUnkHOL1.hpp index 2cafcb84..4f41ab92 100644 --- a/include/MapObject/MapObjectUnkHOL1.hpp +++ b/include/MapObject/MapObjectUnkHOL1.hpp @@ -10,11 +10,11 @@ class MapObjectUnkHOL1 : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkHOL1(); - /* 4C */ virtual ~MapObjectUnkHOL1() override; + /* 30 */ virtual ~MapObjectUnkHOL1() override; void func_ov062_0215ba3c(void); void func_ov062_0215ba8c(void); diff --git a/include/MapObject/MapObjectUnkHOL2.hpp b/include/MapObject/MapObjectUnkHOL2.hpp index bbe0f3ac..c181e675 100644 --- a/include/MapObject/MapObjectUnkHOL2.hpp +++ b/include/MapObject/MapObjectUnkHOL2.hpp @@ -10,11 +10,11 @@ class MapObjectUnkHOL2 : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkHOL2(); - /* 4C */ virtual ~MapObjectUnkHOL2() override; + /* 30 */ virtual ~MapObjectUnkHOL2() override; void func_ov062_0215b660(void); void func_ov062_0215b6e4(void); diff --git a/include/MapObject/MapObjectUnkHOLB.hpp b/include/MapObject/MapObjectUnkHOLB.hpp index 08d20a15..a8958136 100644 --- a/include/MapObject/MapObjectUnkHOLB.hpp +++ b/include/MapObject/MapObjectUnkHOLB.hpp @@ -10,11 +10,11 @@ class MapObjectUnkHOLB : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkHOLB(); - /* 4C */ virtual ~MapObjectUnkHOLB() override; + /* 30 */ virtual ~MapObjectUnkHOLB() override; void func_ov062_0215bb90(void); void func_ov062_0215bbe0(void); diff --git a/include/MapObject/MapObjectUnkHOSB.hpp b/include/MapObject/MapObjectUnkHOSB.hpp index 234b0942..0d4ed83c 100644 --- a/include/MapObject/MapObjectUnkHOSB.hpp +++ b/include/MapObject/MapObjectUnkHOSB.hpp @@ -10,11 +10,11 @@ class MapObjectUnkHOSB : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkHOSB(); - /* 4C */ virtual ~MapObjectUnkHOSB() override; + /* 30 */ virtual ~MapObjectUnkHOSB() override; void func_ov062_0215bce4(void); void func_ov062_0215bd34(void); diff --git a/include/MapObject/MapObjectUnkHOSO.hpp b/include/MapObject/MapObjectUnkHOSO.hpp index e8e27864..06a759f5 100644 --- a/include/MapObject/MapObjectUnkHOSO.hpp +++ b/include/MapObject/MapObjectUnkHOSO.hpp @@ -10,11 +10,11 @@ class MapObjectUnkHOSO : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkHOSO(); - /* 4C */ virtual ~MapObjectUnkHOSO() override; + /* 30 */ virtual ~MapObjectUnkHOSO() override; void func_ov065_02159d10(void); void func_ov065_02159d60(void); diff --git a/include/MapObject/MapObjectUnkHOST.hpp b/include/MapObject/MapObjectUnkHOST.hpp index f1b35373..84a0715d 100644 --- a/include/MapObject/MapObjectUnkHOST.hpp +++ b/include/MapObject/MapObjectUnkHOST.hpp @@ -10,11 +10,11 @@ class MapObjectUnkHOST : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkHOST(); - /* 4C */ virtual ~MapObjectUnkHOST() override; + /* 30 */ virtual ~MapObjectUnkHOST() override; void func_ov058_0214f838(void); void func_ov058_0214f888(void); diff --git a/include/MapObject/MapObjectUnkHOUS.hpp b/include/MapObject/MapObjectUnkHOUS.hpp index 76cac999..5e094d23 100644 --- a/include/MapObject/MapObjectUnkHOUS.hpp +++ b/include/MapObject/MapObjectUnkHOUS.hpp @@ -10,11 +10,11 @@ class MapObjectUnkHOUS : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkHOUS(); - /* 4C */ virtual ~MapObjectUnkHOUS() override; + /* 30 */ virtual ~MapObjectUnkHOUS() override; void func_ov058_0214f160(void); void func_ov058_0214f52c(void); diff --git a/include/MapObject/MapObjectUnkHOW0.hpp b/include/MapObject/MapObjectUnkHOW0.hpp index 2f85bd9c..9e09ac5b 100644 --- a/include/MapObject/MapObjectUnkHOW0.hpp +++ b/include/MapObject/MapObjectUnkHOW0.hpp @@ -10,11 +10,11 @@ class MapObjectUnkHOW0 : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkHOW0(); - /* 4C */ virtual ~MapObjectUnkHOW0() override; + /* 30 */ virtual ~MapObjectUnkHOW0() override; void func_ov066_0215ceb4(void); void func_ov066_0215cf04(void); diff --git a/include/MapObject/MapObjectUnkHOW1.hpp b/include/MapObject/MapObjectUnkHOW1.hpp index 62bb32cb..2779acb0 100644 --- a/include/MapObject/MapObjectUnkHOW1.hpp +++ b/include/MapObject/MapObjectUnkHOW1.hpp @@ -10,11 +10,11 @@ class MapObjectUnkHOW1 : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkHOW1(); - /* 4C */ virtual ~MapObjectUnkHOW1() override; + /* 30 */ virtual ~MapObjectUnkHOW1() override; void func_ov066_0215d008(void); void func_ov066_0215d058(void); diff --git a/include/MapObject/MapObjectUnkICEB.hpp b/include/MapObject/MapObjectUnkICEB.hpp index f44939a8..eb93f5bf 100644 --- a/include/MapObject/MapObjectUnkICEB.hpp +++ b/include/MapObject/MapObjectUnkICEB.hpp @@ -10,11 +10,11 @@ class MapObjectUnkICEB : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkICEB(); - /* 4C */ virtual ~MapObjectUnkICEB() override; + /* 30 */ virtual ~MapObjectUnkICEB() override; void func_ov094_02173c10(void); void func_ov094_02173c40(void); diff --git a/include/MapObject/MapObjectUnkICGR.hpp b/include/MapObject/MapObjectUnkICGR.hpp index 0f1cca44..d25517f2 100644 --- a/include/MapObject/MapObjectUnkICGR.hpp +++ b/include/MapObject/MapObjectUnkICGR.hpp @@ -10,11 +10,11 @@ class MapObjectUnkICGR : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkICGR(); - /* 4C */ virtual ~MapObjectUnkICGR() override; + /* 30 */ virtual ~MapObjectUnkICGR() override; void func_ov079_02155bdc(void); void func_ov079_02155bf0(void); diff --git a/include/MapObject/MapObjectUnkITFL.hpp b/include/MapObject/MapObjectUnkITFL.hpp index 6f02bf91..be7b6703 100644 --- a/include/MapObject/MapObjectUnkITFL.hpp +++ b/include/MapObject/MapObjectUnkITFL.hpp @@ -10,11 +10,11 @@ class MapObjectUnkITFL : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkITFL(); - /* 4C */ virtual ~MapObjectUnkITFL() override; + /* 30 */ virtual ~MapObjectUnkITFL() override; void func_ov031_021059b8(void); void func_ov031_02105be4(void); diff --git a/include/MapObject/MapObjectUnkKNBN.hpp b/include/MapObject/MapObjectUnkKNBN.hpp index 2f13107f..4738bbc2 100644 --- a/include/MapObject/MapObjectUnkKNBN.hpp +++ b/include/MapObject/MapObjectUnkKNBN.hpp @@ -10,11 +10,11 @@ class MapObjectUnkKNBN : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkKNBN(); - /* 4C */ virtual ~MapObjectUnkKNBN() override; + /* 30 */ virtual ~MapObjectUnkKNBN() override; void func_ov058_02150a64(void); void func_ov058_02150ac4(void); diff --git a/include/MapObject/MapObjectUnkLEVN.hpp b/include/MapObject/MapObjectUnkLEVN.hpp index ebc8ea3d..5a06903c 100644 --- a/include/MapObject/MapObjectUnkLEVN.hpp +++ b/include/MapObject/MapObjectUnkLEVN.hpp @@ -10,11 +10,11 @@ class MapObjectUnkLEVN : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkLEVN(); - /* 4C */ virtual ~MapObjectUnkLEVN() override; + /* 30 */ virtual ~MapObjectUnkLEVN() override; void func_ov064_0215a260(void); }; diff --git a/include/MapObject/MapObjectUnkLEVS.hpp b/include/MapObject/MapObjectUnkLEVS.hpp index 968bbd13..376cc0d8 100644 --- a/include/MapObject/MapObjectUnkLEVS.hpp +++ b/include/MapObject/MapObjectUnkLEVS.hpp @@ -10,11 +10,11 @@ class MapObjectUnkLEVS : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkLEVS(); - /* 4C */ virtual ~MapObjectUnkLEVS() override; + /* 30 */ virtual ~MapObjectUnkLEVS() override; void func_ov058_0214e5dc(void); void func_ov058_0214e70c(void); diff --git a/include/MapObject/MapObjectUnkLTRW.hpp b/include/MapObject/MapObjectUnkLTRW.hpp index 33e34fcd..91f05930 100644 --- a/include/MapObject/MapObjectUnkLTRW.hpp +++ b/include/MapObject/MapObjectUnkLTRW.hpp @@ -10,11 +10,11 @@ class MapObjectUnkLTRW : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkLTRW(); - /* 4C */ virtual ~MapObjectUnkLTRW() override; + /* 30 */ virtual ~MapObjectUnkLTRW() override; void func_ov063_02160c6c(void); void func_ov063_02160cc8(void); diff --git a/include/MapObject/MapObjectUnkLVCM.hpp b/include/MapObject/MapObjectUnkLVCM.hpp index 38ca56b7..8a209afd 100644 --- a/include/MapObject/MapObjectUnkLVCM.hpp +++ b/include/MapObject/MapObjectUnkLVCM.hpp @@ -10,11 +10,11 @@ class MapObjectUnkLVCM : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkLVCM(); - /* 4C */ virtual ~MapObjectUnkLVCM() override; + /* 30 */ virtual ~MapObjectUnkLVCM() override; void func_ov084_0215d544(void); void func_ov084_0215d67c(void); diff --git a/include/MapObject/MapObjectUnkLVVT.hpp b/include/MapObject/MapObjectUnkLVVT.hpp index 96c2c150..a53add47 100644 --- a/include/MapObject/MapObjectUnkLVVT.hpp +++ b/include/MapObject/MapObjectUnkLVVT.hpp @@ -10,11 +10,11 @@ class MapObjectUnkLVVT : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkLVVT(); - /* 4C */ virtual ~MapObjectUnkLVVT() override; + /* 30 */ virtual ~MapObjectUnkLVVT() override; void func_ov067_0215b408(void); void func_ov067_0215b460(void); diff --git a/include/MapObject/MapObjectUnkMBBS.hpp b/include/MapObject/MapObjectUnkMBBS.hpp index e18f84d3..676e68fc 100644 --- a/include/MapObject/MapObjectUnkMBBS.hpp +++ b/include/MapObject/MapObjectUnkMBBS.hpp @@ -10,11 +10,11 @@ class MapObjectUnkMBBS : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkMBBS(); - /* 4C */ virtual ~MapObjectUnkMBBS() override; + /* 30 */ virtual ~MapObjectUnkMBBS() override; void func_ov094_02175040(void); void func_ov094_0217506c(void); diff --git a/include/MapObject/MapObjectUnkMBRG.hpp b/include/MapObject/MapObjectUnkMBRG.hpp index e389a640..8c2febc0 100644 --- a/include/MapObject/MapObjectUnkMBRG.hpp +++ b/include/MapObject/MapObjectUnkMBRG.hpp @@ -10,11 +10,11 @@ class MapObjectUnkMBRG : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkMBRG(); - /* 4C */ virtual ~MapObjectUnkMBRG() override; + /* 30 */ virtual ~MapObjectUnkMBRG() override; void func_ov027_02143f7c(void); void func_ov027_02144014(void); diff --git a/include/MapObject/MapObjectUnkMLVC.hpp b/include/MapObject/MapObjectUnkMLVC.hpp index f9abd6d3..b7db98ef 100644 --- a/include/MapObject/MapObjectUnkMLVC.hpp +++ b/include/MapObject/MapObjectUnkMLVC.hpp @@ -10,11 +10,11 @@ class MapObjectUnkMLVC : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkMLVC(); - /* 4C */ virtual ~MapObjectUnkMLVC() override; + /* 30 */ virtual ~MapObjectUnkMLVC() override; void func_ov084_0215dc7c(void); void func_ov084_0215de2c(void); diff --git a/include/MapObject/MapObjectUnkMSCL.hpp b/include/MapObject/MapObjectUnkMSCL.hpp index 95aed2b5..ea6b64a4 100644 --- a/include/MapObject/MapObjectUnkMSCL.hpp +++ b/include/MapObject/MapObjectUnkMSCL.hpp @@ -10,11 +10,11 @@ class MapObjectUnkMSCL : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkMSCL(); - /* 4C */ virtual ~MapObjectUnkMSCL() override; + /* 30 */ virtual ~MapObjectUnkMSCL() override; void func_ov058_021512c0(void); void func_ov058_02151350(void); diff --git a/include/MapObject/MapObjectUnkMTFS.hpp b/include/MapObject/MapObjectUnkMTFS.hpp index 2bdc4ed1..990d94d9 100644 --- a/include/MapObject/MapObjectUnkMTFS.hpp +++ b/include/MapObject/MapObjectUnkMTFS.hpp @@ -10,11 +10,11 @@ class MapObjectUnkMTFS : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkMTFS(); - /* 4C */ virtual ~MapObjectUnkMTFS() override; + /* 30 */ virtual ~MapObjectUnkMTFS() override; void func_ov066_0215d25c(void); void func_ov066_0215d270(void); diff --git a/include/MapObject/MapObjectUnkMTGT.hpp b/include/MapObject/MapObjectUnkMTGT.hpp index df10fe69..f5ed601f 100644 --- a/include/MapObject/MapObjectUnkMTGT.hpp +++ b/include/MapObject/MapObjectUnkMTGT.hpp @@ -10,11 +10,11 @@ class MapObjectUnkMTGT : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkMTGT(); - /* 4C */ virtual ~MapObjectUnkMTGT() override; + /* 30 */ virtual ~MapObjectUnkMTGT() override; void func_ov026_0210b4a4(void); void func_ov026_0210b7bc(void); diff --git a/include/MapObject/MapObjectUnkMTIC.hpp b/include/MapObject/MapObjectUnkMTIC.hpp index c754bcbf..07b45272 100644 --- a/include/MapObject/MapObjectUnkMTIC.hpp +++ b/include/MapObject/MapObjectUnkMTIC.hpp @@ -10,11 +10,11 @@ class MapObjectUnkMTIC : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkMTIC(); - /* 4C */ virtual ~MapObjectUnkMTIC() override; + /* 30 */ virtual ~MapObjectUnkMTIC() override; void func_ov065_02159f08(void); void func_ov065_02159f54(void); diff --git a/include/MapObject/MapObjectUnkMTIR.hpp b/include/MapObject/MapObjectUnkMTIR.hpp index b4b81adf..a84f441d 100644 --- a/include/MapObject/MapObjectUnkMTIR.hpp +++ b/include/MapObject/MapObjectUnkMTIR.hpp @@ -10,11 +10,11 @@ class MapObjectUnkMTIR : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkMTIR(); - /* 4C */ virtual ~MapObjectUnkMTIR() override; + /* 30 */ virtual ~MapObjectUnkMTIR() override; void func_ov067_0215be74(void); void func_ov067_0215bec0(void); diff --git a/include/MapObject/MapObjectUnkMTJR.hpp b/include/MapObject/MapObjectUnkMTJR.hpp index ce0850d3..40e7300f 100644 --- a/include/MapObject/MapObjectUnkMTJR.hpp +++ b/include/MapObject/MapObjectUnkMTJR.hpp @@ -10,11 +10,11 @@ class MapObjectUnkMTJR : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkMTJR(); - /* 4C */ virtual ~MapObjectUnkMTJR() override; + /* 30 */ virtual ~MapObjectUnkMTJR() override; void func_ov063_02160ffc(void); void func_ov063_02161070(void); diff --git a/include/MapObject/MapObjectUnkMTOR.hpp b/include/MapObject/MapObjectUnkMTOR.hpp index 58f180ee..0fd5a39b 100644 --- a/include/MapObject/MapObjectUnkMTOR.hpp +++ b/include/MapObject/MapObjectUnkMTOR.hpp @@ -10,11 +10,11 @@ class MapObjectUnkMTOR : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkMTOR(); - /* 4C */ virtual ~MapObjectUnkMTOR() override; + /* 30 */ virtual ~MapObjectUnkMTOR() override; void func_ov067_0215c074(void); void func_ov067_0215c0c0(void); diff --git a/include/MapObject/MapObjectUnkMTWD.hpp b/include/MapObject/MapObjectUnkMTWD.hpp index 6eaf82a6..5dbed256 100644 --- a/include/MapObject/MapObjectUnkMTWD.hpp +++ b/include/MapObject/MapObjectUnkMTWD.hpp @@ -10,11 +10,11 @@ class MapObjectUnkMTWD : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkMTWD(); - /* 4C */ virtual ~MapObjectUnkMTWD() override; + /* 30 */ virtual ~MapObjectUnkMTWD() override; void func_ov094_02175c90(void); void func_ov094_02175d1c(void); diff --git a/include/MapObject/MapObjectUnkMTWR.hpp b/include/MapObject/MapObjectUnkMTWR.hpp index 4dde46f0..a865d4b3 100644 --- a/include/MapObject/MapObjectUnkMTWR.hpp +++ b/include/MapObject/MapObjectUnkMTWR.hpp @@ -10,11 +10,11 @@ class MapObjectUnkMTWR : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkMTWR(); - /* 4C */ virtual ~MapObjectUnkMTWR() override; + /* 30 */ virtual ~MapObjectUnkMTWR() override; void func_ov026_0210a744(void); void func_ov026_0210a85c(void); diff --git a/include/MapObject/MapObjectUnkMZFE.hpp b/include/MapObject/MapObjectUnkMZFE.hpp index de7d79bc..983a3385 100644 --- a/include/MapObject/MapObjectUnkMZFE.hpp +++ b/include/MapObject/MapObjectUnkMZFE.hpp @@ -10,11 +10,11 @@ class MapObjectUnkMZFE : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkMZFE(); - /* 4C */ virtual ~MapObjectUnkMZFE() override; + /* 30 */ virtual ~MapObjectUnkMZFE() override; void func_ov027_02144378(void); void func_ov027_0214454c(void); diff --git a/include/MapObject/MapObjectUnkMZFX.hpp b/include/MapObject/MapObjectUnkMZFX.hpp index 7533bcf5..de5abe1e 100644 --- a/include/MapObject/MapObjectUnkMZFX.hpp +++ b/include/MapObject/MapObjectUnkMZFX.hpp @@ -10,11 +10,11 @@ class MapObjectUnkMZFX : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkMZFX(); - /* 4C */ virtual ~MapObjectUnkMZFX() override; + /* 30 */ virtual ~MapObjectUnkMZFX() override; void func_ov091_02167bfc(void); void func_ov091_02167c04(void); diff --git a/include/MapObject/MapObjectUnkMZTR.hpp b/include/MapObject/MapObjectUnkMZTR.hpp index d4f069e9..9b781074 100644 --- a/include/MapObject/MapObjectUnkMZTR.hpp +++ b/include/MapObject/MapObjectUnkMZTR.hpp @@ -10,11 +10,11 @@ class MapObjectUnkMZTR : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkMZTR(); - /* 4C */ virtual ~MapObjectUnkMZTR() override; + /* 30 */ virtual ~MapObjectUnkMZTR() override; void func_ov091_02167d58(void); void func_ov091_02167e3c(void); diff --git a/include/MapObject/MapObjectUnkNPST.hpp b/include/MapObject/MapObjectUnkNPST.hpp index 46a5b9aa..c6e332ed 100644 --- a/include/MapObject/MapObjectUnkNPST.hpp +++ b/include/MapObject/MapObjectUnkNPST.hpp @@ -10,11 +10,11 @@ class MapObjectUnkNPST : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkNPST(); - /* 4C */ virtual ~MapObjectUnkNPST() override; + /* 30 */ virtual ~MapObjectUnkNPST() override; void func_ov090_0217397c(void); void func_ov090_02173990(void); diff --git a/include/MapObject/MapObjectUnkPLCT.hpp b/include/MapObject/MapObjectUnkPLCT.hpp index 5fd28e21..ffb01184 100644 --- a/include/MapObject/MapObjectUnkPLCT.hpp +++ b/include/MapObject/MapObjectUnkPLCT.hpp @@ -10,11 +10,11 @@ class MapObjectUnkPLCT : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkPLCT(); - /* 4C */ virtual ~MapObjectUnkPLCT() override; + /* 30 */ virtual ~MapObjectUnkPLCT() override; void func_ov060_021604ac(void); void func_ov060_021604b4(void); diff --git a/include/MapObject/MapObjectUnkPLFA.hpp b/include/MapObject/MapObjectUnkPLFA.hpp index 72e8cda7..653daf9a 100644 --- a/include/MapObject/MapObjectUnkPLFA.hpp +++ b/include/MapObject/MapObjectUnkPLFA.hpp @@ -10,11 +10,11 @@ class MapObjectUnkPLFA : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkPLFA(); - /* 4C */ virtual ~MapObjectUnkPLFA() override; + /* 30 */ virtual ~MapObjectUnkPLFA() override; void func_ov026_02108ee8(void); void func_ov026_02109160(void); diff --git a/include/MapObject/MapObjectUnkPLFM.hpp b/include/MapObject/MapObjectUnkPLFM.hpp index 13a1d890..9b882238 100644 --- a/include/MapObject/MapObjectUnkPLFM.hpp +++ b/include/MapObject/MapObjectUnkPLFM.hpp @@ -10,11 +10,11 @@ class MapObjectUnkPLFM : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkPLFM(); - /* 4C */ virtual ~MapObjectUnkPLFM() override; + /* 30 */ virtual ~MapObjectUnkPLFM() override; void func_ov026_02108468(void); void func_ov026_0210847c(void); diff --git a/include/MapObject/MapObjectUnkPLFR.hpp b/include/MapObject/MapObjectUnkPLFR.hpp index c1ad73ea..13ead276 100644 --- a/include/MapObject/MapObjectUnkPLFR.hpp +++ b/include/MapObject/MapObjectUnkPLFR.hpp @@ -10,11 +10,11 @@ class MapObjectUnkPLFR : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkPLFR(); - /* 4C */ virtual ~MapObjectUnkPLFR() override; + /* 30 */ virtual ~MapObjectUnkPLFR() override; void func_ov077_0215ad70(void); void func_ov077_0215add0(void); diff --git a/include/MapObject/MapObjectUnkPLV2.hpp b/include/MapObject/MapObjectUnkPLV2.hpp index e7961fa2..5be3461f 100644 --- a/include/MapObject/MapObjectUnkPLV2.hpp +++ b/include/MapObject/MapObjectUnkPLV2.hpp @@ -10,11 +10,11 @@ class MapObjectUnkPLV2 : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkPLV2(); - /* 4C */ virtual ~MapObjectUnkPLV2() override; + /* 30 */ virtual ~MapObjectUnkPLV2() override; void func_ov084_0216141c(void); void func_ov084_02161424(void); diff --git a/include/MapObject/MapObjectUnkPRSH.hpp b/include/MapObject/MapObjectUnkPRSH.hpp index f1e9cc1e..4a3b42fe 100644 --- a/include/MapObject/MapObjectUnkPRSH.hpp +++ b/include/MapObject/MapObjectUnkPRSH.hpp @@ -10,11 +10,11 @@ class MapObjectUnkPRSH : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkPRSH(); - /* 4C */ virtual ~MapObjectUnkPRSH() override; + /* 30 */ virtual ~MapObjectUnkPRSH() override; void func_ov081_021520ec(void); void func_ov081_021521cc(void); diff --git a/include/MapObject/MapObjectUnkPTFL.hpp b/include/MapObject/MapObjectUnkPTFL.hpp index d3685082..cd97693e 100644 --- a/include/MapObject/MapObjectUnkPTFL.hpp +++ b/include/MapObject/MapObjectUnkPTFL.hpp @@ -10,11 +10,11 @@ class MapObjectUnkPTFL : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkPTFL(); - /* 4C */ virtual ~MapObjectUnkPTFL() override; + /* 30 */ virtual ~MapObjectUnkPTFL() override; void func_ov070_0214ba34(void); void func_ov070_0214bb78(void); diff --git a/include/MapObject/MapObjectUnkRBBL.hpp b/include/MapObject/MapObjectUnkRBBL.hpp index e8630073..b3d56f2c 100644 --- a/include/MapObject/MapObjectUnkRBBL.hpp +++ b/include/MapObject/MapObjectUnkRBBL.hpp @@ -10,11 +10,11 @@ class MapObjectUnkRBBL : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkRBBL(); - /* 4C */ virtual ~MapObjectUnkRBBL() override; + /* 30 */ virtual ~MapObjectUnkRBBL() override; void func_ov029_021469ec(void); void func_ov029_02146a00(void); diff --git a/include/MapObject/MapObjectUnkRBMR.hpp b/include/MapObject/MapObjectUnkRBMR.hpp index 66ff2100..4458bd6e 100644 --- a/include/MapObject/MapObjectUnkRBMR.hpp +++ b/include/MapObject/MapObjectUnkRBMR.hpp @@ -10,11 +10,11 @@ class MapObjectUnkRBMR : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkRBMR(); - /* 4C */ virtual ~MapObjectUnkRBMR() override; + /* 30 */ virtual ~MapObjectUnkRBMR() override; void func_ov090_02174bf8(void); void func_ov090_02174c0c(void); diff --git a/include/MapObject/MapObjectUnkRBRC.hpp b/include/MapObject/MapObjectUnkRBRC.hpp index f436e0e0..7b4d02b1 100644 --- a/include/MapObject/MapObjectUnkRBRC.hpp +++ b/include/MapObject/MapObjectUnkRBRC.hpp @@ -10,11 +10,11 @@ class MapObjectUnkRBRC : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkRBRC(); - /* 4C */ virtual ~MapObjectUnkRBRC() override; + /* 30 */ virtual ~MapObjectUnkRBRC() override; void func_ov090_021747a4(void); void func_ov090_021747b8(void); diff --git a/include/MapObject/MapObjectUnkRBSR.hpp b/include/MapObject/MapObjectUnkRBSR.hpp index d4daf931..869075d1 100644 --- a/include/MapObject/MapObjectUnkRBSR.hpp +++ b/include/MapObject/MapObjectUnkRBSR.hpp @@ -10,11 +10,11 @@ class MapObjectUnkRBSR : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkRBSR(); - /* 4C */ virtual ~MapObjectUnkRBSR() override; + /* 30 */ virtual ~MapObjectUnkRBSR() override; void func_ov028_02146610(void); void func_ov028_02146624(void); diff --git a/include/MapObject/MapObjectUnkRCFL.hpp b/include/MapObject/MapObjectUnkRCFL.hpp index 92471f37..cb58eef5 100644 --- a/include/MapObject/MapObjectUnkRCFL.hpp +++ b/include/MapObject/MapObjectUnkRCFL.hpp @@ -10,11 +10,11 @@ class MapObjectUnkRCFL : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkRCFL(); - /* 4C */ virtual ~MapObjectUnkRCFL() override; + /* 30 */ virtual ~MapObjectUnkRCFL() override; void func_ov033_0211b908(void); void func_ov033_0211b938(void); diff --git a/include/MapObject/MapObjectUnkRDSD.hpp b/include/MapObject/MapObjectUnkRDSD.hpp index aa2d9963..3e9e4949 100644 --- a/include/MapObject/MapObjectUnkRDSD.hpp +++ b/include/MapObject/MapObjectUnkRDSD.hpp @@ -10,11 +10,11 @@ class MapObjectUnkRDSD : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkRDSD(); - /* 4C */ virtual ~MapObjectUnkRDSD() override; + /* 30 */ virtual ~MapObjectUnkRDSD() override; void func_ov045_02129124(void); void func_ov045_0212918c(void); diff --git a/include/MapObject/MapObjectUnkRKAG.hpp b/include/MapObject/MapObjectUnkRKAG.hpp index a27c2974..b39ad5e9 100644 --- a/include/MapObject/MapObjectUnkRKAG.hpp +++ b/include/MapObject/MapObjectUnkRKAG.hpp @@ -10,11 +10,11 @@ class MapObjectUnkRKAG : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkRKAG(); - /* 4C */ virtual ~MapObjectUnkRKAG() override; + /* 30 */ virtual ~MapObjectUnkRKAG() override; void func_ov068_02161674(void); void func_ov068_02161684(void); diff --git a/include/MapObject/MapObjectUnkRLPT.hpp b/include/MapObject/MapObjectUnkRLPT.hpp index df8984a2..fca458cc 100644 --- a/include/MapObject/MapObjectUnkRLPT.hpp +++ b/include/MapObject/MapObjectUnkRLPT.hpp @@ -10,11 +10,11 @@ class MapObjectUnkRLPT : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkRLPT(); - /* 4C */ virtual ~MapObjectUnkRLPT() override; + /* 30 */ virtual ~MapObjectUnkRLPT() override; void func_ov028_02145ca0(void); void func_ov028_02145cfc(void); diff --git a/include/MapObject/MapObjectUnkRLSG.hpp b/include/MapObject/MapObjectUnkRLSG.hpp index d22ae605..0607d4ab 100644 --- a/include/MapObject/MapObjectUnkRLSG.hpp +++ b/include/MapObject/MapObjectUnkRLSG.hpp @@ -10,11 +10,11 @@ class MapObjectUnkRLSG : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkRLSG(); - /* 4C */ virtual ~MapObjectUnkRLSG() override; + /* 30 */ virtual ~MapObjectUnkRLSG() override; void func_ov031_0210a008(void); void func_ov031_0210a130(void); diff --git a/include/MapObject/MapObjectUnkRNBO.hpp b/include/MapObject/MapObjectUnkRNBO.hpp index f2aff849..49121d10 100644 --- a/include/MapObject/MapObjectUnkRNBO.hpp +++ b/include/MapObject/MapObjectUnkRNBO.hpp @@ -10,11 +10,11 @@ class MapObjectUnkRNBO : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkRNBO(); - /* 4C */ virtual ~MapObjectUnkRNBO() override; + /* 30 */ virtual ~MapObjectUnkRNBO() override; void func_ov071_02160b04(void); void func_ov071_02160b18(void); diff --git a/include/MapObject/MapObjectUnkRPFL.hpp b/include/MapObject/MapObjectUnkRPFL.hpp index e5d8e1d9..6a0fd1bd 100644 --- a/include/MapObject/MapObjectUnkRPFL.hpp +++ b/include/MapObject/MapObjectUnkRPFL.hpp @@ -10,11 +10,11 @@ class MapObjectUnkRPFL : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkRPFL(); - /* 4C */ virtual ~MapObjectUnkRPFL() override; + /* 30 */ virtual ~MapObjectUnkRPFL() override; void func_ov071_02160c88(void); void func_ov071_02160cbc(void); diff --git a/include/MapObject/MapObjectUnkSAND.hpp b/include/MapObject/MapObjectUnkSAND.hpp index 00531e73..7c1b4739 100644 --- a/include/MapObject/MapObjectUnkSAND.hpp +++ b/include/MapObject/MapObjectUnkSAND.hpp @@ -10,11 +10,11 @@ class MapObjectUnkSAND : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkSAND(); - /* 4C */ virtual ~MapObjectUnkSAND() override; + /* 30 */ virtual ~MapObjectUnkSAND() override; void func_ov031_0210acd4(void); void func_ov031_0210ad64(void); diff --git a/include/MapObject/MapObjectUnkSBDE.hpp b/include/MapObject/MapObjectUnkSBDE.hpp index baa75f47..ba3c33f5 100644 --- a/include/MapObject/MapObjectUnkSBDE.hpp +++ b/include/MapObject/MapObjectUnkSBDE.hpp @@ -10,11 +10,11 @@ class MapObjectUnkSBDE : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkSBDE(); - /* 4C */ virtual ~MapObjectUnkSBDE() override; + /* 30 */ virtual ~MapObjectUnkSBDE() override; void func_ov029_021438cc(void); void func_ov029_02143990(void); diff --git a/include/MapObject/MapObjectUnkSHWB.hpp b/include/MapObject/MapObjectUnkSHWB.hpp index aa776892..3e201265 100644 --- a/include/MapObject/MapObjectUnkSHWB.hpp +++ b/include/MapObject/MapObjectUnkSHWB.hpp @@ -10,11 +10,11 @@ class MapObjectUnkSHWB : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkSHWB(); - /* 4C */ virtual ~MapObjectUnkSHWB() override; + /* 30 */ virtual ~MapObjectUnkSHWB() override; void func_ov083_0215c8c8(void); void func_ov083_0215ca68(void); diff --git a/include/MapObject/MapObjectUnkSKBN.hpp b/include/MapObject/MapObjectUnkSKBN.hpp index 2a4bef55..77870b1c 100644 --- a/include/MapObject/MapObjectUnkSKBN.hpp +++ b/include/MapObject/MapObjectUnkSKBN.hpp @@ -10,11 +10,11 @@ class MapObjectUnkSKBN : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkSKBN(); - /* 4C */ virtual ~MapObjectUnkSKBN() override; + /* 30 */ virtual ~MapObjectUnkSKBN() override; void func_ov031_0210556c(void); void func_ov031_02105648(void); diff --git a/include/MapObject/MapObjectUnkSKDI.hpp b/include/MapObject/MapObjectUnkSKDI.hpp index b8880843..68cfd504 100644 --- a/include/MapObject/MapObjectUnkSKDI.hpp +++ b/include/MapObject/MapObjectUnkSKDI.hpp @@ -10,11 +10,11 @@ class MapObjectUnkSKDI : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkSKDI(); - /* 4C */ virtual ~MapObjectUnkSKDI() override; + /* 30 */ virtual ~MapObjectUnkSKDI() override; void func_ov031_02106190(void); void func_ov031_021061dc(void); diff --git a/include/MapObject/MapObjectUnkSPTB.hpp b/include/MapObject/MapObjectUnkSPTB.hpp index f62e3b7d..4a04741c 100644 --- a/include/MapObject/MapObjectUnkSPTB.hpp +++ b/include/MapObject/MapObjectUnkSPTB.hpp @@ -10,11 +10,11 @@ class MapObjectUnkSPTB : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkSPTB(); - /* 4C */ virtual ~MapObjectUnkSPTB() override; + /* 30 */ virtual ~MapObjectUnkSPTB() override; void func_ov031_0210b51c(void); void func_ov031_0210b5a0(void); diff --git a/include/MapObject/MapObjectUnkSTAL.hpp b/include/MapObject/MapObjectUnkSTAL.hpp index 8d3ed59c..f05ca29e 100644 --- a/include/MapObject/MapObjectUnkSTAL.hpp +++ b/include/MapObject/MapObjectUnkSTAL.hpp @@ -10,11 +10,11 @@ class MapObjectUnkSTAL : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkSTAL(); - /* 4C */ virtual ~MapObjectUnkSTAL() override; + /* 30 */ virtual ~MapObjectUnkSTAL() override; void func_ov071_02161bb8(void); void func_ov071_02161d68(void); diff --git a/include/MapObject/MapObjectUnkSTAT.hpp b/include/MapObject/MapObjectUnkSTAT.hpp index 5b3351f4..fc1c81ee 100644 --- a/include/MapObject/MapObjectUnkSTAT.hpp +++ b/include/MapObject/MapObjectUnkSTAT.hpp @@ -10,11 +10,11 @@ class MapObjectUnkSTAT : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkSTAT(); - /* 4C */ virtual ~MapObjectUnkSTAT() override; + /* 30 */ virtual ~MapObjectUnkSTAT() override; void func_ov063_0215f6d0(void); void func_ov063_0215f710(void); diff --git a/include/MapObject/MapObjectUnkSTDE.hpp b/include/MapObject/MapObjectUnkSTDE.hpp index 9bc93919..fd06c29b 100644 --- a/include/MapObject/MapObjectUnkSTDE.hpp +++ b/include/MapObject/MapObjectUnkSTDE.hpp @@ -10,11 +10,11 @@ class MapObjectUnkSTDE : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkSTDE(); - /* 4C */ virtual ~MapObjectUnkSTDE() override; + /* 30 */ virtual ~MapObjectUnkSTDE() override; void func_ov029_02144194(void); void func_ov029_02144200(void); diff --git a/include/MapObject/MapObjectUnkSTDS.hpp b/include/MapObject/MapObjectUnkSTDS.hpp index ebfbdb23..efedd7bf 100644 --- a/include/MapObject/MapObjectUnkSTDS.hpp +++ b/include/MapObject/MapObjectUnkSTDS.hpp @@ -10,11 +10,11 @@ class MapObjectUnkSTDS : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkSTDS(); - /* 4C */ virtual ~MapObjectUnkSTDS() override; + /* 30 */ virtual ~MapObjectUnkSTDS() override; void func_ov086_0215dfdc(void); void func_ov086_0215e094(void); diff --git a/include/MapObject/MapObjectUnkSTIR.hpp b/include/MapObject/MapObjectUnkSTIR.hpp index b184f2b8..6b743f3e 100644 --- a/include/MapObject/MapObjectUnkSTIR.hpp +++ b/include/MapObject/MapObjectUnkSTIR.hpp @@ -10,11 +10,11 @@ class MapObjectUnkSTIR : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkSTIR(); - /* 4C */ virtual ~MapObjectUnkSTIR() override; + /* 30 */ virtual ~MapObjectUnkSTIR() override; void func_ov031_02100bbc(void); void func_ov031_02100d70(void); diff --git a/include/MapObject/MapObjectUnkSTNE.hpp b/include/MapObject/MapObjectUnkSTNE.hpp index 48f63df4..d00b6ad8 100644 --- a/include/MapObject/MapObjectUnkSTNE.hpp +++ b/include/MapObject/MapObjectUnkSTNE.hpp @@ -10,11 +10,11 @@ class MapObjectUnkSTNE : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkSTNE(); - /* 4C */ virtual ~MapObjectUnkSTNE() override; + /* 30 */ virtual ~MapObjectUnkSTNE() override; void func_ov058_0214ebe0(void); void func_ov058_0214ec90(void); diff --git a/include/MapObject/MapObjectUnkSTSD.hpp b/include/MapObject/MapObjectUnkSTSD.hpp index f5784e94..e7bd3f40 100644 --- a/include/MapObject/MapObjectUnkSTSD.hpp +++ b/include/MapObject/MapObjectUnkSTSD.hpp @@ -10,11 +10,11 @@ class MapObjectUnkSTSD : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkSTSD(); - /* 4C */ virtual ~MapObjectUnkSTSD() override; + /* 30 */ virtual ~MapObjectUnkSTSD() override; void func_ov087_02161b00(void); void func_ov087_02161b84(void); diff --git a/include/MapObject/MapObjectUnkSTSF.hpp b/include/MapObject/MapObjectUnkSTSF.hpp index adf5f2c6..84b0dc8b 100644 --- a/include/MapObject/MapObjectUnkSTSF.hpp +++ b/include/MapObject/MapObjectUnkSTSF.hpp @@ -10,11 +10,11 @@ class MapObjectUnkSTSF : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkSTSF(); - /* 4C */ virtual ~MapObjectUnkSTSF() override; + /* 30 */ virtual ~MapObjectUnkSTSF() override; void func_ov078_0215d0a0(void); void func_ov078_0215d0f4(void); diff --git a/include/MapObject/MapObjectUnkSTSH.hpp b/include/MapObject/MapObjectUnkSTSH.hpp index 6bfba213..106435f5 100644 --- a/include/MapObject/MapObjectUnkSTSH.hpp +++ b/include/MapObject/MapObjectUnkSTSH.hpp @@ -10,11 +10,11 @@ class MapObjectUnkSTSH : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkSTSH(); - /* 4C */ virtual ~MapObjectUnkSTSH() override; + /* 30 */ virtual ~MapObjectUnkSTSH() override; void func_ov070_0214a0b8(void); void func_ov070_0214a1a0(void); diff --git a/include/MapObject/MapObjectUnkSTSP.hpp b/include/MapObject/MapObjectUnkSTSP.hpp index b4018bdc..9553ca9f 100644 --- a/include/MapObject/MapObjectUnkSTSP.hpp +++ b/include/MapObject/MapObjectUnkSTSP.hpp @@ -10,11 +10,11 @@ class MapObjectUnkSTSP : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkSTSP(); - /* 4C */ virtual ~MapObjectUnkSTSP() override; + /* 30 */ virtual ~MapObjectUnkSTSP() override; void func_ov031_02109714(void); void func_ov031_0210996c(void); diff --git a/include/MapObject/MapObjectUnkSTSS.hpp b/include/MapObject/MapObjectUnkSTSS.hpp index 0719e508..5a383b4e 100644 --- a/include/MapObject/MapObjectUnkSTSS.hpp +++ b/include/MapObject/MapObjectUnkSTSS.hpp @@ -10,11 +10,11 @@ class MapObjectUnkSTSS : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkSTSS(); - /* 4C */ virtual ~MapObjectUnkSTSS() override; + /* 30 */ virtual ~MapObjectUnkSTSS() override; void func_ov080_0215e818(void); void func_ov080_0215e8c0(void); diff --git a/include/MapObject/MapObjectUnkSTSV.hpp b/include/MapObject/MapObjectUnkSTSV.hpp index e05d553e..e34ec678 100644 --- a/include/MapObject/MapObjectUnkSTSV.hpp +++ b/include/MapObject/MapObjectUnkSTSV.hpp @@ -10,11 +10,11 @@ class MapObjectUnkSTSV : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkSTSV(); - /* 4C */ virtual ~MapObjectUnkSTSV() override; + /* 30 */ virtual ~MapObjectUnkSTSV() override; void func_ov084_021606e4(void); void func_ov084_02160738(void); diff --git a/include/MapObject/MapObjectUnkSTTR.hpp b/include/MapObject/MapObjectUnkSTTR.hpp index 17b54e55..fa58b1f7 100644 --- a/include/MapObject/MapObjectUnkSTTR.hpp +++ b/include/MapObject/MapObjectUnkSTTR.hpp @@ -10,11 +10,11 @@ class MapObjectUnkSTTR : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkSTTR(); - /* 4C */ virtual ~MapObjectUnkSTTR() override; + /* 30 */ virtual ~MapObjectUnkSTTR() override; void func_ov090_02172e08(void); void func_ov090_02172ee8(void); diff --git a/include/MapObject/MapObjectUnkSWBR.hpp b/include/MapObject/MapObjectUnkSWBR.hpp index a3566c4e..f8360e39 100644 --- a/include/MapObject/MapObjectUnkSWBR.hpp +++ b/include/MapObject/MapObjectUnkSWBR.hpp @@ -10,11 +10,11 @@ class MapObjectUnkSWBR : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkSWBR(); - /* 4C */ virtual ~MapObjectUnkSWBR() override; + /* 30 */ virtual ~MapObjectUnkSWBR() override; void func_ov038_0211e82c(void); void func_ov038_0211e8d8(void); diff --git a/include/MapObject/MapObjectUnkSWCB.hpp b/include/MapObject/MapObjectUnkSWCB.hpp index 807e3432..be8fc5a4 100644 --- a/include/MapObject/MapObjectUnkSWCB.hpp +++ b/include/MapObject/MapObjectUnkSWCB.hpp @@ -10,11 +10,11 @@ class MapObjectUnkSWCB : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkSWCB(); - /* 4C */ virtual ~MapObjectUnkSWCB() override; + /* 30 */ virtual ~MapObjectUnkSWCB() override; void func_ov058_02151a68(void); void func_ov058_02151a7c(void); diff --git a/include/MapObject/MapObjectUnkSWCR.hpp b/include/MapObject/MapObjectUnkSWCR.hpp index 24ef358f..5440089c 100644 --- a/include/MapObject/MapObjectUnkSWCR.hpp +++ b/include/MapObject/MapObjectUnkSWCR.hpp @@ -10,11 +10,11 @@ class MapObjectUnkSWCR : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkSWCR(); - /* 4C */ virtual ~MapObjectUnkSWCR() override; + /* 30 */ virtual ~MapObjectUnkSWCR() override; void func_ov063_021614f8(void); void func_ov063_0216150c(void); diff --git a/include/MapObject/MapObjectUnkSWEY.hpp b/include/MapObject/MapObjectUnkSWEY.hpp index d8fbcda6..31897aae 100644 --- a/include/MapObject/MapObjectUnkSWEY.hpp +++ b/include/MapObject/MapObjectUnkSWEY.hpp @@ -10,11 +10,11 @@ class MapObjectUnkSWEY : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkSWEY(); - /* 4C */ virtual ~MapObjectUnkSWEY() override; + /* 30 */ virtual ~MapObjectUnkSWEY() override; void func_ov070_02147690(void); void func_ov070_0214784c(void); diff --git a/include/MapObject/MapObjectUnkSWFS.hpp b/include/MapObject/MapObjectUnkSWFS.hpp index 9b1ea1e1..945f62a1 100644 --- a/include/MapObject/MapObjectUnkSWFS.hpp +++ b/include/MapObject/MapObjectUnkSWFS.hpp @@ -10,11 +10,11 @@ class MapObjectUnkSWFS : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkSWFS(); - /* 4C */ virtual ~MapObjectUnkSWFS() override; + /* 30 */ virtual ~MapObjectUnkSWFS() override; void func_ov031_0210cfcc(void); void func_ov031_0210d038(void); diff --git a/include/MapObject/MapObjectUnkSWHT.hpp b/include/MapObject/MapObjectUnkSWHT.hpp index 09273c6b..e1bdf455 100644 --- a/include/MapObject/MapObjectUnkSWHT.hpp +++ b/include/MapObject/MapObjectUnkSWHT.hpp @@ -10,11 +10,11 @@ class MapObjectUnkSWHT : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkSWHT(); - /* 4C */ virtual ~MapObjectUnkSWHT() override; + /* 30 */ virtual ~MapObjectUnkSWHT() override; void func_ov031_02101be8(void); void func_ov031_02101ce8(void); diff --git a/include/MapObject/MapObjectUnkSWRA.hpp b/include/MapObject/MapObjectUnkSWRA.hpp index a0802f18..a5e8c890 100644 --- a/include/MapObject/MapObjectUnkSWRA.hpp +++ b/include/MapObject/MapObjectUnkSWRA.hpp @@ -10,11 +10,11 @@ class MapObjectUnkSWRA : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkSWRA(); - /* 4C */ virtual ~MapObjectUnkSWRA() override; + /* 30 */ virtual ~MapObjectUnkSWRA() override; void func_ov042_0212b820(void); void func_ov042_0212b8e0(void); diff --git a/include/MapObject/MapObjectUnkSWRB.hpp b/include/MapObject/MapObjectUnkSWRB.hpp index f7740a39..b120e3bd 100644 --- a/include/MapObject/MapObjectUnkSWRB.hpp +++ b/include/MapObject/MapObjectUnkSWRB.hpp @@ -10,11 +10,11 @@ class MapObjectUnkSWRB : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkSWRB(); - /* 4C */ virtual ~MapObjectUnkSWRB() override; + /* 30 */ virtual ~MapObjectUnkSWRB() override; void func_ov070_02145e98(void); void func_ov070_02145f10(void); diff --git a/include/MapObject/MapObjectUnkSWST.hpp b/include/MapObject/MapObjectUnkSWST.hpp index 518adf8e..765c49bf 100644 --- a/include/MapObject/MapObjectUnkSWST.hpp +++ b/include/MapObject/MapObjectUnkSWST.hpp @@ -10,11 +10,11 @@ class MapObjectUnkSWST : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkSWST(); - /* 4C */ virtual ~MapObjectUnkSWST() override; + /* 30 */ virtual ~MapObjectUnkSWST() override; void func_ov000_0209dda4(void); void func_ov000_0209dde0(void); diff --git a/include/MapObject/MapObjectUnkSWSW.hpp b/include/MapObject/MapObjectUnkSWSW.hpp index 476e6b88..4a5aa63b 100644 --- a/include/MapObject/MapObjectUnkSWSW.hpp +++ b/include/MapObject/MapObjectUnkSWSW.hpp @@ -10,11 +10,11 @@ class MapObjectUnkSWSW : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkSWSW(); - /* 4C */ virtual ~MapObjectUnkSWSW() override; + /* 30 */ virtual ~MapObjectUnkSWSW() override; void func_ov032_02120f78(void); void func_ov032_02120fe4(void); diff --git a/include/MapObject/MapObjectUnkSWWN.hpp b/include/MapObject/MapObjectUnkSWWN.hpp index e6475a91..66703056 100644 --- a/include/MapObject/MapObjectUnkSWWN.hpp +++ b/include/MapObject/MapObjectUnkSWWN.hpp @@ -10,11 +10,11 @@ class MapObjectUnkSWWN : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkSWWN(); - /* 4C */ virtual ~MapObjectUnkSWWN() override; + /* 30 */ virtual ~MapObjectUnkSWWN() override; void func_ov070_02146b84(void); void func_ov070_02146bb8(void); diff --git a/include/MapObject/MapObjectUnkTATZ.hpp b/include/MapObject/MapObjectUnkTATZ.hpp index a52062d6..10e581c7 100644 --- a/include/MapObject/MapObjectUnkTATZ.hpp +++ b/include/MapObject/MapObjectUnkTATZ.hpp @@ -10,11 +10,11 @@ class MapObjectUnkTATZ : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkTATZ(); - /* 4C */ virtual ~MapObjectUnkTATZ() override; + /* 30 */ virtual ~MapObjectUnkTATZ() override; void func_ov031_02108ae4(void); void func_ov031_02108c48(void); diff --git a/include/MapObject/MapObjectUnkTBSD.hpp b/include/MapObject/MapObjectUnkTBSD.hpp index a16901ee..b2382dd7 100644 --- a/include/MapObject/MapObjectUnkTBSD.hpp +++ b/include/MapObject/MapObjectUnkTBSD.hpp @@ -10,11 +10,11 @@ class MapObjectUnkTBSD : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkTBSD(); - /* 4C */ virtual ~MapObjectUnkTBSD() override; + /* 30 */ virtual ~MapObjectUnkTBSD() override; void func_ov092_02167c00(void); void func_ov092_02167c58(void); diff --git a/include/MapObject/MapObjectUnkTBSF.hpp b/include/MapObject/MapObjectUnkTBSF.hpp index bfa02c20..75fde9b4 100644 --- a/include/MapObject/MapObjectUnkTBSF.hpp +++ b/include/MapObject/MapObjectUnkTBSF.hpp @@ -10,11 +10,11 @@ class MapObjectUnkTBSF : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkTBSF(); - /* 4C */ virtual ~MapObjectUnkTBSF() override; + /* 30 */ virtual ~MapObjectUnkTBSF() override; void func_ov026_0210a4a4(void); void func_ov026_0210a4f4(void); diff --git a/include/MapObject/MapObjectUnkTBSS.hpp b/include/MapObject/MapObjectUnkTBSS.hpp index 4aa468b6..ab612f1d 100644 --- a/include/MapObject/MapObjectUnkTBSS.hpp +++ b/include/MapObject/MapObjectUnkTBSS.hpp @@ -10,11 +10,11 @@ class MapObjectUnkTBSS : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkTBSS(); - /* 4C */ virtual ~MapObjectUnkTBSS() override; + /* 30 */ virtual ~MapObjectUnkTBSS() override; void func_ov029_02146070(void); void func_ov029_021460c8(void); diff --git a/include/MapObject/MapObjectUnkTCBT.hpp b/include/MapObject/MapObjectUnkTCBT.hpp index a342af77..a409b6c4 100644 --- a/include/MapObject/MapObjectUnkTCBT.hpp +++ b/include/MapObject/MapObjectUnkTCBT.hpp @@ -10,11 +10,11 @@ class MapObjectUnkTCBT : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkTCBT(); - /* 4C */ virtual ~MapObjectUnkTCBT() override; + /* 30 */ virtual ~MapObjectUnkTCBT() override; void func_ov029_0214440c(void); void func_ov029_02144448(void); diff --git a/include/MapObject/MapObjectUnkTDBP.hpp b/include/MapObject/MapObjectUnkTDBP.hpp index bc8d8e35..28984b14 100644 --- a/include/MapObject/MapObjectUnkTDBP.hpp +++ b/include/MapObject/MapObjectUnkTDBP.hpp @@ -10,11 +10,11 @@ class MapObjectUnkTDBP : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkTDBP(); - /* 4C */ virtual ~MapObjectUnkTDBP() override; + /* 30 */ virtual ~MapObjectUnkTDBP() override; void func_ov092_0216651c(void); void func_ov092_02166534(void); diff --git a/include/MapObject/MapObjectUnkTDBR.hpp b/include/MapObject/MapObjectUnkTDBR.hpp index 1e71c554..ce4e78e7 100644 --- a/include/MapObject/MapObjectUnkTDBR.hpp +++ b/include/MapObject/MapObjectUnkTDBR.hpp @@ -10,11 +10,11 @@ class MapObjectUnkTDBR : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkTDBR(); - /* 4C */ virtual ~MapObjectUnkTDBR() override; + /* 30 */ virtual ~MapObjectUnkTDBR() override; void func_ov092_02166700(void); void func_ov092_02166718(void); diff --git a/include/MapObject/MapObjectUnkTDDR.hpp b/include/MapObject/MapObjectUnkTDDR.hpp index 7f3620b4..b46d3d7a 100644 --- a/include/MapObject/MapObjectUnkTDDR.hpp +++ b/include/MapObject/MapObjectUnkTDDR.hpp @@ -10,11 +10,11 @@ class MapObjectUnkTDDR : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkTDDR(); - /* 4C */ virtual ~MapObjectUnkTDDR() override; + /* 30 */ virtual ~MapObjectUnkTDDR() override; void func_ov092_021668f8(void); void func_ov092_02166990(void); diff --git a/include/MapObject/MapObjectUnkTHAW.hpp b/include/MapObject/MapObjectUnkTHAW.hpp index 5981f45d..1514b7b5 100644 --- a/include/MapObject/MapObjectUnkTHAW.hpp +++ b/include/MapObject/MapObjectUnkTHAW.hpp @@ -10,11 +10,11 @@ class MapObjectUnkTHAW : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkTHAW(); - /* 4C */ virtual ~MapObjectUnkTHAW() override; + /* 30 */ virtual ~MapObjectUnkTHAW() override; void func_ov094_021755ec(void); void func_ov094_021756ac(void); diff --git a/include/MapObject/MapObjectUnkTMDE.hpp b/include/MapObject/MapObjectUnkTMDE.hpp index 242ee61f..deb974ca 100644 --- a/include/MapObject/MapObjectUnkTMDE.hpp +++ b/include/MapObject/MapObjectUnkTMDE.hpp @@ -10,11 +10,11 @@ class MapObjectUnkTMDE : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkTMDE(); - /* 4C */ virtual ~MapObjectUnkTMDE() override; + /* 30 */ virtual ~MapObjectUnkTMDE() override; void func_ov029_02141b0c(void); void func_ov029_02141b20(void); diff --git a/include/MapObject/MapObjectUnkTMFR.hpp b/include/MapObject/MapObjectUnkTMFR.hpp index a3c8c59e..fce477d3 100644 --- a/include/MapObject/MapObjectUnkTMFR.hpp +++ b/include/MapObject/MapObjectUnkTMFR.hpp @@ -10,11 +10,11 @@ class MapObjectUnkTMFR : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkTMFR(); - /* 4C */ virtual ~MapObjectUnkTMFR() override; + /* 30 */ virtual ~MapObjectUnkTMFR() override; void func_ov027_02141ab0(void); void func_ov027_02141ac4(void); diff --git a/include/MapObject/MapObjectUnkTMLV.hpp b/include/MapObject/MapObjectUnkTMLV.hpp index 8f89b4b3..80eea4d1 100644 --- a/include/MapObject/MapObjectUnkTMLV.hpp +++ b/include/MapObject/MapObjectUnkTMLV.hpp @@ -10,11 +10,11 @@ class MapObjectUnkTMLV : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkTMLV(); - /* 4C */ virtual ~MapObjectUnkTMLV() override; + /* 30 */ virtual ~MapObjectUnkTMLV() override; void func_ov084_021604f0(void); void func_ov084_02160504(void); diff --git a/include/MapObject/MapObjectUnkTMSB.hpp b/include/MapObject/MapObjectUnkTMSB.hpp index bb323885..468310af 100644 --- a/include/MapObject/MapObjectUnkTMSB.hpp +++ b/include/MapObject/MapObjectUnkTMSB.hpp @@ -10,11 +10,11 @@ class MapObjectUnkTMSB : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkTMSB(); - /* 4C */ virtual ~MapObjectUnkTMSB() override; + /* 30 */ virtual ~MapObjectUnkTMSB() override; void func_ov091_02168138(void); void func_ov091_0216814c(void); diff --git a/include/MapObject/MapObjectUnkTMSN.hpp b/include/MapObject/MapObjectUnkTMSN.hpp index a3eaa455..be826095 100644 --- a/include/MapObject/MapObjectUnkTMSN.hpp +++ b/include/MapObject/MapObjectUnkTMSN.hpp @@ -10,11 +10,11 @@ class MapObjectUnkTMSN : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkTMSN(); - /* 4C */ virtual ~MapObjectUnkTMSN() override; + /* 30 */ virtual ~MapObjectUnkTMSN() override; void func_ov028_021451e0(void); void func_ov028_021451f4(void); diff --git a/include/MapObject/MapObjectUnkTMWT.hpp b/include/MapObject/MapObjectUnkTMWT.hpp index 7ccb4843..8a7ce907 100644 --- a/include/MapObject/MapObjectUnkTMWT.hpp +++ b/include/MapObject/MapObjectUnkTMWT.hpp @@ -10,11 +10,11 @@ class MapObjectUnkTMWT : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkTMWT(); - /* 4C */ virtual ~MapObjectUnkTMWT() override; + /* 30 */ virtual ~MapObjectUnkTMWT() override; void func_ov029_021420c0(void); void func_ov029_021421a8(void); diff --git a/include/MapObject/MapObjectUnkTRBL.hpp b/include/MapObject/MapObjectUnkTRBL.hpp index 447824d7..cc10b5ad 100644 --- a/include/MapObject/MapObjectUnkTRBL.hpp +++ b/include/MapObject/MapObjectUnkTRBL.hpp @@ -10,11 +10,11 @@ class MapObjectUnkTRBL : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkTRBL(); - /* 4C */ virtual ~MapObjectUnkTRBL() override; + /* 30 */ virtual ~MapObjectUnkTRBL() override; void func_ov029_021462dc(void); void func_ov029_0214643c(void); diff --git a/include/MapObject/MapObjectUnkTRBM.hpp b/include/MapObject/MapObjectUnkTRBM.hpp index 08f53e8b..d1024188 100644 --- a/include/MapObject/MapObjectUnkTRBM.hpp +++ b/include/MapObject/MapObjectUnkTRBM.hpp @@ -10,11 +10,11 @@ class MapObjectUnkTRBM : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkTRBM(); - /* 4C */ virtual ~MapObjectUnkTRBM() override; + /* 30 */ virtual ~MapObjectUnkTRBM() override; void func_ov028_02144ec4(void); void func_ov028_02144fb0(void); diff --git a/include/MapObject/MapObjectUnkTRBR.hpp b/include/MapObject/MapObjectUnkTRBR.hpp index 19125393..95a4f4dd 100644 --- a/include/MapObject/MapObjectUnkTRBR.hpp +++ b/include/MapObject/MapObjectUnkTRBR.hpp @@ -10,11 +10,11 @@ class MapObjectUnkTRBR : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkTRBR(); - /* 4C */ virtual ~MapObjectUnkTRBR() override; + /* 30 */ virtual ~MapObjectUnkTRBR() override; void func_ov027_02142ad8(void); void func_ov027_02142bc4(void); diff --git a/include/MapObject/MapObjectUnkTRCC.hpp b/include/MapObject/MapObjectUnkTRCC.hpp index 242cb348..e0447748 100644 --- a/include/MapObject/MapObjectUnkTRCC.hpp +++ b/include/MapObject/MapObjectUnkTRCC.hpp @@ -10,11 +10,11 @@ class MapObjectUnkTRCC : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkTRCC(); - /* 4C */ virtual ~MapObjectUnkTRCC() override; + /* 30 */ virtual ~MapObjectUnkTRCC() override; void func_ov090_021750fc(void); void func_ov090_02175148(void); diff --git a/include/MapObject/MapObjectUnkTRDA.hpp b/include/MapObject/MapObjectUnkTRDA.hpp index 9f979402..3e37b011 100644 --- a/include/MapObject/MapObjectUnkTRDA.hpp +++ b/include/MapObject/MapObjectUnkTRDA.hpp @@ -10,11 +10,11 @@ class MapObjectUnkTRDA : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkTRDA(); - /* 4C */ virtual ~MapObjectUnkTRDA() override; + /* 30 */ virtual ~MapObjectUnkTRDA() override; void func_ov027_02142e3c(void); void func_ov027_02142f28(void); diff --git a/include/MapObject/MapObjectUnkTRDR.hpp b/include/MapObject/MapObjectUnkTRDR.hpp index 14981c9a..a1e49175 100644 --- a/include/MapObject/MapObjectUnkTRDR.hpp +++ b/include/MapObject/MapObjectUnkTRDR.hpp @@ -10,11 +10,11 @@ class MapObjectUnkTRDR : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkTRDR(); - /* 4C */ virtual ~MapObjectUnkTRDR() override; + /* 30 */ virtual ~MapObjectUnkTRDR() override; void func_ov092_02167eb4(void); void func_ov092_02167ecc(void); diff --git a/include/MapObject/MapObjectUnkTRDT.hpp b/include/MapObject/MapObjectUnkTRDT.hpp index f13cb8b1..bd390b25 100644 --- a/include/MapObject/MapObjectUnkTRDT.hpp +++ b/include/MapObject/MapObjectUnkTRDT.hpp @@ -10,11 +10,11 @@ class MapObjectUnkTRDT : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkTRDT(); - /* 4C */ virtual ~MapObjectUnkTRDT() override; + /* 30 */ virtual ~MapObjectUnkTRDT() override; void func_ov090_02174e60(void); void func_ov090_02174eac(void); diff --git a/include/MapObject/MapObjectUnkTRED.hpp b/include/MapObject/MapObjectUnkTRED.hpp index 7b37a6ab..be6de0e4 100644 --- a/include/MapObject/MapObjectUnkTRED.hpp +++ b/include/MapObject/MapObjectUnkTRED.hpp @@ -10,11 +10,11 @@ class MapObjectUnkTRED : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkTRED(); - /* 4C */ virtual ~MapObjectUnkTRED() override; + /* 30 */ virtual ~MapObjectUnkTRED() override; void func_ov031_02104114(void); void func_ov031_02104168(void); diff --git a/include/MapObject/MapObjectUnkTREE.hpp b/include/MapObject/MapObjectUnkTREE.hpp index 99eb77aa..8016d234 100644 --- a/include/MapObject/MapObjectUnkTREE.hpp +++ b/include/MapObject/MapObjectUnkTREE.hpp @@ -10,11 +10,11 @@ class MapObjectUnkTREE : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkTREE(); - /* 4C */ virtual ~MapObjectUnkTREE() override; + /* 30 */ virtual ~MapObjectUnkTREE() override; void func_ov058_0214e09c(void); void func_ov058_0214e23c(void); diff --git a/include/MapObject/MapObjectUnkTREN.hpp b/include/MapObject/MapObjectUnkTREN.hpp index 713d08f6..cb185e1d 100644 --- a/include/MapObject/MapObjectUnkTREN.hpp +++ b/include/MapObject/MapObjectUnkTREN.hpp @@ -10,11 +10,11 @@ class MapObjectUnkTREN : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkTREN(); - /* 4C */ virtual ~MapObjectUnkTREN() override; + /* 30 */ virtual ~MapObjectUnkTREN() override; void func_ov031_02104470(void); }; diff --git a/include/MapObject/MapObjectUnkTRES.hpp b/include/MapObject/MapObjectUnkTRES.hpp index 59eaa13c..db2ad871 100644 --- a/include/MapObject/MapObjectUnkTRES.hpp +++ b/include/MapObject/MapObjectUnkTRES.hpp @@ -10,11 +10,11 @@ class MapObjectUnkTRES : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkTRES(); - /* 4C */ virtual ~MapObjectUnkTRES() override; + /* 30 */ virtual ~MapObjectUnkTRES() override; void func_ov031_02102f64(void); void func_ov031_02102f90(void); diff --git a/include/MapObject/MapObjectUnkTRET.hpp b/include/MapObject/MapObjectUnkTRET.hpp index 3a231e80..73bf5a81 100644 --- a/include/MapObject/MapObjectUnkTRET.hpp +++ b/include/MapObject/MapObjectUnkTRET.hpp @@ -10,11 +10,11 @@ class MapObjectUnkTRET : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkTRET(); - /* 4C */ virtual ~MapObjectUnkTRET() override; + /* 30 */ virtual ~MapObjectUnkTRET() override; void func_ov026_0210976c(void); void func_ov026_021097cc(void); diff --git a/include/MapObject/MapObjectUnkTREW.hpp b/include/MapObject/MapObjectUnkTREW.hpp index d0aff023..32358992 100644 --- a/include/MapObject/MapObjectUnkTREW.hpp +++ b/include/MapObject/MapObjectUnkTREW.hpp @@ -10,11 +10,11 @@ class MapObjectUnkTREW : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkTREW(); - /* 4C */ virtual ~MapObjectUnkTREW() override; + /* 30 */ virtual ~MapObjectUnkTREW() override; void func_ov031_02104250(void); void func_ov031_02104298(void); diff --git a/include/MapObject/MapObjectUnkTRFI.hpp b/include/MapObject/MapObjectUnkTRFI.hpp index 8463fd0a..7fa01193 100644 --- a/include/MapObject/MapObjectUnkTRFI.hpp +++ b/include/MapObject/MapObjectUnkTRFI.hpp @@ -10,11 +10,11 @@ class MapObjectUnkTRFI : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkTRFI(); - /* 4C */ virtual ~MapObjectUnkTRFI() override; + /* 30 */ virtual ~MapObjectUnkTRFI() override; void func_ov030_02142a98(void); void func_ov030_02142b84(void); diff --git a/include/MapObject/MapObjectUnkTRFO.hpp b/include/MapObject/MapObjectUnkTRFO.hpp index aec5851d..d5ceae73 100644 --- a/include/MapObject/MapObjectUnkTRFO.hpp +++ b/include/MapObject/MapObjectUnkTRFO.hpp @@ -10,11 +10,11 @@ class MapObjectUnkTRFO : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkTRFO(); - /* 4C */ virtual ~MapObjectUnkTRFO() override; + /* 30 */ virtual ~MapObjectUnkTRFO() override; void func_ov027_021424c4(void); void func_ov027_021425b0(void); diff --git a/include/MapObject/MapObjectUnkTRFS.hpp b/include/MapObject/MapObjectUnkTRFS.hpp index 97056696..c05eeab4 100644 --- a/include/MapObject/MapObjectUnkTRFS.hpp +++ b/include/MapObject/MapObjectUnkTRFS.hpp @@ -10,11 +10,11 @@ class MapObjectUnkTRFS : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkTRFS(); - /* 4C */ virtual ~MapObjectUnkTRFS() override; + /* 30 */ virtual ~MapObjectUnkTRFS() override; void func_ov028_0214686c(void); void func_ov028_021468b8(void); diff --git a/include/MapObject/MapObjectUnkTRFV.hpp b/include/MapObject/MapObjectUnkTRFV.hpp index 23191fd8..33324edf 100644 --- a/include/MapObject/MapObjectUnkTRFV.hpp +++ b/include/MapObject/MapObjectUnkTRFV.hpp @@ -10,11 +10,11 @@ class MapObjectUnkTRFV : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkTRFV(); - /* 4C */ virtual ~MapObjectUnkTRFV() override; + /* 30 */ virtual ~MapObjectUnkTRFV() override; void func_ov027_021420d4(void); void func_ov027_021421c0(void); diff --git a/include/MapObject/MapObjectUnkTRGM.hpp b/include/MapObject/MapObjectUnkTRGM.hpp index 2bad5f52..22a49b5b 100644 --- a/include/MapObject/MapObjectUnkTRGM.hpp +++ b/include/MapObject/MapObjectUnkTRGM.hpp @@ -10,11 +10,11 @@ class MapObjectUnkTRGM : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkTRGM(); - /* 4C */ virtual ~MapObjectUnkTRGM() override; + /* 30 */ virtual ~MapObjectUnkTRGM() override; void func_ov030_02142edc(void); void func_ov030_02142fc4(void); diff --git a/include/MapObject/MapObjectUnkTRGW.hpp b/include/MapObject/MapObjectUnkTRGW.hpp index e5af5a43..63a3dd0d 100644 --- a/include/MapObject/MapObjectUnkTRGW.hpp +++ b/include/MapObject/MapObjectUnkTRGW.hpp @@ -10,11 +10,11 @@ class MapObjectUnkTRGW : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkTRGW(); - /* 4C */ virtual ~MapObjectUnkTRGW() override; + /* 30 */ virtual ~MapObjectUnkTRGW() override; void func_ov090_02173198(void); void func_ov090_021731e8(void); diff --git a/include/MapObject/MapObjectUnkTRH0.hpp b/include/MapObject/MapObjectUnkTRH0.hpp index cfa2bc20..23481d68 100644 --- a/include/MapObject/MapObjectUnkTRH0.hpp +++ b/include/MapObject/MapObjectUnkTRH0.hpp @@ -10,11 +10,11 @@ class MapObjectUnkTRH0 : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkTRH0(); - /* 4C */ virtual ~MapObjectUnkTRH0() override; + /* 30 */ virtual ~MapObjectUnkTRH0() override; void func_ov028_02145eb8(void); void func_ov028_02145fa4(void); diff --git a/include/MapObject/MapObjectUnkTRH1.hpp b/include/MapObject/MapObjectUnkTRH1.hpp index a1d962c2..82fd5b9d 100644 --- a/include/MapObject/MapObjectUnkTRH1.hpp +++ b/include/MapObject/MapObjectUnkTRH1.hpp @@ -10,11 +10,11 @@ class MapObjectUnkTRH1 : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkTRH1(); - /* 4C */ virtual ~MapObjectUnkTRH1() override; + /* 30 */ virtual ~MapObjectUnkTRH1() override; void func_ov029_02145d1c(void); void func_ov029_02145e6c(void); diff --git a/include/MapObject/MapObjectUnkTRH2.hpp b/include/MapObject/MapObjectUnkTRH2.hpp index d57c2856..2b617b44 100644 --- a/include/MapObject/MapObjectUnkTRH2.hpp +++ b/include/MapObject/MapObjectUnkTRH2.hpp @@ -10,11 +10,11 @@ class MapObjectUnkTRH2 : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkTRH2(); - /* 4C */ virtual ~MapObjectUnkTRH2() override; + /* 30 */ virtual ~MapObjectUnkTRH2() override; void func_ov030_0214323c(void); void func_ov030_02143328(void); diff --git a/include/MapObject/MapObjectUnkTRH3.hpp b/include/MapObject/MapObjectUnkTRH3.hpp index 789a75bd..374e58db 100644 --- a/include/MapObject/MapObjectUnkTRH3.hpp +++ b/include/MapObject/MapObjectUnkTRH3.hpp @@ -10,11 +10,11 @@ class MapObjectUnkTRH3 : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkTRH3(); - /* 4C */ virtual ~MapObjectUnkTRH3() override; + /* 30 */ virtual ~MapObjectUnkTRH3() override; void func_ov030_02143544(void); void func_ov030_02143630(void); diff --git a/include/MapObject/MapObjectUnkTRLD.hpp b/include/MapObject/MapObjectUnkTRLD.hpp index 9fda3fc4..9af58368 100644 --- a/include/MapObject/MapObjectUnkTRLD.hpp +++ b/include/MapObject/MapObjectUnkTRLD.hpp @@ -10,11 +10,11 @@ class MapObjectUnkTRLD : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkTRLD(); - /* 4C */ virtual ~MapObjectUnkTRLD() override; + /* 30 */ virtual ~MapObjectUnkTRLD() override; void func_ov070_0214b5f4(void); void func_ov070_0214b648(void); diff --git a/include/MapObject/MapObjectUnkTRLN.hpp b/include/MapObject/MapObjectUnkTRLN.hpp index 766e0db4..fd8d3a0f 100644 --- a/include/MapObject/MapObjectUnkTRLN.hpp +++ b/include/MapObject/MapObjectUnkTRLN.hpp @@ -10,11 +10,11 @@ class MapObjectUnkTRLN : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkTRLN(); - /* 4C */ virtual ~MapObjectUnkTRLN() override; + /* 30 */ virtual ~MapObjectUnkTRLN() override; void func_ov057_0213b860(void); void func_ov057_0213b864(void); diff --git a/include/MapObject/MapObjectUnkTRLS.hpp b/include/MapObject/MapObjectUnkTRLS.hpp index 07c11854..5f6ae21d 100644 --- a/include/MapObject/MapObjectUnkTRLS.hpp +++ b/include/MapObject/MapObjectUnkTRLS.hpp @@ -10,11 +10,11 @@ class MapObjectUnkTRLS : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkTRLS(); - /* 4C */ virtual ~MapObjectUnkTRLS() override; + /* 30 */ virtual ~MapObjectUnkTRLS() override; void func_ov070_0214b424(void); void func_ov070_0214b450(void); diff --git a/include/MapObject/MapObjectUnkTRLW.hpp b/include/MapObject/MapObjectUnkTRLW.hpp index e600feba..d636b4f3 100644 --- a/include/MapObject/MapObjectUnkTRLW.hpp +++ b/include/MapObject/MapObjectUnkTRLW.hpp @@ -10,11 +10,11 @@ class MapObjectUnkTRLW : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkTRLW(); - /* 4C */ virtual ~MapObjectUnkTRLW() override; + /* 30 */ virtual ~MapObjectUnkTRLW() override; void func_ov070_0214b7e0(void); void func_ov070_0214b800(void); diff --git a/include/MapObject/MapObjectUnkTRMA.hpp b/include/MapObject/MapObjectUnkTRMA.hpp index bd67abf6..35cdaafb 100644 --- a/include/MapObject/MapObjectUnkTRMA.hpp +++ b/include/MapObject/MapObjectUnkTRMA.hpp @@ -10,11 +10,11 @@ class MapObjectUnkTRMA : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkTRMA(); - /* 4C */ virtual ~MapObjectUnkTRMA() override; + /* 30 */ virtual ~MapObjectUnkTRMA() override; void func_ov028_02144bc4(void); void func_ov028_02144cb0(void); diff --git a/include/MapObject/MapObjectUnkTRMR.hpp b/include/MapObject/MapObjectUnkTRMR.hpp index 370e2673..86fe50f5 100644 --- a/include/MapObject/MapObjectUnkTRMR.hpp +++ b/include/MapObject/MapObjectUnkTRMR.hpp @@ -10,11 +10,11 @@ class MapObjectUnkTRMR : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkTRMR(); - /* 4C */ virtual ~MapObjectUnkTRMR() override; + /* 30 */ virtual ~MapObjectUnkTRMR() override; void func_ov090_02174980(void); void func_ov090_021749c0(void); diff --git a/include/MapObject/MapObjectUnkTRPI.hpp b/include/MapObject/MapObjectUnkTRPI.hpp index d4c949f8..6fe8800e 100644 --- a/include/MapObject/MapObjectUnkTRPI.hpp +++ b/include/MapObject/MapObjectUnkTRPI.hpp @@ -10,11 +10,11 @@ class MapObjectUnkTRPI : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkTRPI(); - /* 4C */ virtual ~MapObjectUnkTRPI() override; + /* 30 */ virtual ~MapObjectUnkTRPI() override; void func_ov029_02143614(void); void func_ov029_02143700(void); diff --git a/include/MapObject/MapObjectUnkTRPT.hpp b/include/MapObject/MapObjectUnkTRPT.hpp index fe7d5fc2..10f6e82c 100644 --- a/include/MapObject/MapObjectUnkTRPT.hpp +++ b/include/MapObject/MapObjectUnkTRPT.hpp @@ -10,11 +10,11 @@ class MapObjectUnkTRPT : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkTRPT(); - /* 4C */ virtual ~MapObjectUnkTRPT() override; + /* 30 */ virtual ~MapObjectUnkTRPT() override; void func_ov026_0210e5c0(void); void func_ov026_0210e688(void); diff --git a/include/MapObject/MapObjectUnkTRRA.hpp b/include/MapObject/MapObjectUnkTRRA.hpp index d4f77d62..10eab6b2 100644 --- a/include/MapObject/MapObjectUnkTRRA.hpp +++ b/include/MapObject/MapObjectUnkTRRA.hpp @@ -10,11 +10,11 @@ class MapObjectUnkTRRA : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkTRRA(); - /* 4C */ virtual ~MapObjectUnkTRRA() override; + /* 30 */ virtual ~MapObjectUnkTRRA() override; void func_ov027_02143940(void); void func_ov027_02143a2c(void); diff --git a/include/MapObject/MapObjectUnkTRRC.hpp b/include/MapObject/MapObjectUnkTRRC.hpp index bc3f26d3..8a778caa 100644 --- a/include/MapObject/MapObjectUnkTRRC.hpp +++ b/include/MapObject/MapObjectUnkTRRC.hpp @@ -10,11 +10,11 @@ class MapObjectUnkTRRC : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkTRRC(); - /* 4C */ virtual ~MapObjectUnkTRRC() override; + /* 30 */ virtual ~MapObjectUnkTRRC() override; void func_ov026_02109a50(void); void func_ov026_02109af0(void); diff --git a/include/MapObject/MapObjectUnkTRRD.hpp b/include/MapObject/MapObjectUnkTRRD.hpp index f74b2748..8490a778 100644 --- a/include/MapObject/MapObjectUnkTRRD.hpp +++ b/include/MapObject/MapObjectUnkTRRD.hpp @@ -10,11 +10,11 @@ class MapObjectUnkTRRD : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkTRRD(); - /* 4C */ virtual ~MapObjectUnkTRRD() override; + /* 30 */ virtual ~MapObjectUnkTRRD() override; void func_ov029_02143354(void); void func_ov029_02143440(void); diff --git a/include/MapObject/MapObjectUnkTRRS.hpp b/include/MapObject/MapObjectUnkTRRS.hpp index 62e81208..b876996f 100644 --- a/include/MapObject/MapObjectUnkTRRS.hpp +++ b/include/MapObject/MapObjectUnkTRRS.hpp @@ -10,11 +10,11 @@ class MapObjectUnkTRRS : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkTRRS(); - /* 4C */ virtual ~MapObjectUnkTRRS() override; + /* 30 */ virtual ~MapObjectUnkTRRS() override; void func_ov028_02144970(void); void func_ov028_02144a5c(void); diff --git a/include/MapObject/MapObjectUnkTRRW.hpp b/include/MapObject/MapObjectUnkTRRW.hpp index 2ef4920d..6e024a49 100644 --- a/include/MapObject/MapObjectUnkTRRW.hpp +++ b/include/MapObject/MapObjectUnkTRRW.hpp @@ -10,11 +10,11 @@ class MapObjectUnkTRRW : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkTRRW(); - /* 4C */ virtual ~MapObjectUnkTRRW() override; + /* 30 */ virtual ~MapObjectUnkTRRW() override; void func_ov029_02142648(void); void func_ov029_02142734(void); diff --git a/include/MapObject/MapObjectUnkTRSA.hpp b/include/MapObject/MapObjectUnkTRSA.hpp index 321d6c35..849cf08e 100644 --- a/include/MapObject/MapObjectUnkTRSA.hpp +++ b/include/MapObject/MapObjectUnkTRSA.hpp @@ -10,11 +10,11 @@ class MapObjectUnkTRSA : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkTRSA(); - /* 4C */ virtual ~MapObjectUnkTRSA() override; + /* 30 */ virtual ~MapObjectUnkTRSA() override; void func_ov029_02142914(void); void func_ov029_02142b50(void); diff --git a/include/MapObject/MapObjectUnkTRSD.hpp b/include/MapObject/MapObjectUnkTRSD.hpp index 9a7319c1..9cdbcd74 100644 --- a/include/MapObject/MapObjectUnkTRSD.hpp +++ b/include/MapObject/MapObjectUnkTRSD.hpp @@ -10,11 +10,11 @@ class MapObjectUnkTRSD : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkTRSD(); - /* 4C */ virtual ~MapObjectUnkTRSD() override; + /* 30 */ virtual ~MapObjectUnkTRSD() override; void func_ov090_02173520(void); void func_ov090_021735d8(void); diff --git a/include/MapObject/MapObjectUnkTRSH.hpp b/include/MapObject/MapObjectUnkTRSH.hpp index 740729cb..44683b9a 100644 --- a/include/MapObject/MapObjectUnkTRSH.hpp +++ b/include/MapObject/MapObjectUnkTRSH.hpp @@ -10,11 +10,11 @@ class MapObjectUnkTRSH : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkTRSH(); - /* 4C */ virtual ~MapObjectUnkTRSH() override; + /* 30 */ virtual ~MapObjectUnkTRSH() override; void func_ov027_021427e0(void); void func_ov027_021428cc(void); diff --git a/include/MapObject/MapObjectUnkTRSR.hpp b/include/MapObject/MapObjectUnkTRSR.hpp index d083a0d4..d7104549 100644 --- a/include/MapObject/MapObjectUnkTRSR.hpp +++ b/include/MapObject/MapObjectUnkTRSR.hpp @@ -10,11 +10,11 @@ class MapObjectUnkTRSR : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkTRSR(); - /* 4C */ virtual ~MapObjectUnkTRSR() override; + /* 30 */ virtual ~MapObjectUnkTRSR() override; void func_ov028_0214643c(void); void func_ov028_0214647c(void); diff --git a/include/MapObject/MapObjectUnkTRSS.hpp b/include/MapObject/MapObjectUnkTRSS.hpp index e906b77c..12599177 100644 --- a/include/MapObject/MapObjectUnkTRSS.hpp +++ b/include/MapObject/MapObjectUnkTRSS.hpp @@ -10,11 +10,11 @@ class MapObjectUnkTRSS : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkTRSS(); - /* 4C */ virtual ~MapObjectUnkTRSS() override; + /* 30 */ virtual ~MapObjectUnkTRSS() override; void func_ov028_021444c8(void); void func_ov028_021445b4(void); diff --git a/include/MapObject/MapObjectUnkTRST.hpp b/include/MapObject/MapObjectUnkTRST.hpp index 52b132f9..806711c9 100644 --- a/include/MapObject/MapObjectUnkTRST.hpp +++ b/include/MapObject/MapObjectUnkTRST.hpp @@ -10,11 +10,11 @@ class MapObjectUnkTRST : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkTRST(); - /* 4C */ virtual ~MapObjectUnkTRST() override; + /* 30 */ virtual ~MapObjectUnkTRST() override; void func_ov030_02143860(void); void func_ov030_0214394c(void); diff --git a/include/MapObject/MapObjectUnkTRSW.hpp b/include/MapObject/MapObjectUnkTRSW.hpp index aea9f002..e03e4cda 100644 --- a/include/MapObject/MapObjectUnkTRSW.hpp +++ b/include/MapObject/MapObjectUnkTRSW.hpp @@ -10,11 +10,11 @@ class MapObjectUnkTRSW : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkTRSW(); - /* 4C */ virtual ~MapObjectUnkTRSW() override; + /* 30 */ virtual ~MapObjectUnkTRSW() override; void func_ov034_02120f68(void); void func_ov034_02121014(void); diff --git a/include/MapObject/MapObjectUnkTRTF.hpp b/include/MapObject/MapObjectUnkTRTF.hpp index 27713204..b4b12087 100644 --- a/include/MapObject/MapObjectUnkTRTF.hpp +++ b/include/MapObject/MapObjectUnkTRTF.hpp @@ -10,11 +10,11 @@ class MapObjectUnkTRTF : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkTRTF(); - /* 4C */ virtual ~MapObjectUnkTRTF() override; + /* 30 */ virtual ~MapObjectUnkTRTF() override; void func_ov026_0210e398(void); void func_ov026_0210e3e4(void); diff --git a/include/MapObject/MapObjectUnkTRTS.hpp b/include/MapObject/MapObjectUnkTRTS.hpp index f3b9fe4f..20c40163 100644 --- a/include/MapObject/MapObjectUnkTRTS.hpp +++ b/include/MapObject/MapObjectUnkTRTS.hpp @@ -10,11 +10,11 @@ class MapObjectUnkTRTS : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkTRTS(); - /* 4C */ virtual ~MapObjectUnkTRTS() override; + /* 30 */ virtual ~MapObjectUnkTRTS() override; void func_ov028_021461d4(void); void func_ov028_0214625c(void); diff --git a/include/MapObject/MapObjectUnkTRWA.hpp b/include/MapObject/MapObjectUnkTRWA.hpp index 7961c49c..6f905002 100644 --- a/include/MapObject/MapObjectUnkTRWA.hpp +++ b/include/MapObject/MapObjectUnkTRWA.hpp @@ -10,11 +10,11 @@ class MapObjectUnkTRWA : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkTRWA(); - /* 4C */ virtual ~MapObjectUnkTRWA() override; + /* 30 */ virtual ~MapObjectUnkTRWA() override; void func_ov029_02142390(void); void func_ov029_0214247c(void); diff --git a/include/MapObject/MapObjectUnkTRWS.hpp b/include/MapObject/MapObjectUnkTRWS.hpp index 39c1baea..d5cf7c72 100644 --- a/include/MapObject/MapObjectUnkTRWS.hpp +++ b/include/MapObject/MapObjectUnkTRWS.hpp @@ -10,11 +10,11 @@ class MapObjectUnkTRWS : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkTRWS(); - /* 4C */ virtual ~MapObjectUnkTRWS() override; + /* 30 */ virtual ~MapObjectUnkTRWS() override; void func_ov031_02104584(void); void func_ov031_021045f8(void); diff --git a/include/MapObject/MapObjectUnkTSGM.hpp b/include/MapObject/MapObjectUnkTSGM.hpp index 8705463b..9352d553 100644 --- a/include/MapObject/MapObjectUnkTSGM.hpp +++ b/include/MapObject/MapObjectUnkTSGM.hpp @@ -10,11 +10,11 @@ class MapObjectUnkTSGM : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkTSGM(); - /* 4C */ virtual ~MapObjectUnkTSGM() override; + /* 30 */ virtual ~MapObjectUnkTSGM() override; void func_ov065_02159a14(void); void func_ov065_02159ab0(void); diff --git a/include/MapObject/MapObjectUnkTSUB.hpp b/include/MapObject/MapObjectUnkTSUB.hpp index fff2dac5..a7a703af 100644 --- a/include/MapObject/MapObjectUnkTSUB.hpp +++ b/include/MapObject/MapObjectUnkTSUB.hpp @@ -10,11 +10,11 @@ class MapObjectUnkTSUB : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkTSUB(); - /* 4C */ virtual ~MapObjectUnkTSUB() override; + /* 30 */ virtual ~MapObjectUnkTSUB() override; void func_ov031_02105088(void); void func_ov031_021050b4(void); diff --git a/include/MapObject/MapObjectUnkTWGS.hpp b/include/MapObject/MapObjectUnkTWGS.hpp index 221baee3..a899b4d7 100644 --- a/include/MapObject/MapObjectUnkTWGS.hpp +++ b/include/MapObject/MapObjectUnkTWGS.hpp @@ -10,11 +10,11 @@ class MapObjectUnkTWGS : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkTWGS(); - /* 4C */ virtual ~MapObjectUnkTWGS() override; + /* 30 */ virtual ~MapObjectUnkTWGS() override; void func_ov090_02172314(void); void func_ov090_02172328(void); diff --git a/include/MapObject/MapObjectUnkTWPC.hpp b/include/MapObject/MapObjectUnkTWPC.hpp index 7cde68f9..54f9b844 100644 --- a/include/MapObject/MapObjectUnkTWPC.hpp +++ b/include/MapObject/MapObjectUnkTWPC.hpp @@ -10,11 +10,11 @@ class MapObjectUnkTWPC : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkTWPC(); - /* 4C */ virtual ~MapObjectUnkTWPC() override; + /* 30 */ virtual ~MapObjectUnkTWPC() override; void func_ov090_02172a64(void); void func_ov090_02172b48(void); diff --git a/include/MapObject/MapObjectUnkTWPG.hpp b/include/MapObject/MapObjectUnkTWPG.hpp index 8c76ee3f..a00573e9 100644 --- a/include/MapObject/MapObjectUnkTWPG.hpp +++ b/include/MapObject/MapObjectUnkTWPG.hpp @@ -10,11 +10,11 @@ class MapObjectUnkTWPG : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkTWPG(); - /* 4C */ virtual ~MapObjectUnkTWPG() override; + /* 30 */ virtual ~MapObjectUnkTWPG() override; void func_ov090_02171638(void); void func_ov090_02171730(void); diff --git a/include/MapObject/MapObjectUnkWDST.hpp b/include/MapObject/MapObjectUnkWDST.hpp index d5b6e192..7dfeda85 100644 --- a/include/MapObject/MapObjectUnkWDST.hpp +++ b/include/MapObject/MapObjectUnkWDST.hpp @@ -10,11 +10,11 @@ class MapObjectUnkWDST : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkWDST(); - /* 4C */ virtual ~MapObjectUnkWDST() override; + /* 30 */ virtual ~MapObjectUnkWDST() override; void func_ov094_02171d4c(void); void func_ov094_02171e58(void); diff --git a/include/MapObject/MapObjectUnkWHSW.hpp b/include/MapObject/MapObjectUnkWHSW.hpp index 7a98fbb1..edebbd2a 100644 --- a/include/MapObject/MapObjectUnkWHSW.hpp +++ b/include/MapObject/MapObjectUnkWHSW.hpp @@ -10,11 +10,11 @@ class MapObjectUnkWHSW : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkWHSW(); - /* 4C */ virtual ~MapObjectUnkWHSW() override; + /* 30 */ virtual ~MapObjectUnkWHSW() override; void func_ov029_02145500(void); void func_ov029_021455b4(void); diff --git a/include/MapObject/MapObjectUnkWLMP.hpp b/include/MapObject/MapObjectUnkWLMP.hpp index 0b16f73c..58d0692a 100644 --- a/include/MapObject/MapObjectUnkWLMP.hpp +++ b/include/MapObject/MapObjectUnkWLMP.hpp @@ -10,11 +10,11 @@ class MapObjectUnkWLMP : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkWLMP(); - /* 4C */ virtual ~MapObjectUnkWLMP() override; + /* 30 */ virtual ~MapObjectUnkWLMP() override; void func_ov094_02171150(void); void func_ov094_021711d0(void); diff --git a/include/MapObject/MapObjectUnkWLMS.hpp b/include/MapObject/MapObjectUnkWLMS.hpp index 6f5251c6..a83392e6 100644 --- a/include/MapObject/MapObjectUnkWLMS.hpp +++ b/include/MapObject/MapObjectUnkWLMS.hpp @@ -10,11 +10,11 @@ class MapObjectUnkWLMS : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ MapObjectUnkWLMS(); - /* 4C */ virtual ~MapObjectUnkWLMS() override; + /* 30 */ virtual ~MapObjectUnkWLMS() override; void func_ov063_0215fe74(void); void func_ov063_0215fe88(void); diff --git a/include/MapObject/MapObjectUnkWPHL.hpp b/include/MapObject/MapObjectUnkWPHL.hpp index 0f5caffc..d6a0981d 100644 --- a/include/MapObject/MapObjectUnkWPHL.hpp +++ b/include/MapObject/MapObjectUnkWPHL.hpp @@ -10,11 +10,12 @@ class MapObjectUnkWPHL : public MapObject { public: /* 00 (base) */ - /* 94 */ + /* 40 */ STRUCT_PAD(0x40, 0x8C); + /* 8C */ MapObjectUnkWPHL(); - /* 4C */ virtual ~MapObjectUnkWPHL() override; + /* 30 */ virtual ~MapObjectUnkWPHL() override; void func_ov034_02121854(void); void func_ov034_021218f0(void); diff --git a/include/Unknown/Common.hpp b/include/Unknown/Common.hpp index 9b115e86..1e008d89 100644 --- a/include/Unknown/Common.hpp +++ b/include/Unknown/Common.hpp @@ -2,6 +2,7 @@ #include "Game/GameModeManager.hpp" #include "System/SysNew.hpp" +#include "Unknown/UnkFileSystem.hpp" #include "global.h" #include "nitro/math.h" #include "nns/text.h" @@ -766,17 +767,6 @@ public: void func_02015460(const char *param1, void *param2, unk32 param3); }; -class UnkSystem4 { -public: - /* 00 */ unk32 mUnk_00; - /* 04 */ unk32 mUnk_04; - /* 08 */ unk32 mUnk_08; - /* 0C */ unk32 mUnk_0C; - /* 10 */ - - ~UnkSystem4(); -}; - class UnkStruct2 { public: /* 00 */ unk8 pad[0x10]; @@ -791,9 +781,9 @@ struct UnkResult { void *mUnk_00; void *mUnk_04; void *mUnk_08; - UnkSystem4 mUnk_0C; - UnkSystem4 mUnk_1C; - UnkSystem4 mUnk_2C; + UnkFileSystem3 mUnk_0C; + UnkFileSystem3 mUnk_1C; + UnkFileSystem3 mUnk_2C; UnkResult(); UnkResult(const char *path); diff --git a/include/Unknown/UnkFileSystem.hpp b/include/Unknown/UnkFileSystem.hpp new file mode 100644 index 00000000..24fc1921 --- /dev/null +++ b/include/Unknown/UnkFileSystem.hpp @@ -0,0 +1,97 @@ +#pragma once + +#include "System/SysNew.hpp" +#include "types.h" + +class UnkFileSystem1 { +public: + /* 00 (vtable) */ + /* 04 */ void *mUnk_04; + /* 08 */ union { + void *mpFile; + void *volatile mpFile2; + }; + /* 0C */ size_t mFileSize; + /* 10 */ + + UnkFileSystem1(void *param1) : + mUnk_04(param1), + mpFile(NULL), + mFileSize(0) {} + + // data_02043f78 + /* 00 */ virtual ~UnkFileSystem1(); // func_02015518 && func_0201551c && func_02015528 + /* 08 */ virtual void *vfunc_08(unk32 param1) = 0; + /* 0C */ virtual void vfunc_0C(void); // func_0201552c + /* 10 */ virtual size_t vfunc_10(unk32 param1); // func_02015534 + /* 14 */ +}; + +class UnkFileSystem5 : public UnkFileSystem1 { +public: + /* 00 (base) */ + /* 10 */ HeapIndex16 mHeapIndex; + /* 12 */ unk8 mUnk_12; + /* 13 */ unk8 mUnk_13; + /* 14 */ + + UnkFileSystem5(); + UnkFileSystem5(void *param1, unk32 param2, unk32 param3, u8 param4); + + // data_02043f08 + /* 00 */ virtual ~UnkFileSystem5() override; + /* 08 */ virtual void *vfunc_08(unk32 param1) override; + /* 0C */ virtual void vfunc_0C(void) override; + /* 10 */ virtual size_t vfunc_10(unk32 param1) override; +}; + +class UnkFileSystem2_10 { +public: + /* 00 */ void *mpFile; + + UnkFileSystem2_10(); // func_02015380 + ~UnkFileSystem2_10(); // func_020153c4 +}; + +class UnkFileSystem4 : public UnkFileSystem1 { +public: + /* 00 (base) */ + /* 10 */ unk32 mUnk_10; + /* 14 */ unk32 mUnk_14; + /* 18 */ u8 mUnk_18; + /* 1C */ + + UnkFileSystem4(void *param1, unk32 param2, unk32 param3, unk32 param4); // func_02015628 + + // data_02043f24 + /* 00 */ virtual ~UnkFileSystem4() override; // func_02015644 && func_02015650 + /* 08 */ virtual void *vfunc_08(unk32 param1) override; // func_02015664 +}; + +class UnkFileSystem3 : public UnkFileSystem1 { +public: + /* 00 (base) */ + /* 10 */ + + UnkFileSystem3(void *param1) : + UnkFileSystem1(param1) {} + + // data_02043f40 + /* 00 */ virtual ~UnkFileSystem3() override; // func_0201568c && func_02015698 + /* 08 */ virtual void *vfunc_08(unk32 param1) override; // func_020156ac +}; + +class UnkFileSystem2 : public UnkFileSystem1 { +public: + /* 00 (base) */ + /* 10 */ UnkFileSystem2_10 mUnk_10; + /* 14 */ unk8 mUnk_14; + + UnkFileSystem2(void *param1, unk32 param2); // func_020156c8 + + // data_02043f5c + /* 00 */ virtual ~UnkFileSystem2() override; // func_020156f4 && func_02015708 + /* 08 */ virtual void *vfunc_08(unk32 param1) override; // func_02015724 + /* 0C */ virtual void vfunc_0C(void) override; // func_02015750 + /* 10 */ virtual size_t vfunc_10(unk32 param1) override; // func_02015758 +}; diff --git a/include/Unknown/UnkStruct_027e0ce8.hpp b/include/Unknown/UnkStruct_027e0ce8.hpp deleted file mode 100644 index aa55dded..00000000 --- a/include/Unknown/UnkStruct_027e0ce8.hpp +++ /dev/null @@ -1,49 +0,0 @@ -#pragma once - -#include "Unknown/UnkStruct_ov000_020b34c4.hpp" -#include "types.h" - -class UnkStruct_func_01fff520_ret { -public: - void func_ov031_02103878(); -}; - -class UnkStruct_027e0ce8_00 { -public: - /* 00 (vtable) */ - /* 04 */ STRUCT_PAD(0x04, 0x38); - /* 38 */ unk32 mUnk_38; - /* 3C */ STRUCT_PAD(0x3C, 0xCC); - /* CC */ unk32 mUnk_CC; - - /* 00 */ virtual void vfunc_00(); - /* 04 */ virtual void vfunc_04(); - /* 08 */ virtual void vfunc_08(); - /* 0C */ virtual void vfunc_0C(); - /* 10 */ virtual void vfunc_10(); - /* 14 */ virtual void vfunc_14(); - /* 18 */ virtual void vfunc_18(); - /* 1C */ virtual void vfunc_1C(); - /* 20 */ virtual void vfunc_20(); - /* 24 */ virtual void vfunc_24(); - /* 28 */ virtual void vfunc_28(); - /* 2C */ virtual void vfunc_2C(); - /* 30 */ virtual ~UnkStruct_027e0ce8_00(); - /* 38 */ virtual void vfunc_38() = 0; - /* 3C */ virtual void vfunc_3C() = 0; - - void func_ov000_0209d6ac(Vec3p *param1); - void func_ov034_02121d84(); -}; - -class UnkStruct_027e0ce8 { -public: - /* 00 */ UnkStruct_027e0ce8_00 *mUnk_00; // pointer to polygon list? - /* 04 */ UnkStruct_027e0ce8_00 *mUnk_04; // pointer to the end of that list - /* 08 */ UnkStruct_func_01fff520_ret **mUnk_08; - - UnkStruct_func_01fff520_ret **func_01fff520(UnkStruct_ov000_020b34c4 *param1, void *); - UnkStruct_027e0ce8_00 *func_01fff498(unk32 param1, unk32 param2); -}; - -extern UnkStruct_027e0ce8 *data_027e0ce8; diff --git a/include/Unknown/UnkStruct_ov000_020b4f84.hpp b/include/Unknown/UnkStruct_ov000_020b4f84.hpp index 445a8188..8e692abd 100644 --- a/include/Unknown/UnkStruct_ov000_020b4f84.hpp +++ b/include/Unknown/UnkStruct_ov000_020b4f84.hpp @@ -1,6 +1,7 @@ #pragma once #include "System/SysNew.hpp" +#include "Unknown/UnkFileSystem.hpp" #include "nns/font.h" #include "types.h" @@ -14,53 +15,8 @@ enum { FontIndex_Max = 6 }; -class UnkStruct_ov000_020b4f84_00_Base2 { -public: - /* 00 (vtable) */ - /* 04 */ void *mUnk_04; - /* 08 */ union { - void *mpFile; - void *volatile mpFile2; - }; - /* 0C */ size_t mFileSize; - /* 10 */ HeapIndex16 mHeapIndex; - - UnkStruct_ov000_020b4f84_00_Base2() {} - UnkStruct_ov000_020b4f84_00_Base2(void *param1, unk32 param2) : - mUnk_04(param1), - mpFile(NULL), - mFileSize(0), - mHeapIndex(param2) {} - - /* 00 */ virtual ~UnkStruct_ov000_020b4f84_00_Base2() {} - /* 08 */ virtual void *vfunc_08(unk32 param1); // file open? - /* 0C */ virtual void vfunc_0C(void); // allocate? - /* 10 */ virtual size_t vfunc_10(unk32 param1); -}; - -// file handler? doesn't seem to be specifically tied to fonts -class UnkStruct_ov000_020b4f84_00_Base : public UnkStruct_ov000_020b4f84_00_Base2 { -public: - /* 12 */ unk8 mUnk_12; - /* 13 */ unk8 mUnk_13; - /* 14 */ - - UnkStruct_ov000_020b4f84_00_Base(); - UnkStruct_ov000_020b4f84_00_Base(void *param1, unk32 param2, unk32 param3, u8 param4); - - // data_02043f08 vtable - /* 00 */ virtual ~UnkStruct_ov000_020b4f84_00_Base() override; - /* 08 */ virtual void *vfunc_08(unk32 param1) override; - /* 0C */ virtual void vfunc_0C(void) override; - /* 10 */ virtual size_t vfunc_10(unk32 param1) override; - - void func_02015528(); - void func_0201552c(); - unk32 func_02015534(); -}; - // FontEntry? -class UnkStruct_ov000_020b4f84_00 : public UnkStruct_ov000_020b4f84_00_Base { +class UnkStruct_ov000_020b4f84_00 : public UnkFileSystem5 { public: /* 00 (base) */ /* 14 */ Font_UnkStruct1 mUnk_14; diff --git a/src/000_Second/Actor/ActorManager.cpp b/src/000_Second/Actor/ActorManager.cpp index 543c9f56..f8e181b1 100644 --- a/src/000_Second/Actor/ActorManager.cpp +++ b/src/000_Second/Actor/ActorManager.cpp @@ -15,5 +15,5 @@ static ActorId gActorProfileLookupTable[] = { // }; DTCM_BEGIN; -ActorManager *gActorManager; +ActorManager *gpActorManager; DTCM_END; diff --git a/src/000_Second/Actor/ActorUnkSWOB.cpp b/src/000_Second/Actor/ActorUnkSWOB.cpp index 2dbceeb8..40a70ff8 100644 --- a/src/000_Second/Actor/ActorUnkSWOB.cpp +++ b/src/000_Second/Actor/ActorUnkSWOB.cpp @@ -98,7 +98,7 @@ ARM void ActorUnkSWOB::func_ov000_0209aa30(void) { AStack_7c.func_ov000_020975f8(); for (j = 0, i = 0; i < ARRAY_LEN(this->mUnk_A4); i++) { - if (gActorManager->func_01fff3b4(this->mUnk_A4[i].mUnk_00) == NULL) { + if (gpActorManager->func_01fff3b4(this->mUnk_A4[i].mUnk_00) == NULL) { this->mUnk_A4[i].mUnk_00 = 0; vec.x = INT_TO_Q20(gRandom.Next32(0, 11) - 5); diff --git a/src/000_Second/Actor/ActorUnk_ov000_020a8bb0.cpp b/src/000_Second/Actor/ActorUnk_ov000_020a8bb0.cpp index 90cbb563..a5a4b4ad 100644 --- a/src/000_Second/Actor/ActorUnk_ov000_020a8bb0.cpp +++ b/src/000_Second/Actor/ActorUnk_ov000_020a8bb0.cpp @@ -221,7 +221,7 @@ ARM void ActorUnk_ov000_020a8bb0::func_ov000_020a94b0() {} ARM void ActorUnk_ov000_020a8bb0::vfunc_9c() {} ARM unk32 ActorUnk_ov000_020a8bb0::vfunc_a0() { - this->func_01fff458(); + this->GetActorId(); return 1; } diff --git a/src/001_SceneInit/Actor/ActorManager_001.cpp b/src/001_SceneInit/Actor/ActorManager_001.cpp index d28be3a4..739a2db7 100644 --- a/src/001_SceneInit/Actor/ActorManager_001.cpp +++ b/src/001_SceneInit/Actor/ActorManager_001.cpp @@ -403,10 +403,10 @@ THUMB void ActorManager::func_ov001_020bb844() { } THUMB void ActorManager::SetInstance(ActorManager *instance) { - gActorManager = instance; + gpActorManager = instance; } THUMB int ActorManager::ClearInstance() { - gActorManager = NULL; + gpActorManager = NULL; //! @bug: the function expects a return value (though it seems unused) } diff --git a/src/031_Land/Actor/ActorRupee.cpp b/src/031_Land/Actor/ActorRupee.cpp index aaf621f0..de3be48a 100644 --- a/src/031_Land/Actor/ActorRupee.cpp +++ b/src/031_Land/Actor/ActorRupee.cpp @@ -337,7 +337,7 @@ ARM void ActorRupee::func_ov031_020e9438() { } ARM void ActorRupee::func_ov031_020e9450() { - this->func_ov017_020bf9c8(gActorManager->func_01fff3b4(this->mUnk_bc)); + this->func_ov017_020bf9c8(gpActorManager->func_01fff3b4(this->mUnk_bc)); this->mPrevPos = this->mPos; Vec3p_Add(&this->mPos, &this->mVel, &this->mPos); @@ -409,17 +409,17 @@ ARM void ActorRupee::func_ov031_020e95b0() { // non-matching ARM void ActorRupee::func_ov031_020e95c0() { - ActorUnk_ov000_020a8bb0 *temp_r0; + Actor *pActor; - temp_r0 = gActorManager->func_01fff3b4(this->mUnk_c0); - if (temp_r0 == NULL) { + pActor = gpActorManager->func_01fff3b4(this->mUnk_c0); + if (pActor == NULL) { this->func_ov031_020e9904(0); return; } - this->mPos.x = temp_r0->mPos.x; - this->mPos.y = temp_r0->mPos.y; - this->mPos.z = temp_r0->mPos.z; + this->mPos.x = pActor->mPos.x; + this->mPos.y = pActor->mPos.y; + this->mPos.z = pActor->mPos.z; } ARM void ActorRupee::func_ov031_020e9610() { diff --git a/src/110_PlayerGet/PlayerGet.cpp b/src/110_PlayerGet/PlayerGet.cpp index 6b36cfab..6fe0010e 100644 --- a/src/110_PlayerGet/PlayerGet.cpp +++ b/src/110_PlayerGet/PlayerGet.cpp @@ -2,6 +2,8 @@ #include "Actor/ActorId.hpp" #include "Actor/ActorManager.hpp" +#include "Actor/ActorUnkNSHD.hpp" +#include "MapObject/MapObjectManager.hpp" #include "Player/PlayerGet.hpp" #include "System/OverlayManager.hpp" #include "Unknown/UnkStruct_020d8698.hpp" @@ -9,7 +11,6 @@ #include "Unknown/UnkStruct_027e09b8.hpp" #include "Unknown/UnkStruct_027e09bc.hpp" #include "Unknown/UnkStruct_027e0cd8.hpp" -#include "Unknown/UnkStruct_027e0ce8.hpp" #include "Unknown/UnkStruct_027e0cec.hpp" #include "Unknown/UnkStruct_ov000_02067bc4.hpp" #include "Unknown/UnkStruct_ov000_020b34c4.hpp" @@ -33,8 +34,6 @@ extern "C" void func_ov000_02058fc4(unk32 *, UnkStruct_PlayerGet_74 *, Vec3p *); extern unk32 *data_027e0958; extern "C" void func_ov024_020d6370(unk32 *, ItemId); extern unk32 *data_ov024_020d86b0; -extern "C" unk32 func_01fff584(); -extern "C" ActorId func_01fff458(void *); extern "C" void func_ov000_0208ba10(char *, void *, unk32); extern "C" unk32 func_ov000_020a4c00(ItemId itemId); extern "C" void func_02015ea8(unk32, unk16 *); @@ -286,7 +285,7 @@ ARM bool PlayerGet::func_ov110_02186b8c() { ARM void PlayerGet::vfunc_0c(UnkStruct_PlayerGet_vfunc_0c_param1 *param1) { ItemManager *pItemManager; ItemId itemId; - ActorUnk_ov000_020a8bb0 *iVar10; + Actor *iVar10; Vec3p *pUnk_38; Vec3p *pUnk_3c; char auStack_108[12]; @@ -349,13 +348,13 @@ ARM void PlayerGet::vfunc_0c(UnkStruct_PlayerGet_vfunc_0c_param1 *param1) { return; } - iVar10 = gActorManager->func_01fff3b4(*(u32 *) this->mUnk_54.mUnk_00); + iVar10 = gpActorManager->func_01fff3b4(*(u32 *) this->mUnk_54.mUnk_00); if (iVar10 == NULL) { return; } - if (iVar10->func_01fff458() == ActorId_NormalShield) { + if (iVar10->GetActorId() == ActorId_NormalShield) { UNSET_FLAG(iVar10->mFlags, ActorFlag_Visible); iVar10->mUnk_4a = 0; } @@ -499,14 +498,14 @@ const UnkStruct_ov110_021861ec data_ov110_021861ec = UnkStruct_ov110_021861ec(0x ARM void PlayerGet::vfunc_10(unk32 param1, unk32 param2) { unk32 var_r1; - UnkStruct_func_01fff520_ret **temp_r0_6; + MapObject **temp_r0_6; s32 temp_r5; bool temp_r6; s32 var_r0; s32 var_r0_2; bool var_r1_2; u32 var_r5_2; - ActorUnk_ov000_020a8bb0 *temp_r0_3; + ActorUnkNSHD *temp_r0_3; switch (param1) { case 0x39: @@ -631,8 +630,9 @@ ARM void PlayerGet::vfunc_10(unk32 param1, unk32 param2) { this->mUnk_30->func_ov000_020936ec(); if (((*(u16 *) this->mUnk_54.mUnk_00 << 0x10) >> 0x1E) == 1) { - temp_r0_3 = gActorManager->func_01fff3b4(*(u32 *) this->mUnk_54.mUnk_00); - if ((temp_r0_3 != NULL) && (temp_r0_3->func_01fff458() == ActorId_NormalShield)) { + temp_r0_3 = (ActorUnkNSHD *) gpActorManager->func_01fff3b4(*(u32 *) this->mUnk_54.mUnk_00); + + if ((temp_r0_3 != NULL) && (temp_r0_3->GetActorId() == ActorId_NormalShield)) { if (this->func_ov110_02186b8c()) { this->mUnk_28->pItemManager->mUnk_12 ^= 2; } @@ -669,24 +669,27 @@ ARM void PlayerGet::vfunc_10(unk32 param1, unk32 param2) { } if (*(u16 *) this->mUnk_54.mUnk_00 == 0x1000) { - if (data_027e0ce8->func_01fff498(this->mUnk_54.mUnk_00[0], this->mUnk_54.mUnk_00[1]) != 0) { - var_r5_2 = '\0'; + MapObject *pMapObj = gpMapObjManager->func_01fff498(this->mUnk_54.mUnk_00[0], this->mUnk_54.mUnk_00[1]); - switch (func_01fff584()) { - case 'TRLN': - var_r5_2 = 'TREN'; + if (pMapObj != NULL) { + var_r5_2 = MapObjectId_None; + + switch (pMapObj->GetMapObjectId()) { + case MapObjectId_TRLN: + var_r5_2 = MapObjectId_TREN; break; - case 'TREN': - var_r5_2 = 'TRLN'; + case MapObjectId_TREN: + var_r5_2 = MapObjectId_TRLN; break; default: break; } - if (var_r5_2 != 0) { - // data_ov000_020b34c4.mUnk_04 = var_r5_2; - temp_r0_6 = data_027e0ce8->func_01fff520(&data_ov000_020b34c4, data_027e0ce8->mUnk_00); - if (temp_r0_6 == data_027e0ce8->mUnk_08) { + if (var_r5_2 != MapObjectId_None) { + data_ov000_020b34c4.mUnk_04 = var_r5_2; + temp_r0_6 = gpMapObjManager->func_01fff520(&data_ov000_020b34c4, gpMapObjManager->mMapObjTable); + + if (temp_r0_6 == gpMapObjManager->mUnk_08) { (*temp_r0_6)->func_ov031_02103878(); } } diff --git a/src/112_PlayerSceneChange/PlayerSceneChange.cpp b/src/112_PlayerSceneChange/PlayerSceneChange.cpp index 8b6242d8..e1b3f13e 100644 --- a/src/112_PlayerSceneChange/PlayerSceneChange.cpp +++ b/src/112_PlayerSceneChange/PlayerSceneChange.cpp @@ -1,10 +1,11 @@ #include "Player/PlayerSceneChange.hpp" #include "Actor/ActorManager.hpp" #include "Actor/ActorUnk_ov000_020a8bb0.hpp" +#include "MapObject/MapObjectManager.hpp" +#include "MapObject/MapObjectUnkDRTY.hpp" #include "Unknown/UnkStruct_027e09b8.hpp" #include "Unknown/UnkStruct_027e0cd8.hpp" #include "Unknown/UnkStruct_027e0cdc.hpp" -#include "Unknown/UnkStruct_027e0ce8.hpp" #include @@ -48,9 +49,9 @@ ARM PlayerSceneChange::~PlayerSceneChange() { ARM s16 PlayerSceneChange::func_ov112_02184bbc(s16 param1) { // fake match? if ((u32) (*(u16 *) &this->mUnk_90 << 0x10) >> 0x1E == 1) { - ActorUnk_ov000_020a8bb0 *iVar1 = gActorManager->func_01fff3b4(this->mUnk_90); + Actor *iVar1 = gpActorManager->func_01fff3b4(this->mUnk_90); - if (iVar1 != 0) { + if (iVar1 != NULL) { return iVar1->mAngle; } } else if (this->mUnk_94[0] == 0x1000) { @@ -62,7 +63,6 @@ ARM s16 PlayerSceneChange::func_ov112_02184bbc(s16 param1) { extern "C" bool func_ov096_02179c14(); extern "C" void func_ov034_02121de4(void *); -extern "C" unk32 func_01fff584(); extern q4 data_02040964[]; extern q4 data_0203e964[]; extern q4 data_02041964[]; @@ -145,18 +145,19 @@ ARM void PlayerSceneChange::vfunc_0c(UnkStruct_PlayerGet_vfunc_0c_param1 *param1 break; default: if (this->mUnk_2c->mUnk_150 == 0x1000) { - UnkStruct_027e0ce8_00 *temp_r0_4 = data_027e0ce8->func_01fff498(this->mUnk_2c->mUnk_150 >> 0x10, 0); + MapObjectUnkDRTY *pDRTY = + (MapObjectUnkDRTY *) gpMapObjManager->func_01fff498(this->mUnk_2c->mUnk_150 >> 0x10, 0); - if (temp_r0_4 != NULL) { - temp_r0_4->func_ov000_0209d6ac((Vec3p *) &this->mUnk_70); + if (pDRTY != NULL) { + pDRTY->func_ov000_0209d6ac((Vec3p *) &this->mUnk_70); if (this->mUnk_68 == 0x19) { - temp_r0_4->func_ov034_02121d84(); - this->mUnk_8C = temp_r0_4->mUnk_38; - } else if (func_01fff584() == 'DRTY') { - *(u32 *) this->mUnk_94 = temp_r0_4->mUnk_38; + pDRTY->func_ov034_02121d84(); + this->mUnk_8C = pDRTY->mUnk_38; + } else if (pDRTY->GetMapObjectId() == MapObjectId_DRTY) { + *(u32 *) this->mUnk_94 = pDRTY->mUnk_38; - switch (temp_r0_4->mUnk_CC) { + switch (pDRTY->mUnk_CC) { case 1: this->mUnk_AE = FLOAT_TO_Q20(-5.778f); break; @@ -171,14 +172,15 @@ ARM void PlayerSceneChange::vfunc_0c(UnkStruct_PlayerGet_vfunc_0c_param1 *param1 } } else { if (((u32) ((u16) this->mUnk_2c->mUnk_150 << 0x10) >> 0x1E) == 1) { - ActorUnk_ov000_020a8bb0 *temp_r0_6 = gActorManager->func_01fff3b4(this->mUnk_2c->mUnk_150); + ActorUnk_ov000_020a8bb0 *temp_r0_6 = + (ActorUnk_ov000_020a8bb0 *) gpActorManager->func_01fff3b4(this->mUnk_2c->mUnk_150); if (temp_r0_6 != NULL) { this->mUnk_70.x = temp_r0_6->mPos.x; this->mUnk_70.y = temp_r0_6->mPos.y; this->mUnk_70.z = temp_r0_6->mPos.z; - if (temp_r0_6->func_01fff458() == 'GTTG') { + if (temp_r0_6->GetActorId() == ActorId_GTTG) { this->mUnk_90 = temp_r0_6->mRef.index; this->mUnk_AA = temp_r0_6->mAngle; this->mUnk_A8 = temp_r0_6->mAngle; @@ -282,8 +284,8 @@ ARM void PlayerSceneChange::vfunc_0c(UnkStruct_PlayerGet_vfunc_0c_param1 *param1 return; } - UnkStruct_027e0ce8_00 *target = data_027e0ce8->func_01fff498(this->mUnk_8C >> 16, 0); - if (target != NULL && func_01fff584() == 'WPHL') { + MapObject *target = gpMapObjManager->func_01fff498(this->mUnk_8C >> 16, 0); + if (target != NULL && target->GetMapObjectId() == MapObjectId_WPHL) { func_ov034_02121de4(target); } @@ -321,9 +323,9 @@ ARM void PlayerSceneChange::vfunc_0c(UnkStruct_PlayerGet_vfunc_0c_param1 *param1 } local_9c; local_9c.ptr = &data_ov000_020b3000; local_9c.actorId = ActorId_RPMT; - Actor **ppAVar12 = gActorManager->func_01fff350(&local_9c, gActorManager->mActorTable); + Actor **ppAVar12 = gpActorManager->func_01fff350(&local_9c, gpActorManager->mActorTable); - if (ppAVar12 == gActorManager->mUnk_08) { + if (ppAVar12 == gpActorManager->mUnk_08) { struct { unk8 mUnk_04; unk8 pad[4]; diff --git a/src/Main/UnkFileSystem.cpp b/src/Main/UnkFileSystem.cpp new file mode 100644 index 00000000..3518c569 --- /dev/null +++ b/src/Main/UnkFileSystem.cpp @@ -0,0 +1,119 @@ +#include "System/SysNew.hpp" +#include "Unknown/UnkStruct_ov000_020b4f84.hpp" + +extern "C" size_t func_020010e0(UnkStruct_02011e10_Sub1 *heapID, void *pFile, unk32 param3); +extern "C" void *func_02012ec8(unk32, unk16, void *, size_t *, unk32, u8); +extern "C" void *func_02012ee4(void *, unk32, unk32, size_t *, u8); +extern "C" void *func_02012f6c(void *, size_t *); +extern "C" HeapIndex16 func_02015338(); + +THUMB UnkFileSystem1::~UnkFileSystem1() {} + +THUMB void UnkFileSystem1::vfunc_0C() { + this->mpFile = NULL; + this->mFileSize = 0; +} + +THUMB size_t UnkFileSystem1::vfunc_10(unk32 param1) { + return this->mFileSize; +} + +THUMB UnkFileSystem5::UnkFileSystem5() : + UnkFileSystem1(0) { + this->mUnk_04 = NULL; + this->mpFile = NULL; + this->mFileSize = 0; + this->mHeapIndex = HeapIndex_1; + this->mUnk_12 = 0; +} + +THUMB UnkFileSystem5::UnkFileSystem5(void *param1, unk32 param2, unk32 param3, u8 param4) : + UnkFileSystem1(param1) { + this->mHeapIndex = param3; + this->mUnk_12 = param4; +} + +THUMB UnkFileSystem5::~UnkFileSystem5() { + this->vfunc_0C(); +} + +THUMB void *UnkFileSystem5::vfunc_08(unk32 param1) { + if (this->mpFile == NULL) { + this->mpFile = func_02012ec8(0, this->mHeapIndex, this->mUnk_04, &this->mFileSize, param1, this->mUnk_12); + } + + return this->mpFile; +} + +THUMB void UnkFileSystem5::vfunc_0C(void) { + if (this->mpFile2 != NULL) { + delete this->mpFile; + this->UnkFileSystem1::vfunc_0C(); + } +} + +THUMB size_t UnkFileSystem5::vfunc_10(unk32 param1) { + size_t prevFileSize = this->mFileSize; + + if (this->mpFile2 != NULL && param1 < this->mFileSize) { + if (data_0204999c.mUnk_00[this->mHeapIndex]->mId == UnkId_EXPH) { + this->mFileSize = func_020010e0(data_0204999c.mUnk_00[this->mHeapIndex], this->mpFile, param1); + } + } + + return prevFileSize; +} + +THUMB UnkFileSystem4::UnkFileSystem4(void *param1, unk32 param2, unk32 param3, unk32 param4) : + UnkFileSystem1(param1) { + this->mUnk_18 = param2; + this->mUnk_10 = param3; + this->mUnk_14 = param4; +} + +THUMB UnkFileSystem4::~UnkFileSystem4() {} + +THUMB void *UnkFileSystem4::vfunc_08(unk32 param1) { + if (this->mpFile == NULL) { + this->mpFile = func_02012ee4(this->mUnk_04, this->mUnk_10, this->mUnk_14, &this->mFileSize, this->mUnk_18); + } + + return this->mpFile; +} + +THUMB UnkFileSystem3::~UnkFileSystem3() {} + +THUMB void *UnkFileSystem3::vfunc_08(unk32 param1) { + if (this->mpFile == NULL) { + this->mpFile = func_02012f6c(this->mUnk_04, &this->mFileSize); + } + + return this->mpFile; +} + +THUMB UnkFileSystem2::UnkFileSystem2(void *param1, unk32 param2) : + UnkFileSystem1(param1) { + this->mUnk_14 = param2; +} + +THUMB UnkFileSystem2::~UnkFileSystem2() {} + +THUMB void *UnkFileSystem2::vfunc_08(unk32 param1) { + this->mpFile = this->mUnk_10.mpFile = + func_02012ec8(0, func_02015338(), this->mUnk_04, &this->mFileSize, -32, this->mUnk_14); + return this->mpFile; +} + +THUMB void UnkFileSystem2::vfunc_0C(void) { + this->mpFile = NULL; +} + +THUMB size_t UnkFileSystem2::vfunc_10(unk32 param1) { + size_t prevFileSize = this->mFileSize; + + if (this->mpFile2 != NULL && param1 < this->mFileSize) { + this->mFileSize = func_020010e0(data_0204999c.mUnk_00[func_02015338()], this->mpFile, param1); + } + + return prevFileSize; +} diff --git a/src/Main/UnkStruct_ov000_020b4f84_00_Base.cpp b/src/Main/UnkStruct_ov000_020b4f84_00_Base.cpp deleted file mode 100644 index 3b857db5..00000000 --- a/src/Main/UnkStruct_ov000_020b4f84_00_Base.cpp +++ /dev/null @@ -1,61 +0,0 @@ -#include "System/SysNew.hpp" -#include "Unknown/UnkStruct_ov000_020b4f84.hpp" - -extern "C" void *func_02012ec8(unk32, unk16, void *, size_t *, unk32, u8); -extern "C" size_t func_020010e0(UnkStruct_02011e10_Sub1 *heapID, void *pFile, unk32 param3); - -THUMB void UnkStruct_ov000_020b4f84_00_Base::func_02015528() {} - -THUMB void UnkStruct_ov000_020b4f84_00_Base::func_0201552c() { - this->mpFile = NULL; - this->mFileSize = 0; -} - -THUMB unk32 UnkStruct_ov000_020b4f84_00_Base::func_02015534() { - return this->mFileSize; -} - -THUMB UnkStruct_ov000_020b4f84_00_Base::UnkStruct_ov000_020b4f84_00_Base() { - this->mUnk_04 = NULL; - this->mpFile = NULL; - this->mFileSize = 0; - this->mHeapIndex = HeapIndex_1; - this->mUnk_12 = 0; -} - -THUMB UnkStruct_ov000_020b4f84_00_Base::UnkStruct_ov000_020b4f84_00_Base(void *param1, unk32 param2, unk32 param3, u8 param4) : - UnkStruct_ov000_020b4f84_00_Base2(param1, param3) { - this->mUnk_12 = param4; -} - -THUMB UnkStruct_ov000_020b4f84_00_Base::~UnkStruct_ov000_020b4f84_00_Base() { - this->vfunc_0C(); - this->func_02015528(); -} - -THUMB void *UnkStruct_ov000_020b4f84_00_Base::vfunc_08(unk32 param1) { - if (this->mpFile == NULL) { - this->mpFile = func_02012ec8(0, this->mHeapIndex, this->mUnk_04, &this->mFileSize, param1, this->mUnk_12); - } - - return this->mpFile; -} - -THUMB void UnkStruct_ov000_020b4f84_00_Base::vfunc_0C(void) { - if (this->mpFile2 != NULL) { - delete this->mpFile; - this->func_0201552c(); - } -} - -THUMB size_t UnkStruct_ov000_020b4f84_00_Base::vfunc_10(unk32 param1) { - size_t prevFileSize = this->mFileSize; - - if (this->mpFile2 != NULL && param1 < this->mFileSize) { - if (data_0204999c.mUnk_00[this->mHeapIndex]->mId == UnkId_EXPH) { - this->mFileSize = func_020010e0(data_0204999c.mUnk_00[this->mHeapIndex], this->mpFile, param1); - } - } - - return prevFileSize; -} diff --git a/tools/configure.py b/tools/configure.py index d5cd9f38..cf60d163 100755 --- a/tools/configure.py +++ b/tools/configure.py @@ -129,7 +129,7 @@ config.libs = [ Object("Main/Game/Game.cpp"), Object("Main/Player/TouchControl.cpp"), Object("Main/System/OverlayManager.cpp"), - Object("Main/UnkStruct_ov000_020b4f84_00_Base.cpp"), + Object("Main/UnkFileSystem.cpp"), Object("Main/System/Random.cpp"), Object("Main/Game/GameModeLinkListNode.cpp"), Object("Main/func_02017ea4.cpp"),