diff --git a/config/eur/arm9/overlays/ov031/delinks.txt b/config/eur/arm9/overlays/ov031/delinks.txt index 497c292c..ff8777f7 100644 --- a/config/eur/arm9/overlays/ov031/delinks.txt +++ b/config/eur/arm9/overlays/ov031/delinks.txt @@ -181,28 +181,28 @@ src/031_Land/MapObject/MapObjectDoorBase.cpp: .data start:0x02114ffc end:0x021150b0 .bss start:0x02117204 end:0x0211727c -src/031_Land/MapObject/MapObjectUnkDRDS.cpp: +src/031_Land/MapObject/MapObjectDoorDangerSpawn.cpp: .text start:0x020fd0f8 end:0x020fe734 .init start:0x02111b28 end:0x02111b8c .ctor start:0x02112814 end:0x02112818 .data start:0x021150b0 end:0x02115184 .bss start:0x0211727c end:0x02117360 -src/031_Land/MapObject/MapObjectUnkDRKY.cpp: +src/031_Land/MapObject/MapObjectDoorKey.cpp: .text start:0x020fe734 end:0x020fee6c .init start:0x02111b8c end:0x02111bf0 .ctor start:0x02112818 end:0x0211281c .data start:0x02115184 end:0x02115254 .bss start:0x02117360 end:0x02117444 -src/031_Land/MapObject/MapObjectUnkDRSW.cpp: +src/031_Land/MapObject/MapObjectDoorSwitch.cpp: .text start:0x020fee6c end:0x020ff518 .init start:0x02111bf0 end:0x02111c54 .ctor start:0x0211281c end:0x02112820 .data start:0x02115254 end:0x02115328 .bss start:0x02117444 end:0x02117528 -src/031_Land/MapObject/MapObjectUnkDRCK.cpp: +src/031_Land/MapObject/MapObjectDoorClick.cpp: .text start:0x020ff518 end:0x02100230 .rodata start:0x02110c1c end:0x02110c3c .init start:0x02111c54 end:0x02111cb8 @@ -210,7 +210,7 @@ src/031_Land/MapObject/MapObjectUnkDRCK.cpp: .data start:0x02115328 end:0x02115414 .bss start:0x02117528 end:0x021175a0 -src/031_Land/MapObject/MapObjectUnkDRTC.cpp: +src/031_Land/MapObject/MapObjectDoorTouch.cpp: .text start:0x0210024c end:0x021004bc .init start:0x02111cb8 end:0x02111d08 .ctor start:0x02112824 end:0x02112828 diff --git a/config/eur/arm9/overlays/ov031/symbols.txt b/config/eur/arm9/overlays/ov031/symbols.txt index 61a9ad81..450b6baf 100644 --- a/config/eur/arm9/overlays/ov031/symbols.txt +++ b/config/eur/arm9/overlays/ov031/symbols.txt @@ -1312,131 +1312,131 @@ _ZN17MapObjectDoorBaseD1Ev kind:function(arm,size=0x20) addr:0x020fd090 _ZN17MapObjectDoorBaseD0Ev kind:function(arm,size=0x28) addr:0x020fd0b0 _ZThn64_N17MapObjectDoorBase9vfunc2_08Ev kind:function(arm,size=0x10) addr:0x020fd0d8 _ZThn64_N17MapObjectDoorBase9vfunc2_04Ev kind:function(arm,size=0x10) addr:0x020fd0e8 -_ZN23MapObjectProfileUnkDRDS10GetProfileEv kind:function(arm,size=0xc) addr:0x020fd0f8 -_ZN23MapObjectProfileUnkDRDS6CreateEv kind:function(arm,size=0x24) addr:0x020fd104 -_ZN23MapObjectProfileUnkDRDSC1Ev kind:function(arm,size=0x50) addr:0x020fd128 -_ZN16MapObjectUnkDRDSC1Ev kind:function(arm,size=0xbc) addr:0x020fd178 -_ZN16MapObjectUnkDRDS8vfunc_00Ev kind:function(arm,size=0x50) addr:0x020fd234 -_ZN16MapObjectUnkDRDS8vfunc_04Ev kind:function(arm,size=0x174) addr:0x020fd284 -_ZN16MapObjectUnkDRDS9vfunc2_04Ev kind:function(arm,size=0xc) addr:0x020fd3f8 -_ZN16MapObjectUnkDRDS9vfunc2_08Ev kind:function(arm,size=0x70) addr:0x020fd404 -_ZN16MapObjectUnkDRDS8vfunc_08Ev kind:function(arm,size=0x374) addr:0x020fd474 -_ZN16MapObjectUnkDRDS8vfunc_0CEv kind:function(arm,size=0x2c) addr:0x020fd7e8 -_ZN16MapObjectUnkDRDS8vfunc_5CEii kind:function(arm,size=0x3f4) addr:0x020fd814 -_ZN16MapObjectUnkDRDS8vfunc_64Ev kind:function(arm,size=0xbc) addr:0x020fdc08 -_ZN16MapObjectUnkDRDS8vfunc_68Ev kind:function(arm,size=0xac) addr:0x020fdcc4 -_ZN16MapObjectUnkDRDS8vfunc_6CEv kind:function(arm,size=0x158) addr:0x020fdd70 -_ZN16MapObjectUnkDRDS19func_ov031_020fdec8Ev kind:function(arm,size=0xf8) addr:0x020fdec8 -_ZN16MapObjectUnkDRDS8vfunc_18EPcc kind:function(arm,size=0xc) addr:0x020fdfc0 -_ZN16MapObjectUnkDRDS8vfunc_14Ev kind:function(arm,size=0x80) addr:0x020fdfcc -_ZN16MapObjectUnkDRDS9vfunc2_10Ev kind:function(arm,size=0x84) addr:0x020fe04c -_ZN16MapObjectUnkDRDS8vfunc_74Ev kind:function(arm,size=0x15c) addr:0x020fe0d0 -_ZN16MapObjectUnkDRDS8vfunc_7CEv kind:function(arm,size=0x24) addr:0x020fe22c -_ZN16MapObjectUnkDRDS8vfunc_40Ev kind:function(arm,size=0x28) addr:0x020fe250 -_ZN16MapObjectUnkDRDS8vfunc_44Ev kind:function(arm,size=0x44) addr:0x020fe278 -_ZN16MapObjectUnkDRDS8vfunc_48Ev kind:function(arm,size=0x2c) addr:0x020fe2bc -_ZN16MapObjectUnkDRDS8vfunc_4CEv kind:function(arm,size=0x44) addr:0x020fe2e8 -_ZN16MapObjectUnkDRDS8vfunc_88Ev kind:function(arm,size=0x24) addr:0x020fe32c -_ZN16MapObjectUnkDRDS8vfunc_8CEv kind:function(arm,size=0x38) addr:0x020fe350 -_ZN16MapObjectUnkDRDS8vfunc_84EiP5Vec3pPs kind:function(arm,size=0x274) addr:0x020fe388 -_ZN16MapObjectUnkDRDS19func_ov031_020fe5fcEP5Vec3pPS_ kind:function(arm,size=0x9c) addr:0x020fe5fc -_ZN16MapObjectUnkDRDSD1Ev kind:function(arm,size=0x30) addr:0x020fe698 -_ZN16MapObjectUnkDRDSD0Ev kind:function(arm,size=0x38) addr:0x020fe6c8 -_ZN23MapObjectProfileUnkDRDSD1Ev kind:function(arm,size=0x14) addr:0x020fe700 -_ZThn64_N16MapObjectUnkDRDS9vfunc2_08Ev kind:function(arm,size=0x10) addr:0x020fe714 -_ZThn64_N16MapObjectUnkDRDS9vfunc2_04Ev kind:function(arm,size=0x10) addr:0x020fe724 -_ZN23MapObjectProfileUnkDRKY10GetProfileEv kind:function(arm,size=0xc) addr:0x020fe734 -_ZN23MapObjectProfileUnkDRKY6CreateEv kind:function(arm,size=0x24) addr:0x020fe740 -_ZN23MapObjectProfileUnkDRKYC1Ev kind:function(arm,size=0x54) addr:0x020fe764 -_ZN16MapObjectUnkDRKYC1Ev kind:function(arm,size=0xb4) addr:0x020fe7b8 -_ZN16MapObjectUnkDRKY8vfunc_00Ev kind:function(arm,size=0x1c) addr:0x020fe86c -_ZN16MapObjectUnkDRKY8vfunc_08Ev kind:function(arm,size=0x18) addr:0x020fe888 -_ZN16MapObjectUnkDRKY8vfunc_18EPcc kind:function(arm,size=0xc) addr:0x020fe8a0 -_ZN16MapObjectUnkDRKY8vfunc_14Ev kind:function(arm,size=0x14c) addr:0x020fe8ac -_ZN16MapObjectUnkDRKY8vfunc_5CEii kind:function(arm,size=0x90) addr:0x020fe9f8 -_ZN16MapObjectUnkDRKY19func_ov031_020fea88Ev kind:function(arm,size=0x34) addr:0x020fea88 -_ZN16MapObjectUnkDRKY8vfunc_28Ev kind:function(arm,size=0x90) addr:0x020feabc -_ZN16MapObjectUnkDRKY8vfunc_64Ev kind:function(arm,size=0xc) addr:0x020feb4c -_ZN16MapObjectUnkDRKY8vfunc_68Ev kind:function(arm,size=0x8) addr:0x020feb58 -_ZN16MapObjectUnkDRKY8vfunc_6CEv kind:function(arm,size=0x8) addr:0x020feb60 -_ZN16MapObjectUnkDRKY8vfunc_74Ev kind:function(arm,size=0x50) addr:0x020feb68 -_ZN16MapObjectUnkDRKY8vfunc_7CEv kind:function(arm,size=0x24) addr:0x020febb8 -_ZN16MapObjectUnkDRKY8vfunc_78Ev kind:function(arm,size=0x19c) addr:0x020febdc -_ZN16MapObjectUnkDRKY8vfunc_40Ev kind:function(arm,size=0x2c) addr:0x020fed78 -_ZN16MapObjectUnkDRKY8vfunc_44Ev kind:function(arm,size=0x44) addr:0x020feda4 -_ZN16MapObjectUnkDRKY8vfunc_48Ev kind:function(arm,size=0x4) addr:0x020fede8 -_ZN16MapObjectUnkDRKY8vfunc_4CEv kind:function(arm,size=0x4) addr:0x020fedec -_ZN16MapObjectUnkDRKYD1Ev kind:function(arm,size=0x30) addr:0x020fedf0 -_ZN16MapObjectUnkDRKYD0Ev kind:function(arm,size=0x38) addr:0x020fee20 -_ZN23MapObjectProfileUnkDRKYD1Ev kind:function(arm,size=0x14) addr:0x020fee58 -_ZN23MapObjectProfileUnkDRSW10GetProfileEv kind:function(arm,size=0xc) addr:0x020fee6c -_ZN23MapObjectProfileUnkDRSW6CreateEv kind:function(arm,size=0x24) addr:0x020fee78 -_ZN23MapObjectProfileUnkDRSWC1Ev kind:function(arm,size=0x48) addr:0x020fee9c -_ZN16MapObjectUnkDRSWC2Ev kind:function(arm,size=0x64) addr:0x020feee4 -_ZN16MapObjectUnkDRSWC1Ev kind:function(arm,size=0x64) addr:0x020fef48 -_ZN16MapObjectUnkDRSW8vfunc_00Ev kind:function(arm,size=0xd0) addr:0x020fefac -_ZN16MapObjectUnkDRSW8vfunc_08Ev kind:function(arm,size=0x84) addr:0x020ff07c -_ZN16MapObjectUnkDRSW8vfunc_64Ev kind:function(arm,size=0x10) addr:0x020ff100 -_ZN16MapObjectUnkDRSW8vfunc_6CEv kind:function(arm,size=0x20) addr:0x020ff110 -_ZN16MapObjectUnkDRSW8vfunc_14Ev kind:function(arm,size=0x80) addr:0x020ff130 -_ZN16MapObjectUnkDRSW8vfunc_18EPcc kind:function(arm,size=0xc) addr:0x020ff1b0 -_ZN16MapObjectUnkDRSW8vfunc_74Ev kind:function(arm,size=0xcc) addr:0x020ff1bc -_ZN16MapObjectUnkDRSW9vfunc2_10Ev kind:function(arm,size=0x50) addr:0x020ff288 -_ZN16MapObjectUnkDRSW8vfunc_50Ev kind:function(arm,size=0x40) addr:0x020ff2d8 -_ZN16MapObjectUnkDRSW8vfunc_54Ev kind:function(arm,size=0x74) addr:0x020ff318 -_ZN16MapObjectUnkDRSW8vfunc_58Ev kind:function(arm,size=0x44) addr:0x020ff38c -_ZN16MapObjectUnkDRSW8vfunc_40Ev kind:function(arm,size=0x2c) addr:0x020ff3d0 -_ZN16MapObjectUnkDRSW8vfunc_44Ev kind:function(arm,size=0x40) addr:0x020ff3fc -_ZN16MapObjectUnkDRSW8vfunc_48Ev kind:function(arm,size=0x2c) addr:0x020ff43c -_ZN16MapObjectUnkDRSW8vfunc_4CEv kind:function(arm,size=0x44) addr:0x020ff468 -_ZN16MapObjectUnkDRSWD1Ev kind:function(arm,size=0x28) addr:0x020ff4ac -_ZN16MapObjectUnkDRSWD0Ev kind:function(arm,size=0x30) addr:0x020ff4d4 -_ZN23MapObjectProfileUnkDRSWD1Ev kind:function(arm,size=0x14) addr:0x020ff504 -_ZN23MapObjectProfileUnkDRCK10GetProfileEv kind:function(arm,size=0xc) addr:0x020ff518 -_ZN23MapObjectProfileUnkDRCK6CreateEv kind:function(arm,size=0x24) addr:0x020ff524 -_ZN23MapObjectProfileUnkDRCKC1Ev kind:function(arm,size=0x50) addr:0x020ff548 -_ZN16MapObjectUnkDRCKC2Ev kind:function(arm,size=0x88) addr:0x020ff598 -_ZN16MapObjectUnkDRCKC1Ev kind:function(arm,size=0x88) addr:0x020ff620 -_ZN16MapObjectUnkDRCK9vfunc2_1CEi kind:function(arm,size=0x14) addr:0x020ff6a8 -_ZN16MapObjectUnkDRCK8vfunc_00Ev kind:function(arm,size=0x100) addr:0x020ff6bc -_ZN16MapObjectUnkDRCK8vfunc_08Ev kind:function(arm,size=0x3d0) addr:0x020ff7bc -_ZN16MapObjectUnkDRCK8vfunc_18EPcc kind:function(arm,size=0xc) addr:0x020ffb8c -_ZN16MapObjectUnkDRCK8vfunc_14Ev kind:function(arm,size=0x14c) addr:0x020ffb98 -_ZN16MapObjectUnkDRCK8vfunc_5CEii kind:function(arm,size=0xf8) addr:0x020ffce4 -_ZN16MapObjectUnkDRCK9vfunc2_14Ev kind:function(arm,size=0x8) addr:0x020ffddc -_ZN16MapObjectUnkDRCK19func_ov031_020ffde4Ev kind:function(arm,size=0x38) addr:0x020ffde4 -_ZN16MapObjectUnkDRCK8vfunc_28Ev kind:function(arm,size=0x60) addr:0x020ffe1c -_ZN16MapObjectUnkDRCK8vfunc_64Ev kind:function(arm,size=0x10) addr:0x020ffe7c -_ZN16MapObjectUnkDRCK8vfunc_68Ev kind:function(arm,size=0x8) addr:0x020ffe8c -_ZN16MapObjectUnkDRCK8vfunc_6CEv kind:function(arm,size=0x8) addr:0x020ffe94 -_ZN16MapObjectUnkDRCK8vfunc_74Ev kind:function(arm,size=0x50) addr:0x020ffe9c -_ZN16MapObjectUnkDRCK8vfunc_7CEv kind:function(arm,size=0x24) addr:0x020ffeec -_ZN16MapObjectUnkDRCK8vfunc_78Ev kind:function(arm,size=0x19c) addr:0x020fff10 -_ZN16MapObjectUnkDRCK9vfunc2_10Ev kind:function(arm,size=0x8c) addr:0x021000ac -_ZN16MapObjectUnkDRCK8vfunc_40Ev kind:function(arm,size=0x2c) addr:0x02100138 -_ZN16MapObjectUnkDRCK8vfunc_44Ev kind:function(arm,size=0x44) addr:0x02100164 -_ZN16MapObjectUnkDRCK8vfunc_48Ev kind:function(arm,size=0x4) addr:0x021001a8 -_ZN16MapObjectUnkDRCK8vfunc_4CEv kind:function(arm,size=0x4) addr:0x021001ac -_ZN16MapObjectUnkDRCK9vfunc2_18Ev kind:function(arm,size=0x4) addr:0x021001b0 -_ZN16MapObjectUnkDRCKD1Ev kind:function(arm,size=0x30) addr:0x021001b4 -_ZN16MapObjectUnkDRCKD0Ev kind:function(arm,size=0x38) addr:0x021001e4 -_ZN23MapObjectProfileUnkDRCKD1Ev kind:function(arm,size=0x14) addr:0x0210021c -_ZN23MapObjectProfileUnkDRCKD0Ev kind:function(arm,size=0x1c) addr:0x02100230 -_ZN23MapObjectProfileUnkDRTC10GetProfileEv kind:function(arm,size=0xc) addr:0x0210024c -_ZN23MapObjectProfileUnkDRTC6CreateEv kind:function(arm,size=0x24) addr:0x02100258 -_ZN23MapObjectProfileUnkDRTCC1Ev kind:function(arm,size=0x4c) addr:0x0210027c -_ZN16MapObjectUnkDRTCC1Ev kind:function(arm,size=0x34) addr:0x021002c8 -_ZN16MapObjectUnkDRTC8vfunc_00Ev kind:function(arm,size=0x18) addr:0x021002fc -_ZN16MapObjectUnkDRTC9vfunc2_10Ev kind:function(arm,size=0x8c) addr:0x02100314 -_ZN16MapObjectUnkDRTC8vfunc_40Ev kind:function(arm,size=0x28) addr:0x021003a0 -_ZN16MapObjectUnkDRTC8vfunc_44Ev kind:function(arm,size=0x44) addr:0x021003c8 -_ZN16MapObjectUnkDRTC8vfunc_48Ev kind:function(arm,size=0x4) addr:0x0210040c -_ZN16MapObjectUnkDRTC8vfunc_4CEv kind:function(arm,size=0x4) addr:0x02100410 -_ZN16MapObjectUnkDRTC9vfunc2_18Ev kind:function(arm,size=0x2c) addr:0x02100414 -_ZN16MapObjectUnkDRTCD1Ev kind:function(arm,size=0x30) addr:0x02100440 -_ZN16MapObjectUnkDRTCD0Ev kind:function(arm,size=0x38) addr:0x02100470 -_ZN23MapObjectProfileUnkDRTCD1Ev kind:function(arm,size=0x14) addr:0x021004a8 -_ZN23MapObjectProfileUnkDRTCD0Ev kind:function(arm,size=0x1c) addr:0x021004bc +_ZN31MapObjectProfileDoorDangerSpawn10GetProfileEv kind:function(arm,size=0xc) addr:0x020fd0f8 +_ZN31MapObjectProfileDoorDangerSpawn6CreateEv kind:function(arm,size=0x24) addr:0x020fd104 +_ZN31MapObjectProfileDoorDangerSpawnC1Ev kind:function(arm,size=0x50) addr:0x020fd128 +_ZN24MapObjectDoorDangerSpawnC1Ev kind:function(arm,size=0xbc) addr:0x020fd178 +_ZN24MapObjectDoorDangerSpawn8vfunc_00Ev kind:function(arm,size=0x50) addr:0x020fd234 +_ZN24MapObjectDoorDangerSpawn8vfunc_04Ev kind:function(arm,size=0x174) addr:0x020fd284 +_ZN24MapObjectDoorDangerSpawn9vfunc2_04Ev kind:function(arm,size=0xc) addr:0x020fd3f8 +_ZN24MapObjectDoorDangerSpawn9vfunc2_08Ev kind:function(arm,size=0x70) addr:0x020fd404 +_ZN24MapObjectDoorDangerSpawn8vfunc_08Ev kind:function(arm,size=0x374) addr:0x020fd474 +_ZN24MapObjectDoorDangerSpawn8vfunc_0CEv kind:function(arm,size=0x2c) addr:0x020fd7e8 +_ZN24MapObjectDoorDangerSpawn8vfunc_5CEii kind:function(arm,size=0x3f4) addr:0x020fd814 +_ZN24MapObjectDoorDangerSpawn8vfunc_64Ev kind:function(arm,size=0xbc) addr:0x020fdc08 +_ZN24MapObjectDoorDangerSpawn8vfunc_68Ev kind:function(arm,size=0xac) addr:0x020fdcc4 +_ZN24MapObjectDoorDangerSpawn8vfunc_6CEv kind:function(arm,size=0x158) addr:0x020fdd70 +_ZN24MapObjectDoorDangerSpawn19func_ov031_020fdec8Ev kind:function(arm,size=0xf8) addr:0x020fdec8 +_ZN24MapObjectDoorDangerSpawn8vfunc_18EPcc kind:function(arm,size=0xc) addr:0x020fdfc0 +_ZN24MapObjectDoorDangerSpawn8vfunc_14Ev kind:function(arm,size=0x80) addr:0x020fdfcc +_ZN24MapObjectDoorDangerSpawn9vfunc2_10Ev kind:function(arm,size=0x84) addr:0x020fe04c +_ZN24MapObjectDoorDangerSpawn8vfunc_74Ev kind:function(arm,size=0x15c) addr:0x020fe0d0 +_ZN24MapObjectDoorDangerSpawn8vfunc_7CEv kind:function(arm,size=0x24) addr:0x020fe22c +_ZN24MapObjectDoorDangerSpawn8vfunc_40Ev kind:function(arm,size=0x28) addr:0x020fe250 +_ZN24MapObjectDoorDangerSpawn8vfunc_44Ev kind:function(arm,size=0x44) addr:0x020fe278 +_ZN24MapObjectDoorDangerSpawn8vfunc_48Ev kind:function(arm,size=0x2c) addr:0x020fe2bc +_ZN24MapObjectDoorDangerSpawn8vfunc_4CEv kind:function(arm,size=0x44) addr:0x020fe2e8 +_ZN24MapObjectDoorDangerSpawn8vfunc_88Ev kind:function(arm,size=0x24) addr:0x020fe32c +_ZN24MapObjectDoorDangerSpawn8vfunc_8CEv kind:function(arm,size=0x38) addr:0x020fe350 +_ZN24MapObjectDoorDangerSpawn8vfunc_84EiP5Vec3pPs kind:function(arm,size=0x274) addr:0x020fe388 +_ZN24MapObjectDoorDangerSpawn19func_ov031_020fe5fcEP5Vec3pPS_ kind:function(arm,size=0x9c) addr:0x020fe5fc +_ZN24MapObjectDoorDangerSpawnD1Ev kind:function(arm,size=0x30) addr:0x020fe698 +_ZN24MapObjectDoorDangerSpawnD0Ev kind:function(arm,size=0x38) addr:0x020fe6c8 +_ZN31MapObjectProfileDoorDangerSpawnD1Ev kind:function(arm,size=0x14) addr:0x020fe700 +_ZThn64_N24MapObjectDoorDangerSpawn9vfunc2_08Ev kind:function(arm,size=0x10) addr:0x020fe714 +_ZThn64_N24MapObjectDoorDangerSpawn9vfunc2_04Ev kind:function(arm,size=0x10) addr:0x020fe724 +_ZN23MapObjectProfileDoorKey10GetProfileEv kind:function(arm,size=0xc) addr:0x020fe734 +_ZN23MapObjectProfileDoorKey6CreateEv kind:function(arm,size=0x24) addr:0x020fe740 +_ZN23MapObjectProfileDoorKeyC1Ev kind:function(arm,size=0x54) addr:0x020fe764 +_ZN16MapObjectDoorKeyC1Ev kind:function(arm,size=0xb4) addr:0x020fe7b8 +_ZN16MapObjectDoorKey8vfunc_00Ev kind:function(arm,size=0x1c) addr:0x020fe86c +_ZN16MapObjectDoorKey8vfunc_08Ev kind:function(arm,size=0x18) addr:0x020fe888 +_ZN16MapObjectDoorKey8vfunc_18EPcc kind:function(arm,size=0xc) addr:0x020fe8a0 +_ZN16MapObjectDoorKey8vfunc_14Ev kind:function(arm,size=0x14c) addr:0x020fe8ac +_ZN16MapObjectDoorKey8vfunc_5CEii kind:function(arm,size=0x90) addr:0x020fe9f8 +_ZN16MapObjectDoorKey19func_ov031_020fea88Ev kind:function(arm,size=0x34) addr:0x020fea88 +_ZN16MapObjectDoorKey8vfunc_28Ev kind:function(arm,size=0x90) addr:0x020feabc +_ZN16MapObjectDoorKey8vfunc_64Ev kind:function(arm,size=0xc) addr:0x020feb4c +_ZN16MapObjectDoorKey8vfunc_68Ev kind:function(arm,size=0x8) addr:0x020feb58 +_ZN16MapObjectDoorKey8vfunc_6CEv kind:function(arm,size=0x8) addr:0x020feb60 +_ZN16MapObjectDoorKey8vfunc_74Ev kind:function(arm,size=0x50) addr:0x020feb68 +_ZN16MapObjectDoorKey8vfunc_7CEv kind:function(arm,size=0x24) addr:0x020febb8 +_ZN16MapObjectDoorKey8vfunc_78Ev kind:function(arm,size=0x19c) addr:0x020febdc +_ZN16MapObjectDoorKey8vfunc_40Ev kind:function(arm,size=0x2c) addr:0x020fed78 +_ZN16MapObjectDoorKey8vfunc_44Ev kind:function(arm,size=0x44) addr:0x020feda4 +_ZN16MapObjectDoorKey8vfunc_48Ev kind:function(arm,size=0x4) addr:0x020fede8 +_ZN16MapObjectDoorKey8vfunc_4CEv kind:function(arm,size=0x4) addr:0x020fedec +_ZN16MapObjectDoorKeyD1Ev kind:function(arm,size=0x30) addr:0x020fedf0 +_ZN16MapObjectDoorKeyD0Ev kind:function(arm,size=0x38) addr:0x020fee20 +_ZN23MapObjectProfileDoorKeyD1Ev kind:function(arm,size=0x14) addr:0x020fee58 +_ZN26MapObjectProfileDoorSwitch10GetProfileEv kind:function(arm,size=0xc) addr:0x020fee6c +_ZN26MapObjectProfileDoorSwitch6CreateEv kind:function(arm,size=0x24) addr:0x020fee78 +_ZN26MapObjectProfileDoorSwitchC1Ev kind:function(arm,size=0x48) addr:0x020fee9c +_ZN19MapObjectDoorSwitchC2Ev kind:function(arm,size=0x64) addr:0x020feee4 +_ZN19MapObjectDoorSwitchC1Ev kind:function(arm,size=0x64) addr:0x020fef48 +_ZN19MapObjectDoorSwitch8vfunc_00Ev kind:function(arm,size=0xd0) addr:0x020fefac +_ZN19MapObjectDoorSwitch8vfunc_08Ev kind:function(arm,size=0x84) addr:0x020ff07c +_ZN19MapObjectDoorSwitch8vfunc_64Ev kind:function(arm,size=0x10) addr:0x020ff100 +_ZN19MapObjectDoorSwitch8vfunc_6CEv kind:function(arm,size=0x20) addr:0x020ff110 +_ZN19MapObjectDoorSwitch8vfunc_14Ev kind:function(arm,size=0x80) addr:0x020ff130 +_ZN19MapObjectDoorSwitch8vfunc_18EPcc kind:function(arm,size=0xc) addr:0x020ff1b0 +_ZN19MapObjectDoorSwitch8vfunc_74Ev kind:function(arm,size=0xcc) addr:0x020ff1bc +_ZN19MapObjectDoorSwitch9vfunc2_10Ev kind:function(arm,size=0x50) addr:0x020ff288 +_ZN19MapObjectDoorSwitch8vfunc_50Ev kind:function(arm,size=0x40) addr:0x020ff2d8 +_ZN19MapObjectDoorSwitch8vfunc_54Ev kind:function(arm,size=0x74) addr:0x020ff318 +_ZN19MapObjectDoorSwitch8vfunc_58Ev kind:function(arm,size=0x44) addr:0x020ff38c +_ZN19MapObjectDoorSwitch8vfunc_40Ev kind:function(arm,size=0x2c) addr:0x020ff3d0 +_ZN19MapObjectDoorSwitch8vfunc_44Ev kind:function(arm,size=0x40) addr:0x020ff3fc +_ZN19MapObjectDoorSwitch8vfunc_48Ev kind:function(arm,size=0x2c) addr:0x020ff43c +_ZN19MapObjectDoorSwitch8vfunc_4CEv kind:function(arm,size=0x44) addr:0x020ff468 +_ZN19MapObjectDoorSwitchD1Ev kind:function(arm,size=0x28) addr:0x020ff4ac +_ZN19MapObjectDoorSwitchD0Ev kind:function(arm,size=0x30) addr:0x020ff4d4 +_ZN26MapObjectProfileDoorSwitchD1Ev kind:function(arm,size=0x14) addr:0x020ff504 +_ZN25MapObjectProfileDoorClick10GetProfileEv kind:function(arm,size=0xc) addr:0x020ff518 +_ZN25MapObjectProfileDoorClick6CreateEv kind:function(arm,size=0x24) addr:0x020ff524 +_ZN25MapObjectProfileDoorClickC1Ev kind:function(arm,size=0x50) addr:0x020ff548 +_ZN18MapObjectDoorClickC2Ev kind:function(arm,size=0x88) addr:0x020ff598 +_ZN18MapObjectDoorClickC1Ev kind:function(arm,size=0x88) addr:0x020ff620 +_ZN18MapObjectDoorClick9vfunc2_1CEi kind:function(arm,size=0x14) addr:0x020ff6a8 +_ZN18MapObjectDoorClick8vfunc_00Ev kind:function(arm,size=0x100) addr:0x020ff6bc +_ZN18MapObjectDoorClick8vfunc_08Ev kind:function(arm,size=0x3d0) addr:0x020ff7bc +_ZN18MapObjectDoorClick8vfunc_18EPcc kind:function(arm,size=0xc) addr:0x020ffb8c +_ZN18MapObjectDoorClick8vfunc_14Ev kind:function(arm,size=0x14c) addr:0x020ffb98 +_ZN18MapObjectDoorClick8vfunc_5CEii kind:function(arm,size=0xf8) addr:0x020ffce4 +_ZN18MapObjectDoorClick9vfunc2_14Ev kind:function(arm,size=0x8) addr:0x020ffddc +_ZN18MapObjectDoorClick19func_ov031_020ffde4Ev kind:function(arm,size=0x38) addr:0x020ffde4 +_ZN18MapObjectDoorClick8vfunc_28Ev kind:function(arm,size=0x60) addr:0x020ffe1c +_ZN18MapObjectDoorClick8vfunc_64Ev kind:function(arm,size=0x10) addr:0x020ffe7c +_ZN18MapObjectDoorClick8vfunc_68Ev kind:function(arm,size=0x8) addr:0x020ffe8c +_ZN18MapObjectDoorClick8vfunc_6CEv kind:function(arm,size=0x8) addr:0x020ffe94 +_ZN18MapObjectDoorClick8vfunc_74Ev kind:function(arm,size=0x50) addr:0x020ffe9c +_ZN18MapObjectDoorClick8vfunc_7CEv kind:function(arm,size=0x24) addr:0x020ffeec +_ZN18MapObjectDoorClick8vfunc_78Ev kind:function(arm,size=0x19c) addr:0x020fff10 +_ZN18MapObjectDoorClick9vfunc2_10Ev kind:function(arm,size=0x8c) addr:0x021000ac +_ZN18MapObjectDoorClick8vfunc_40Ev kind:function(arm,size=0x2c) addr:0x02100138 +_ZN18MapObjectDoorClick8vfunc_44Ev kind:function(arm,size=0x44) addr:0x02100164 +_ZN18MapObjectDoorClick8vfunc_48Ev kind:function(arm,size=0x4) addr:0x021001a8 +_ZN18MapObjectDoorClick8vfunc_4CEv kind:function(arm,size=0x4) addr:0x021001ac +_ZN18MapObjectDoorClick9vfunc2_18Ev kind:function(arm,size=0x4) addr:0x021001b0 +_ZN18MapObjectDoorClickD1Ev kind:function(arm,size=0x30) addr:0x021001b4 +_ZN18MapObjectDoorClickD0Ev kind:function(arm,size=0x38) addr:0x021001e4 +_ZN25MapObjectProfileDoorClickD1Ev kind:function(arm,size=0x14) addr:0x0210021c +_ZN25MapObjectProfileDoorClickD0Ev kind:function(arm,size=0x1c) addr:0x02100230 +_ZN25MapObjectProfileDoorTouch10GetProfileEv kind:function(arm,size=0xc) addr:0x0210024c +_ZN25MapObjectProfileDoorTouch6CreateEv kind:function(arm,size=0x24) addr:0x02100258 +_ZN25MapObjectProfileDoorTouchC1Ev kind:function(arm,size=0x4c) addr:0x0210027c +_ZN18MapObjectDoorTouchC1Ev kind:function(arm,size=0x34) addr:0x021002c8 +_ZN18MapObjectDoorTouch8vfunc_00Ev kind:function(arm,size=0x18) addr:0x021002fc +_ZN18MapObjectDoorTouch9vfunc2_10Ev kind:function(arm,size=0x8c) addr:0x02100314 +_ZN18MapObjectDoorTouch8vfunc_40Ev kind:function(arm,size=0x28) addr:0x021003a0 +_ZN18MapObjectDoorTouch8vfunc_44Ev kind:function(arm,size=0x44) addr:0x021003c8 +_ZN18MapObjectDoorTouch8vfunc_48Ev kind:function(arm,size=0x4) addr:0x0210040c +_ZN18MapObjectDoorTouch8vfunc_4CEv kind:function(arm,size=0x4) addr:0x02100410 +_ZN18MapObjectDoorTouch9vfunc2_18Ev kind:function(arm,size=0x2c) addr:0x02100414 +_ZN18MapObjectDoorTouchD1Ev kind:function(arm,size=0x30) addr:0x02100440 +_ZN18MapObjectDoorTouchD0Ev kind:function(arm,size=0x38) addr:0x02100470 +_ZN25MapObjectProfileDoorTouchD1Ev kind:function(arm,size=0x14) addr:0x021004a8 +_ZN25MapObjectProfileDoorTouchD0Ev kind:function(arm,size=0x1c) addr:0x021004bc _ZN23MapObjectProfileUnkEXIT10GetProfileEv kind:function(arm,size=0xc) addr:0x021004d8 _ZN23MapObjectProfileUnkEXIT6CreateEv kind:function(arm,size=0x24) addr:0x021004e4 _ZN23MapObjectProfileUnkEXITC1Ev kind:function(arm,size=0x48) addr:0x02100508 @@ -2100,11 +2100,11 @@ __sinit_ActorUnkCLLT.cpp kind:function(arm,size=0x50) addr:0x021119fc __sinit_ActorUnkEFSB.cpp kind:function(arm,size=0x50) addr:0x02111a4c __sinit_ActorUnkNFSP.cpp kind:function(arm,size=0x50) addr:0x02111a9c __sinit_MapObjectDoorBase.cpp kind:function(arm,size=0x3c) addr:0x02111aec local -__sinit_MapObjectUnkDRDS.cpp kind:function(arm,size=0x64) addr:0x02111b28 -__sinit_MapObjectUnkDRKY.cpp kind:function(arm,size=0x64) addr:0x02111b8c -__sinit_MapObjectUnkDRSW.cpp kind:function(arm,size=0x64) addr:0x02111bf0 -__sinit_MapObjectUnkDRCK.cpp kind:function(arm,size=0x64) addr:0x02111c54 -__sinit_MapObjectUnkDRTC.cpp kind:function(arm,size=0x50) addr:0x02111cb8 +__sinit_MapObjectDoorDangerSpawn.cpp kind:function(arm,size=0x64) addr:0x02111b28 +__sinit_MapObjectDoorKey.cpp kind:function(arm,size=0x64) addr:0x02111b8c +__sinit_MapObjectDoorSwitch.cpp kind:function(arm,size=0x64) addr:0x02111bf0 +__sinit_MapObjectDoorClick.cpp kind:function(arm,size=0x64) addr:0x02111c54 +__sinit_MapObjectDoorTouch.cpp kind:function(arm,size=0x50) addr:0x02111cb8 __sinit_MapObjectUnkEXIT.cpp kind:function(arm,size=0x50) addr:0x02111d08 __sinit_MapObjectUnkGATE.cpp kind:function(arm,size=0x50) addr:0x02111d58 __sinit_MapObjectUnkSTIR.cpp kind:function(arm,size=0x50) addr:0x02111da8 @@ -2164,11 +2164,11 @@ __sinit_MapObjectUnkSWFS.cpp kind:function(arm,size=0x70) addr:0x02112724 .p__sinit_ActorUnkEFSB.cpp kind:data(word) addr:0x02112808 .p__sinit_ActorUnkNFSP.cpp kind:data(word) addr:0x0211280c .p__sinit_MapObjectDoorBase.cpp kind:data(word) addr:0x02112810 local -.p__sinit_MapObjectUnkDRDS.cpp kind:data(word) addr:0x02112814 -.p__sinit_MapObjectUnkDRKY.cpp kind:data(word) addr:0x02112818 -.p__sinit_MapObjectUnkDRSW.cpp kind:data(word) addr:0x0211281c -.p__sinit_MapObjectUnkDRCK.cpp kind:data(word) addr:0x02112820 -.p__sinit_MapObjectUnkDRTC.cpp kind:data(word) addr:0x02112824 +.p__sinit_MapObjectDoorDangerSpawn.cpp kind:data(word) addr:0x02112814 +.p__sinit_MapObjectDoorKey.cpp kind:data(word) addr:0x02112818 +.p__sinit_MapObjectDoorSwitch.cpp kind:data(word) addr:0x0211281c +.p__sinit_MapObjectDoorClick.cpp kind:data(word) addr:0x02112820 +.p__sinit_MapObjectDoorTouch.cpp kind:data(word) addr:0x02112824 .p__sinit_MapObjectUnkEXIT.cpp kind:data(word) addr:0x02112828 .p__sinit_MapObjectUnkGATE.cpp kind:data(word) addr:0x0211282c .p__sinit_MapObjectUnkSTIR.cpp kind:data(word) addr:0x02112830 @@ -2416,19 +2416,19 @@ _ZTV19data_ov031_02114f9c kind:data(any) addr:0x02114f9c data_ov031_02114ffc kind:data(any) addr:0x02114ffc _ZTV17MapObjectDoorBase kind:data(any) addr:0x02115000 data_ov031_021150b0 kind:data(any) addr:0x021150b0 -_ZTV23MapObjectProfileUnkDRDS kind:data(any) addr:0x021150b4 -_ZTV16MapObjectUnkDRDS kind:data(any) addr:0x021150d0 +_ZTV31MapObjectProfileDoorDangerSpawn kind:data(any) addr:0x021150b4 +_ZTV24MapObjectDoorDangerSpawn kind:data(any) addr:0x021150d0 data_ov031_02115184 kind:data(any) addr:0x02115184 -_ZTV23MapObjectProfileUnkDRKY kind:data(any) addr:0x02115188 -_ZTV16MapObjectUnkDRKY kind:data(any) addr:0x021151a4 +_ZTV23MapObjectProfileDoorKey kind:data(any) addr:0x02115188 +_ZTV16MapObjectDoorKey kind:data(any) addr:0x021151a4 data_ov031_02115254 kind:data(any) addr:0x02115254 -_ZTV23MapObjectProfileUnkDRSW kind:data(any) addr:0x02115258 -_ZTV16MapObjectUnkDRSW kind:data(any) addr:0x02115274 +_ZTV26MapObjectProfileDoorSwitch kind:data(any) addr:0x02115258 +_ZTV19MapObjectDoorSwitch kind:data(any) addr:0x02115274 data_ov031_02115328 kind:data(any) addr:0x02115328 local -_ZTV23MapObjectProfileUnkDRCK kind:data(any) addr:0x0211532c -_ZTV16MapObjectUnkDRCK kind:data(any) addr:0x02115354 -_ZTV23MapObjectProfileUnkDRTC kind:data(any) addr:0x02115414 -_ZTV16MapObjectUnkDRTC kind:data(any) addr:0x0211543c +_ZTV25MapObjectProfileDoorClick kind:data(any) addr:0x0211532c +_ZTV18MapObjectDoorClick kind:data(any) addr:0x02115354 +_ZTV25MapObjectProfileDoorTouch kind:data(any) addr:0x02115414 +_ZTV18MapObjectDoorTouch kind:data(any) addr:0x0211543c _ZTV19data_ov031_02115504 kind:data(any) addr:0x021154fc data_ov031_02115520 kind:data(any) addr:0x02115520 data_ov031_02115560 kind:data(any) addr:0x02115560 @@ -2619,21 +2619,21 @@ _ZGVN15ProfileInstanceI19ActorProfileUnkNFSPE8sProfileE kind:bss addr:0x0211711c _ZN15ProfileInstanceI19ActorProfileUnkNFSPE8sProfileE kind:bss addr:0x0211712c data_ov031_02117204 kind:bss(size=0x8) addr:0x02117204 data_ov031_02117210 kind:bss addr:0x02117210 -_ZGVN15ProfileInstanceI23MapObjectProfileUnkDRDSE8sProfileE kind:bss addr:0x0211727c +_ZGVN15ProfileInstanceI31MapObjectProfileDoorDangerSpawnE8sProfileE kind:bss addr:0x0211727c @10933 kind:bss addr:0x02117280 -_ZN15ProfileInstanceI23MapObjectProfileUnkDRDSE8sProfileE kind:bss addr:0x0211728c -_ZGVN15ProfileInstanceI23MapObjectProfileUnkDRKYE8sProfileE kind:bss addr:0x02117360 +_ZN15ProfileInstanceI31MapObjectProfileDoorDangerSpawnE8sProfileE kind:bss addr:0x0211728c +_ZGVN15ProfileInstanceI23MapObjectProfileDoorKeyE8sProfileE kind:bss addr:0x02117360 @10939 kind:bss addr:0x02117364 -_ZN15ProfileInstanceI23MapObjectProfileUnkDRKYE8sProfileE kind:bss addr:0x02117370 -_ZGVN15ProfileInstanceI23MapObjectProfileUnkDRSWE8sProfileE kind:bss addr:0x02117444 +_ZN15ProfileInstanceI23MapObjectProfileDoorKeyE8sProfileE kind:bss addr:0x02117370 +_ZGVN15ProfileInstanceI26MapObjectProfileDoorSwitchE8sProfileE kind:bss addr:0x02117444 @10945 kind:bss addr:0x02117448 -_ZN15ProfileInstanceI23MapObjectProfileUnkDRSWE8sProfileE kind:bss addr:0x02117454 -_ZGVN15ProfileInstanceI23MapObjectProfileUnkDRCKE8sProfileE kind:bss addr:0x02117528 +_ZN15ProfileInstanceI26MapObjectProfileDoorSwitchE8sProfileE kind:bss addr:0x02117454 +_ZGVN15ProfileInstanceI25MapObjectProfileDoorClickE8sProfileE kind:bss addr:0x02117528 @10951 kind:bss addr:0x0211752c -_ZN15ProfileInstanceI23MapObjectProfileUnkDRCKE8sProfileE kind:bss addr:0x02117538 -_ZGVN15ProfileInstanceI23MapObjectProfileUnkDRTCE8sProfileE kind:bss addr:0x021175a0 +_ZN15ProfileInstanceI25MapObjectProfileDoorClickE8sProfileE kind:bss addr:0x02117538 +_ZGVN15ProfileInstanceI25MapObjectProfileDoorTouchE8sProfileE kind:bss addr:0x021175a0 @10957 kind:bss addr:0x021175a4 -_ZN15ProfileInstanceI23MapObjectProfileUnkDRTCE8sProfileE kind:bss addr:0x021175b0 +_ZN15ProfileInstanceI25MapObjectProfileDoorTouchE8sProfileE kind:bss addr:0x021175b0 _ZGVN15ProfileInstanceI23MapObjectProfileUnkEXITE8sProfileE kind:bss addr:0x02117618 @10963 kind:bss addr:0x0211761c _ZN15ProfileInstanceI23MapObjectProfileUnkEXITE8sProfileE kind:bss addr:0x02117628 diff --git a/config/jp/arm9/overlays/ov031/delinks.txt b/config/jp/arm9/overlays/ov031/delinks.txt index 8a26f09a..31a87d0f 100644 --- a/config/jp/arm9/overlays/ov031/delinks.txt +++ b/config/jp/arm9/overlays/ov031/delinks.txt @@ -181,28 +181,28 @@ src/031_Land/MapObject/MapObjectDoorBase.cpp: .data start:0x02116d70 end:0x02116e24 .bss start:0x02118fa4 end:0x0211901c -src/031_Land/MapObject/MapObjectUnkDRDS.cpp: +src/031_Land/MapObject/MapObjectDoorDangerSpawn.cpp: .text start:0x020feb40 end:0x021001dc .init start:0x021138b4 end:0x02113918 .ctor start:0x021145a0 end:0x021145a4 .data start:0x02116e24 end:0x02116ef8 .bss start:0x0211901c end:0x02119100 -src/031_Land/MapObject/MapObjectUnkDRKY.cpp: +src/031_Land/MapObject/MapObjectDoorKey.cpp: .text start:0x021001dc end:0x02100914 .init start:0x02113918 end:0x0211397c .ctor start:0x021145a4 end:0x021145a8 .data start:0x02116ef8 end:0x02116fc8 .bss start:0x02119100 end:0x021191e4 -src/031_Land/MapObject/MapObjectUnkDRSW.cpp: +src/031_Land/MapObject/MapObjectDoorSwitch.cpp: .text start:0x02100914 end:0x02101260 .init start:0x0211397c end:0x021139e0 .ctor start:0x021145a8 end:0x021145ac .data start:0x02116fc8 end:0x0211709c .bss start:0x021191e4 end:0x021192c8 -src/031_Land/MapObject/MapObjectUnkDRCK.cpp: +src/031_Land/MapObject/MapObjectDoorClick.cpp: .text start:0x02101260 end:0x02101f78 .rodata start:0x0211298c end:0x021129ac .init start:0x021139e0 end:0x02113a44 @@ -210,7 +210,7 @@ src/031_Land/MapObject/MapObjectUnkDRCK.cpp: .data start:0x0211709c end:0x02117188 .bss start:0x021192c8 end:0x02119340 -src/031_Land/MapObject/MapObjectUnkDRTC.cpp: +src/031_Land/MapObject/MapObjectDoorTouch.cpp: .text start:0x02101f94 end:0x02102204 .init start:0x02113a44 end:0x02113a94 .ctor start:0x021145b0 end:0x021145b4 diff --git a/config/jp/arm9/overlays/ov031/symbols.txt b/config/jp/arm9/overlays/ov031/symbols.txt index 2f12d1a1..7f8a9634 100644 --- a/config/jp/arm9/overlays/ov031/symbols.txt +++ b/config/jp/arm9/overlays/ov031/symbols.txt @@ -1311,131 +1311,131 @@ _ZN17MapObjectDoorBaseD1Ev kind:function(arm,size=0x20) addr:0x020fead8 _ZN17MapObjectDoorBaseD0Ev kind:function(arm,size=0x28) addr:0x020feaf8 _ZThn64_N17MapObjectDoorBase9vfunc2_08Ev kind:function(arm,size=0x10) addr:0x020feb20 _ZThn64_N17MapObjectDoorBase9vfunc2_04Ev kind:function(arm,size=0x10) addr:0x020feb30 -_ZN23MapObjectProfileUnkDRDS10GetProfileEv kind:function(arm,size=0xc) addr:0x020feb40 -_ZN23MapObjectProfileUnkDRDS6CreateEv kind:function(arm,size=0x24) addr:0x020feb4c -_ZN23MapObjectProfileUnkDRDSC1Ev kind:function(arm,size=0x50) addr:0x020feb70 -_ZN16MapObjectUnkDRDSC1Ev kind:function(arm,size=0xbc) addr:0x020febc0 -_ZN16MapObjectUnkDRDS8vfunc_00Ev kind:function(arm,size=0x50) addr:0x020fec7c -_ZN16MapObjectUnkDRDS8vfunc_04Ev kind:function(arm,size=0x1d4) addr:0x020feccc -_ZN16MapObjectUnkDRDS9vfunc2_04Ev kind:function(arm,size=0xc) addr:0x020feea0 -_ZN16MapObjectUnkDRDS9vfunc2_08Ev kind:function(arm,size=0x70) addr:0x020feeac -_ZN16MapObjectUnkDRDS8vfunc_08Ev kind:function(arm,size=0x374) addr:0x020fef1c -_ZN16MapObjectUnkDRDS8vfunc_0CEv kind:function(arm,size=0x2c) addr:0x020ff290 -_ZN16MapObjectUnkDRDS8vfunc_5CEii kind:function(arm,size=0x3f4) addr:0x020ff2bc -_ZN16MapObjectUnkDRDS8vfunc_64Ev kind:function(arm,size=0xbc) addr:0x020ff6b0 -_ZN16MapObjectUnkDRDS8vfunc_68Ev kind:function(arm,size=0xac) addr:0x020ff76c -_ZN16MapObjectUnkDRDS8vfunc_6CEv kind:function(arm,size=0x158) addr:0x020ff818 -_ZN16MapObjectUnkDRDS19func_ov031_020fdec8Ev kind:function(arm,size=0xf8) addr:0x020ff970 -_ZN16MapObjectUnkDRDS8vfunc_18EPcc kind:function(arm,size=0xc) addr:0x020ffa68 -_ZN16MapObjectUnkDRDS8vfunc_14Ev kind:function(arm,size=0x80) addr:0x020ffa74 -_ZN16MapObjectUnkDRDS9vfunc2_10Ev kind:function(arm,size=0x84) addr:0x020ffaf4 -_ZN16MapObjectUnkDRDS8vfunc_74Ev kind:function(arm,size=0x15c) addr:0x020ffb78 -_ZN16MapObjectUnkDRDS8vfunc_7CEv kind:function(arm,size=0x24) addr:0x020ffcd4 -_ZN16MapObjectUnkDRDS8vfunc_40Ev kind:function(arm,size=0x28) addr:0x020ffcf8 -_ZN16MapObjectUnkDRDS8vfunc_44Ev kind:function(arm,size=0x44) addr:0x020ffd20 -_ZN16MapObjectUnkDRDS8vfunc_48Ev kind:function(arm,size=0x2c) addr:0x020ffd64 -_ZN16MapObjectUnkDRDS8vfunc_4CEv kind:function(arm,size=0x44) addr:0x020ffd90 -_ZN16MapObjectUnkDRDS8vfunc_88Ev kind:function(arm,size=0x24) addr:0x020ffdd4 -_ZN16MapObjectUnkDRDS8vfunc_8CEv kind:function(arm,size=0x38) addr:0x020ffdf8 -_ZN16MapObjectUnkDRDS8vfunc_84EiP5Vec3pPs kind:function(arm,size=0x274) addr:0x020ffe30 -_ZN16MapObjectUnkDRDS19func_ov031_020fe5fcEP5Vec3pPS_ kind:function(arm,size=0x9c) addr:0x021000a4 -_ZN16MapObjectUnkDRDSD1Ev kind:function(arm,size=0x30) addr:0x02100140 -_ZN16MapObjectUnkDRDSD0Ev kind:function(arm,size=0x38) addr:0x02100170 -_ZN23MapObjectProfileUnkDRDSD1Ev kind:function(arm,size=0x14) addr:0x021001a8 -_ZThn64_N16MapObjectUnkDRDS9vfunc2_08Ev kind:function(arm,size=0x10) addr:0x021001bc -_ZThn64_N16MapObjectUnkDRDS9vfunc2_04Ev kind:function(arm,size=0x10) addr:0x021001cc -_ZN23MapObjectProfileUnkDRKY10GetProfileEv kind:function(arm,size=0xc) addr:0x021001dc -_ZN23MapObjectProfileUnkDRKY6CreateEv kind:function(arm,size=0x24) addr:0x021001e8 -_ZN23MapObjectProfileUnkDRKYC1Ev kind:function(arm,size=0x54) addr:0x0210020c -_ZN16MapObjectUnkDRKYC1Ev kind:function(arm,size=0xb4) addr:0x02100260 -_ZN16MapObjectUnkDRKY8vfunc_00Ev kind:function(arm,size=0x1c) addr:0x02100314 -_ZN16MapObjectUnkDRKY8vfunc_08Ev kind:function(arm,size=0x18) addr:0x02100330 -_ZN16MapObjectUnkDRKY8vfunc_18EPcc kind:function(arm,size=0xc) addr:0x02100348 -_ZN16MapObjectUnkDRKY8vfunc_14Ev kind:function(arm,size=0x14c) addr:0x02100354 -_ZN16MapObjectUnkDRKY8vfunc_5CEii kind:function(arm,size=0x90) addr:0x021004a0 -_ZN16MapObjectUnkDRKY19func_ov031_020fea88Ev kind:function(arm,size=0x34) addr:0x02100530 -_ZN16MapObjectUnkDRKY8vfunc_28Ev kind:function(arm,size=0x90) addr:0x02100564 -_ZN16MapObjectUnkDRKY8vfunc_64Ev kind:function(arm,size=0xc) addr:0x021005f4 -_ZN16MapObjectUnkDRKY8vfunc_68Ev kind:function(arm,size=0x8) addr:0x02100600 -_ZN16MapObjectUnkDRKY8vfunc_6CEv kind:function(arm,size=0x8) addr:0x02100608 -_ZN16MapObjectUnkDRKY8vfunc_74Ev kind:function(arm,size=0x50) addr:0x02100610 -_ZN16MapObjectUnkDRKY8vfunc_7CEv kind:function(arm,size=0x24) addr:0x02100660 -_ZN16MapObjectUnkDRKY8vfunc_78Ev kind:function(arm,size=0x19c) addr:0x02100684 -_ZN16MapObjectUnkDRKY8vfunc_40Ev kind:function(arm,size=0x2c) addr:0x02100820 -_ZN16MapObjectUnkDRKY8vfunc_44Ev kind:function(arm,size=0x44) addr:0x0210084c -_ZN16MapObjectUnkDRKY8vfunc_48Ev kind:function(arm,size=0x4) addr:0x02100890 -_ZN16MapObjectUnkDRKY8vfunc_4CEv kind:function(arm,size=0x4) addr:0x02100894 -_ZN16MapObjectUnkDRKYD1Ev kind:function(arm,size=0x30) addr:0x02100898 -_ZN16MapObjectUnkDRKYD0Ev kind:function(arm,size=0x38) addr:0x021008c8 -_ZN23MapObjectProfileUnkDRKYD1Ev kind:function(arm,size=0x14) addr:0x02100900 -_ZN23MapObjectProfileUnkDRSW10GetProfileEv kind:function(arm,size=0xc) addr:0x02100914 -_ZN23MapObjectProfileUnkDRSW6CreateEv kind:function(arm,size=0x24) addr:0x02100920 -_ZN23MapObjectProfileUnkDRSWC1Ev kind:function(arm,size=0x48) addr:0x02100944 -_ZN16MapObjectUnkDRSWC2Ev kind:function(arm,size=0x78) addr:0x0210098c -_ZN16MapObjectUnkDRSWC1Ev kind:function(arm,size=0x78) addr:0x02100a04 -_ZN16MapObjectUnkDRSW8vfunc_00Ev kind:function(arm,size=0x128) addr:0x02100a7c -_ZN16MapObjectUnkDRSW8vfunc_08Ev kind:function(arm,size=0x84) addr:0x02100ba4 -_ZN16MapObjectUnkDRSW8vfunc_64Ev kind:function(arm,size=0x10) addr:0x02100c28 -_ZN16MapObjectUnkDRSW8vfunc_6CEv kind:function(arm,size=0x20) addr:0x02100c38 -_ZN16MapObjectUnkDRSW8vfunc_14Ev kind:function(arm,size=0x80) addr:0x02100c58 -_ZN16MapObjectUnkDRSW8vfunc_18EPcc kind:function(arm,size=0xc) addr:0x02100cd8 -_ZN16MapObjectUnkDRSW8vfunc_74Ev kind:function(arm,size=0xcc) addr:0x02100ce4 -_ZN16MapObjectUnkDRSW9vfunc2_10Ev kind:function(arm,size=0x50) addr:0x02100db0 -_ZN16MapObjectUnkDRSW8vfunc_50Ev kind:function(arm,size=0xec) addr:0x02100e00 -_ZN16MapObjectUnkDRSW8vfunc_54Ev kind:function(arm,size=0x170) addr:0x02100eec -_ZN16MapObjectUnkDRSW8vfunc_58Ev kind:function(arm,size=0xbc) addr:0x0210105c -_ZN16MapObjectUnkDRSW8vfunc_40Ev kind:function(arm,size=0x2c) addr:0x02101118 -_ZN16MapObjectUnkDRSW8vfunc_44Ev kind:function(arm,size=0x40) addr:0x02101144 -_ZN16MapObjectUnkDRSW8vfunc_48Ev kind:function(arm,size=0x2c) addr:0x02101184 -_ZN16MapObjectUnkDRSW8vfunc_4CEv kind:function(arm,size=0x44) addr:0x021011b0 -_ZN16MapObjectUnkDRSWD1Ev kind:function(arm,size=0x28) addr:0x021011f4 -_ZN16MapObjectUnkDRSWD0Ev kind:function(arm,size=0x30) addr:0x0210121c -_ZN23MapObjectProfileUnkDRSWD1Ev kind:function(arm,size=0x14) addr:0x0210124c -_ZN23MapObjectProfileUnkDRCK10GetProfileEv kind:function(arm,size=0xc) addr:0x02101260 -_ZN23MapObjectProfileUnkDRCK6CreateEv kind:function(arm,size=0x24) addr:0x0210126c -_ZN23MapObjectProfileUnkDRCKC1Ev kind:function(arm,size=0x50) addr:0x02101290 -_ZN16MapObjectUnkDRCKC2Ev kind:function(arm,size=0x88) addr:0x021012e0 -_ZN16MapObjectUnkDRCKC1Ev kind:function(arm,size=0x88) addr:0x02101368 -_ZN16MapObjectUnkDRCK9vfunc2_1CEi kind:function(arm,size=0x14) addr:0x021013f0 -_ZN16MapObjectUnkDRCK8vfunc_00Ev kind:function(arm,size=0x100) addr:0x02101404 -_ZN16MapObjectUnkDRCK8vfunc_08Ev kind:function(arm,size=0x3d0) addr:0x02101504 -_ZN16MapObjectUnkDRCK8vfunc_18EPcc kind:function(arm,size=0xc) addr:0x021018d4 -_ZN16MapObjectUnkDRCK8vfunc_14Ev kind:function(arm,size=0x14c) addr:0x021018e0 -_ZN16MapObjectUnkDRCK8vfunc_5CEii kind:function(arm,size=0xf8) addr:0x02101a2c -_ZN16MapObjectUnkDRCK9vfunc2_14Ev kind:function(arm,size=0x8) addr:0x02101b24 -_ZN16MapObjectUnkDRCK19func_ov031_020ffde4Ev kind:function(arm,size=0x38) addr:0x02101b2c -_ZN16MapObjectUnkDRCK8vfunc_28Ev kind:function(arm,size=0x60) addr:0x02101b64 -_ZN16MapObjectUnkDRCK8vfunc_64Ev kind:function(arm,size=0x10) addr:0x02101bc4 -_ZN16MapObjectUnkDRCK8vfunc_68Ev kind:function(arm,size=0x8) addr:0x02101bd4 -_ZN16MapObjectUnkDRCK8vfunc_6CEv kind:function(arm,size=0x8) addr:0x02101bdc -_ZN16MapObjectUnkDRCK8vfunc_74Ev kind:function(arm,size=0x50) addr:0x02101be4 -_ZN16MapObjectUnkDRCK8vfunc_7CEv kind:function(arm,size=0x24) addr:0x02101c34 -_ZN16MapObjectUnkDRCK8vfunc_78Ev kind:function(arm,size=0x19c) addr:0x02101c58 -_ZN16MapObjectUnkDRCK9vfunc2_10Ev kind:function(arm,size=0x8c) addr:0x02101df4 -_ZN16MapObjectUnkDRCK8vfunc_40Ev kind:function(arm,size=0x2c) addr:0x02101e80 -_ZN16MapObjectUnkDRCK8vfunc_44Ev kind:function(arm,size=0x44) addr:0x02101eac -_ZN16MapObjectUnkDRCK8vfunc_48Ev kind:function(arm,size=0x4) addr:0x02101ef0 -_ZN16MapObjectUnkDRCK8vfunc_4CEv kind:function(arm,size=0x4) addr:0x02101ef4 -_ZN16MapObjectUnkDRCK9vfunc2_18Ev kind:function(arm,size=0x4) addr:0x02101ef8 -_ZN16MapObjectUnkDRCKD1Ev kind:function(arm,size=0x30) addr:0x02101efc -_ZN16MapObjectUnkDRCKD0Ev kind:function(arm,size=0x38) addr:0x02101f2c -_ZN23MapObjectProfileUnkDRCKD1Ev kind:function(arm,size=0x14) addr:0x02101f64 -_ZN23MapObjectProfileUnkDRCKD0Ev kind:function(arm,size=0x1c) addr:0x02101f78 -_ZN23MapObjectProfileUnkDRTC10GetProfileEv kind:function(arm,size=0xc) addr:0x02101f94 -_ZN23MapObjectProfileUnkDRTC6CreateEv kind:function(arm,size=0x24) addr:0x02101fa0 -_ZN23MapObjectProfileUnkDRTCC1Ev kind:function(arm,size=0x4c) addr:0x02101fc4 -_ZN16MapObjectUnkDRTCC1Ev kind:function(arm,size=0x34) addr:0x02102010 -_ZN16MapObjectUnkDRTC8vfunc_00Ev kind:function(arm,size=0x18) addr:0x02102044 -_ZN16MapObjectUnkDRTC9vfunc2_10Ev kind:function(arm,size=0x8c) addr:0x0210205c -_ZN16MapObjectUnkDRTC8vfunc_40Ev kind:function(arm,size=0x28) addr:0x021020e8 -_ZN16MapObjectUnkDRTC8vfunc_44Ev kind:function(arm,size=0x44) addr:0x02102110 -_ZN16MapObjectUnkDRTC8vfunc_48Ev kind:function(arm,size=0x4) addr:0x02102154 -_ZN16MapObjectUnkDRTC8vfunc_4CEv kind:function(arm,size=0x4) addr:0x02102158 -_ZN16MapObjectUnkDRTC9vfunc2_18Ev kind:function(arm,size=0x2c) addr:0x0210215c -_ZN16MapObjectUnkDRTCD1Ev kind:function(arm,size=0x30) addr:0x02102188 -_ZN16MapObjectUnkDRTCD0Ev kind:function(arm,size=0x38) addr:0x021021b8 -_ZN23MapObjectProfileUnkDRTCD1Ev kind:function(arm,size=0x14) addr:0x021021f0 -_ZN23MapObjectProfileUnkDRTCD0Ev kind:function(arm,size=0x1c) addr:0x02102204 +_ZN31MapObjectProfileDoorDangerSpawn10GetProfileEv kind:function(arm,size=0xc) addr:0x020feb40 +_ZN31MapObjectProfileDoorDangerSpawn6CreateEv kind:function(arm,size=0x24) addr:0x020feb4c +_ZN31MapObjectProfileDoorDangerSpawnC1Ev kind:function(arm,size=0x50) addr:0x020feb70 +_ZN24MapObjectDoorDangerSpawnC1Ev kind:function(arm,size=0xbc) addr:0x020febc0 +_ZN24MapObjectDoorDangerSpawn8vfunc_00Ev kind:function(arm,size=0x50) addr:0x020fec7c +_ZN24MapObjectDoorDangerSpawn8vfunc_04Ev kind:function(arm,size=0x1d4) addr:0x020feccc +_ZN24MapObjectDoorDangerSpawn9vfunc2_04Ev kind:function(arm,size=0xc) addr:0x020feea0 +_ZN24MapObjectDoorDangerSpawn9vfunc2_08Ev kind:function(arm,size=0x70) addr:0x020feeac +_ZN24MapObjectDoorDangerSpawn8vfunc_08Ev kind:function(arm,size=0x374) addr:0x020fef1c +_ZN24MapObjectDoorDangerSpawn8vfunc_0CEv kind:function(arm,size=0x2c) addr:0x020ff290 +_ZN24MapObjectDoorDangerSpawn8vfunc_5CEii kind:function(arm,size=0x3f4) addr:0x020ff2bc +_ZN24MapObjectDoorDangerSpawn8vfunc_64Ev kind:function(arm,size=0xbc) addr:0x020ff6b0 +_ZN24MapObjectDoorDangerSpawn8vfunc_68Ev kind:function(arm,size=0xac) addr:0x020ff76c +_ZN24MapObjectDoorDangerSpawn8vfunc_6CEv kind:function(arm,size=0x158) addr:0x020ff818 +_ZN24MapObjectDoorDangerSpawn19func_ov031_020fdec8Ev kind:function(arm,size=0xf8) addr:0x020ff970 +_ZN24MapObjectDoorDangerSpawn8vfunc_18EPcc kind:function(arm,size=0xc) addr:0x020ffa68 +_ZN24MapObjectDoorDangerSpawn8vfunc_14Ev kind:function(arm,size=0x80) addr:0x020ffa74 +_ZN24MapObjectDoorDangerSpawn9vfunc2_10Ev kind:function(arm,size=0x84) addr:0x020ffaf4 +_ZN24MapObjectDoorDangerSpawn8vfunc_74Ev kind:function(arm,size=0x15c) addr:0x020ffb78 +_ZN24MapObjectDoorDangerSpawn8vfunc_7CEv kind:function(arm,size=0x24) addr:0x020ffcd4 +_ZN24MapObjectDoorDangerSpawn8vfunc_40Ev kind:function(arm,size=0x28) addr:0x020ffcf8 +_ZN24MapObjectDoorDangerSpawn8vfunc_44Ev kind:function(arm,size=0x44) addr:0x020ffd20 +_ZN24MapObjectDoorDangerSpawn8vfunc_48Ev kind:function(arm,size=0x2c) addr:0x020ffd64 +_ZN24MapObjectDoorDangerSpawn8vfunc_4CEv kind:function(arm,size=0x44) addr:0x020ffd90 +_ZN24MapObjectDoorDangerSpawn8vfunc_88Ev kind:function(arm,size=0x24) addr:0x020ffdd4 +_ZN24MapObjectDoorDangerSpawn8vfunc_8CEv kind:function(arm,size=0x38) addr:0x020ffdf8 +_ZN24MapObjectDoorDangerSpawn8vfunc_84EiP5Vec3pPs kind:function(arm,size=0x274) addr:0x020ffe30 +_ZN24MapObjectDoorDangerSpawn19func_ov031_020fe5fcEP5Vec3pPS_ kind:function(arm,size=0x9c) addr:0x021000a4 +_ZN24MapObjectDoorDangerSpawnD1Ev kind:function(arm,size=0x30) addr:0x02100140 +_ZN24MapObjectDoorDangerSpawnD0Ev kind:function(arm,size=0x38) addr:0x02100170 +_ZN31MapObjectProfileDoorDangerSpawnD1Ev kind:function(arm,size=0x14) addr:0x021001a8 +_ZThn64_N24MapObjectDoorDangerSpawn9vfunc2_08Ev kind:function(arm,size=0x10) addr:0x021001bc +_ZThn64_N24MapObjectDoorDangerSpawn9vfunc2_04Ev kind:function(arm,size=0x10) addr:0x021001cc +_ZN23MapObjectProfileDoorKey10GetProfileEv kind:function(arm,size=0xc) addr:0x021001dc +_ZN23MapObjectProfileDoorKey6CreateEv kind:function(arm,size=0x24) addr:0x021001e8 +_ZN23MapObjectProfileDoorKeyC1Ev kind:function(arm,size=0x54) addr:0x0210020c +_ZN16MapObjectDoorKeyC1Ev kind:function(arm,size=0xb4) addr:0x02100260 +_ZN16MapObjectDoorKey8vfunc_00Ev kind:function(arm,size=0x1c) addr:0x02100314 +_ZN16MapObjectDoorKey8vfunc_08Ev kind:function(arm,size=0x18) addr:0x02100330 +_ZN16MapObjectDoorKey8vfunc_18EPcc kind:function(arm,size=0xc) addr:0x02100348 +_ZN16MapObjectDoorKey8vfunc_14Ev kind:function(arm,size=0x14c) addr:0x02100354 +_ZN16MapObjectDoorKey8vfunc_5CEii kind:function(arm,size=0x90) addr:0x021004a0 +_ZN16MapObjectDoorKey19func_ov031_020fea88Ev kind:function(arm,size=0x34) addr:0x02100530 +_ZN16MapObjectDoorKey8vfunc_28Ev kind:function(arm,size=0x90) addr:0x02100564 +_ZN16MapObjectDoorKey8vfunc_64Ev kind:function(arm,size=0xc) addr:0x021005f4 +_ZN16MapObjectDoorKey8vfunc_68Ev kind:function(arm,size=0x8) addr:0x02100600 +_ZN16MapObjectDoorKey8vfunc_6CEv kind:function(arm,size=0x8) addr:0x02100608 +_ZN16MapObjectDoorKey8vfunc_74Ev kind:function(arm,size=0x50) addr:0x02100610 +_ZN16MapObjectDoorKey8vfunc_7CEv kind:function(arm,size=0x24) addr:0x02100660 +_ZN16MapObjectDoorKey8vfunc_78Ev kind:function(arm,size=0x19c) addr:0x02100684 +_ZN16MapObjectDoorKey8vfunc_40Ev kind:function(arm,size=0x2c) addr:0x02100820 +_ZN16MapObjectDoorKey8vfunc_44Ev kind:function(arm,size=0x44) addr:0x0210084c +_ZN16MapObjectDoorKey8vfunc_48Ev kind:function(arm,size=0x4) addr:0x02100890 +_ZN16MapObjectDoorKey8vfunc_4CEv kind:function(arm,size=0x4) addr:0x02100894 +_ZN16MapObjectDoorKeyD1Ev kind:function(arm,size=0x30) addr:0x02100898 +_ZN16MapObjectDoorKeyD0Ev kind:function(arm,size=0x38) addr:0x021008c8 +_ZN23MapObjectProfileDoorKeyD1Ev kind:function(arm,size=0x14) addr:0x02100900 +_ZN26MapObjectProfileDoorSwitch10GetProfileEv kind:function(arm,size=0xc) addr:0x02100914 +_ZN26MapObjectProfileDoorSwitch6CreateEv kind:function(arm,size=0x24) addr:0x02100920 +_ZN26MapObjectProfileDoorSwitchC1Ev kind:function(arm,size=0x48) addr:0x02100944 +_ZN19MapObjectDoorSwitchC2Ev kind:function(arm,size=0x78) addr:0x0210098c +_ZN19MapObjectDoorSwitchC1Ev kind:function(arm,size=0x78) addr:0x02100a04 +_ZN19MapObjectDoorSwitch8vfunc_00Ev kind:function(arm,size=0x128) addr:0x02100a7c +_ZN19MapObjectDoorSwitch8vfunc_08Ev kind:function(arm,size=0x84) addr:0x02100ba4 +_ZN19MapObjectDoorSwitch8vfunc_64Ev kind:function(arm,size=0x10) addr:0x02100c28 +_ZN19MapObjectDoorSwitch8vfunc_6CEv kind:function(arm,size=0x20) addr:0x02100c38 +_ZN19MapObjectDoorSwitch8vfunc_14Ev kind:function(arm,size=0x80) addr:0x02100c58 +_ZN19MapObjectDoorSwitch8vfunc_18EPcc kind:function(arm,size=0xc) addr:0x02100cd8 +_ZN19MapObjectDoorSwitch8vfunc_74Ev kind:function(arm,size=0xcc) addr:0x02100ce4 +_ZN19MapObjectDoorSwitch9vfunc2_10Ev kind:function(arm,size=0x50) addr:0x02100db0 +_ZN19MapObjectDoorSwitch8vfunc_50Ev kind:function(arm,size=0xec) addr:0x02100e00 +_ZN19MapObjectDoorSwitch8vfunc_54Ev kind:function(arm,size=0x170) addr:0x02100eec +_ZN19MapObjectDoorSwitch8vfunc_58Ev kind:function(arm,size=0xbc) addr:0x0210105c +_ZN19MapObjectDoorSwitch8vfunc_40Ev kind:function(arm,size=0x2c) addr:0x02101118 +_ZN19MapObjectDoorSwitch8vfunc_44Ev kind:function(arm,size=0x40) addr:0x02101144 +_ZN19MapObjectDoorSwitch8vfunc_48Ev kind:function(arm,size=0x2c) addr:0x02101184 +_ZN19MapObjectDoorSwitch8vfunc_4CEv kind:function(arm,size=0x44) addr:0x021011b0 +_ZN19MapObjectDoorSwitchD1Ev kind:function(arm,size=0x28) addr:0x021011f4 +_ZN19MapObjectDoorSwitchD0Ev kind:function(arm,size=0x30) addr:0x0210121c +_ZN26MapObjectProfileDoorSwitchD1Ev kind:function(arm,size=0x14) addr:0x0210124c +_ZN25MapObjectProfileDoorClick10GetProfileEv kind:function(arm,size=0xc) addr:0x02101260 +_ZN25MapObjectProfileDoorClick6CreateEv kind:function(arm,size=0x24) addr:0x0210126c +_ZN25MapObjectProfileDoorClickC1Ev kind:function(arm,size=0x50) addr:0x02101290 +_ZN18MapObjectDoorClickC2Ev kind:function(arm,size=0x88) addr:0x021012e0 +_ZN18MapObjectDoorClickC1Ev kind:function(arm,size=0x88) addr:0x02101368 +_ZN18MapObjectDoorClick9vfunc2_1CEi kind:function(arm,size=0x14) addr:0x021013f0 +_ZN18MapObjectDoorClick8vfunc_00Ev kind:function(arm,size=0x100) addr:0x02101404 +_ZN18MapObjectDoorClick8vfunc_08Ev kind:function(arm,size=0x3d0) addr:0x02101504 +_ZN18MapObjectDoorClick8vfunc_18EPcc kind:function(arm,size=0xc) addr:0x021018d4 +_ZN18MapObjectDoorClick8vfunc_14Ev kind:function(arm,size=0x14c) addr:0x021018e0 +_ZN18MapObjectDoorClick8vfunc_5CEii kind:function(arm,size=0xf8) addr:0x02101a2c +_ZN18MapObjectDoorClick9vfunc2_14Ev kind:function(arm,size=0x8) addr:0x02101b24 +_ZN18MapObjectDoorClick19func_ov031_020ffde4Ev kind:function(arm,size=0x38) addr:0x02101b2c +_ZN18MapObjectDoorClick8vfunc_28Ev kind:function(arm,size=0x60) addr:0x02101b64 +_ZN18MapObjectDoorClick8vfunc_64Ev kind:function(arm,size=0x10) addr:0x02101bc4 +_ZN18MapObjectDoorClick8vfunc_68Ev kind:function(arm,size=0x8) addr:0x02101bd4 +_ZN18MapObjectDoorClick8vfunc_6CEv kind:function(arm,size=0x8) addr:0x02101bdc +_ZN18MapObjectDoorClick8vfunc_74Ev kind:function(arm,size=0x50) addr:0x02101be4 +_ZN18MapObjectDoorClick8vfunc_7CEv kind:function(arm,size=0x24) addr:0x02101c34 +_ZN18MapObjectDoorClick8vfunc_78Ev kind:function(arm,size=0x19c) addr:0x02101c58 +_ZN18MapObjectDoorClick9vfunc2_10Ev kind:function(arm,size=0x8c) addr:0x02101df4 +_ZN18MapObjectDoorClick8vfunc_40Ev kind:function(arm,size=0x2c) addr:0x02101e80 +_ZN18MapObjectDoorClick8vfunc_44Ev kind:function(arm,size=0x44) addr:0x02101eac +_ZN18MapObjectDoorClick8vfunc_48Ev kind:function(arm,size=0x4) addr:0x02101ef0 +_ZN18MapObjectDoorClick8vfunc_4CEv kind:function(arm,size=0x4) addr:0x02101ef4 +_ZN18MapObjectDoorClick9vfunc2_18Ev kind:function(arm,size=0x4) addr:0x02101ef8 +_ZN18MapObjectDoorClickD1Ev kind:function(arm,size=0x30) addr:0x02101efc +_ZN18MapObjectDoorClickD0Ev kind:function(arm,size=0x38) addr:0x02101f2c +_ZN25MapObjectProfileDoorClickD1Ev kind:function(arm,size=0x14) addr:0x02101f64 +_ZN25MapObjectProfileDoorClickD0Ev kind:function(arm,size=0x1c) addr:0x02101f78 +_ZN25MapObjectProfileDoorTouch10GetProfileEv kind:function(arm,size=0xc) addr:0x02101f94 +_ZN25MapObjectProfileDoorTouch6CreateEv kind:function(arm,size=0x24) addr:0x02101fa0 +_ZN25MapObjectProfileDoorTouchC1Ev kind:function(arm,size=0x4c) addr:0x02101fc4 +_ZN18MapObjectDoorTouchC1Ev kind:function(arm,size=0x34) addr:0x02102010 +_ZN18MapObjectDoorTouch8vfunc_00Ev kind:function(arm,size=0x18) addr:0x02102044 +_ZN18MapObjectDoorTouch9vfunc2_10Ev kind:function(arm,size=0x8c) addr:0x0210205c +_ZN18MapObjectDoorTouch8vfunc_40Ev kind:function(arm,size=0x28) addr:0x021020e8 +_ZN18MapObjectDoorTouch8vfunc_44Ev kind:function(arm,size=0x44) addr:0x02102110 +_ZN18MapObjectDoorTouch8vfunc_48Ev kind:function(arm,size=0x4) addr:0x02102154 +_ZN18MapObjectDoorTouch8vfunc_4CEv kind:function(arm,size=0x4) addr:0x02102158 +_ZN18MapObjectDoorTouch9vfunc2_18Ev kind:function(arm,size=0x2c) addr:0x0210215c +_ZN18MapObjectDoorTouchD1Ev kind:function(arm,size=0x30) addr:0x02102188 +_ZN18MapObjectDoorTouchD0Ev kind:function(arm,size=0x38) addr:0x021021b8 +_ZN25MapObjectProfileDoorTouchD1Ev kind:function(arm,size=0x14) addr:0x021021f0 +_ZN25MapObjectProfileDoorTouchD0Ev kind:function(arm,size=0x1c) addr:0x02102204 _ZN23MapObjectProfileUnkEXIT10GetProfileEv kind:function(arm,size=0xc) addr:0x02102220 _ZN23MapObjectProfileUnkEXIT6CreateEv kind:function(arm,size=0x24) addr:0x0210222c _ZN23MapObjectProfileUnkEXITC1Ev kind:function(arm,size=0x48) addr:0x02102250 @@ -2097,11 +2097,11 @@ __sinit_ActorUnkCLLT.cpp kind:function(arm,size=0x50) addr:0x02113788 __sinit_ActorUnkEFSB.cpp kind:function(arm,size=0x50) addr:0x021137d8 __sinit_ActorUnkNFSP.cpp kind:function(arm,size=0x50) addr:0x02113828 __sinit_MapObjectDoorBase.cpp kind:function(arm,size=0x3c) addr:0x02113878 local -__sinit_MapObjectUnkDRDS.cpp kind:function(arm,size=0x64) addr:0x021138b4 -__sinit_MapObjectUnkDRKY.cpp kind:function(arm,size=0x64) addr:0x02113918 -__sinit_MapObjectUnkDRSW.cpp kind:function(arm,size=0x64) addr:0x0211397c -__sinit_MapObjectUnkDRCK.cpp kind:function(arm,size=0x64) addr:0x021139e0 -__sinit_MapObjectUnkDRTC.cpp kind:function(arm,size=0x50) addr:0x02113a44 +__sinit_MapObjectDoorDangerSpawn.cpp kind:function(arm,size=0x64) addr:0x021138b4 +__sinit_MapObjectDoorKey.cpp kind:function(arm,size=0x64) addr:0x02113918 +__sinit_MapObjectDoorSwitch.cpp kind:function(arm,size=0x64) addr:0x0211397c +__sinit_MapObjectDoorClick.cpp kind:function(arm,size=0x64) addr:0x021139e0 +__sinit_MapObjectDoorTouch.cpp kind:function(arm,size=0x50) addr:0x02113a44 __sinit_MapObjectUnkEXIT.cpp kind:function(arm,size=0x50) addr:0x02113a94 __sinit_MapObjectUnkGATE.cpp kind:function(arm,size=0x50) addr:0x02113ae4 __sinit_MapObjectUnkSTIR.cpp kind:function(arm,size=0x50) addr:0x02113b34 @@ -2161,11 +2161,11 @@ __sinit_MapObjectUnkSWFS.cpp kind:function(arm,size=0x70) addr:0x021144b0 .p__sinit_ActorUnkEFSB.cpp kind:data(word) addr:0x02114594 .p__sinit_ActorUnkNFSP.cpp kind:data(word) addr:0x02114598 .p__sinit_MapObjectDoorBase.cpp kind:data(word) addr:0x0211459c local -.p__sinit_MapObjectUnkDRDS.cpp kind:data(word) addr:0x021145a0 -.p__sinit_MapObjectUnkDRKY.cpp kind:data(word) addr:0x021145a4 -.p__sinit_MapObjectUnkDRSW.cpp kind:data(word) addr:0x021145a8 -.p__sinit_MapObjectUnkDRCK.cpp kind:data(word) addr:0x021145ac -.p__sinit_MapObjectUnkDRTC.cpp kind:data(word) addr:0x021145b0 +.p__sinit_MapObjectDoorDangerSpawn.cpp kind:data(word) addr:0x021145a0 +.p__sinit_MapObjectDoorKey.cpp kind:data(word) addr:0x021145a4 +.p__sinit_MapObjectDoorSwitch.cpp kind:data(word) addr:0x021145a8 +.p__sinit_MapObjectDoorClick.cpp kind:data(word) addr:0x021145ac +.p__sinit_MapObjectDoorTouch.cpp kind:data(word) addr:0x021145b0 .p__sinit_MapObjectUnkEXIT.cpp kind:data(word) addr:0x021145b4 .p__sinit_MapObjectUnkGATE.cpp kind:data(word) addr:0x021145b8 .p__sinit_MapObjectUnkSTIR.cpp kind:data(word) addr:0x021145bc @@ -2411,19 +2411,19 @@ _ZTV19data_ov031_02116d10 kind:data(any) addr:0x02116d10 data_ov031_02114ffc kind:data(any) addr:0x02116d70 _ZTV17MapObjectDoorBase kind:data(any) addr:0x02116d74 data_ov031_02116e24 kind:data(any) addr:0x02116e24 -_ZTV23MapObjectProfileUnkDRDS kind:data(any) addr:0x02116e28 -_ZTV16MapObjectUnkDRDS kind:data(any) addr:0x02116e44 +_ZTV31MapObjectProfileDoorDangerSpawn kind:data(any) addr:0x02116e28 +_ZTV24MapObjectDoorDangerSpawn kind:data(any) addr:0x02116e44 data_ov031_02115184 kind:data(any) addr:0x02116ef8 -_ZTV23MapObjectProfileUnkDRKY kind:data(any) addr:0x02116efc -_ZTV16MapObjectUnkDRKY kind:data(any) addr:0x02116f18 +_ZTV23MapObjectProfileDoorKey kind:data(any) addr:0x02116efc +_ZTV16MapObjectDoorKey kind:data(any) addr:0x02116f18 data_ov031_02115254 kind:data(any) addr:0x02116fc8 -_ZTV23MapObjectProfileUnkDRSW kind:data(any) addr:0x02116fcc -_ZTV16MapObjectUnkDRSW kind:data(any) addr:0x02116fe8 +_ZTV26MapObjectProfileDoorSwitch kind:data(any) addr:0x02116fcc +_ZTV19MapObjectDoorSwitch kind:data(any) addr:0x02116fe8 data_ov031_0211709c kind:data(any) addr:0x0211709c local -_ZTV23MapObjectProfileUnkDRCK kind:data(any) addr:0x021170a0 -_ZTV16MapObjectUnkDRCK kind:data(any) addr:0x021170c8 -_ZTV23MapObjectProfileUnkDRTC kind:data(any) addr:0x02117188 -_ZTV16MapObjectUnkDRTC kind:data(any) addr:0x021171b0 +_ZTV25MapObjectProfileDoorClick kind:data(any) addr:0x021170a0 +_ZTV18MapObjectDoorClick kind:data(any) addr:0x021170c8 +_ZTV25MapObjectProfileDoorTouch kind:data(any) addr:0x02117188 +_ZTV18MapObjectDoorTouch kind:data(any) addr:0x021171b0 _ZTV19data_ov031_02117278 kind:data(any) addr:0x02117270 data_ov031_02117294 kind:data(any) addr:0x02117294 data_ov031_021172d4 kind:data(any) addr:0x021172d4 @@ -2615,21 +2615,21 @@ _ZGVN15ProfileInstanceI19ActorProfileUnkNFSPE8sProfileE kind:bss addr:0x02118ebc _ZN15ProfileInstanceI19ActorProfileUnkNFSPE8sProfileE kind:bss addr:0x02118ecc data_ov031_02117204 kind:bss(size=0x8) addr:0x02118fa4 data_ov031_02117210 kind:bss addr:0x02118fb0 -_ZGVN15ProfileInstanceI23MapObjectProfileUnkDRDSE8sProfileE kind:bss addr:0x0211901c +_ZGVN15ProfileInstanceI31MapObjectProfileDoorDangerSpawnE8sProfileE kind:bss addr:0x0211901c @30933 kind:bss addr:0x02119020 -_ZN15ProfileInstanceI23MapObjectProfileUnkDRDSE8sProfileE kind:bss addr:0x0211902c -_ZGVN15ProfileInstanceI23MapObjectProfileUnkDRKYE8sProfileE kind:bss addr:0x02119100 +_ZN15ProfileInstanceI31MapObjectProfileDoorDangerSpawnE8sProfileE kind:bss addr:0x0211902c +_ZGVN15ProfileInstanceI23MapObjectProfileDoorKeyE8sProfileE kind:bss addr:0x02119100 @30939 kind:bss addr:0x02119104 -_ZN15ProfileInstanceI23MapObjectProfileUnkDRKYE8sProfileE kind:bss addr:0x02119110 -_ZGVN15ProfileInstanceI23MapObjectProfileUnkDRSWE8sProfileE kind:bss addr:0x021191e4 +_ZN15ProfileInstanceI23MapObjectProfileDoorKeyE8sProfileE kind:bss addr:0x02119110 +_ZGVN15ProfileInstanceI26MapObjectProfileDoorSwitchE8sProfileE kind:bss addr:0x021191e4 @30945 kind:bss addr:0x021191e8 -_ZN15ProfileInstanceI23MapObjectProfileUnkDRSWE8sProfileE kind:bss addr:0x021191f4 -_ZGVN15ProfileInstanceI23MapObjectProfileUnkDRCKE8sProfileE kind:bss addr:0x021192c8 +_ZN15ProfileInstanceI26MapObjectProfileDoorSwitchE8sProfileE kind:bss addr:0x021191f4 +_ZGVN15ProfileInstanceI25MapObjectProfileDoorClickE8sProfileE kind:bss addr:0x021192c8 @30951 kind:bss addr:0x021192cc -_ZN15ProfileInstanceI23MapObjectProfileUnkDRCKE8sProfileE kind:bss addr:0x021192d8 -_ZGVN15ProfileInstanceI23MapObjectProfileUnkDRTCE8sProfileE kind:bss addr:0x02119340 +_ZN15ProfileInstanceI25MapObjectProfileDoorClickE8sProfileE kind:bss addr:0x021192d8 +_ZGVN15ProfileInstanceI25MapObjectProfileDoorTouchE8sProfileE kind:bss addr:0x02119340 @30957 kind:bss addr:0x02119344 -_ZN15ProfileInstanceI23MapObjectProfileUnkDRTCE8sProfileE kind:bss addr:0x02119350 +_ZN15ProfileInstanceI25MapObjectProfileDoorTouchE8sProfileE kind:bss addr:0x02119350 _ZGVN15ProfileInstanceI23MapObjectProfileUnkEXITE8sProfileE kind:bss addr:0x021193b8 @30963 kind:bss addr:0x021193bc _ZN15ProfileInstanceI23MapObjectProfileUnkEXITE8sProfileE kind:bss addr:0x021193c8 diff --git a/include/Map/MapObjectTable.inl b/include/Map/MapObjectTable.inl index 22ed6d9b..74399b3c 100644 --- a/include/Map/MapObjectTable.inl +++ b/include/Map/MapObjectTable.inl @@ -29,17 +29,17 @@ DEFINE_MAP_OBJECT_TYPE('DFNC', DFNC) DEFINE_MAP_OBJECT_TYPE('DOPA', DOPA) DEFINE_MAP_OBJECT_TYPE('DRBK', DRBK) DEFINE_MAP_OBJECT_TYPE('DRBR', DRBR) -DEFINE_MAP_OBJECT_TYPE('DRCK', DRCK) -DEFINE_MAP_OBJECT_TYPE('DRDS', DRDS) +DEFINE_MAP_OBJECT_TYPE('DRCK', DoorClick) +DEFINE_MAP_OBJECT_TYPE('DRDS', DoorDangerSpawn) DEFINE_MAP_OBJECT_TYPE('DRGN', DRGN) DEFINE_MAP_OBJECT_TYPE('DRHS', DRHS) -DEFINE_MAP_OBJECT_TYPE('DRKY', DRKY) +DEFINE_MAP_OBJECT_TYPE('DRKY', DoorKey) DEFINE_MAP_OBJECT_TYPE('DRMC', DRMC) DEFINE_MAP_OBJECT_TYPE('DRRS', DRRS) DEFINE_MAP_OBJECT_TYPE('DRSN', DRSN) DEFINE_MAP_OBJECT_TYPE('DRST', DRST) -DEFINE_MAP_OBJECT_TYPE('DRSW', DRSW) -DEFINE_MAP_OBJECT_TYPE('DRTC', DRTC) +DEFINE_MAP_OBJECT_TYPE('DRSW', DoorSwitch) +DEFINE_MAP_OBJECT_TYPE('DRTC', DoorTouch) DEFINE_MAP_OBJECT_TYPE('DRTK', DRTK) DEFINE_MAP_OBJECT_TYPE('DRTW', DRTW) DEFINE_MAP_OBJECT_TYPE('DRTY', DRTY) diff --git a/include/MapObject/MapObjectUnkDRCK.hpp b/include/MapObject/MapObjectDoorClick.hpp similarity index 82% rename from include/MapObject/MapObjectUnkDRCK.hpp rename to include/MapObject/MapObjectDoorClick.hpp index 3ae453e6..a82a0e57 100644 --- a/include/MapObject/MapObjectUnkDRCK.hpp +++ b/include/MapObject/MapObjectDoorClick.hpp @@ -5,19 +5,19 @@ #include "global.h" #include "types.h" -class MapObjectProfileUnkDRCK : public MapObjectProfile_Derived1 { +class MapObjectProfileDoorClick : public MapObjectProfile_Derived1 { public: /* 00 (base) */ - MapObjectProfileUnkDRCK(); - ~MapObjectProfileUnkDRCK() {} + MapObjectProfileDoorClick(); + ~MapObjectProfileDoorClick() {} /* 0C */ virtual MapObject *Create(); - static MapObjectProfileUnkDRCK *GetProfile(); + static MapObjectProfileDoorClick *GetProfile(); }; -class MapObjectUnkDRCK : public MapObjectDoorBase { +class MapObjectDoorClick : public MapObjectDoorBase { public: /* 00 (base) */ /* 94 */ UnkSystem6_Derived2 mUnk_94; @@ -30,14 +30,14 @@ public: /* A8 */ MapObject_10 mUnk_A8; /* CC */ - MapObjectUnkDRCK(); + MapObjectDoorClick(); /* 00 */ virtual bool vfunc_00() override; /* 08 */ virtual void vfunc_08() override; /* 14 */ virtual void vfunc_14() override; /* 18 */ virtual void vfunc_18(s8 *param1, s8 param2) override; /* 28 */ virtual unk32 vfunc_28() override; - /* 30 */ virtual ~MapObjectUnkDRCK() override {} + /* 30 */ virtual ~MapObjectDoorClick() override {} /* 40 */ virtual void vfunc_40() override; /* 44 */ virtual void vfunc_44() override; /* 48 */ virtual void vfunc_48() override; diff --git a/include/MapObject/MapObjectUnkDRDS.hpp b/include/MapObject/MapObjectDoorDangerSpawn.hpp similarity index 81% rename from include/MapObject/MapObjectUnkDRDS.hpp rename to include/MapObject/MapObjectDoorDangerSpawn.hpp index 49424c78..18135aec 100644 --- a/include/MapObject/MapObjectUnkDRDS.hpp +++ b/include/MapObject/MapObjectDoorDangerSpawn.hpp @@ -8,19 +8,19 @@ #include "global.h" #include "types.h" -class MapObjectProfileUnkDRDS : public MapObjectProfile_Derived2 { +class MapObjectProfileDoorDangerSpawn : public MapObjectProfile_Derived2 { public: /* 00 (base) */ - MapObjectProfileUnkDRDS(); - ~MapObjectProfileUnkDRDS(); + MapObjectProfileDoorDangerSpawn(); + ~MapObjectProfileDoorDangerSpawn(); /* 0C */ virtual MapObject *Create(); - static MapObjectProfileUnkDRDS *GetProfile(); + static MapObjectProfileDoorDangerSpawn *GetProfile(); }; -class MapObjectUnkDRDS : public MapObjectDoorBase { +class MapObjectDoorDangerSpawn : public MapObjectDoorBase { public: /* 00 (base) */ /* 94 */ UnkSystem6_Derived2 mUnk_94; @@ -37,7 +37,7 @@ public: /* AC */ volatile u16 mUnk_AC; /* AE */ u16 mUnk_AE; - MapObjectUnkDRDS(); + MapObjectDoorDangerSpawn(); // data_ov031_021150d8 (MapObject) /* 00 */ virtual bool vfunc_00() override; @@ -46,7 +46,7 @@ public: /* 0C */ virtual void vfunc_0C() override; /* 14 */ virtual void vfunc_14() override; /* 18 */ virtual void vfunc_18(s8 *param1, s8 param2) override; - /* 30 */ virtual ~MapObjectUnkDRDS() override; + /* 30 */ virtual ~MapObjectDoorDangerSpawn() override; // (MapObject_UnkStruct1_Derived1) /* 04 */ virtual void vfunc2_04() override; @@ -72,5 +72,5 @@ public: bool func_ov031_020fdec8(void); - static void func_ov031_020fe5fc(Vec3p *param1, MapObjectUnkDRDS *thisx); + static void func_ov031_020fe5fc(Vec3p *param1, MapObjectDoorDangerSpawn *thisx); }; diff --git a/include/MapObject/MapObjectUnkDRKY.hpp b/include/MapObject/MapObjectDoorKey.hpp similarity index 83% rename from include/MapObject/MapObjectUnkDRKY.hpp rename to include/MapObject/MapObjectDoorKey.hpp index 2ba99aa3..2de00cfa 100644 --- a/include/MapObject/MapObjectUnkDRKY.hpp +++ b/include/MapObject/MapObjectDoorKey.hpp @@ -6,7 +6,7 @@ #include "global.h" #include "types.h" -class MapObjectUnkDRKY : public MapObjectDoorBase { +class MapObjectDoorKey : public MapObjectDoorBase { public: /* 00 (base) */ /* 94 */ UnkSystem6_Derived2 mUnk_94; @@ -21,14 +21,14 @@ public: /* A7 */ unk8 mUnk_A7; // pad? /* A8 */ - MapObjectUnkDRKY(); + MapObjectDoorKey(); /* 00 */ virtual bool vfunc_00() override; /* 08 */ virtual void vfunc_08() override; /* 14 */ virtual void vfunc_14() override; /* 18 */ virtual void vfunc_18(s8 *param1, s8 param2) override; /* 28 */ virtual unk32 vfunc_28() override; - /* 30 */ virtual ~MapObjectUnkDRKY() override; + /* 30 */ virtual ~MapObjectDoorKey() override; /* 40 */ virtual void vfunc_40() override; /* 44 */ virtual void vfunc_44() override; /* 48 */ virtual void vfunc_48() override; @@ -44,14 +44,14 @@ public: bool func_ov031_020fea88(void); }; -class MapObjectProfileUnkDRKY : public MapObjectProfile_Derived2 { +class MapObjectProfileDoorKey : public MapObjectProfile_Derived2 { public: /* 00 (base) */ - MapObjectProfileUnkDRKY(); - ~MapObjectProfileUnkDRKY(); + MapObjectProfileDoorKey(); + ~MapObjectProfileDoorKey(); /* 0C */ virtual MapObject *Create(); - static MapObjectProfileUnkDRKY *GetProfile(); + static MapObjectProfileDoorKey *GetProfile(); }; diff --git a/include/MapObject/MapObjectUnkDRSW.hpp b/include/MapObject/MapObjectDoorSwitch.hpp similarity index 81% rename from include/MapObject/MapObjectUnkDRSW.hpp rename to include/MapObject/MapObjectDoorSwitch.hpp index d777002e..d96d356d 100644 --- a/include/MapObject/MapObjectUnkDRSW.hpp +++ b/include/MapObject/MapObjectDoorSwitch.hpp @@ -7,7 +7,7 @@ #include "types.h" #include "versions.h" -class MapObjectUnkDRSW : public MapObjectDoorBase { +class MapObjectDoorSwitch : public MapObjectDoorBase { public: /* 000 (base) */ /* 094 */ UnkSystem4 mUnk_094; @@ -25,14 +25,14 @@ public: /* 11C */ #endif - MapObjectUnkDRSW(); + MapObjectDoorSwitch(); // data_ov031_0211527c (MapObject) /* 00 */ virtual bool vfunc_00() override; /* 08 */ virtual void vfunc_08() override; /* 14 */ virtual void vfunc_14() override; /* 18 */ virtual void vfunc_18(s8 *param1, s8 param2) override; - /* 30 */ virtual ~MapObjectUnkDRSW() override; + /* 30 */ virtual ~MapObjectDoorSwitch() override; /* 40 */ virtual void vfunc_40() override; /* 44 */ virtual void vfunc_44() override; /* 48 */ virtual void vfunc_48() override; @@ -48,14 +48,14 @@ public: /* 10 */ virtual void *vfunc2_10(); }; -class MapObjectProfileUnkDRSW : public MapObjectProfile_Derived2 { +class MapObjectProfileDoorSwitch : public MapObjectProfile_Derived2 { public: /* 00 (base) */ - MapObjectProfileUnkDRSW(); - ~MapObjectProfileUnkDRSW(); + MapObjectProfileDoorSwitch(); + ~MapObjectProfileDoorSwitch(); /* 0C */ virtual MapObject *Create(); - static MapObjectProfileUnkDRSW *GetProfile(); + static MapObjectProfileDoorSwitch *GetProfile(); }; diff --git a/include/MapObject/MapObjectUnkDRTC.hpp b/include/MapObject/MapObjectDoorTouch.hpp similarity index 60% rename from include/MapObject/MapObjectUnkDRTC.hpp rename to include/MapObject/MapObjectDoorTouch.hpp index d7103b5a..d8e2a69a 100644 --- a/include/MapObject/MapObjectUnkDRTC.hpp +++ b/include/MapObject/MapObjectDoorTouch.hpp @@ -1,19 +1,19 @@ #pragma once +#include "MapObject/MapObjectDoorClick.hpp" #include "MapObject/MapObjectProfile.hpp" -#include "MapObject/MapObjectUnkDRCK.hpp" #include "global.h" #include "types.h" -class MapObjectUnkDRTC : public MapObjectUnkDRCK { +class MapObjectDoorTouch : public MapObjectDoorClick { public: /* 00 (base) */ /* 40 */ - MapObjectUnkDRTC(); + MapObjectDoorTouch(); /* 00 */ virtual bool vfunc_00() override; - /* 30 */ virtual ~MapObjectUnkDRTC() override; + /* 30 */ virtual ~MapObjectDoorTouch() override; /* 40 */ virtual void vfunc_40() override; /* 44 */ virtual void vfunc_44() override; /* 48 */ virtual void vfunc_48() override; @@ -23,14 +23,14 @@ public: /* 18 */ virtual void vfunc2_18() override; }; -class MapObjectProfileUnkDRTC : public MapObjectProfile_Derived1 { +class MapObjectProfileDoorTouch : public MapObjectProfile_Derived1 { public: /* 00 (base) */ - MapObjectProfileUnkDRTC(); - ~MapObjectProfileUnkDRTC(); + MapObjectProfileDoorTouch(); + ~MapObjectProfileDoorTouch(); /* 0C */ virtual MapObject *Create(); - static MapObjectProfileUnkDRTC *GetProfile(); + static MapObjectProfileDoorTouch *GetProfile(); }; diff --git a/src/031_Land/MapObject/MapObjectUnkDRCK.cpp b/src/031_Land/MapObject/MapObjectDoorClick.cpp similarity index 86% rename from src/031_Land/MapObject/MapObjectUnkDRCK.cpp rename to src/031_Land/MapObject/MapObjectDoorClick.cpp index 4f9f880a..9dde642d 100644 --- a/src/031_Land/MapObject/MapObjectUnkDRCK.cpp +++ b/src/031_Land/MapObject/MapObjectDoorClick.cpp @@ -1,4 +1,4 @@ -#include "MapObject/MapObjectUnkDRCK.hpp" +#include "MapObject/MapObjectDoorClick.hpp" #include "System/SysNew.hpp" #include "Unknown/UnkStruct_027e09a8.hpp" #include "Unknown/UnkStruct_027e09b8.hpp" @@ -21,20 +21,20 @@ static const u16 data_ov031_02110c28[] = {0x00, 0x00, 0x00, 0x00, 0x07, 0x0A, 0x const UnkStruct_ov031_021150b0 data_ov031_02115328(0x1E66); -ARM DECL_PROFILE(MapObjectProfileUnkDRCK); +ARM DECL_PROFILE(MapObjectProfileDoorClick); -ARM MapObject *MapObjectProfileUnkDRCK::Create() { - return new(HeapIndex_ITCM) MapObjectUnkDRCK(); +ARM MapObject *MapObjectProfileDoorClick::Create() { + return new(HeapIndex_ITCM) MapObjectDoorClick(); } -ARM MapObjectProfileUnkDRCK::MapObjectProfileUnkDRCK() : - MapObjectProfile_Derived1(MapObjectId_DRCK, -1, 0) { +ARM MapObjectProfileDoorClick::MapObjectProfileDoorClick() : + MapObjectProfile_Derived1(MapObjectId_DoorClick, -1, 0) { this->mUnk_06 = 2; this->mUnk_1E |= 0x01; this->mUnk_0C = 0x399A; } -ARM MapObjectUnkDRCK::MapObjectUnkDRCK() : +ARM MapObjectDoorClick::MapObjectDoorClick() : mUnk_9C(1), mUnk_A0(0) { this->mUnk_8F = true; @@ -43,12 +43,12 @@ ARM MapObjectUnkDRCK::MapObjectUnkDRCK() : this->func_ov000_0209d2c4(1, 1); } -ARM u16 MapObjectUnkDRCK::vfunc2_1C(unk32 param1) { +ARM u16 MapObjectDoorClick::vfunc2_1C(unk32 param1) { return data_ov031_02110c28[param1]; } // https://decomp.me/scratch/zmw3b -ARM bool MapObjectUnkDRCK::vfunc_00(void) { +ARM bool MapObjectDoorClick::vfunc_00(void) { Vec3p local_1c; Vec3p local_28; Vec3p local_40[2]; @@ -93,7 +93,7 @@ ARM bool MapObjectUnkDRCK::vfunc_00(void) { return true; } -ARM void MapObjectUnkDRCK::vfunc_08(void) { +ARM void MapObjectDoorClick::vfunc_08(void) { if (this->mUnk_A4 != 0 && this->func_ov000_0209d29c(0)) { this->mUnk_A4 = 0; } @@ -198,12 +198,12 @@ ARM void MapObjectUnkDRCK::vfunc_08(void) { } } -ARM void MapObjectUnkDRCK::vfunc_18(s8 *param1, s8 param2) { +ARM void MapObjectDoorClick::vfunc_18(s8 *param1, s8 param2) { this->func_ov031_020fcb78(param1, param2); } // https://decomp.me/scratch/3XTMj -ARM void MapObjectUnkDRCK::vfunc_14(void) { +ARM void MapObjectDoorClick::vfunc_14(void) { f32 factor; f32 uVar3; s32 sVar2; @@ -246,7 +246,7 @@ ARM void MapObjectUnkDRCK::vfunc_14(void) { this->mUnk_94.vfunc_14(&m, &local_48); } -ARM void MapObjectUnkDRCK::vfunc_5C(unk32 param1, unk32 param2) { +ARM void MapObjectDoorClick::vfunc_5C(unk32 param1, unk32 param2) { s32 var_r6; u32 temp_r8; UnkStackStruct1 sp8; @@ -287,11 +287,11 @@ ARM void MapObjectUnkDRCK::vfunc_5C(unk32 param1, unk32 param2) { } } -ARM MapObject_10 *MapObjectUnkDRCK::vfunc2_14(void) { +ARM MapObject_10 *MapObjectDoorClick::vfunc2_14(void) { return &this->mUnk_A8; } -ARM bool MapObjectUnkDRCK::func_ov031_020ffde4(void) { +ARM bool MapObjectDoorClick::func_ov031_020ffde4(void) { switch (this->mUnk_A4) { case 0: return true; @@ -307,7 +307,7 @@ ARM bool MapObjectUnkDRCK::func_ov031_020ffde4(void) { return false; } -ARM unk32 MapObjectUnkDRCK::vfunc_28(void) { +ARM unk32 MapObjectDoorClick::vfunc_28(void) { switch (this->mUnk_16) { case 3: case 4: @@ -324,24 +324,24 @@ ARM unk32 MapObjectUnkDRCK::vfunc_28(void) { return 0; } -ARM bool MapObjectUnkDRCK::vfunc_64(void) { +ARM bool MapObjectDoorClick::vfunc_64(void) { return this->func_ov000_0209d29c(1); } -ARM bool MapObjectUnkDRCK::vfunc_68(void) { +ARM bool MapObjectDoorClick::vfunc_68(void) { return false; } -ARM bool MapObjectUnkDRCK::vfunc_6C(void) { +ARM bool MapObjectDoorClick::vfunc_6C(void) { return false; } -ARM void MapObjectUnkDRCK::vfunc_74(void) { +ARM void MapObjectDoorClick::vfunc_74(void) { data_027e0cec->func_ov000_0209ff8c(&this->mUnk_68, 0x89E, &this->mPos, 4); data_027e0cec->func_ov000_0209ff8c(&this->mUnk_A0, 0x89E, &this->mPos, 4); } -ARM void MapObjectUnkDRCK::vfunc_7C(void) { +ARM void MapObjectDoorClick::vfunc_7C(void) { this->MapObjectDoorBase::vfunc_7C(); if (this->mUnk_A0.mUnk_00 != NULL) { @@ -349,7 +349,7 @@ ARM void MapObjectUnkDRCK::vfunc_7C(void) { } } -ARM void MapObjectUnkDRCK::vfunc_78(void) { +ARM void MapObjectDoorClick::vfunc_78(void) { Vec3p local_24; Vec3p local_30; Vec3p VStack_3c; @@ -404,22 +404,22 @@ ARM void MapObjectUnkDRCK::vfunc_78(void) { } } -ARM void MapObjectUnkDRCK::vfunc2_10(void) { +ARM void MapObjectDoorClick::vfunc2_10(void) { unk32 index = this->mUnk_20.mUnk_00[0]; - this->mUnk_94.vfunc_08(GetUnkPointer2(index, data_ov031_02110c1c[index])); + this->mUnk_94.vfunc_08(GetUnkPointer2(index, data_ov031_02110c1c[index])); } -ARM void MapObjectUnkDRCK::vfunc_40(void) { +ARM void MapObjectDoorClick::vfunc_40(void) { data_027e09a8->func_ov000_02071b30(0x143, &this->mPos, 0); } -ARM void MapObjectUnkDRCK::vfunc_44(void) { +ARM void MapObjectDoorClick::vfunc_44(void) { unk32 local_c = *(u32 *) &this->mUnk_38; data_027e09a8->func_ov000_02071d34(&local_c, 0x142, &this->mPos, 0); } -ARM void MapObjectUnkDRCK::vfunc_48(void) {} +ARM void MapObjectDoorClick::vfunc_48(void) {} -ARM void MapObjectUnkDRCK::vfunc_4C(void) {} +ARM void MapObjectDoorClick::vfunc_4C(void) {} -ARM void MapObjectUnkDRCK::vfunc2_18(void) {} +ARM void MapObjectDoorClick::vfunc2_18(void) {} diff --git a/src/031_Land/MapObject/MapObjectUnkDRDS.cpp b/src/031_Land/MapObject/MapObjectDoorDangerSpawn.cpp similarity index 89% rename from src/031_Land/MapObject/MapObjectUnkDRDS.cpp rename to src/031_Land/MapObject/MapObjectDoorDangerSpawn.cpp index e8d04318..952eb79a 100644 --- a/src/031_Land/MapObject/MapObjectUnkDRDS.cpp +++ b/src/031_Land/MapObject/MapObjectDoorDangerSpawn.cpp @@ -1,4 +1,4 @@ -#include "MapObject/MapObjectUnkDRDS.hpp" +#include "MapObject/MapObjectDoorDangerSpawn.hpp" #include "Actor/ActorManager.hpp" #include "MapObject/MapObjectManager.hpp" #include "System/SysNew.hpp" @@ -23,21 +23,21 @@ extern UnkStruct_ov000_020b34c4_Callback data_ov000_020b4cc4; const UnkStruct_ov031_021150b0 data_ov031_021150b0(0x1E66); -ARM DECL_PROFILE(MapObjectProfileUnkDRDS); +ARM DECL_PROFILE(MapObjectProfileDoorDangerSpawn); -ARM MapObject *MapObjectProfileUnkDRDS::Create() { - return new(HeapIndex_ITCM) MapObjectUnkDRDS(); +ARM MapObject *MapObjectProfileDoorDangerSpawn::Create() { + return new(HeapIndex_ITCM) MapObjectDoorDangerSpawn(); } -ARM MapObjectProfileUnkDRDS::MapObjectProfileUnkDRDS() : - MapObjectProfile_Derived2(MapObjectId_DRDS, MapObjectId_DRDS) { +ARM MapObjectProfileDoorDangerSpawn::MapObjectProfileDoorDangerSpawn() : + MapObjectProfile_Derived2(MapObjectId_DoorDangerSpawn, MapObjectId_DoorDangerSpawn) { this->mUnk_0E = 1; this->mUnk_06 = -1; this->mUnk_1E &= ~0x01; } -ARM MapObjectUnkDRDS::MapObjectUnkDRDS() : - mUnk_94(GetUnkPointer1()), +ARM MapObjectDoorDangerSpawn::MapObjectDoorDangerSpawn() : + mUnk_94(GetUnkPointer1()), mUnk_9C(1), mUnk_A0(0), mUnk_A1(false), @@ -50,7 +50,7 @@ ARM MapObjectUnkDRDS::MapObjectUnkDRDS() : this->mUnk_89 = true; } -ARM bool MapObjectUnkDRDS::vfunc_00(void) { +ARM bool MapObjectDoorDangerSpawn::vfunc_00(void) { this->func_ov031_020fbf10(true, false); this->mUnk_78 = 0x23; this->mUnk_7A = 0x0F; @@ -60,7 +60,7 @@ ARM bool MapObjectUnkDRDS::vfunc_00(void) { return true; } -ARM void MapObjectUnkDRDS::vfunc_04(void) { +ARM void MapObjectDoorDangerSpawn::vfunc_04(void) { UnkStruct_027e0cd8_0c *ptr; Vec3p auStack_20; @@ -93,13 +93,13 @@ ARM void MapObjectUnkDRDS::vfunc_04(void) { UnkStruct_ov000_020b34c4 stack; bool run = true; stack.mUnk_00 = &data_ov000_020b4cc4; - stack.mUnk_04 = MapObjectId_DRDS; + stack.mUnk_04 = MapObjectId_DoorDangerSpawn; MapObject **ppMapObject = gpMapObjManager->func_01fff520((UnkStruct_ov000_020b34c4 *) &stack.mUnk_00, gpMapObjManager->mMapObjTable); if (ppMapObject != gpMapObjManager->mUnk_08) { - MapObjectUnkDRDS *pMapObject = (MapObjectUnkDRDS *) *ppMapObject; + MapObjectDoorDangerSpawn *pMapObject = (MapObjectDoorDangerSpawn *) *ppMapObject; u32 temp1; u32 temp2; @@ -129,17 +129,17 @@ ARM void MapObjectUnkDRDS::vfunc_04(void) { this->vfunc_5C(0, 0); UnkStruct_027e09bc_0c *uVar5 = data_027e09bc->mUnk_0C; - MapObjectUnkDRDS::func_ov031_020fe5fc(&auStack_20, this); + MapObjectDoorDangerSpawn::func_ov031_020fe5fc(&auStack_20, this); uVar5->func_ov000_0207834c(&auStack_20, (unk32) func_ov000_02077590(0), 0); } } -ARM void MapObjectUnkDRDS::vfunc2_04(void) { +ARM void MapObjectDoorDangerSpawn::vfunc2_04(void) { this->MapObjectDoorBase::vfunc2_04(); } -ARM void MapObjectUnkDRDS::vfunc2_08(void) { +ARM void MapObjectDoorDangerSpawn::vfunc2_08(void) { this->mUnk_8C = 1; this->vfunc_84(1, &this->mUnk_4C, &this->mUnk_4A); this->MapObjectDoorBase::vfunc2_08(); @@ -156,7 +156,7 @@ struct UnkStruct_Copy { }; // https://decomp.me/scratch/KLkdU -ARM void MapObjectUnkDRDS::vfunc_08(void) { +ARM void MapObjectDoorDangerSpawn::vfunc_08(void) { UnkStruct_Copy sp3C; UnkStruct_Copy sp1C; Vec3p sp10; @@ -264,7 +264,7 @@ ARM void MapObjectUnkDRDS::vfunc_08(void) { } } -ARM void MapObjectUnkDRDS::vfunc_0C(void) { +ARM void MapObjectDoorDangerSpawn::vfunc_0C(void) { this->MapObjectDoorBase::vfunc_0C(); if ((u16) this->mUnk_16 <= 1) { @@ -272,7 +272,7 @@ ARM void MapObjectUnkDRDS::vfunc_0C(void) { } } -ARM void MapObjectUnkDRDS::vfunc_5C(unk32 param1, unk32 param2) { +ARM void MapObjectDoorDangerSpawn::vfunc_5C(unk32 param1, unk32 param2) { UnkStruct_027e0cd8 **ptr; s32 var_r6; u32 temp_r8; @@ -402,7 +402,7 @@ ARM void MapObjectUnkDRDS::vfunc_5C(unk32 param1, unk32 param2) { } } -ARM bool MapObjectUnkDRDS::vfunc_64(void) { +ARM bool MapObjectDoorDangerSpawn::vfunc_64(void) { UnkStruct_027e0cd8_0c *pUVar4; unk32 var_r0; bool var_r5; @@ -440,7 +440,7 @@ ARM bool MapObjectUnkDRDS::vfunc_64(void) { return MapObjectDoorBase::vfunc_64(); } -ARM bool MapObjectUnkDRDS::vfunc_68(void) { +ARM bool MapObjectDoorDangerSpawn::vfunc_68(void) { UnkStruct_027e0cd8_0c *pUVar2 = data_027e0cd8->mUnk_0C; if (this->mUnk_20.mUnk_00[2] == 1) { @@ -465,7 +465,7 @@ ARM bool MapObjectUnkDRDS::vfunc_68(void) { return gpActorManager->func_ov000_0209704c() == 0; } -ARM bool MapObjectUnkDRDS::vfunc_6C(void) { +ARM bool MapObjectDoorDangerSpawn::vfunc_6C(void) { UnkStruct_027e0cd8_0c *pUVar5; switch (this->mUnk_20.mUnk_00[1]) { @@ -519,7 +519,7 @@ ARM bool MapObjectUnkDRDS::vfunc_6C(void) { return false; } -ARM bool MapObjectUnkDRDS::func_ov031_020fdec8(void) { +ARM bool MapObjectDoorDangerSpawn::func_ov031_020fdec8(void) { UnkStruct_027e0cd8_0c *pUVar4; Vec3p *uVar3; int iVar1; @@ -562,11 +562,11 @@ ARM bool MapObjectUnkDRDS::func_ov031_020fdec8(void) { return false; } -ARM void MapObjectUnkDRDS::vfunc_18(s8 *param1, s8 param2) { +ARM void MapObjectDoorDangerSpawn::vfunc_18(s8 *param1, s8 param2) { this->func_ov031_020fcb78(param1, param2); } -ARM void MapObjectUnkDRDS::vfunc_14(void) { +ARM void MapObjectDoorDangerSpawn::vfunc_14(void) { Mat3p m; Mat3p_InitYRotation(&m, SIN((u16) this->mUnk_14), COS((u16) this->mUnk_14)); @@ -576,7 +576,7 @@ ARM void MapObjectUnkDRDS::vfunc_14(void) { this->mUnk_94.vfunc_14(&m, &pos); } -ARM void MapObjectUnkDRDS::vfunc2_10(void) { +ARM void MapObjectDoorDangerSpawn::vfunc2_10(void) { switch (this->mUnk_16) { case 0: default: @@ -601,7 +601,7 @@ ARM void MapObjectUnkDRDS::vfunc2_10(void) { } // https://decomp.me/scratch/DEJfq -ARM void MapObjectUnkDRDS::vfunc_74(void) { +ARM void MapObjectDoorDangerSpawn::vfunc_74(void) { Vec3p local_28; Vec3p local_34; Vec3p local_40; @@ -652,7 +652,7 @@ ARM void MapObjectUnkDRDS::vfunc_74(void) { } } -ARM void MapObjectUnkDRDS::vfunc_7C(void) { +ARM void MapObjectDoorDangerSpawn::vfunc_7C(void) { this->MapObjectDoorBase::vfunc_7C(); if (this->mUnk_A8.mUnk_00 != NULL) { @@ -660,29 +660,29 @@ ARM void MapObjectUnkDRDS::vfunc_7C(void) { } } -ARM void MapObjectUnkDRDS::vfunc_40(void) { +ARM void MapObjectDoorDangerSpawn::vfunc_40(void) { data_027e09a8->func_ov000_02071b30(0x138, &this->mPos, 0); } -ARM void MapObjectUnkDRDS::vfunc_44(void) { +ARM void MapObjectDoorDangerSpawn::vfunc_44(void) { unk32 local_c = *(u32 *) &this->mUnk_38; data_027e09a8->func_ov000_02071d34(&local_c, 0x137, &this->mPos, 0); } -ARM void MapObjectUnkDRDS::vfunc_48(void) { +ARM void MapObjectDoorDangerSpawn::vfunc_48(void) { data_027e09a8->func_ov000_02071b30(0x13A, &this->mPos, 0); } -ARM void MapObjectUnkDRDS::vfunc_4C(void) { +ARM void MapObjectDoorDangerSpawn::vfunc_4C(void) { unk32 local_c = *(u32 *) &this->mUnk_38; data_027e09a8->func_ov000_02071d34(&local_c, 0x139, &this->mPos, 0); } -ARM bool MapObjectUnkDRDS::vfunc_88(void) { +ARM bool MapObjectDoorDangerSpawn::vfunc_88(void) { return !data_027e09b8->func_01ffd420(); } -ARM unk32 MapObjectUnkDRDS::vfunc_8C(void) { +ARM unk32 MapObjectDoorDangerSpawn::vfunc_8C(void) { if (this->mUnk_A2) { if (data_027e0ce0->func_01fff1a4()) { return 0x28; @@ -694,7 +694,7 @@ ARM unk32 MapObjectUnkDRDS::vfunc_8C(void) { return 0; } -ARM void MapObjectUnkDRDS::vfunc_84(unk32 param1, Vec3p *param2, unk16 *param3) { +ARM void MapObjectDoorDangerSpawn::vfunc_84(unk32 param1, Vec3p *param2, unk16 *param3) { s16 iVar1; if (!this->mUnk_58) { @@ -734,7 +734,7 @@ ARM void MapObjectUnkDRDS::vfunc_84(unk32 param1, Vec3p *param2, unk16 *param3) Vec3p_Add(&this->mPos, &local_30, &this->mUnk_5C); } -ARM void MapObjectUnkDRDS::func_ov031_020fe5fc(Vec3p *param1, MapObjectUnkDRDS *thisx) { +ARM void MapObjectDoorDangerSpawn::func_ov031_020fe5fc(Vec3p *param1, MapObjectDoorDangerSpawn *thisx) { if (data_027e0ce0->func_01fff1a4()) { Vec3p *piVar2 = data_027e0ce0->func_01fff148(1); Vec3p *piVar3 = data_027e0ce0->func_01fff148(0); @@ -750,5 +750,5 @@ ARM void MapObjectUnkDRDS::func_ov031_020fe5fc(Vec3p *param1, MapObjectUnkDRDS * } } -ARM MapObjectUnkDRDS::~MapObjectUnkDRDS() {} -ARM MapObjectProfileUnkDRDS::~MapObjectProfileUnkDRDS() {} +ARM MapObjectDoorDangerSpawn::~MapObjectDoorDangerSpawn() {} +ARM MapObjectProfileDoorDangerSpawn::~MapObjectProfileDoorDangerSpawn() {} diff --git a/src/031_Land/MapObject/MapObjectUnkDRKY.cpp b/src/031_Land/MapObject/MapObjectDoorKey.cpp similarity index 78% rename from src/031_Land/MapObject/MapObjectUnkDRKY.cpp rename to src/031_Land/MapObject/MapObjectDoorKey.cpp index 0181056f..c383dfd7 100644 --- a/src/031_Land/MapObject/MapObjectUnkDRKY.cpp +++ b/src/031_Land/MapObject/MapObjectDoorKey.cpp @@ -1,4 +1,4 @@ -#include "MapObject/MapObjectUnkDRKY.hpp" +#include "MapObject/MapObjectDoorKey.hpp" #include "System/SysNew.hpp" #include "Unknown/UnkStruct_027e09a8.hpp" #include "Unknown/UnkStruct_027e0ce0.hpp" @@ -9,22 +9,22 @@ extern "C" void func_01ffaf74(Vec3p *, Mat4x3p *, Vec3p *); const UnkStruct_ov031_021150b0 data_ov031_02115184(0x1E66); -ARM DECL_PROFILE(MapObjectProfileUnkDRKY); +ARM DECL_PROFILE(MapObjectProfileDoorKey); -ARM MapObject *MapObjectProfileUnkDRKY::Create() { - return new(HeapIndex_ITCM) MapObjectUnkDRKY(); +ARM MapObject *MapObjectProfileDoorKey::Create() { + return new(HeapIndex_ITCM) MapObjectDoorKey(); } -ARM MapObjectProfileUnkDRKY::MapObjectProfileUnkDRKY() : - MapObjectProfile_Derived2(MapObjectId_DRKY, MapObjectId_DRKY) { +ARM MapObjectProfileDoorKey::MapObjectProfileDoorKey() : + MapObjectProfile_Derived2(MapObjectId_DoorKey, MapObjectId_DoorKey) { this->mUnk_0E = 1; this->mUnk_06 = 2; this->mUnk_1E |= 0x01; this->mUnk_0C = 0x2666; } -ARM MapObjectUnkDRKY::MapObjectUnkDRKY() : - mUnk_94(GetUnkPointer1()), +ARM MapObjectDoorKey::MapObjectDoorKey() : + mUnk_94(GetUnkPointer1()), mUnk_9C(1), mUnk_A0(0), mUnk_A4(false) { @@ -33,22 +33,22 @@ ARM MapObjectUnkDRKY::MapObjectUnkDRKY() : this->mUnk_18[0] = 0x0E; } -ARM bool MapObjectUnkDRKY::vfunc_00(void) { +ARM bool MapObjectDoorKey::vfunc_00(void) { this->func_ov031_020fbf10(true, false); return true; } -ARM void MapObjectUnkDRKY::vfunc_08(void) { +ARM void MapObjectDoorKey::vfunc_08(void) { this->MapObjectDoorBase::vfunc_08(); this->mUnk_A4 = false; } -ARM void MapObjectUnkDRKY::vfunc_18(s8 *param1, s8 param2) { +ARM void MapObjectDoorKey::vfunc_18(s8 *param1, s8 param2) { this->MapObjectDoorBase::func_ov031_020fcb78(param1, param2); } // https://decomp.me/scratch/XO3u2 -ARM void MapObjectUnkDRKY::vfunc_14(void) { +ARM void MapObjectDoorKey::vfunc_14(void) { f32 factor; f32 uVar3; s32 sVar2; @@ -91,7 +91,7 @@ ARM void MapObjectUnkDRKY::vfunc_14(void) { this->mUnk_94.vfunc_14(&m, &local_48); } -ARM void MapObjectUnkDRKY::vfunc_5C(unk32 param1, unk32 param2) { +ARM void MapObjectDoorKey::vfunc_5C(unk32 param1, unk32 param2) { this->mUnk_8D = true; this->MapObjectDoorBase::vfunc_5C(param1, param2); @@ -112,7 +112,7 @@ ARM void MapObjectUnkDRKY::vfunc_5C(unk32 param1, unk32 param2) { } } -ARM bool MapObjectUnkDRKY::func_ov031_020fea88(void) { +ARM bool MapObjectDoorKey::func_ov031_020fea88(void) { if (this->mUnk_A4) { return false; } @@ -124,7 +124,7 @@ ARM bool MapObjectUnkDRKY::func_ov031_020fea88(void) { return false; } -ARM unk32 MapObjectUnkDRKY::vfunc_28(void) { +ARM unk32 MapObjectDoorKey::vfunc_28(void) { if (this->mUnk_A4) { return -1; } @@ -149,24 +149,24 @@ ARM unk32 MapObjectUnkDRKY::vfunc_28(void) { return 0; } -ARM bool MapObjectUnkDRKY::vfunc_64(void) { +ARM bool MapObjectDoorKey::vfunc_64(void) { return this->func_ov000_0209d668(); } -ARM bool MapObjectUnkDRKY::vfunc_68(void) { +ARM bool MapObjectDoorKey::vfunc_68(void) { return false; } -ARM bool MapObjectUnkDRKY::vfunc_6C(void) { +ARM bool MapObjectDoorKey::vfunc_6C(void) { return false; } -ARM void MapObjectUnkDRKY::vfunc_74(void) { +ARM void MapObjectDoorKey::vfunc_74(void) { data_027e0cec->func_ov000_0209ff8c(&this->mUnk_68, 0x89E, &this->mPos, 4); data_027e0cec->func_ov000_0209ff8c(&this->mUnk_A0, 0x89E, &this->mPos, 4); } -ARM void MapObjectUnkDRKY::vfunc_7C(void) { +ARM void MapObjectDoorKey::vfunc_7C(void) { this->MapObjectDoorBase::vfunc_7C(); if (this->mUnk_A0.mUnk_00 != NULL) { @@ -174,7 +174,7 @@ ARM void MapObjectUnkDRKY::vfunc_7C(void) { } } -ARM void MapObjectUnkDRKY::vfunc_78(void) { +ARM void MapObjectDoorKey::vfunc_78(void) { Vec3p local_24; Vec3p local_30; Vec3p VStack_3c; @@ -229,18 +229,18 @@ ARM void MapObjectUnkDRKY::vfunc_78(void) { } } -ARM void MapObjectUnkDRKY::vfunc_40(void) { +ARM void MapObjectDoorKey::vfunc_40(void) { data_027e09a8->func_ov000_02071b30(0x136, &this->mPos, 0); } -ARM void MapObjectUnkDRKY::vfunc_44(void) { +ARM void MapObjectDoorKey::vfunc_44(void) { unk32 stack = *(u32 *) &this->mUnk_38; data_027e09a8->func_ov000_02071d34(&stack, 0x135, &this->mPos, 0); } -ARM void MapObjectUnkDRKY::vfunc_48(void) {} +ARM void MapObjectDoorKey::vfunc_48(void) {} -ARM void MapObjectUnkDRKY::vfunc_4C(void) {} +ARM void MapObjectDoorKey::vfunc_4C(void) {} -ARM MapObjectUnkDRKY::~MapObjectUnkDRKY() {} -ARM MapObjectProfileUnkDRKY::~MapObjectProfileUnkDRKY() {} +ARM MapObjectDoorKey::~MapObjectDoorKey() {} +ARM MapObjectProfileDoorKey::~MapObjectProfileDoorKey() {} diff --git a/src/031_Land/MapObject/MapObjectUnkDRSW.cpp b/src/031_Land/MapObject/MapObjectDoorSwitch.cpp similarity index 87% rename from src/031_Land/MapObject/MapObjectUnkDRSW.cpp rename to src/031_Land/MapObject/MapObjectDoorSwitch.cpp index c9a4126c..e9e14281 100644 --- a/src/031_Land/MapObject/MapObjectUnkDRSW.cpp +++ b/src/031_Land/MapObject/MapObjectDoorSwitch.cpp @@ -1,4 +1,4 @@ -#include "MapObject/MapObjectUnkDRSW.hpp" +#include "MapObject/MapObjectDoorSwitch.hpp" #include "System/SysNew.hpp" #include "Unknown/UnkStruct_027e09a8.hpp" #include "Unknown/UnkStruct_027e09b8.hpp" @@ -11,19 +11,19 @@ extern "C" void func_01ff9218(q20 *, q20, q20); const UnkStruct_ov031_021150b0 data_ov031_02115254(0x1E66); -ARM DECL_PROFILE(MapObjectProfileUnkDRSW); +ARM DECL_PROFILE(MapObjectProfileDoorSwitch); -ARM MapObject *MapObjectProfileUnkDRSW::Create() { - return new(HeapIndex_ITCM) MapObjectUnkDRSW(); +ARM MapObject *MapObjectProfileDoorSwitch::Create() { + return new(HeapIndex_ITCM) MapObjectDoorSwitch(); } -ARM MapObjectProfileUnkDRSW::MapObjectProfileUnkDRSW() : - MapObjectProfile_Derived2(MapObjectId_DRSW, MapObjectId_DRSW) { +ARM MapObjectProfileDoorSwitch::MapObjectProfileDoorSwitch() : + MapObjectProfile_Derived2(MapObjectId_DoorSwitch, MapObjectId_DoorSwitch) { this->mUnk_06 = -1; this->mUnk_1E &= ~0x01; } -ARM MapObjectUnkDRSW::MapObjectUnkDRSW() : +ARM MapObjectDoorSwitch::MapObjectDoorSwitch() : mUnk_094(0) { this->mUnkPos = FLOAT_TO_Q20(0.0f); @@ -37,7 +37,7 @@ ARM MapObjectUnkDRSW::MapObjectUnkDRSW() : this->mUnk_89 = true; } -ARM bool MapObjectUnkDRSW::vfunc_00(void) { +ARM bool MapObjectDoorSwitch::vfunc_00(void) { this->mUnk_094.vfunc_08(this->vfunc2_10()); this->func_ov031_020fbf10(true, true); @@ -90,7 +90,7 @@ ARM bool MapObjectUnkDRSW::vfunc_00(void) { return true; } -ARM void MapObjectUnkDRSW::vfunc_08(void) { +ARM void MapObjectDoorSwitch::vfunc_08(void) { if (this->mUnk_20.mUnk_00[3] == 2 && data_027e09b8->func_01ffd420()) { this->MapObjectDoorBase::vfunc_08(); } else if (this->mUnk_16 == 5 && this->vfunc_6C()) { @@ -100,11 +100,11 @@ ARM void MapObjectUnkDRSW::vfunc_08(void) { } } -ARM bool MapObjectUnkDRSW::vfunc_64(void) { +ARM bool MapObjectDoorSwitch::vfunc_64(void) { return this->func_ov000_0209d29c(0); } -ARM bool MapObjectUnkDRSW::vfunc_6C(void) { +ARM bool MapObjectDoorSwitch::vfunc_6C(void) { if (this->func_ov000_0209d29c(0)) { return false; } @@ -112,7 +112,7 @@ ARM bool MapObjectUnkDRSW::vfunc_6C(void) { return true; } -ARM void MapObjectUnkDRSW::vfunc_14(void) { +ARM void MapObjectDoorSwitch::vfunc_14(void) { u16 angle = this->mUnk_14; Mat3p m; @@ -123,11 +123,11 @@ ARM void MapObjectUnkDRSW::vfunc_14(void) { this->mUnk_094.vfunc_14(&m, &local_40); } -ARM void MapObjectUnkDRSW::vfunc_18(s8 *param1, s8 param2) { +ARM void MapObjectDoorSwitch::vfunc_18(s8 *param1, s8 param2) { this->func_ov031_020fcb78(param1, param2); } -ARM void MapObjectUnkDRSW::vfunc_74(void) { +ARM void MapObjectDoorSwitch::vfunc_74(void) { Vec3p local_20(this->mPos); Vec3p local_2c(0, 0, 0x666); Mat4x3p m; @@ -144,11 +144,11 @@ ARM void MapObjectUnkDRSW::vfunc_74(void) { } } -ARM void *MapObjectUnkDRSW::vfunc2_10(void) { - return GetUnkPointer1(); +ARM void *MapObjectDoorSwitch::vfunc2_10(void) { + return GetUnkPointer1(); } -ARM void MapObjectUnkDRSW::vfunc_50(void) { +ARM void MapObjectDoorSwitch::vfunc_50(void) { #if IS_JP if (!this->mUnk_140) { return; @@ -207,7 +207,7 @@ ARM void MapObjectUnkDRSW::vfunc_50(void) { #endif } -ARM void MapObjectUnkDRSW::vfunc_54(void) { +ARM void MapObjectDoorSwitch::vfunc_54(void) { this->func_ov031_020fcf0c(1); #if IS_JP @@ -280,7 +280,7 @@ ARM void MapObjectUnkDRSW::vfunc_54(void) { #endif } -ARM void MapObjectUnkDRSW::vfunc_58(void) { +ARM void MapObjectDoorSwitch::vfunc_58(void) { #if IS_JP if (!this->mUnk_140) { return; @@ -316,23 +316,23 @@ ARM void MapObjectUnkDRSW::vfunc_58(void) { #endif } -ARM void MapObjectUnkDRSW::vfunc_40(void) { +ARM void MapObjectDoorSwitch::vfunc_40(void) { data_027e09a8->func_ov000_02071b30(0x131, &this->mPos, 0); } -ARM void MapObjectUnkDRSW::vfunc_44(void) { +ARM void MapObjectDoorSwitch::vfunc_44(void) { unk32 local_c = *(u32 *) &this->mUnk_38; data_027e09a8->func_ov000_02071d34(&local_c, 0x130, &this->mPos, 0); } -ARM void MapObjectUnkDRSW::vfunc_48(void) { +ARM void MapObjectDoorSwitch::vfunc_48(void) { data_027e09a8->func_ov000_02071b30(0x133, &this->mPos, 0); } -ARM void MapObjectUnkDRSW::vfunc_4C(void) { +ARM void MapObjectDoorSwitch::vfunc_4C(void) { unk32 local_c = *(u32 *) &this->mUnk_38; data_027e09a8->func_ov000_02071d34(&local_c, 0x132, &this->mPos, 0); } -ARM MapObjectUnkDRSW::~MapObjectUnkDRSW() {} -ARM MapObjectProfileUnkDRSW::~MapObjectProfileUnkDRSW() {} +ARM MapObjectDoorSwitch::~MapObjectDoorSwitch() {} +ARM MapObjectProfileDoorSwitch::~MapObjectProfileDoorSwitch() {} diff --git a/src/031_Land/MapObject/MapObjectDoorTouch.cpp b/src/031_Land/MapObject/MapObjectDoorTouch.cpp new file mode 100644 index 00000000..f45b0961 --- /dev/null +++ b/src/031_Land/MapObject/MapObjectDoorTouch.cpp @@ -0,0 +1,55 @@ +#include "MapObject/MapObjectDoorTouch.hpp" +#include "System/SysNew.hpp" +#include "Unknown/Common.hpp" +#include "Unknown/UnkStruct_027e09a8.hpp" + +extern u32 data_ov031_02110c3c[]; + +ARM DECL_PROFILE(MapObjectProfileDoorTouch); + +ARM MapObject *MapObjectProfileDoorTouch::Create() { + return new(HeapIndex_ITCM) MapObjectDoorTouch(); +} + +ARM MapObjectProfileDoorTouch::MapObjectProfileDoorTouch() : + MapObjectProfile_Derived1(MapObjectId_DoorTouch, -1, 0) { + this->mUnk_06 = -1; + this->mUnk_1E &= ~0x01; +} + +ARM MapObjectDoorTouch::MapObjectDoorTouch() { + this->mUnk_18[0] = 0x0F; +} + +ARM bool MapObjectDoorTouch::vfunc_00(void) { + this->MapObjectDoorClick::vfunc_00(); + this->mUnk_88 = true; + return true; +} + +ARM void MapObjectDoorTouch::vfunc2_10(void) { + MapObjectProfileDoorTouch *p = GET_PROFILE(MapObjectProfileDoorTouch); + unk32 index = this->mUnk_20.mUnk_00[0]; + this->mUnk_94.vfunc_08(GetUnkPointer2(index, data_ov031_02110c3c[index])); +} + +ARM void MapObjectDoorTouch::vfunc_40(void) { + data_027e09a8->func_ov000_02071b30(0x148, &this->mPos, 0); +} + +ARM void MapObjectDoorTouch::vfunc_44(void) { + unk32 local_c = *(u32 *) &this->mUnk_38; + data_027e09a8->func_ov000_02071d34(&local_c, 0x147, &this->mPos, 0); +} + +ARM void MapObjectDoorTouch::vfunc_48(void) {} + +ARM void MapObjectDoorTouch::vfunc_4C(void) {} + +ARM void MapObjectDoorTouch::vfunc2_18(void) { + data_027e09a8->func_ov000_02071b30(0x146, &this->mPos, 0); +} + +ARM MapObjectDoorTouch::~MapObjectDoorTouch() {} + +ARM MapObjectProfileDoorTouch::~MapObjectProfileDoorTouch() {} diff --git a/src/031_Land/MapObject/MapObjectUnkDRTC.cpp b/src/031_Land/MapObject/MapObjectUnkDRTC.cpp deleted file mode 100644 index f6209495..00000000 --- a/src/031_Land/MapObject/MapObjectUnkDRTC.cpp +++ /dev/null @@ -1,55 +0,0 @@ -#include "MapObject/MapObjectUnkDRTC.hpp" -#include "System/SysNew.hpp" -#include "Unknown/Common.hpp" -#include "Unknown/UnkStruct_027e09a8.hpp" - -extern u32 data_ov031_02110c3c[]; - -ARM DECL_PROFILE(MapObjectProfileUnkDRTC); - -ARM MapObject *MapObjectProfileUnkDRTC::Create() { - return new(HeapIndex_ITCM) MapObjectUnkDRTC(); -} - -ARM MapObjectProfileUnkDRTC::MapObjectProfileUnkDRTC() : - MapObjectProfile_Derived1(MapObjectId_DRTC, -1, 0) { - this->mUnk_06 = -1; - this->mUnk_1E &= ~0x01; -} - -ARM MapObjectUnkDRTC::MapObjectUnkDRTC() { - this->mUnk_18[0] = 0x0F; -} - -ARM bool MapObjectUnkDRTC::vfunc_00(void) { - this->MapObjectUnkDRCK::vfunc_00(); - this->mUnk_88 = true; - return true; -} - -ARM void MapObjectUnkDRTC::vfunc2_10(void) { - MapObjectProfileUnkDRTC *p = GET_PROFILE(MapObjectProfileUnkDRTC); - unk32 index = this->mUnk_20.mUnk_00[0]; - this->mUnk_94.vfunc_08(GetUnkPointer2(index, data_ov031_02110c3c[index])); -} - -ARM void MapObjectUnkDRTC::vfunc_40(void) { - data_027e09a8->func_ov000_02071b30(0x148, &this->mPos, 0); -} - -ARM void MapObjectUnkDRTC::vfunc_44(void) { - unk32 local_c = *(u32 *) &this->mUnk_38; - data_027e09a8->func_ov000_02071d34(&local_c, 0x147, &this->mPos, 0); -} - -ARM void MapObjectUnkDRTC::vfunc_48(void) {} - -ARM void MapObjectUnkDRTC::vfunc_4C(void) {} - -ARM void MapObjectUnkDRTC::vfunc2_18(void) { - data_027e09a8->func_ov000_02071b30(0x146, &this->mPos, 0); -} - -ARM MapObjectUnkDRTC::~MapObjectUnkDRTC() {} - -ARM MapObjectProfileUnkDRTC::~MapObjectProfileUnkDRTC() {} diff --git a/tools/configure.py b/tools/configure.py index 3c8cf544..5917ef3e 100755 --- a/tools/configure.py +++ b/tools/configure.py @@ -399,11 +399,11 @@ config.libs = [ Object("031_Land/MapObject/MapObjectUnkBMFL.cpp"), Object("031_Land/MapObject/MapObjectUnkBREX.cpp"), Object("031_Land/MapObject/MapObjectUnkCRWL.cpp"), - Object("031_Land/MapObject/MapObjectUnkDRCK.cpp"), - Object("031_Land/MapObject/MapObjectUnkDRDS.cpp"), - Object("031_Land/MapObject/MapObjectUnkDRKY.cpp"), - Object("031_Land/MapObject/MapObjectUnkDRSW.cpp"), - Object("031_Land/MapObject/MapObjectUnkDRTC.cpp"), + Object("031_Land/MapObject/MapObjectDoorClick.cpp"), + Object("031_Land/MapObject/MapObjectDoorDangerSpawn.cpp"), + Object("031_Land/MapObject/MapObjectDoorKey.cpp"), + Object("031_Land/MapObject/MapObjectDoorSwitch.cpp"), + Object("031_Land/MapObject/MapObjectDoorTouch.cpp"), Object("031_Land/MapObject/MapObjectUnkEXIT.cpp"), Object("031_Land/MapObject/MapObjectUnkGATE.cpp"), Object("031_Land/MapObject/MapObjectUnkGRSS.cpp"), diff --git a/tools/name_actor.py b/tools/name_actor.py new file mode 100755 index 00000000..34e713df --- /dev/null +++ b/tools/name_actor.py @@ -0,0 +1,131 @@ +#!/usr/bin/env python3 + +import argparse + +from pathlib import Path + + +CONFIG_DIR = Path("config").resolve() +INC_DIR = Path("include").resolve() +SRC_DIR = Path("src").resolve() + + +def update_filename(args): + # rename the file in config and directories + + is_actor = not args.is_map_obj + kind = "Actor" if is_actor else "MapObject" + old_fname = f"{kind}Unk{args.old_name}.cpp" + new_fname = f"{kind}{args.new_name}.cpp" + + for delink_file in CONFIG_DIR.rglob("delinks.txt"): + assert delink_file.exists() + filedata = delink_file.read_text() + if old_fname in filedata: + delink_file.write_text(filedata.replace(old_fname, new_fname)) + + for sym_file in CONFIG_DIR.rglob("symbols.txt"): + assert sym_file.exists() + filedata = sym_file.read_text() + if old_fname in filedata: + sym_file.write_text(filedata.replace(old_fname, new_fname)) + + config_py = Path("tools/configure.py").resolve() + filedata = config_py.read_text() + if old_fname in filedata: + config_py.write_text(filedata.replace(old_fname, new_fname)) + + for h_old in INC_DIR.rglob("*.hpp"): + if old_fname.removesuffix(".cpp") in h_old.stem: + h_old.rename(h_old.with_stem(new_fname.removesuffix(".cpp")).with_suffix(".hpp")) + break + + for s_old in SRC_DIR.rglob("*.cpp"): + if old_fname.removesuffix(".cpp") in s_old.stem: + s_old.rename(s_old.with_stem(new_fname.removesuffix(".cpp"))) + break + + +def update_classes(args, is_profile: bool): + # rename the class in the files + + is_actor = not args.is_map_obj + kind = "Actor" if is_actor else "MapObject" + + if is_profile: + kind = f"{kind}Profile" + + old_class = f"{kind}Unk{args.old_name}" + new_class = f"{kind}{args.new_name}" + + for h_file in INC_DIR.rglob("*.hpp"): + assert h_file.exists() + + filedata = h_file.read_text() + if old_class in filedata: + h_file.write_text(filedata.replace(old_class, new_class)) + + for c_file in SRC_DIR.rglob("*.cpp"): + assert c_file.exists() + + filedata = c_file.read_text() + if old_class in filedata: + c_file.write_text(filedata.replace(old_class, new_class)) + + old_mangled = f"{len(old_class)}{old_class}" + new_mangled = f"{len(new_class)}{new_class}" + + for sym_file in CONFIG_DIR.rglob("symbols.txt"): + assert sym_file.exists() + filedata = sym_file.read_text() + if old_mangled in filedata: + sym_file.write_text(filedata.replace(old_mangled, new_mangled)) + + +def update_id(args): + # renames the id in files + + if args.is_map_obj: + table = INC_DIR / "Map" / "MapObjectTable.inl" + old_id = f"MapObjectId_{args.old_name}" + new_id = f"MapObjectId_{args.new_name}" + else: + table = INC_DIR / "Actor" / "ActorTable.inl" + old_id = f"ActortId_{args.old_name}" + new_id = f"ActortId_{args.new_name}" + + for h_file in INC_DIR.rglob("*.hpp"): + assert h_file.exists() + + filedata = h_file.read_text() + if old_id in filedata: + h_file.write_text(filedata.replace(old_id, new_id)) + + for c_file in SRC_DIR.rglob("*.cpp"): + assert c_file.exists() + + filedata = c_file.read_text() + if old_id in filedata: + c_file.write_text(filedata.replace(old_id, new_id)) + + assert table.exists() + table.write_text(table.read_text().replace(f", {args.old_name})", f", {args.new_name})")) + + +def main(): + parser = argparse.ArgumentParser(description="Generates build.ninja") + parser.add_argument("old_name", type=str, help="old name") + parser.add_argument("new_name", type=str, help="new name") + parser.add_argument("-m", "--map-object", action="store_true", dest="is_map_obj", required=False, default=False, help="is map object") + + args = parser.parse_args() + assert len(args.old_name) > 0 and len(args.new_name) > 0 + + update_id(args) + update_classes(args, False) # update actor class + update_classes(args, True) # update profile class + update_filename(args) # update filenames + + +if __name__ == "__main__": + main()