diff --git a/config/eur/arm9/delinks.txt b/config/eur/arm9/delinks.txt index 474ee686..5ad6125d 100644 --- a/config/eur/arm9/delinks.txt +++ b/config/eur/arm9/delinks.txt @@ -68,14 +68,6 @@ libs/c/src/ansi_files.c: .data start:0x020446a8 end:0x0204478c .bss start:0x020517a0 end:0x02051aa0 -libs/c/src/float.c: - complete - .data start:0x0204478c end:0x02044790 - -libs/c/src/locale.c: - complete - .data start:0x02044790 end:0x020449ac - libs/c/src/arith.c: complete .text start:0x020338d4 end:0x020338ec @@ -122,6 +114,14 @@ libs/c/src/wmem.c: complete .text start:0x020341f8 end:0x02034230 +libs/c/src/float.c: + complete + .data start:0x0204478c end:0x02044790 + +libs/c/src/locale.c: + complete + .data start:0x02044790 end:0x020449ac + libs/c/src/wprintf.c: .text start:0x02034230 end:0x0203615c .data start:0x020449ac end:0x02044a2c diff --git a/config/eur/arm9/overlays/ov000/delinks.txt b/config/eur/arm9/overlays/ov000/delinks.txt index 5a076b11..6fd58fa3 100644 --- a/config/eur/arm9/overlays/ov000/delinks.txt +++ b/config/eur/arm9/overlays/ov000/delinks.txt @@ -31,37 +31,37 @@ src/000_Second/Actor/ActorUnkSWOB.cpp: .text start:0x0209a8b8 end:0x0209aca8 .init start:0x020b07e8 end:0x020b0838 .ctor start:0x020b1908 end:0x020b190c - .bss start:0x020b5c0c end:0x020b5c48 + .bss start:0x020b5bfc end:0x020b5c48 src/000_Second/Actor/ActorUnkSWTM.cpp: .text start:0x0209aca8 end:0x0209b22c .init start:0x020b0838 end:0x020b0888 .ctor start:0x020b190c end:0x020b1910 - .bss start:0x020b5c58 end:0x020b5c94 + .bss start:0x020b5c48 end:0x020b5c98 src/000_Second/Actor/ActorUnkEVIC.cpp: .text start:0x0209bf88 end:0x0209c074 .init start:0x020b0888 end:0x020b08d8 .ctor start:0x020b1910 end:0x020b1914 - .bss start:0x020b5ca8 end:0x020b5ce4 + .bss start:0x020b5c98 end:0x020b5ce4 src/000_Second/Actor/ActorUnkEFIK.cpp: .text start:0x0209c074 end:0x0209c348 .init start:0x020b08d8 end:0x020b0928 .ctor start:0x020b1914 end:0x020b1918 - .bss start:0x020b5cf4 end:0x020b5d30 + .bss start:0x020b5ce4 end:0x020b6118 src/000_Second/MapObject/MapObjectUnkSWST.cpp: .text start:0x0209dce0 end:0x0209e3f8 .init start:0x020b0950 end:0x020b09ac .ctor start:0x020b191c end:0x020b1920 - .bss start:0x020b6130 end:0x020b6150 + .bss start:0x020b6118 end:0x020b6228 src/000_Second/MapObject/MapObjectUnkBLCM.cpp: .text start:0x0209e3f8 end:0x0209e768 .init start:0x020b09ac end:0x020b09fc .ctor start:0x020b1920 end:0x020b1924 - .bss start:0x020b6238 end:0x020b62a0 + .bss start:0x020b6228 end:0x020b62a0 src/000_Second/Item/ItemManager.cpp: complete diff --git a/config/eur/arm9/overlays/ov000/symbols.txt b/config/eur/arm9/overlays/ov000/symbols.txt index d129e2be..6948383f 100644 --- a/config/eur/arm9/overlays/ov000/symbols.txt +++ b/config/eur/arm9/overlays/ov000/symbols.txt @@ -4046,31 +4046,31 @@ data_ov000_020b5390 kind:bss addr:0x020b5390 data_ov000_020b5398 kind:bss addr:0x020b5398 data_ov000_020b539c kind:bss addr:0x020b539c data_ov000_020b53d0 kind:bss addr:0x020b53d0 -data_ov000_020b5bfc kind:bss addr:0x020b5bfc -data_ov000_020b5c00 kind:bss addr:0x020b5c00 -sActorProfileUnkSWOB kind:bss addr:0x020b5c0c -data_ov000_020b5c48 kind:bss addr:0x020b5c48 -data_ov000_020b5c4c kind:bss addr:0x020b5c4c -sActorProfileUnkSWTM kind:bss addr:0x020b5c58 +_ZGVN15ProfileInstanceI19ActorProfileUnkSWOBE8sProfileE kind:bss addr:0x020b5bfc +@10033 kind:bss addr:0x020b5c00 +_ZN15ProfileInstanceI19ActorProfileUnkSWOBE8sProfileE kind:bss addr:0x020b5c0c +_ZGVN15ProfileInstanceI19ActorProfileUnkSWTME8sProfileE kind:bss addr:0x020b5c48 +@10039 kind:bss addr:0x020b5c4c +_ZN15ProfileInstanceI19ActorProfileUnkSWTME8sProfileE kind:bss addr:0x020b5c58 data_ov000_020b5c94 kind:bss addr:0x020b5c94 -data_ov000_020b5c98 kind:bss addr:0x020b5c98 -data_ov000_020b5c9c kind:bss addr:0x020b5c9c -sActorProfileUnkEVIC kind:bss addr:0x020b5ca8 -data_ov000_020b5ce4 kind:bss addr:0x020b5ce4 -data_ov000_020b5ce8 kind:bss addr:0x020b5ce8 -sActorProfileUnkEFIK kind:bss addr:0x020b5cf4 +_ZGVN15ProfileInstanceI19ActorProfileUnkEVICE8sProfileE kind:bss addr:0x020b5c98 +@10045 kind:bss addr:0x020b5c9c +_ZN15ProfileInstanceI19ActorProfileUnkEVICE8sProfileE kind:bss addr:0x020b5ca8 +_ZGVN15ProfileInstanceI19ActorProfileUnkEFIKE8sProfileE kind:bss addr:0x020b5ce4 +@10051 kind:bss addr:0x020b5ce8 +_ZN15ProfileInstanceI19ActorProfileUnkEFIKE8sProfileE kind:bss addr:0x020b5cf4 data_ov000_020b5d30 kind:bss addr:0x020b5d30 data_ov000_020b5d34 kind:bss addr:0x020b5d34 data_ov000_020b5d3c kind:bss addr:0x020b5d3c data_ov000_020b6114 kind:bss addr:0x020b6114 -data_ov000_020b6118 kind:bss addr:0x020b6118 -data_ov000_020b6124 kind:bss addr:0x020b6124 -sMapObjectProfileUnkSWST kind:bss addr:0x020b6130 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkSWSTE8sProfileE kind:bss addr:0x020b6118 +@10057 kind:bss addr:0x020b6124 +_ZN15ProfileInstanceI23MapObjectProfileUnkSWSTE8sProfileE kind:bss addr:0x020b6130 data_ov000_020b6150 kind:bss addr:0x020b6150 data_ov000_020b6204 kind:bss addr:0x020b6204 -data_ov000_020b6228 kind:bss addr:0x020b6228 -data_ov000_020b622c kind:bss addr:0x020b622c -sMapObjectProfileUnkBLCM kind:bss addr:0x020b6238 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkBLCME8sProfileE kind:bss addr:0x020b6228 +@10063 kind:bss addr:0x020b622c +_ZN15ProfileInstanceI23MapObjectProfileUnkBLCME8sProfileE kind:bss addr:0x020b6238 data_ov000_020b62a0 kind:bss addr:0x020b62a0 data_ov000_020b62a4 kind:bss addr:0x020b62a4 gSaveManager kind:bss addr:0x020b62a8 diff --git a/config/eur/arm9/overlays/ov021/delinks.txt b/config/eur/arm9/overlays/ov021/delinks.txt index 1a12bfc1..cc94df53 100644 --- a/config/eur/arm9/overlays/ov021/delinks.txt +++ b/config/eur/arm9/overlays/ov021/delinks.txt @@ -9,70 +9,70 @@ src/021_BattleGame/Actor/ActorUnkBAPH.cpp: .text start:0x020ec0f0 end:0x020f02ec .init start:0x02107938 end:0x021079ac .ctor start:0x02107e4c end:0x02107e50 - .bss start:0x021090c8 end:0x021091a0 + .bss start:0x021090b0 end:0x021091a0 src/021_BattleGame/Actor/ActorUnkBAEY.cpp: .text start:0x020f02ec end:0x020f0cdc .init start:0x021079ac end:0x021079fc .ctor start:0x02107e50 end:0x02107e54 - .bss start:0x021091b0 end:0x02109288 + .bss start:0x021091a0 end:0x021092a4 src/021_BattleGame/Actor/ActorUnkBAFO.cpp: .text start:0x020f0cdc end:0x020f1a14 .init start:0x021079fc end:0x02107aa4 .ctor start:0x02107e54 end:0x02107e58 - .bss start:0x021092bc end:0x02109394 + .bss start:0x021092a4 end:0x02109394 src/021_BattleGame/Actor/ActorUnkBTIR.cpp: .text start:0x020f1a14 end:0x020f243c .init start:0x02107aa4 end:0x02107af4 .ctor start:0x02107e58 end:0x02107e5c - .bss start:0x021093a4 end:0x0210947c + .bss start:0x02109394 end:0x0210947c src/021_BattleGame/Actor/ActorUnkBFFN.cpp: .text start:0x020f243c end:0x020f37d0 .init start:0x02107af4 end:0x02107b44 .ctor start:0x02107e5c end:0x02107e60 - .bss start:0x0210948c end:0x021094c8 + .bss start:0x0210947c end:0x021094c8 src/021_BattleGame/Actor/ActorUnkBPAP.cpp: .text start:0x020f37d0 end:0x020f38c8 .init start:0x02107b44 end:0x02107b94 .ctor start:0x02107e60 end:0x02107e64 - .bss start:0x021094d8 end:0x02109514 + .bss start:0x021094c8 end:0x02109514 src/021_BattleGame/Actor/ActorUnkCLZN.cpp: .text start:0x020f38c8 end:0x020f39ac .init start:0x02107b94 end:0x02107be4 .ctor start:0x02107e64 end:0x02107e68 - .bss start:0x02109524 end:0x02109560 + .bss start:0x02109514 end:0x02109560 src/021_BattleGame/Actor/ActorUnkFOFA.cpp: .text start:0x020f39ac end:0x020f3aa4 .init start:0x02107be4 end:0x02107c34 .ctor start:0x02107e68 end:0x02107e6c - .bss start:0x02109570 end:0x0210957c + .bss start:0x02109560 end:0x021095ac src/021_BattleGame/Actor/ActorUnkLVOF.cpp: .text start:0x020f3aa4 end:0x020f4730 .init start:0x02107c34 end:0x02107c84 .ctor start:0x02107e6c end:0x02107e70 - .bss start:0x021095bc end:0x021095f8 + .bss start:0x021095ac end:0x02109698 src/021_BattleGame/MapObject/MapObjectUnkBAPL.cpp: .text start:0x020f491c end:0x020f5b24 .init start:0x02107c84 end:0x02107ce0 .ctor start:0x02107e70 end:0x02107e74 - .bss start:0x021096b0 end:0x021096d0 + .bss start:0x02109698 end:0x021096d0 src/021_BattleGame/MapObject/MapObjectUnkBFFL.cpp: .text start:0x020f5b24 end:0x020f619c .init start:0x02107ce0 end:0x02107d30 .ctor start:0x02107e74 end:0x02107e78 - .bss start:0x021096e0 end:0x021097b4 + .bss start:0x021096d0 end:0x021097b4 src/021_BattleGame/MapObject/MapObjectUnkBFSP.cpp: .text start:0x020f619c end:0x020f6410 .init start:0x02107d30 end:0x02107d80 .ctor start:0x02107e78 end:0x02107e7c - .bss start:0x021097c4 end:0x02109898 + .bss start:0x021097b4 end:0x02109898 diff --git a/config/eur/arm9/overlays/ov021/symbols.txt b/config/eur/arm9/overlays/ov021/symbols.txt index 262d6406..16f44fce 100644 --- a/config/eur/arm9/overlays/ov021/symbols.txt +++ b/config/eur/arm9/overlays/ov021/symbols.txt @@ -1054,52 +1054,52 @@ data_ov021_02109084 kind:bss addr:0x02109084 data_ov021_0210908c kind:bss addr:0x0210908c data_ov021_02109098 kind:bss addr:0x02109098 data_ov021_021090a4 kind:bss addr:0x021090a4 -data_ov021_021090b0 kind:bss addr:0x021090b0 -data_ov021_021090bc kind:bss addr:0x021090bc -sActorProfileUnkBAPH kind:bss addr:0x021090c8 -data_ov021_021091a0 kind:bss addr:0x021091a0 -data_ov021_021091a4 kind:bss addr:0x021091a4 -sActorProfileUnkBAEY kind:bss addr:0x021091b0 +_ZGVN15ProfileInstanceI19ActorProfileUnkBAPHE8sProfileE kind:bss addr:0x021090b0 +@10087 kind:bss addr:0x021090bc +_ZN15ProfileInstanceI19ActorProfileUnkBAPHE8sProfileE kind:bss addr:0x021090c8 +_ZGVN15ProfileInstanceI19ActorProfileUnkBAEYE8sProfileE kind:bss addr:0x021091a0 +@10093 kind:bss addr:0x021091a4 +_ZN15ProfileInstanceI19ActorProfileUnkBAEYE8sProfileE kind:bss addr:0x021091b0 data_ov021_02109288 kind:bss addr:0x02109288 data_ov021_0210928c kind:bss addr:0x0210928c data_ov021_02109298 kind:bss addr:0x02109298 -data_ov021_021092a4 kind:bss addr:0x021092a4 -data_ov021_021092b0 kind:bss addr:0x021092b0 -sActorProfileUnkBAFO kind:bss addr:0x021092bc -data_ov021_02109394 kind:bss addr:0x02109394 -data_ov021_02109398 kind:bss addr:0x02109398 -sActorProfileUnkBTIR kind:bss addr:0x021093a4 -data_ov021_0210947c kind:bss addr:0x0210947c -data_ov021_02109480 kind:bss addr:0x02109480 -sActorProfileUnkBFFN kind:bss addr:0x0210948c -data_ov021_021094c8 kind:bss addr:0x021094c8 -data_ov021_021094cc kind:bss addr:0x021094cc -sActorProfileUnkBPAP kind:bss addr:0x021094d8 -data_ov021_02109514 kind:bss addr:0x02109514 -data_ov021_02109518 kind:bss addr:0x02109518 -sActorProfileUnkCLZN kind:bss addr:0x02109524 -data_ov021_02109560 kind:bss addr:0x02109560 -data_ov021_02109564 kind:bss addr:0x02109564 -sActorProfileUnkFOFA kind:bss addr:0x02109570 +_ZGVN15ProfileInstanceI19ActorProfileUnkBAFOE8sProfileE kind:bss addr:0x021092a4 +@10099 kind:bss addr:0x021092b0 +_ZN15ProfileInstanceI19ActorProfileUnkBAFOE8sProfileE kind:bss addr:0x021092bc +_ZGVN15ProfileInstanceI19ActorProfileUnkBTIRE8sProfileE kind:bss addr:0x02109394 +@10105 kind:bss addr:0x02109398 +_ZN15ProfileInstanceI19ActorProfileUnkBTIRE8sProfileE kind:bss addr:0x021093a4 +_ZGVN15ProfileInstanceI19ActorProfileUnkBFFNE8sProfileE kind:bss addr:0x0210947c +@10111 kind:bss addr:0x02109480 +_ZN15ProfileInstanceI19ActorProfileUnkBFFNE8sProfileE kind:bss addr:0x0210948c +_ZGVN15ProfileInstanceI19ActorProfileUnkBPAPE8sProfileE kind:bss addr:0x021094c8 +@10117 kind:bss addr:0x021094cc +_ZN15ProfileInstanceI19ActorProfileUnkBPAPE8sProfileE kind:bss addr:0x021094d8 +_ZGVN15ProfileInstanceI19ActorProfileUnkCLZNE8sProfileE kind:bss addr:0x02109514 +@10123 kind:bss addr:0x02109518 +_ZN15ProfileInstanceI19ActorProfileUnkCLZNE8sProfileE kind:bss addr:0x02109524 +_ZGVN15ProfileInstanceI19ActorProfileUnkFOFAE8sProfileE kind:bss addr:0x02109560 +@10129 kind:bss addr:0x02109564 +_ZN15ProfileInstanceI19ActorProfileUnkFOFAE8sProfileE kind:bss addr:0x02109570 data_ov021_0210957c kind:bss addr:0x0210957c ambiguous -data_ov021_021095ac kind:bss addr:0x021095ac -data_ov021_021095b0 kind:bss addr:0x021095b0 -sActorProfileUnkLVOF kind:bss addr:0x021095bc +_ZGVN15ProfileInstanceI19ActorProfileUnkLVOFE8sProfileE kind:bss addr:0x021095ac +@10135 kind:bss addr:0x021095b0 +_ZN15ProfileInstanceI19ActorProfileUnkLVOFE8sProfileE kind:bss addr:0x021095bc data_ov021_021095f8 kind:bss addr:0x021095f8 ambiguous data_ov021_02109600 kind:bss addr:0x02109600 ambiguous data_ov021_02109608 kind:bss addr:0x02109608 ambiguous data_ov021_02109610 kind:bss addr:0x02109610 ambiguous data_ov021_0210965c kind:bss addr:0x0210965c ambiguous data_ov021_02109694 kind:bss addr:0x02109694 -data_ov021_02109698 kind:bss addr:0x02109698 -data_ov021_021096a4 kind:bss addr:0x021096a4 -sMapObjectProfileUnkBAPL kind:bss addr:0x021096b0 -data_ov021_021096d0 kind:bss addr:0x021096d0 -data_ov021_021096d4 kind:bss addr:0x021096d4 -sMapObjectProfileUnkBFFL kind:bss addr:0x021096e0 -data_ov021_021097b4 kind:bss addr:0x021097b4 -data_ov021_021097b8 kind:bss addr:0x021097b8 -sMapObjectProfileUnkBFSP kind:bss addr:0x021097c4 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkBAPLE8sProfileE kind:bss addr:0x02109698 +@10141 kind:bss addr:0x021096a4 +_ZN15ProfileInstanceI23MapObjectProfileUnkBAPLE8sProfileE kind:bss addr:0x021096b0 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkBFFLE8sProfileE kind:bss addr:0x021096d0 +@10147 kind:bss addr:0x021096d4 +_ZN15ProfileInstanceI23MapObjectProfileUnkBFFLE8sProfileE kind:bss addr:0x021096e0 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkBFSPE8sProfileE kind:bss addr:0x021097b4 +@10153 kind:bss addr:0x021097b8 +_ZN15ProfileInstanceI23MapObjectProfileUnkBFSPE8sProfileE kind:bss addr:0x021097c4 data_ov021_02109898 kind:bss addr:0x02109898 data_ov021_021098bc kind:bss addr:0x021098bc data_ov021_021098c0 kind:bss addr:0x021098c0 diff --git a/config/eur/arm9/overlays/ov024/symbols.txt b/config/eur/arm9/overlays/ov024/symbols.txt index 0dcdb2e9..2f0ef7da 100644 --- a/config/eur/arm9/overlays/ov024/symbols.txt +++ b/config/eur/arm9/overlays/ov024/symbols.txt @@ -914,4 +914,4 @@ data_ov024_020d86b0 kind:bss addr:0x020d86b0 data_ov024_020d86b4 kind:bss addr:0x020d86b4 ambiguous data_ov024_020d86b8 kind:bss addr:0x020d86b8 data_ov024_020d86bc kind:bss addr:0x020d86bc -sActorProfileUnkOBPC kind:bss addr:0x020d86c8 +_ZN15ProfileInstanceI19ActorProfileUnkOBPCE8sProfileE kind:bss addr:0x020d86c8 diff --git a/config/eur/arm9/overlays/ov026/delinks.txt b/config/eur/arm9/overlays/ov026/delinks.txt index 0ad9490e..be36993e 100644 --- a/config/eur/arm9/overlays/ov026/delinks.txt +++ b/config/eur/arm9/overlays/ov026/delinks.txt @@ -9,202 +9,202 @@ src/026_Train/Actor/ActorUnkDKCL.cpp: .text start:0x02104f00 end:0x021050cc .init start:0x02134038 end:0x02134088 .ctor start:0x021351c8 end:0x021351cc - .bss start:0x0213f624 end:0x0213f6fc + .bss start:0x0213f614 end:0x0213f6fc src/026_Train/MapObject/MapObjectUnkPLFM.cpp: .text start:0x021082f0 end:0x02108e40 .init start:0x021343e4 end:0x0213446c .ctor start:0x021351d0 end:0x021351d4 - .bss start:0x0213f70c end:0x0213f794 + .bss start:0x0213f6fc end:0x0213f7e0 src/026_Train/MapObject/MapObjectUnkPLFA.cpp: .text start:0x02108e40 end:0x021092c4 .init start:0x0213446c end:0x021344e0 .ctor start:0x021351d4 end:0x021351d8 - .bss start:0x0213f7f0 end:0x0213f810 + .bss start:0x0213f7e0 end:0x0213f810 src/026_Train/MapObject/MapObjectUnkTRET.cpp: .text start:0x02109610 end:0x02109970 .init start:0x02134500 end:0x02134550 .ctor start:0x021351dc end:0x021351e0 - .bss start:0x0213f820 end:0x0213f8f4 + .bss start:0x0213f810 end:0x0213f914 src/026_Train/MapObject/MapObjectUnkTRRC.cpp: .text start:0x02109970 end:0x02109e90 .init start:0x02134550 end:0x021345a0 .ctor start:0x021351e0 end:0x021351e4 - .bss start:0x0213f924 end:0x0213f9f8 + .bss start:0x0213f914 end:0x0213fa18 src/026_Train/MapObject/MapObjectUnkTBSF.cpp: .text start:0x0210a398 end:0x0210a644 .init start:0x021345bc end:0x0213460c .ctor start:0x021351e8 end:0x021351ec - .bss start:0x0213fa28 end:0x0213fafc + .bss start:0x0213fa18 end:0x0213fb1c src/026_Train/MapObject/MapObjectUnkMTWR.cpp: .text start:0x0210a644 end:0x0210a930 .init start:0x0213460c end:0x0213465c .ctor start:0x021351ec end:0x021351f0 - .bss start:0x0213fb2c end:0x0213fb4c + .bss start:0x0213fb1c end:0x0213fc00 src/026_Train/MapObject/MapObjectUnkEBRD.cpp: .text start:0x0210a930 end:0x0210abc0 .init start:0x0213465c end:0x021346ac .ctor start:0x021351f0 end:0x021351f4 - .bss start:0x0213fc10 end:0x0213fce4 + .bss start:0x0213fc00 end:0x0213fce4 src/026_Train/MapObject/MapObjectUnkETNL.cpp: .text start:0x0210abc0 end:0x0210aea8 .init start:0x021346ac end:0x021346fc .ctor start:0x021351f4 end:0x021351f8 - .bss start:0x0213fcf4 end:0x0213fdc8 + .bss start:0x0213fce4 end:0x0213fdc8 src/026_Train/MapObject/MapObjectUnkMTGT.cpp: .text start:0x0210b3c0 end:0x0210baa0 .init start:0x0213471c end:0x0213476c .ctor start:0x021351fc end:0x02135200 - .bss start:0x0213fdd8 end:0x0213fdf8 + .bss start:0x0213fdc8 end:0x0213feac src/026_Train/MapObject/MapObjectUnkTRTF.cpp: .text start:0x0210e238 end:0x0210e4e4 .init start:0x021347c8 end:0x02134818 .ctor start:0x02135204 end:0x02135208 - .bss start:0x0213febc end:0x0213ff90 + .bss start:0x0213feac end:0x0213ffb0 src/026_Train/MapObject/MapObjectUnkTRPT.cpp: .text start:0x0210e4e4 end:0x0210e8c4 .init start:0x02134818 end:0x02134868 .ctor start:0x02135208 end:0x0213520c - .bss start:0x0213ffc0 end:0x0213ffe0 + .bss start:0x0213ffb0 end:0x02140094 src/026_Train/MapObject/MapObjectUnkEFRS.cpp: .text start:0x0210e8c4 end:0x0210ed3c .init start:0x02134868 end:0x021348b8 .ctor start:0x0213520c end:0x02135210 - .bss start:0x021400c4 end:0x02140198 + .bss start:0x02140094 end:0x02140198 src/026_Train/MapObject/MapObjectUnkETSD.cpp: .text start:0x0210ed3c end:0x0210f130 .init start:0x021348b8 end:0x02134908 .ctor start:0x02135210 end:0x02135214 - .bss start:0x021401a8 end:0x0214027c + .bss start:0x02140198 end:0x02140284 src/026_Train/Actor/ActorUnkCNBL.cpp: .text start:0x0210f130 end:0x0210fd88 .init start:0x02134908 end:0x02134958 .ctor start:0x02135214 end:0x02135218 - .bss start:0x02140294 end:0x021402d0 + .bss start:0x02140284 end:0x021402f0 src/026_Train/Actor/ActorUnkTRBC.cpp: .text start:0x0210fd88 end:0x02110250 .init start:0x02134958 end:0x021349c0 .ctor start:0x02135218 end:0x0213521c - .bss start:0x02140300 end:0x021403d8 + .bss start:0x021402f0 end:0x021403d8 src/026_Train/Actor/ActorUnkTRCB.cpp: .text start:0x02110250 end:0x02110c7c .init start:0x021349c0 end:0x02134a10 .ctor start:0x0213521c end:0x02135220 - .bss start:0x021403e8 end:0x02140424 + .bss start:0x021403d8 end:0x02140424 src/026_Train/Actor/ActorUnkTHER.cpp: .text start:0x021110a0 end:0x02111334 .init start:0x02134a10 end:0x02134a60 .ctor start:0x02135220 end:0x02135224 - .bss start:0x02140434 end:0x02140470 + .bss start:0x02140424 end:0x02140470 src/026_Train/Actor/ActorUnkTRUP.cpp: .text start:0x02111334 end:0x02111640 .init start:0x02134a60 end:0x02134ab0 .ctor start:0x02135224 end:0x02135228 - .bss start:0x02140480 end:0x021404bc + .bss start:0x02140470 end:0x021405c4 src/026_Train/Actor/ActorUnkKLTR.cpp: .text start:0x02111640 end:0x02113d3c .init start:0x02134ab0 end:0x02134b00 .ctor start:0x02135228 end:0x0213522c - .bss start:0x021405e4 end:0x021406bc + .bss start:0x021405c4 end:0x021406c4 src/026_Train/Actor/ActorUnkTRTT.cpp: .text start:0x02113d3c end:0x021165f0 .init start:0x02134b00 end:0x02134b9c .ctor start:0x0213522c end:0x02135230 - .bss start:0x021406dc end:0x021407b4 + .bss start:0x021406c4 end:0x021407b4 src/026_Train/Actor/ActorUnkTFAT.cpp: .text start:0x021165f0 end:0x021167c4 .init start:0x02134b9c end:0x02134bec .ctor start:0x02135230 end:0x02135234 - .bss start:0x021407c4 end:0x02140800 + .bss start:0x021407b4 end:0x02140844 src/026_Train/Actor/ActorUnkTBRD.cpp: .text start:0x021167c4 end:0x0211a9f8 .init start:0x02134bec end:0x02134cbc .ctor start:0x02135234 end:0x02135238 - .bss start:0x0214085c end:0x02140934 + .bss start:0x02140844 end:0x02140e00 src/026_Train/Actor/ActorUnkSNST.cpp: .text start:0x0211a9f8 end:0x0211ad2c .init start:0x02134cbc end:0x02134d0c .ctor start:0x02135238 end:0x0213523c - .bss start:0x02140e10 end:0x02140ee8 + .bss start:0x02140e00 end:0x02140ee8 src/026_Train/Actor/ActorUnkTRSP.cpp: .text start:0x0211ad2c end:0x0211dbcc .init start:0x02134d0c end:0x02134d98 .ctor start:0x0213523c end:0x02135240 - .bss start:0x02140ef8 end:0x02140fd0 + .bss start:0x02140ee8 end:0x02140ff8 src/026_Train/Actor/ActorUnkRB1T.cpp: .text start:0x0211e0f8 end:0x02120a6c .init start:0x02134de8 end:0x02134e38 .ctor start:0x02135244 end:0x02135248 - .bss start:0x02141008 end:0x021410e0 + .bss start:0x02140ff8 end:0x021410e0 src/026_Train/Actor/ActorUnkRBRT.cpp: .text start:0x02120a6c end:0x021211f8 .init start:0x02134e38 end:0x02134e88 .ctor start:0x02135248 end:0x0213524c - .bss start:0x021410f0 end:0x021411c8 + .bss start:0x021410e0 end:0x021411c8 src/026_Train/Actor/ActorUnkRBNT.cpp: .text start:0x021211f8 end:0x021220fc .init start:0x02134e88 end:0x02134ed8 .ctor start:0x0213524c end:0x02135250 - .bss start:0x021411d8 end:0x021412b0 + .bss start:0x021411c8 end:0x021412b0 src/026_Train/Actor/ActorUnkTVLR.cpp: .text start:0x021220fc end:0x02122ebc .init start:0x02134ed8 end:0x02134f28 .ctor start:0x02135250 end:0x02135254 - .bss start:0x021412c4 end:0x02141300 + .bss start:0x021412b0 end:0x021413ac src/026_Train/Actor/ActorUnkTTET.cpp: .text start:0x02122ebc end:0x0212361c .init start:0x02134f28 end:0x02134f78 .ctor start:0x02135254 end:0x02135258 - .bss start:0x021413b8 end:0x021413f4 + .bss start:0x021413ac end:0x02141424 src/026_Train/Actor/ActorUnkTRSG.cpp: .text start:0x0212361c end:0x02123aa4 .init start:0x02134f78 end:0x02134fc8 .ctor start:0x02135258 end:0x0213525c - .bss start:0x02141434 end:0x02141470 + .bss start:0x02141424 end:0x02141478 src/026_Train/Actor/ActorUnkBDEM.cpp: .text start:0x02123aa4 end:0x02127f84 .init start:0x02134fc8 end:0x02135040 .ctor start:0x0213525c end:0x02135260 - .bss start:0x02141490 end:0x02141568 + .bss start:0x02141478 end:0x02141574 src/026_Train/Actor/ActorUnkTCOW_WCAS.cpp: .text start:0x02127f84 end:0x0212b8b8 .init start:0x02135040 end:0x021350f4 .ctor start:0x02135260 end:0x02135264 - .bss start:0x0214158c end:0x0214173c + .bss start:0x02141574 end:0x02141830 src/026_Train/Actor/ActorUnkDKTR.cpp: .text start:0x0212b8b8 end:0x0212e458 .init start:0x021350f4 end:0x02135144 .ctor start:0x02135264 end:0x02135268 - .bss start:0x02141850 end:0x02141928 + .bss start:0x02141830 end:0x02141928 diff --git a/config/eur/arm9/overlays/ov026/symbols.txt b/config/eur/arm9/overlays/ov026/symbols.txt index 82f85f8f..24bb3e25 100644 --- a/config/eur/arm9/overlays/ov026/symbols.txt +++ b/config/eur/arm9/overlays/ov026/symbols.txt @@ -3018,78 +3018,74 @@ data_ov026_0213f5ec kind:bss addr:0x0213f5ec data_ov026_0213f5f4 kind:bss addr:0x0213f5f4 data_ov026_0213f600 kind:bss addr:0x0213f600 data_ov026_0213f608 kind:bss addr:0x0213f608 -data_ov026_0213f614 kind:bss addr:0x0213f614 -data_ov026_0213f618 kind:bss addr:0x0213f618 -sActorProfileUnkDKCL kind:bss addr:0x0213f624 -data_ov026_0213f6fc kind:bss addr:0x0213f6fc -data_ov026_0213f700 kind:bss addr:0x0213f700 -sMapObjectProfileUnkPLFM kind:bss addr:0x0213f70c -data_ov026_0213f794 kind:bss addr:0x0213f794 ambiguous -data_ov026_0213f7e0 kind:bss addr:0x0213f7e0 -data_ov026_0213f7e4 kind:bss addr:0x0213f7e4 -sMapObjectProfileUnkPLFA kind:bss addr:0x0213f7f0 -data_ov026_0213f810 kind:bss addr:0x0213f810 -data_ov026_0213f814 kind:bss addr:0x0213f814 -sMapObjectProfileUnkTRET kind:bss addr:0x0213f820 +_ZGVN15ProfileInstanceI19ActorProfileUnkDKCLE8sProfileE kind:bss addr:0x0213f614 +@10176 kind:bss addr:0x0213f618 +_ZN15ProfileInstanceI19ActorProfileUnkDKCLE8sProfileE kind:bss addr:0x0213f624 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkPLFME8sProfileE kind:bss addr:0x0213f6fc +@10171 kind:bss addr:0x0213f700 +_ZN15ProfileInstanceI23MapObjectProfileUnkPLFME8sProfileE kind:bss addr:0x0213f70c +_ZGVN15ProfileInstanceI23MapObjectProfileUnkPLFAE8sProfileE kind:bss addr:0x0213f7e0 +@10177 kind:bss addr:0x0213f7e4 +_ZN15ProfileInstanceI23MapObjectProfileUnkPLFAE8sProfileE kind:bss addr:0x0213f7f0 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRETE8sProfileE kind:bss addr:0x0213f810 +@10183 kind:bss addr:0x0213f814 +_ZN15ProfileInstanceI23MapObjectProfileUnkTRETE8sProfileE kind:bss addr:0x0213f820 data_ov026_0213f8f4 kind:bss addr:0x0213f8f4 -data_ov026_0213f914 kind:bss addr:0x0213f914 -data_ov026_0213f918 kind:bss addr:0x0213f918 -sMapObjectProfileUnkTRRC kind:bss addr:0x0213f924 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRRCE8sProfileE kind:bss addr:0x0213f914 +@10189 kind:bss addr:0x0213f918 +_ZN15ProfileInstanceI23MapObjectProfileUnkTRRCE8sProfileE kind:bss addr:0x0213f924 data_ov026_0213f9f8 kind:bss addr:0x0213f9f8 -data_ov026_0213fa18 kind:bss addr:0x0213fa18 -data_ov026_0213fa1c kind:bss addr:0x0213fa1c -sMapObjectProfileUnkTBSF kind:bss addr:0x0213fa28 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTBSFE8sProfileE kind:bss addr:0x0213fa18 +@10195 kind:bss addr:0x0213fa1c +_ZN15ProfileInstanceI23MapObjectProfileUnkTBSFE8sProfileE kind:bss addr:0x0213fa28 data_ov026_0213fafc kind:bss addr:0x0213fafc -data_ov026_0213fb1c kind:bss addr:0x0213fb1c -data_ov026_0213fb20 kind:bss addr:0x0213fb20 -sMapObjectProfileUnkMTWR kind:bss addr:0x0213fb2c +_ZGVN15ProfileInstanceI23MapObjectProfileUnkMTWRE8sProfileE kind:bss addr:0x0213fb1c +@10201 kind:bss addr:0x0213fb20 +_ZN15ProfileInstanceI23MapObjectProfileUnkMTWRE8sProfileE kind:bss addr:0x0213fb2c data_ov026_0213fb4c kind:bss addr:0x0213fb4c -data_ov026_0213fc00 kind:bss addr:0x0213fc00 -data_ov026_0213fc04 kind:bss addr:0x0213fc04 -sMapObjectProfileUnkEBRD kind:bss addr:0x0213fc10 -data_ov026_0213fce4 kind:bss addr:0x0213fce4 -data_ov026_0213fce8 kind:bss addr:0x0213fce8 -sMapObjectProfileUnkETNL kind:bss addr:0x0213fcf4 -data_ov026_0213fdc8 kind:bss addr:0x0213fdc8 -data_ov026_0213fdcc kind:bss addr:0x0213fdcc -sMapObjectProfileUnkMTGT kind:bss addr:0x0213fdd8 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkEBRDE8sProfileE kind:bss addr:0x0213fc00 +@10207 kind:bss addr:0x0213fc04 +_ZN15ProfileInstanceI23MapObjectProfileUnkEBRDE8sProfileE kind:bss addr:0x0213fc10 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkETNLE8sProfileE kind:bss addr:0x0213fce4 +@10213 kind:bss addr:0x0213fce8 +_ZN15ProfileInstanceI23MapObjectProfileUnkETNLE8sProfileE kind:bss addr:0x0213fcf4 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkMTGTE8sProfileE kind:bss addr:0x0213fdc8 +@10219 kind:bss addr:0x0213fdcc +_ZN15ProfileInstanceI23MapObjectProfileUnkMTGTE8sProfileE kind:bss addr:0x0213fdd8 data_ov026_0213fdf8 kind:bss addr:0x0213fdf8 -data_ov026_0213feac kind:bss addr:0x0213feac -data_ov026_0213feb0 kind:bss addr:0x0213feb0 -sMapObjectProfileUnkTRTF kind:bss addr:0x0213febc +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRTFE8sProfileE kind:bss addr:0x0213feac +@10225 kind:bss addr:0x0213feb0 +_ZN15ProfileInstanceI23MapObjectProfileUnkTRTFE8sProfileE kind:bss addr:0x0213febc data_ov026_0213ff90 kind:bss addr:0x0213ff90 -data_ov026_0213ffb0 kind:bss addr:0x0213ffb0 -data_ov026_0213ffb4 kind:bss addr:0x0213ffb4 -sMapObjectProfileUnkTRPT kind:bss addr:0x0213ffc0 -data_ov026_0213ffe0 kind:bss addr:0x0213ffe0 ambiguous -data_ov026_0214000c kind:bss addr:0x0214000c ambiguous -data_ov026_02140058 kind:bss addr:0x02140058 ambiguous +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRPTE8sProfileE kind:bss addr:0x0213ffb0 +@10231 kind:bss addr:0x0213ffb4 +_ZN15ProfileInstanceI23MapObjectProfileUnkTRPTE8sProfileE kind:bss addr:0x0213ffc0 data_ov026_02140094 kind:bss addr:0x02140094 -data_ov026_021400b4 kind:bss addr:0x021400b4 -data_ov026_021400b8 kind:bss addr:0x021400b8 -sMapObjectProfileUnkEFRS kind:bss addr:0x021400c4 -data_ov026_02140198 kind:bss addr:0x02140198 -data_ov026_0214019c kind:bss addr:0x0214019c -sMapObjectProfileUnkETSD kind:bss addr:0x021401a8 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkEFRSE8sProfileE kind:bss addr:0x021400b4 +@10237 kind:bss addr:0x021400b8 +_ZN15ProfileInstanceI23MapObjectProfileUnkEFRSE8sProfileE kind:bss addr:0x021400c4 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkETSDE8sProfileE kind:bss addr:0x02140198 +@10243 kind:bss addr:0x0214019c +_ZN15ProfileInstanceI23MapObjectProfileUnkETSDE8sProfileE kind:bss addr:0x021401a8 data_ov026_0214027c kind:bss addr:0x0214027c data_ov026_02140280 kind:bss addr:0x02140280 -data_ov026_02140284 kind:bss addr:0x02140284 -data_ov026_02140288 kind:bss addr:0x02140288 -sActorProfileUnkCNBL kind:bss addr:0x02140294 +_ZGVN15ProfileInstanceI19ActorProfileUnkCNBLE8sProfileE kind:bss addr:0x02140284 +@10260 kind:bss addr:0x02140288 +_ZN15ProfileInstanceI19ActorProfileUnkCNBLE8sProfileE kind:bss addr:0x02140294 data_ov026_021402d0 kind:bss addr:0x021402d0 data_ov026_021402e0 kind:bss addr:0x021402e0 -data_ov026_021402f0 kind:bss addr:0x021402f0 -data_ov026_021402f4 kind:bss addr:0x021402f4 -sActorProfileUnkTRBC kind:bss addr:0x02140300 -data_ov026_021403d8 kind:bss addr:0x021403d8 -data_ov026_021403dc kind:bss addr:0x021403dc -sActorProfileUnkTRCB kind:bss addr:0x021403e8 -data_ov026_02140424 kind:bss addr:0x02140424 -data_ov026_02140428 kind:bss addr:0x02140428 -sActorProfileUnkTHER kind:bss addr:0x02140434 -data_ov026_02140470 kind:bss addr:0x02140470 -data_ov026_02140474 kind:bss addr:0x02140474 -sActorProfileUnkTRUP kind:bss addr:0x02140480 +_ZGVN15ProfileInstanceI19ActorProfileUnkTRBCE8sProfileE kind:bss addr:0x021402f0 +@10266 kind:bss addr:0x021402f4 +_ZN15ProfileInstanceI19ActorProfileUnkTRBCE8sProfileE kind:bss addr:0x02140300 +_ZGVN15ProfileInstanceI19ActorProfileUnkTRCBE8sProfileE kind:bss addr:0x021403d8 +@10272 kind:bss addr:0x021403dc +_ZN15ProfileInstanceI19ActorProfileUnkTRCBE8sProfileE kind:bss addr:0x021403e8 +_ZGVN15ProfileInstanceI19ActorProfileUnkTHERE8sProfileE kind:bss addr:0x02140424 +@10278 kind:bss addr:0x02140428 +_ZN15ProfileInstanceI19ActorProfileUnkTHERE8sProfileE kind:bss addr:0x02140434 +_ZGVN15ProfileInstanceI19ActorProfileUnkTRUPE8sProfileE kind:bss addr:0x02140470 +@10284 kind:bss addr:0x02140474 +_ZN15ProfileInstanceI19ActorProfileUnkTRUPE8sProfileE kind:bss addr:0x02140480 data_ov026_021404bc kind:bss addr:0x021404bc data_ov026_021404c0 kind:bss addr:0x021404c0 data_ov026_021404c4 kind:bss addr:0x021404c4 @@ -3118,72 +3114,72 @@ data_ov026_02140584 kind:bss addr:0x02140584 data_ov026_02140594 kind:bss addr:0x02140594 data_ov026_021405a4 kind:bss addr:0x021405a4 data_ov026_021405b4 kind:bss addr:0x021405b4 -data_ov026_021405c4 kind:bss addr:0x021405c4 -data_ov026_021405d4 kind:bss addr:0x021405d4 -sActorProfileUnkKLTR kind:bss addr:0x021405e4 +_ZGVN15ProfileInstanceI19ActorProfileUnkKLTRE8sProfileE kind:bss addr:0x021405c4 +@10290 kind:bss addr:0x021405d4 +_ZN15ProfileInstanceI19ActorProfileUnkKLTRE8sProfileE kind:bss addr:0x021405e4 data_ov026_021406bc kind:bss addr:0x021406bc -data_ov026_021406c4 kind:bss addr:0x021406c4 -data_ov026_021406d0 kind:bss addr:0x021406d0 -sActorProfileUnkTRTT kind:bss addr:0x021406dc -data_ov026_021407b4 kind:bss addr:0x021407b4 -data_ov026_021407b8 kind:bss addr:0x021407b8 -sActorProfileUnkTFAT kind:bss addr:0x021407c4 +_ZGVN15ProfileInstanceI19ActorProfileUnkTRTTE8sProfileE kind:bss addr:0x021406c4 +@10296 kind:bss addr:0x021406d0 +_ZN15ProfileInstanceI19ActorProfileUnkTRTTE8sProfileE kind:bss addr:0x021406dc +_ZGVN15ProfileInstanceI19ActorProfileUnkTFATE8sProfileE kind:bss addr:0x021407b4 +@10302 kind:bss addr:0x021407b8 +_ZN15ProfileInstanceI19ActorProfileUnkTFATE8sProfileE kind:bss addr:0x021407c4 data_ov026_02140800 kind:bss addr:0x02140800 data_ov026_0214080c kind:bss addr:0x0214080c data_ov026_02140818 kind:bss addr:0x02140818 data_ov026_02140824 kind:bss addr:0x02140824 data_ov026_02140834 kind:bss addr:0x02140834 -data_ov026_02140844 kind:bss addr:0x02140844 -data_ov026_02140848 kind:bss addr:0x02140848 -sActorProfileUnkTBRD kind:bss addr:0x0214085c +_ZGVN15ProfileInstanceI19ActorProfileUnkTBRDE8sProfileE kind:bss addr:0x02140844 +@10308 kind:bss addr:0x02140848 +_ZN15ProfileInstanceI19ActorProfileUnkTBRDE8sProfileE kind:bss addr:0x0214085c data_ov026_02140934 kind:bss addr:0x02140934 data_ov026_02140948 kind:bss addr:0x02140948 data_ov026_02140a5d kind:bss addr:0x02140a5d ambiguous data_ov026_02140a7d kind:bss addr:0x02140a7d ambiguous -data_ov026_02140e00 kind:bss addr:0x02140e00 -data_ov026_02140e04 kind:bss addr:0x02140e04 -sActorProfileUnkSNST kind:bss addr:0x02140e10 -data_ov026_02140ee8 kind:bss addr:0x02140ee8 -data_ov026_02140eec kind:bss addr:0x02140eec -sActorProfileUnkTRSP kind:bss addr:0x02140ef8 +_ZGVN15ProfileInstanceI19ActorProfileUnkSNSTE8sProfileE kind:bss addr:0x02140e00 +@10314 kind:bss addr:0x02140e04 +_ZN15ProfileInstanceI19ActorProfileUnkSNSTE8sProfileE kind:bss addr:0x02140e10 +_ZGVN15ProfileInstanceI19ActorProfileUnkTRSPE8sProfileE kind:bss addr:0x02140ee8 +@10320 kind:bss addr:0x02140eec +_ZN15ProfileInstanceI19ActorProfileUnkTRSPE8sProfileE kind:bss addr:0x02140ef8 data_ov026_02140fd0 kind:bss addr:0x02140fd0 data_ov026_02140fd4 kind:bss addr:0x02140fd4 data_ov026_02140fe0 kind:bss addr:0x02140fe0 -data_ov026_02140ff8 kind:bss addr:0x02140ff8 -data_ov026_02140ffc kind:bss addr:0x02140ffc -sActorProfileUnkRB1T kind:bss addr:0x02141008 -data_ov026_021410e0 kind:bss addr:0x021410e0 -data_ov026_021410e4 kind:bss addr:0x021410e4 -sActorProfileUnkRBRT kind:bss addr:0x021410f0 -data_ov026_021411c8 kind:bss addr:0x021411c8 -data_ov026_021411cc kind:bss addr:0x021411cc -sActorProfileUnkRBNT kind:bss addr:0x021411d8 -data_ov026_021412b0 kind:bss addr:0x021412b0 -data_ov026_021412b8 kind:bss addr:0x021412b8 -sActorProfileUnkTVLR kind:bss addr:0x021412c4 +_ZGVN15ProfileInstanceI19ActorProfileUnkRB1TE8sProfileE kind:bss addr:0x02140ff8 +@10326 kind:bss addr:0x02140ffc +_ZN15ProfileInstanceI19ActorProfileUnkRB1TE8sProfileE kind:bss addr:0x02141008 +_ZGVN15ProfileInstanceI19ActorProfileUnkRBRTE8sProfileE kind:bss addr:0x021410e0 +@10332 kind:bss addr:0x021410e4 +_ZN15ProfileInstanceI19ActorProfileUnkRBRTE8sProfileE kind:bss addr:0x021410f0 +_ZGVN15ProfileInstanceI19ActorProfileUnkRBNTE8sProfileE kind:bss addr:0x021411c8 +@10338 kind:bss addr:0x021411cc +_ZN15ProfileInstanceI19ActorProfileUnkRBNTE8sProfileE kind:bss addr:0x021411d8 +_ZGVN15ProfileInstanceI19ActorProfileUnkTVLRE8sProfileE kind:bss addr:0x021412b0 +@10344 kind:bss addr:0x021412b8 +_ZN15ProfileInstanceI19ActorProfileUnkTVLRE8sProfileE kind:bss addr:0x021412c4 data_ov026_02141300 kind:bss addr:0x02141300 data_ov026_0214139c kind:bss addr:0x0214139c data_ov026_021413a0 kind:bss addr:0x021413a0 data_ov026_021413a4 kind:bss addr:0x021413a4 data_ov026_021413a8 kind:bss addr:0x021413a8 -data_ov026_021413ac kind:bss addr:0x021413ac -data_ov026_021413b4 kind:bss addr:0x021413b4 ambiguous -sActorProfileUnkTTET kind:bss addr:0x021413b8 +_ZGVN15ProfileInstanceI19ActorProfileUnkTTETE8sProfileE kind:bss addr:0x021413ac +@10350 kind:bss addr:0x021413b4 ambiguous +_ZN15ProfileInstanceI19ActorProfileUnkTTETE8sProfileE kind:bss addr:0x021413b8 data_ov026_021413f4 kind:bss addr:0x021413f4 data_ov026_02141404 kind:bss addr:0x02141404 data_ov026_02141414 kind:bss addr:0x02141414 -data_ov026_02141424 kind:bss addr:0x02141424 -data_ov026_02141428 kind:bss addr:0x02141428 -sActorProfileUnkTRSG kind:bss addr:0x02141434 +_ZGVN15ProfileInstanceI19ActorProfileUnkTRSGE8sProfileE kind:bss addr:0x02141424 +@10356 kind:bss addr:0x02141428 +_ZN15ProfileInstanceI19ActorProfileUnkTRSGE8sProfileE kind:bss addr:0x02141434 data_ov026_02141470 kind:bss addr:0x02141470 -data_ov026_02141478 kind:bss addr:0x02141478 -data_ov026_02141484 kind:bss addr:0x02141484 -sActorProfileUnkBDEM kind:bss addr:0x02141490 +_ZGVN15ProfileInstanceI19ActorProfileUnkBDEME8sProfileE kind:bss addr:0x02141478 +@10362 kind:bss addr:0x02141484 +_ZN15ProfileInstanceI19ActorProfileUnkBDEME8sProfileE kind:bss addr:0x02141490 data_ov026_02141568 kind:bss addr:0x02141568 -data_ov026_02141574 kind:bss addr:0x02141574 -data_ov026_02141580 kind:bss addr:0x02141580 -sActorProfileUnkWCAS kind:bss addr:0x0214158c -sActorProfileUnkTCOW kind:bss addr:0x02141664 +_ZGVN15ProfileInstanceI19ActorProfileUnkWCASE8sProfileE kind:bss addr:0x02141574 +@10368 kind:bss addr:0x02141580 +_ZN15ProfileInstanceI19ActorProfileUnkWCASE8sProfileE kind:bss addr:0x0214158c +_ZN15ProfileInstanceI19ActorProfileUnkTCOWE8sProfileE kind:bss addr:0x02141664 data_ov026_0214173c kind:bss addr:0x0214173c data_ov026_02141740 kind:bss addr:0x02141740 data_ov026_02141744 kind:bss addr:0x02141744 @@ -3210,9 +3206,9 @@ data_ov026_021417f0 kind:bss addr:0x021417f0 data_ov026_02141800 kind:bss addr:0x02141800 data_ov026_02141810 kind:bss addr:0x02141810 data_ov026_02141820 kind:bss addr:0x02141820 -data_ov026_02141830 kind:bss addr:0x02141830 -data_ov026_02141840 kind:bss addr:0x02141840 -sActorProfileUnkDKTR kind:bss addr:0x02141850 +_ZGVN15ProfileInstanceI19ActorProfileUnkDKTRE8sProfileE kind:bss addr:0x02141830 +@10374 kind:bss addr:0x02141840 +_ZN15ProfileInstanceI19ActorProfileUnkDKTRE8sProfileE kind:bss addr:0x02141850 data_ov026_02141928 kind:bss addr:0x02141928 data_ov026_0214192c kind:bss addr:0x0214192c data_ov026_02141938 kind:bss addr:0x02141938 diff --git a/config/eur/arm9/overlays/ov027/delinks.txt b/config/eur/arm9/overlays/ov027/delinks.txt index 99b6cd78..9dfda2fd 100644 --- a/config/eur/arm9/overlays/ov027/delinks.txt +++ b/config/eur/arm9/overlays/ov027/delinks.txt @@ -9,73 +9,73 @@ src/027_TrainForest/MapObject/MapObjectUnkTMFR.cpp: .text start:0x021419e0 end:0x02142020 .init start:0x02147f38 end:0x02147fa8 .ctor start:0x02148384 end:0x02148388 - .bss start:0x02148e20 end:0x02148ef4 + .bss start:0x02148e08 end:0x02148ef4 src/027_TrainForest/MapObject/MapObjectUnkTRFV.cpp: .text start:0x02142020 end:0x02142418 .init start:0x02147fa8 end:0x02147ff8 .ctor start:0x02148388 end:0x0214838c - .bss start:0x02148f04 end:0x02148fd8 + .bss start:0x02148ef4 end:0x02148fd8 src/027_TrainForest/MapObject/MapObjectUnkTRFO.cpp: .text start:0x02142418 end:0x02142718 .init start:0x02147ff8 end:0x02148048 .ctor start:0x0214838c end:0x02148390 - .bss start:0x02148fe8 end:0x02149058 + .bss start:0x02148fd8 end:0x021490bc src/027_TrainForest/MapObject/MapObjectUnkTRSH.cpp: .text start:0x02142718 end:0x02142a34 .init start:0x02148048 end:0x02148098 .ctor start:0x02148390 end:0x02148394 - .bss start:0x021490cc end:0x021491a0 + .bss start:0x021490bc end:0x021491a0 src/027_TrainForest/MapObject/MapObjectUnkTRBR.cpp: .text start:0x02142a34 end:0x02142d34 .init start:0x02148098 end:0x021480e8 .ctor start:0x02148394 end:0x02148398 - .bss start:0x021491b0 end:0x02149284 + .bss start:0x021491a0 end:0x02149284 src/027_TrainForest/MapObject/MapObjectUnkTRDA.cpp: .text start:0x02142d34 end:0x02142fec .init start:0x021480e8 end:0x02148138 .ctor start:0x02148398 end:0x0214839c - .bss start:0x02149294 end:0x02149368 + .bss start:0x02149284 end:0x02149368 src/027_TrainForest/MapObject/MapObjectUnkETDK.cpp: .text start:0x02142fec end:0x02143878 .init start:0x02148138 end:0x02148188 .ctor start:0x0214839c end:0x021483a0 - .bss start:0x02149378 end:0x02149398 + .bss start:0x02149368 end:0x0214944c src/027_TrainForest/MapObject/MapObjectUnkTRRA.cpp: .text start:0x02143878 end:0x02143ba0 .init start:0x02148188 end:0x021481d8 .ctor start:0x021483a0 end:0x021483a4 - .bss start:0x0214945c end:0x02149530 + .bss start:0x0214944c end:0x02149530 src/027_TrainForest/MapObject/MapObjectUnkCSTL.cpp: .text start:0x02143ba0 end:0x02143ec4 .init start:0x021481d8 end:0x02148228 .ctor start:0x021483a4 end:0x021483a8 - .bss start:0x02149540 end:0x02149614 + .bss start:0x02149530 end:0x02149614 src/027_TrainForest/MapObject/MapObjectUnkMBRG.cpp: .text start:0x02143ec4 end:0x02144264 .init start:0x02148228 end:0x02148278 .ctor start:0x021483a8 end:0x021483ac - .bss start:0x02149624 end:0x0214968c + .bss start:0x02149614 end:0x0214968c src/027_TrainForest/MapObject/MapObjectUnkMZFE.cpp: .text start:0x02144280 end:0x02144818 .init start:0x02148278 end:0x021482e4 .ctor start:0x021483ac end:0x021483b0 - .bss start:0x0214969c end:0x02149770 + .bss start:0x0214968c end:0x02149770 src/027_TrainForest/Actor/ActorUnkTRER.cpp: .text start:0x02144818 end:0x021450a8 .init start:0x021482e4 end:0x02148334 .ctor start:0x021483b0 end:0x021483b4 - .bss start:0x02149784 end:0x0214985c + .bss start:0x02149770 end:0x0214985c src/027_TrainForest/Actor/ActorUnkFKTR.cpp: .text start:0x021450a8 end:0x02147efc diff --git a/config/eur/arm9/overlays/ov027/symbols.txt b/config/eur/arm9/overlays/ov027/symbols.txt index cb7c9990..4bc5319d 100644 --- a/config/eur/arm9/overlays/ov027/symbols.txt +++ b/config/eur/arm9/overlays/ov027/symbols.txt @@ -330,44 +330,43 @@ data_ov027_02148cf4 kind:data(any) addr:0x02148cf4 data_ov027_02148d3c kind:data(any) addr:0x02148d3c _ZTV19data_ov027_02148d80 kind:data(any) addr:0x02148d80 data_ov027_02148e00 kind:bss addr:0x02148e00 -data_ov027_02148e08 kind:bss addr:0x02148e08 -data_ov027_02148e14 kind:bss addr:0x02148e14 -sMapObjectProfileUnkTMFR kind:bss addr:0x02148e20 -data_ov027_02148ef4 kind:bss addr:0x02148ef4 -data_ov027_02148ef8 kind:bss addr:0x02148ef8 -sMapObjectProfileUnkTRFV kind:bss addr:0x02148f04 -data_ov027_02148fd8 kind:bss addr:0x02148fd8 -data_ov027_02148fdc kind:bss addr:0x02148fdc -sMapObjectProfileUnkTRFO kind:bss addr:0x02148fe8 -data_ov027_02149058 kind:bss addr:0x02149058 ambiguous -data_ov027_021490bc kind:bss addr:0x021490bc -data_ov027_021490c0 kind:bss addr:0x021490c0 -sMapObjectProfileUnkTRSH kind:bss addr:0x021490cc -data_ov027_021491a0 kind:bss addr:0x021491a0 -data_ov027_021491a4 kind:bss addr:0x021491a4 -sMapObjectProfileUnkTRBR kind:bss addr:0x021491b0 -data_ov027_02149284 kind:bss addr:0x02149284 -data_ov027_02149288 kind:bss addr:0x02149288 -sMapObjectProfileUnkTRDA kind:bss addr:0x02149294 -data_ov027_02149368 kind:bss addr:0x02149368 -data_ov027_0214936c kind:bss addr:0x0214936c -sMapObjectProfileUnkETDK kind:bss addr:0x02149378 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTMFRE8sProfileE kind:bss addr:0x02148e08 +@10375 kind:bss addr:0x02148e14 +_ZN15ProfileInstanceI23MapObjectProfileUnkTMFRE8sProfileE kind:bss addr:0x02148e20 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRFVE8sProfileE kind:bss addr:0x02148ef4 +@10381 kind:bss addr:0x02148ef8 +_ZN15ProfileInstanceI23MapObjectProfileUnkTRFVE8sProfileE kind:bss addr:0x02148f04 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRFOE8sProfileE kind:bss addr:0x02148fd8 +@10387 kind:bss addr:0x02148fdc +_ZN15ProfileInstanceI23MapObjectProfileUnkTRFOE8sProfileE kind:bss addr:0x02148fe8 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRSHE8sProfileE kind:bss addr:0x021490bc +@10393 kind:bss addr:0x021490c0 +_ZN15ProfileInstanceI23MapObjectProfileUnkTRSHE8sProfileE kind:bss addr:0x021490cc +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRBRE8sProfileE kind:bss addr:0x021491a0 +@10399 kind:bss addr:0x021491a4 +_ZN15ProfileInstanceI23MapObjectProfileUnkTRBRE8sProfileE kind:bss addr:0x021491b0 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRDAE8sProfileE kind:bss addr:0x02149284 +@10405 kind:bss addr:0x02149288 +_ZN15ProfileInstanceI23MapObjectProfileUnkTRDAE8sProfileE kind:bss addr:0x02149294 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkETDKE8sProfileE kind:bss addr:0x02149368 +@10411 kind:bss addr:0x0214936c +_ZN15ProfileInstanceI23MapObjectProfileUnkETDKE8sProfileE kind:bss addr:0x02149378 data_ov027_02149398 kind:bss addr:0x02149398 -data_ov027_0214944c kind:bss addr:0x0214944c -data_ov027_02149450 kind:bss addr:0x02149450 -sMapObjectProfileUnkTRRA kind:bss addr:0x0214945c -data_ov027_02149530 kind:bss addr:0x02149530 -data_ov027_02149534 kind:bss addr:0x02149534 -sMapObjectProfileUnkCSTL kind:bss addr:0x02149540 -data_ov027_02149614 kind:bss addr:0x02149614 -data_ov027_02149618 kind:bss addr:0x02149618 -sMapObjectProfileUnkMBRG kind:bss addr:0x02149624 -data_ov027_0214968c kind:bss addr:0x0214968c -data_ov027_02149690 kind:bss addr:0x02149690 -sMapObjectProfileUnkMZFE kind:bss addr:0x0214969c -data_ov027_02149770 kind:bss addr:0x02149770 -data_ov027_02149778 kind:bss addr:0x02149778 -sActorProfileUnkTRER kind:bss addr:0x02149784 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRRAE8sProfileE kind:bss addr:0x0214944c +@10417 kind:bss addr:0x02149450 +_ZN15ProfileInstanceI23MapObjectProfileUnkTRRAE8sProfileE kind:bss addr:0x0214945c +_ZGVN15ProfileInstanceI23MapObjectProfileUnkCSTLE8sProfileE kind:bss addr:0x02149530 +@10423 kind:bss addr:0x02149534 +_ZN15ProfileInstanceI23MapObjectProfileUnkCSTLE8sProfileE kind:bss addr:0x02149540 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkMBRGE8sProfileE kind:bss addr:0x02149614 +@10429 kind:bss addr:0x02149618 +_ZN15ProfileInstanceI23MapObjectProfileUnkMBRGE8sProfileE kind:bss addr:0x02149624 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkMZFEE8sProfileE kind:bss addr:0x0214968c +@10435 kind:bss addr:0x02149690 +_ZN15ProfileInstanceI23MapObjectProfileUnkMZFEE8sProfileE kind:bss addr:0x0214969c +_ZGVN15ProfileInstanceI19ActorProfileUnkTRERE8sProfileE kind:bss addr:0x02149770 +@10452 kind:bss addr:0x02149778 +_ZN15ProfileInstanceI19ActorProfileUnkTRERE8sProfileE kind:bss addr:0x02149784 data_ov027_0214985c kind:bss addr:0x0214985c data_ov027_02149860 kind:bss addr:0x02149860 data_ov027_02149864 kind:bss addr:0x02149864 @@ -398,4 +397,4 @@ data_ov027_02149944 kind:bss addr:0x02149944 data_ov027_02149954 kind:bss addr:0x02149954 data_ov027_02149964 kind:bss addr:0x02149964 data_ov027_02149974 kind:bss addr:0x02149974 -sActorProfileUnkFKTR kind:bss addr:0x02149984 +_ZN15ProfileInstanceI19ActorProfileUnkFKTRE8sProfileE kind:bss addr:0x02149984 diff --git a/config/eur/arm9/overlays/ov028/delinks.txt b/config/eur/arm9/overlays/ov028/delinks.txt index 495ca745..c9b84a52 100644 --- a/config/eur/arm9/overlays/ov028/delinks.txt +++ b/config/eur/arm9/overlays/ov028/delinks.txt @@ -9,94 +9,94 @@ src/028_TrainSnow/Actor/ActorUnkSNMA.cpp: .text start:0x021419e0 end:0x0214314c .init start:0x02146a44 end:0x02146ae0 .ctor start:0x02146fd0 end:0x02146fd4 - .bss start:0x02147c7c end:0x02147d54 + .bss start:0x02147c64 end:0x02147d54 src/028_TrainSnow/Actor/ActorUnkSNMB.cpp: .text start:0x0214314c end:0x02143898 .init start:0x02146ae0 end:0x02146b30 .ctor start:0x02146fd4 end:0x02146fd8 - .bss start:0x02147d64 end:0x02147e3c + .bss start:0x02147d54 end:0x02147e40 src/028_TrainSnow/MapObject/MapObjectUnkTRSS.cpp: .text start:0x02144408 end:0x02144868 .init start:0x02146b50 end:0x02146ba0 .ctor start:0x02146fdc end:0x02146fe0 - .bss start:0x02147e4c end:0x02147ef0 + .bss start:0x02147e40 end:0x02147f20 src/028_TrainSnow/MapObject/MapObjectUnkTRRS.cpp: .text start:0x02144868 end:0x02144b20 .init start:0x02146ba0 end:0x02146bf0 .ctor start:0x02146fe0 end:0x02146fe4 - .bss start:0x02147f30 end:0x02148004 + .bss start:0x02147f20 end:0x02148004 src/028_TrainSnow/MapObject/MapObjectUnkTRMA.cpp: .text start:0x02144b20 end:0x02144e20 .init start:0x02146bf0 end:0x02146c40 .ctor start:0x02146fe4 end:0x02146fe8 - .bss start:0x02148014 end:0x021480e8 + .bss start:0x02148004 end:0x021480e8 src/028_TrainSnow/MapObject/MapObjectUnkTRBM.cpp: .text start:0x02144e20 end:0x02145120 .init start:0x02146c40 end:0x02146c90 .ctor start:0x02146fe8 end:0x02146fec - .bss start:0x021480f8 end:0x021481cc + .bss start:0x021480e8 end:0x021481d4 src/028_TrainSnow/MapObject/MapObjectUnkTMSN.cpp: .text start:0x02145120 end:0x02145608 .init start:0x02146c90 end:0x02146d00 .ctor start:0x02146fec end:0x02146ff0 - .bss start:0x021481ec end:0x021482c0 + .bss start:0x021481d4 end:0x021482c0 src/028_TrainSnow/MapObject/MapObjectUnkETNS.cpp: .text start:0x02145608 end:0x02145758 .init start:0x02146d00 end:0x02146d50 .ctor start:0x02146ff0 end:0x02146ff4 - .bss start:0x021482d0 end:0x021483a4 + .bss start:0x021482c0 end:0x021483a4 src/028_TrainSnow/MapObject/MapObjectUnkETSW.cpp: .text start:0x02145758 end:0x02145a8c .init start:0x02146d50 end:0x02146da0 .ctor start:0x02146ff4 end:0x02146ff8 - .bss start:0x021483b4 end:0x02148488 + .bss start:0x021483a4 end:0x02148488 src/028_TrainSnow/MapObject/MapObjectUnkEFRF.cpp: .text start:0x02145a8c end:0x02145c00 .init start:0x02146da0 end:0x02146df0 .ctor start:0x02146ff8 end:0x02146ffc - .bss start:0x02148498 end:0x0214856c + .bss start:0x02148488 end:0x0214856c src/028_TrainSnow/MapObject/MapObjectUnkRLPT.cpp: .text start:0x02145c00 end:0x02145da8 .init start:0x02146df0 end:0x02146e40 .ctor start:0x02146ffc end:0x02147000 - .bss start:0x0214857c end:0x0214859c + .bss start:0x0214856c end:0x0214859c src/028_TrainSnow/MapObject/MapObjectUnkTRH0.cpp: .text start:0x02145da8 end:0x02146068 .init start:0x02146e40 end:0x02146e90 .ctor start:0x02147000 end:0x02147004 - .bss start:0x021485ac end:0x02148680 + .bss start:0x0214859c end:0x02148680 src/028_TrainSnow/MapObject/MapObjectUnkTRTS.cpp: .text start:0x02146068 end:0x0214635c .init start:0x02146e90 end:0x02146ee0 .ctor start:0x02147004 end:0x02147008 - .bss start:0x02148690 end:0x02148764 + .bss start:0x02148680 end:0x02148784 src/028_TrainSnow/MapObject/MapObjectUnkTRSR.cpp: .text start:0x0214635c end:0x02146534 .init start:0x02146ee0 end:0x02146f30 .ctor start:0x02147008 end:0x0214700c - .bss start:0x02148794 end:0x02148868 + .bss start:0x02148784 end:0x02148888 src/028_TrainSnow/MapObject/MapObjectUnkRBSR.cpp: .text start:0x02146534 end:0x02146728 .init start:0x02146f30 end:0x02146f80 .ctor start:0x0214700c end:0x02147010 - .bss start:0x02148898 end:0x021488dc + .bss start:0x02148888 end:0x021488dc src/028_TrainSnow/MapObject/MapObjectUnkTRFS.cpp: .text start:0x02146728 end:0x021469b8 .init start:0x02146f80 end:0x02146fd0 .ctor start:0x02147010 end:0x02147014 - .bss start:0x021488ec end:0x021489c0 + .bss start:0x021488dc end:0x021489c0 diff --git a/config/eur/arm9/overlays/ov028/symbols.txt b/config/eur/arm9/overlays/ov028/symbols.txt index 3f09ae04..fc4da8fb 100644 --- a/config/eur/arm9/overlays/ov028/symbols.txt +++ b/config/eur/arm9/overlays/ov028/symbols.txt @@ -355,57 +355,56 @@ data_ov028_02147b94 kind:data(any) addr:0x02147b94 data_ov028_02147bf4 kind:data(any) addr:0x02147bf4 data_ov028_02147c10 kind:data(any) addr:0x02147c10 data_ov028_02147c60 kind:bss addr:0x02147c60 -data_ov028_02147c64 kind:bss addr:0x02147c64 -data_ov028_02147c70 kind:bss addr:0x02147c70 -sActorProfileUnkSNMA kind:bss addr:0x02147c7c -data_ov028_02147d54 kind:bss addr:0x02147d54 -data_ov028_02147d58 kind:bss addr:0x02147d58 -sActorProfileUnkSNMB kind:bss addr:0x02147d64 +_ZGVN15ProfileInstanceI19ActorProfileUnkSNMAE8sProfileE kind:bss addr:0x02147c64 +@10469 kind:bss addr:0x02147c70 +_ZN15ProfileInstanceI19ActorProfileUnkSNMAE8sProfileE kind:bss addr:0x02147c7c +_ZGVN15ProfileInstanceI19ActorProfileUnkSNMBE8sProfileE kind:bss addr:0x02147d54 +@10475 kind:bss addr:0x02147d58 +_ZN15ProfileInstanceI19ActorProfileUnkSNMBE8sProfileE kind:bss addr:0x02147d64 data_ov028_02147e3c kind:bss addr:0x02147e3c -data_ov028_02147e40 kind:bss addr:0x02147e40 -data_ov028_02147e48 kind:bss addr:0x02147e48 ambiguous -sMapObjectProfileUnkTRSS kind:bss addr:0x02147e4c -data_ov028_02147ef0 kind:bss addr:0x02147ef0 ambiguous -data_ov028_02147f20 kind:bss addr:0x02147f20 -data_ov028_02147f24 kind:bss addr:0x02147f24 -sMapObjectProfileUnkTRRS kind:bss addr:0x02147f30 -data_ov028_02148004 kind:bss addr:0x02148004 -data_ov028_02148008 kind:bss addr:0x02148008 -sMapObjectProfileUnkTRMA kind:bss addr:0x02148014 -data_ov028_021480e8 kind:bss addr:0x021480e8 -data_ov028_021480ec kind:bss addr:0x021480ec -sMapObjectProfileUnkTRBM kind:bss addr:0x021480f8 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRSSE8sProfileE kind:bss addr:0x02147e40 +@10470 kind:bss addr:0x02147e48 ambiguous +_ZN15ProfileInstanceI23MapObjectProfileUnkTRSSE8sProfileE kind:bss addr:0x02147e4c +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRRSE8sProfileE kind:bss addr:0x02147f20 +@10476 kind:bss addr:0x02147f24 +_ZN15ProfileInstanceI23MapObjectProfileUnkTRRSE8sProfileE kind:bss addr:0x02147f30 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRMAE8sProfileE kind:bss addr:0x02148004 +@10482 kind:bss addr:0x02148008 +_ZN15ProfileInstanceI23MapObjectProfileUnkTRMAE8sProfileE kind:bss addr:0x02148014 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRBME8sProfileE kind:bss addr:0x021480e8 +@10488 kind:bss addr:0x021480ec +_ZN15ProfileInstanceI23MapObjectProfileUnkTRBME8sProfileE kind:bss addr:0x021480f8 data_ov028_021481cc kind:bss addr:0x021481cc -data_ov028_021481d4 kind:bss addr:0x021481d4 -data_ov028_021481e0 kind:bss addr:0x021481e0 -sMapObjectProfileUnkTMSN kind:bss addr:0x021481ec -data_ov028_021482c0 kind:bss addr:0x021482c0 -data_ov028_021482c4 kind:bss addr:0x021482c4 -sMapObjectProfileUnkETNS kind:bss addr:0x021482d0 -data_ov028_021483a4 kind:bss addr:0x021483a4 -data_ov028_021483a8 kind:bss addr:0x021483a8 -sMapObjectProfileUnkETSW kind:bss addr:0x021483b4 -data_ov028_02148488 kind:bss addr:0x02148488 -data_ov028_0214848c kind:bss addr:0x0214848c -sMapObjectProfileUnkEFRF kind:bss addr:0x02148498 -data_ov028_0214856c kind:bss addr:0x0214856c -data_ov028_02148570 kind:bss addr:0x02148570 -sMapObjectProfileUnkRLPT kind:bss addr:0x0214857c -data_ov028_0214859c kind:bss addr:0x0214859c -data_ov028_021485a0 kind:bss addr:0x021485a0 -sMapObjectProfileUnkTRH0 kind:bss addr:0x021485ac -data_ov028_02148680 kind:bss addr:0x02148680 -data_ov028_02148684 kind:bss addr:0x02148684 -sMapObjectProfileUnkTRTS kind:bss addr:0x02148690 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTMSNE8sProfileE kind:bss addr:0x021481d4 +@10494 kind:bss addr:0x021481e0 +_ZN15ProfileInstanceI23MapObjectProfileUnkTMSNE8sProfileE kind:bss addr:0x021481ec +_ZGVN15ProfileInstanceI23MapObjectProfileUnkETNSE8sProfileE kind:bss addr:0x021482c0 +@10500 kind:bss addr:0x021482c4 +_ZN15ProfileInstanceI23MapObjectProfileUnkETNSE8sProfileE kind:bss addr:0x021482d0 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkETSWE8sProfileE kind:bss addr:0x021483a4 +@10506 kind:bss addr:0x021483a8 +_ZN15ProfileInstanceI23MapObjectProfileUnkETSWE8sProfileE kind:bss addr:0x021483b4 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkEFRFE8sProfileE kind:bss addr:0x02148488 +@10512 kind:bss addr:0x0214848c +_ZN15ProfileInstanceI23MapObjectProfileUnkEFRFE8sProfileE kind:bss addr:0x02148498 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkRLPTE8sProfileE kind:bss addr:0x0214856c +@10518 kind:bss addr:0x02148570 +_ZN15ProfileInstanceI23MapObjectProfileUnkRLPTE8sProfileE kind:bss addr:0x0214857c +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRH0E8sProfileE kind:bss addr:0x0214859c +@10524 kind:bss addr:0x021485a0 +_ZN15ProfileInstanceI23MapObjectProfileUnkTRH0E8sProfileE kind:bss addr:0x021485ac +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRTSE8sProfileE kind:bss addr:0x02148680 +@10530 kind:bss addr:0x02148684 +_ZN15ProfileInstanceI23MapObjectProfileUnkTRTSE8sProfileE kind:bss addr:0x02148690 data_ov028_02148764 kind:bss addr:0x02148764 -data_ov028_02148784 kind:bss addr:0x02148784 -data_ov028_02148788 kind:bss addr:0x02148788 -sMapObjectProfileUnkTRSR kind:bss addr:0x02148794 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRSRE8sProfileE kind:bss addr:0x02148784 +@10536 kind:bss addr:0x02148788 +_ZN15ProfileInstanceI23MapObjectProfileUnkTRSRE8sProfileE kind:bss addr:0x02148794 data_ov028_02148868 kind:bss addr:0x02148868 -data_ov028_02148888 kind:bss addr:0x02148888 -data_ov028_0214888c kind:bss addr:0x0214888c -sMapObjectProfileUnkRBSR kind:bss addr:0x02148898 -data_ov028_021488dc kind:bss addr:0x021488dc -data_ov028_021488e0 kind:bss addr:0x021488e0 -sMapObjectProfileUnkTRFS kind:bss addr:0x021488ec +_ZGVN15ProfileInstanceI23MapObjectProfileUnkRBSRE8sProfileE kind:bss addr:0x02148888 +@10542 kind:bss addr:0x0214888c +_ZN15ProfileInstanceI23MapObjectProfileUnkRBSRE8sProfileE kind:bss addr:0x02148898 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRFSE8sProfileE kind:bss addr:0x021488dc +@10548 kind:bss addr:0x021488e0 +_ZN15ProfileInstanceI23MapObjectProfileUnkTRFSE8sProfileE kind:bss addr:0x021488ec data_ov028_021489c0 kind:bss addr:0x021489c0 diff --git a/config/eur/arm9/overlays/ov029/delinks.txt b/config/eur/arm9/overlays/ov029/delinks.txt index f1cf9a6b..b4f376d7 100644 --- a/config/eur/arm9/overlays/ov029/delinks.txt +++ b/config/eur/arm9/overlays/ov029/delinks.txt @@ -9,112 +9,112 @@ src/029_TrainWater/MapObject/MapObjectUnkTMDE.cpp: .text start:0x021419e0 end:0x02141fb0 .init start:0x02150f84 end:0x02150ff4 .ctor start:0x02151694 end:0x02151698 - .bss start:0x02152780 end:0x02152854 + .bss start:0x02152768 end:0x02152854 src/029_TrainWater/MapObject/MapObjectUnkTMWT.cpp: .text start:0x02141fb0 end:0x02142264 .init start:0x02150ff4 end:0x02151044 .ctor start:0x02151698 end:0x0215169c - .bss start:0x02152864 end:0x02152938 + .bss start:0x02152854 end:0x02152938 src/029_TrainWater/MapObject/MapObjectUnkTRWA.cpp: .text start:0x02142264 end:0x02142540 .init start:0x02151044 end:0x02151094 .ctor start:0x0215169c end:0x021516a0 - .bss start:0x02152948 end:0x021529c4 + .bss start:0x02152938 end:0x02152a20 src/029_TrainWater/MapObject/MapObjectUnkTRRW.cpp: .text start:0x02142540 end:0x021427f8 .init start:0x02151094 end:0x021510e4 .ctor start:0x021516a0 end:0x021516a4 - .bss start:0x02152a2c end:0x02152b00 + .bss start:0x02152a20 end:0x02152b00 src/029_TrainWater/MapObject/MapObjectUnkTRSA.cpp: .text start:0x021427f8 end:0x0214324c .init start:0x021510e4 end:0x02151134 .ctor start:0x021516a4 end:0x021516a8 - .bss start:0x02152b10 end:0x02152b30 + .bss start:0x02152b00 end:0x02152be4 src/029_TrainWater/MapObject/MapObjectUnkTRRD.cpp: .text start:0x0214324c end:0x02143504 .init start:0x02151134 end:0x02151184 .ctor start:0x021516a8 end:0x021516ac - .bss start:0x02152bf4 end:0x02152ca0 + .bss start:0x02152be4 end:0x02152cc8 src/029_TrainWater/MapObject/MapObjectUnkTRPI.cpp: .text start:0x02143504 end:0x021437c4 .init start:0x02151184 end:0x021511d4 .ctor start:0x021516ac end:0x021516b0 - .bss start:0x02152cd8 end:0x02152d64 + .bss start:0x02152cc8 end:0x02152dac src/029_TrainWater/MapObject/MapObjectUnkSBDE.cpp: .text start:0x021437c4 end:0x02144070 .init start:0x021511d4 end:0x02151224 .ctor start:0x021516b0 end:0x021516b4 - .bss start:0x02152dbc end:0x02152e4c + .bss start:0x02152dac end:0x02152e90 src/029_TrainWater/MapObject/MapObjectUnkSTDE.cpp: .text start:0x02144070 end:0x02144324 .init start:0x02151224 end:0x02151274 .ctor start:0x021516b4 end:0x021516b8 - .bss start:0x02152ea0 end:0x02152f08 + .bss start:0x02152e90 end:0x02152f78 src/029_TrainWater/MapObject/MapObjectUnkTCBT.cpp: .text start:0x02144324 end:0x02145368 .init start:0x02151274 end:0x021512c4 .ctor start:0x021516b8 end:0x021516bc - .bss start:0x02152f84 end:0x02152f8c + .bss start:0x02152f78 end:0x02153078 src/029_TrainWater/MapObject/MapObjectUnkWHSW.cpp: .text start:0x02145368 end:0x02145c70 .init start:0x021512c4 end:0x02151314 .ctor start:0x021516bc end:0x021516c0 - .bss start:0x02153088 end:0x021530a8 + .bss start:0x02153078 end:0x0215317c src/029_TrainWater/MapObject/MapObjectUnkTRH1.cpp: .text start:0x02145c70 end:0x02145f68 .init start:0x02151314 end:0x02151364 .ctor start:0x021516c0 end:0x021516c4 - .bss start:0x0215318c end:0x021531b4 + .bss start:0x0215317c end:0x02153260 src/029_TrainWater/MapObject/MapObjectUnkTBSS.cpp: .text start:0x02145f68 end:0x021461fc .init start:0x02151364 end:0x021513b4 .ctor start:0x021516c4 end:0x021516c8 - .bss start:0x02153270 end:0x02153344 + .bss start:0x02153260 end:0x02153364 src/029_TrainWater/MapObject/MapObjectUnkTRBL.cpp: .text start:0x021461fc end:0x021468f4 .init start:0x021513b4 end:0x02151404 .ctor start:0x021516c8 end:0x021516cc - .bss start:0x02153374 end:0x02153448 + .bss start:0x02153364 end:0x02153468 src/029_TrainWater/MapObject/MapObjectUnkRBBL.cpp: .text start:0x021468f4 end:0x02146b04 .init start:0x02151404 end:0x02151454 .ctor start:0x021516cc end:0x021516d0 - .bss start:0x02153478 end:0x021534bc + .bss start:0x02153468 end:0x0215351c src/029_TrainWater/Actor/ActorUnkDLPN.cpp: .text start:0x02146b04 end:0x02149ccc .init start:0x02151454 end:0x021514e4 .ctor start:0x021516d0 end:0x021516d4 - .bss start:0x02153544 end:0x0215361c + .bss start:0x0215351c end:0x0215361c src/029_TrainWater/Actor/ActorUnkBLJF.cpp: .text start:0x02149ccc end:0x0214af7c .init start:0x021514e4 end:0x02151540 .ctor start:0x021516d4 end:0x021516d8 - .bss start:0x02153638 end:0x02153710 + .bss start:0x0215361c end:0x02153720 src/029_TrainWater/Actor/ActorUnkMDYG.cpp: .text start:0x0214af7c end:0x0214d8a8 .init start:0x02151540 end:0x02151610 .ctor start:0x021516d8 end:0x021516dc - .bss start:0x02153750 end:0x02153828 + .bss start:0x02153720 end:0x0215382c src/029_TrainWater/Actor/ActorUnkPRSP.cpp: .text start:0x0214d8a8 end:0x02150e90 .init start:0x02151610 end:0x02151694 .ctor start:0x021516dc end:0x021516e0 - .bss start:0x02153844 end:0x02153920 + .bss start:0x0215382c end:0x02153920 diff --git a/config/eur/arm9/overlays/ov029/symbols.txt b/config/eur/arm9/overlays/ov029/symbols.txt index 4f0ca1ba..7f5d28b2 100644 --- a/config/eur/arm9/overlays/ov029/symbols.txt +++ b/config/eur/arm9/overlays/ov029/symbols.txt @@ -555,70 +555,59 @@ _ZTV19data_ov029_0215262c kind:data(any) addr:0x0215262c data_ov029_02152690 kind:data(any) addr:0x02152690 data_ov029_021526f8 kind:data(any) addr:0x021526f8 data_ov029_02152760 kind:bss addr:0x02152760 -data_ov029_02152768 kind:bss addr:0x02152768 -data_ov029_02152774 kind:bss addr:0x02152774 -sMapObjectProfileUnkTMDE kind:bss addr:0x02152780 -data_ov029_02152854 kind:bss addr:0x02152854 -data_ov029_02152858 kind:bss addr:0x02152858 -sMapObjectProfileUnkTMWT kind:bss addr:0x02152864 -data_ov029_02152938 kind:bss addr:0x02152938 -data_ov029_0215293c kind:bss addr:0x0215293c -sMapObjectProfileUnkTRWA kind:bss addr:0x02152948 -data_ov029_021529c4 kind:bss addr:0x021529c4 ambiguous +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTMDEE8sProfileE kind:bss addr:0x02152768 +@10560 kind:bss addr:0x02152774 +_ZN15ProfileInstanceI23MapObjectProfileUnkTMDEE8sProfileE kind:bss addr:0x02152780 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTMWTE8sProfileE kind:bss addr:0x02152854 +@10566 kind:bss addr:0x02152858 +_ZN15ProfileInstanceI23MapObjectProfileUnkTMWTE8sProfileE kind:bss addr:0x02152864 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRWAE8sProfileE kind:bss addr:0x02152938 +@10572 kind:bss addr:0x0215293c +_ZN15ProfileInstanceI23MapObjectProfileUnkTRWAE8sProfileE kind:bss addr:0x02152948 data_ov029_02152a1c kind:bss addr:0x02152a1c -data_ov029_02152a20 kind:bss addr:0x02152a20 -data_ov029_02152a25 kind:bss addr:0x02152a25 ambiguous -sMapObjectProfileUnkTRRW kind:bss addr:0x02152a2c -data_ov029_02152b00 kind:bss addr:0x02152b00 -data_ov029_02152b04 kind:bss addr:0x02152b04 -sMapObjectProfileUnkTRSA kind:bss addr:0x02152b10 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRRWE8sProfileE kind:bss addr:0x02152a20 +@10578 kind:bss addr:0x02152a25 +_ZN15ProfileInstanceI23MapObjectProfileUnkTRRWE8sProfileE kind:bss addr:0x02152a2c +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRSAE8sProfileE kind:bss addr:0x02152b00 +@10584 kind:bss addr:0x02152b04 +_ZN15ProfileInstanceI23MapObjectProfileUnkTRSAE8sProfileE kind:bss addr:0x02152b10 data_ov029_02152b30 kind:bss addr:0x02152b30 -data_ov029_02152b54 kind:bss addr:0x02152b54 ambiguous -data_ov029_02152be4 kind:bss addr:0x02152be4 -data_ov029_02152be8 kind:bss addr:0x02152be8 -sMapObjectProfileUnkTRRD kind:bss addr:0x02152bf4 -data_ov029_02152ca0 kind:bss addr:0x02152ca0 ambiguous -data_ov029_02152cc8 kind:bss addr:0x02152cc8 -data_ov029_02152ccc kind:bss addr:0x02152ccc -sMapObjectProfileUnkTRPI kind:bss addr:0x02152cd8 -data_ov029_02152d64 kind:bss addr:0x02152d64 ambiguous -data_ov029_02152dac kind:bss addr:0x02152dac -data_ov029_02152db0 kind:bss addr:0x02152db0 -sMapObjectProfileUnkSBDE kind:bss addr:0x02152dbc -data_ov029_02152e4c kind:bss addr:0x02152e4c ambiguous -data_ov029_02152e90 kind:bss addr:0x02152e90 -data_ov029_02152e94 kind:bss addr:0x02152e94 -sMapObjectProfileUnkSTDE kind:bss addr:0x02152ea0 -data_ov029_02152f08 kind:bss addr:0x02152f08 ambiguous -data_ov029_02152f68 kind:bss addr:0x02152f68 ambiguous +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRRDE8sProfileE kind:bss addr:0x02152be4 +@10590 kind:bss addr:0x02152be8 +_ZN15ProfileInstanceI23MapObjectProfileUnkTRRDE8sProfileE kind:bss addr:0x02152bf4 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRPIE8sProfileE kind:bss addr:0x02152cc8 +@10596 kind:bss addr:0x02152ccc +_ZN15ProfileInstanceI23MapObjectProfileUnkTRPIE8sProfileE kind:bss addr:0x02152cd8 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkSBDEE8sProfileE kind:bss addr:0x02152dac +@10602 kind:bss addr:0x02152db0 +_ZN15ProfileInstanceI23MapObjectProfileUnkSBDEE8sProfileE kind:bss addr:0x02152dbc +_ZGVN15ProfileInstanceI23MapObjectProfileUnkSTDEE8sProfileE kind:bss addr:0x02152e90 +@10608 kind:bss addr:0x02152e94 +_ZN15ProfileInstanceI23MapObjectProfileUnkSTDEE8sProfileE kind:bss addr:0x02152ea0 data_ov029_02152f74 kind:bss addr:0x02152f74 -data_ov029_02152f78 kind:bss addr:0x02152f78 -data_ov029_02152f80 kind:bss addr:0x02152f80 ambiguous -sMapObjectProfileUnkTCBT kind:bss addr:0x02152f84 -data_ov029_02152f8c kind:bss addr:0x02152f8c ambiguous -data_ov029_02152f98 kind:bss addr:0x02152f98 ambiguous +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTCBTE8sProfileE kind:bss addr:0x02152f78 +@10614 kind:bss addr:0x02152f80 ambiguous +_ZN15ProfileInstanceI23MapObjectProfileUnkTCBTE8sProfileE kind:bss addr:0x02152f84 data_ov029_02153058 kind:bss addr:0x02153058 -data_ov029_02153078 kind:bss addr:0x02153078 -data_ov029_0215307c kind:bss addr:0x0215307c -sMapObjectProfileUnkWHSW kind:bss addr:0x02153088 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkWHSWE8sProfileE kind:bss addr:0x02153078 +@10620 kind:bss addr:0x0215307c +_ZN15ProfileInstanceI23MapObjectProfileUnkWHSWE8sProfileE kind:bss addr:0x02153088 data_ov029_021530a8 kind:bss addr:0x021530a8 -data_ov029_021530b8 kind:bss addr:0x021530b8 ambiguous data_ov029_0215315c kind:bss addr:0x0215315c -data_ov029_0215317c kind:bss addr:0x0215317c -data_ov029_02153180 kind:bss addr:0x02153180 -sMapObjectProfileUnkTRH1 kind:bss addr:0x0215318c -data_ov029_021531b4 kind:bss addr:0x021531b4 ambiguous -data_ov029_02153260 kind:bss addr:0x02153260 -data_ov029_02153264 kind:bss addr:0x02153264 -sMapObjectProfileUnkTBSS kind:bss addr:0x02153270 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRH1E8sProfileE kind:bss addr:0x0215317c +@10626 kind:bss addr:0x02153180 +_ZN15ProfileInstanceI23MapObjectProfileUnkTRH1E8sProfileE kind:bss addr:0x0215318c +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTBSSE8sProfileE kind:bss addr:0x02153260 +@10632 kind:bss addr:0x02153264 +_ZN15ProfileInstanceI23MapObjectProfileUnkTBSSE8sProfileE kind:bss addr:0x02153270 data_ov029_02153344 kind:bss addr:0x02153344 -data_ov029_02153364 kind:bss addr:0x02153364 -data_ov029_02153368 kind:bss addr:0x02153368 -sMapObjectProfileUnkTRBL kind:bss addr:0x02153374 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRBLE8sProfileE kind:bss addr:0x02153364 +@10638 kind:bss addr:0x02153368 +_ZN15ProfileInstanceI23MapObjectProfileUnkTRBLE8sProfileE kind:bss addr:0x02153374 data_ov029_02153448 kind:bss addr:0x02153448 -data_ov029_02153468 kind:bss addr:0x02153468 -data_ov029_0215346c kind:bss addr:0x0215346c -sMapObjectProfileUnkRBBL kind:bss addr:0x02153478 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkRBBLE8sProfileE kind:bss addr:0x02153468 +@10644 kind:bss addr:0x0215346c +_ZN15ProfileInstanceI23MapObjectProfileUnkRBBLE8sProfileE kind:bss addr:0x02153478 data_ov029_021534bc kind:bss addr:0x021534bc data_ov029_021534c4 kind:bss addr:0x021534c4 data_ov029_021534d0 kind:bss addr:0x021534d0 @@ -627,18 +616,18 @@ data_ov029_021534e8 kind:bss addr:0x021534e8 data_ov029_021534f4 kind:bss addr:0x021534f4 data_ov029_02153500 kind:bss addr:0x02153500 data_ov029_02153510 kind:bss addr:0x02153510 -data_ov029_0215351c kind:bss addr:0x0215351c -data_ov029_02153534 kind:bss addr:0x02153534 -sActorProfileUnkDLPN kind:bss addr:0x02153544 -data_ov029_0215361c kind:bss addr:0x0215361c -data_ov029_02153620 kind:bss addr:0x02153620 -sActorProfileUnkBLJF kind:bss addr:0x02153638 +_ZGVN15ProfileInstanceI19ActorProfileUnkDLPNE8sProfileE kind:bss addr:0x0215351c +@10661 kind:bss addr:0x02153534 +_ZN15ProfileInstanceI19ActorProfileUnkDLPNE8sProfileE kind:bss addr:0x02153544 +_ZGVN15ProfileInstanceI19ActorProfileUnkBLJFE8sProfileE kind:bss addr:0x0215361c +@10667 kind:bss addr:0x02153620 +_ZN15ProfileInstanceI19ActorProfileUnkBLJFE8sProfileE kind:bss addr:0x02153638 data_ov029_02153710 kind:bss addr:0x02153710 data_ov029_02153714 kind:bss addr:0x02153714 -data_ov029_02153720 kind:bss addr:0x02153720 -data_ov029_0215372c kind:bss addr:0x0215372c -sActorProfileUnkMDYG kind:bss addr:0x02153750 +_ZGVN15ProfileInstanceI19ActorProfileUnkMDYGE8sProfileE kind:bss addr:0x02153720 +@10673 kind:bss addr:0x0215372c +_ZN15ProfileInstanceI19ActorProfileUnkMDYGE8sProfileE kind:bss addr:0x02153750 data_ov029_02153828 kind:bss addr:0x02153828 -data_ov029_0215382c kind:bss addr:0x0215382c -data_ov029_02153838 kind:bss addr:0x02153838 -sActorProfileUnkPRSP kind:bss addr:0x02153844 +_ZGVN15ProfileInstanceI19ActorProfileUnkPRSPE8sProfileE kind:bss addr:0x0215382c +@10679 kind:bss addr:0x02153838 +_ZN15ProfileInstanceI19ActorProfileUnkPRSPE8sProfileE kind:bss addr:0x02153844 diff --git a/config/eur/arm9/overlays/ov030/delinks.txt b/config/eur/arm9/overlays/ov030/delinks.txt index a7d63e99..53c3c067 100644 --- a/config/eur/arm9/overlays/ov030/delinks.txt +++ b/config/eur/arm9/overlays/ov030/delinks.txt @@ -9,76 +9,76 @@ src/030_TrainFlame/MapObject/MapObjectUnkETTV.cpp: .text start:0x02141e64 end:0x021429ec .init start:0x02150994 end:0x021509e4 .ctor start:0x02150f7c end:0x02150f80 - .bss start:0x02151d90 end:0x02151db0 + .bss start:0x02151d80 end:0x02151e64 src/030_TrainFlame/MapObject/MapObjectUnkTRFI.cpp: .text start:0x021429ec end:0x02142e38 .init start:0x021509e4 end:0x02150a34 .ctor start:0x02150f80 end:0x02150f84 - .bss start:0x02151e74 end:0x02151f48 + .bss start:0x02151e64 end:0x02151f48 src/030_TrainFlame/MapObject/MapObjectUnkTRGM.cpp: .text start:0x02142e38 end:0x02143190 .init start:0x02150a34 end:0x02150a84 .ctor start:0x02150f84 end:0x02150f88 - .bss start:0x02151f58 end:0x02152018 + .bss start:0x02151f48 end:0x0215202c src/030_TrainFlame/MapObject/MapObjectUnkTRH2.cpp: .text start:0x02143190 end:0x02143498 .init start:0x02150a84 end:0x02150ad4 .ctor start:0x02150f88 end:0x02150f8c - .bss start:0x0215203c end:0x02152054 + .bss start:0x0215202c end:0x02152110 src/030_TrainFlame/MapObject/MapObjectUnkTRH3.cpp: .text start:0x02143498 end:0x021437a0 .init start:0x02150ad4 end:0x02150b24 .ctor start:0x02150f8c end:0x02150f90 - .bss start:0x02152120 end:0x021521f4 + .bss start:0x02152110 end:0x021521f4 src/030_TrainFlame/MapObject/MapObjectUnkTRST.cpp: .text start:0x021437a0 end:0x02143abc .init start:0x02150b24 end:0x02150b74 .ctor start:0x02150f90 end:0x02150f94 - .bss start:0x02152204 end:0x021522d8 + .bss start:0x021521f4 end:0x02152308 src/030_TrainFlame/Actor/ActorUnkHELA.cpp: .text start:0x02143abc end:0x0214b0cc .init start:0x02150b74 end:0x02150cb0 .ctor start:0x02150f94 end:0x02150f98 - .bss start:0x02152340 end:0x02152418 + .bss start:0x02152308 end:0x021528e4 src/030_TrainFlame/Actor/ActorUnkHLMG.cpp: .text start:0x0214b0cc end:0x0214c344 .init start:0x02150cb0 end:0x02150d98 .ctor start:0x02150f98 end:0x02150f9c - .bss start:0x021528f4 end:0x02152930 + .bss start:0x021528e4 end:0x02152930 src/030_TrainFlame/Actor/ActorUnkFDKY.cpp: .text start:0x0214c344 end:0x0214ce3c .init start:0x02150d98 end:0x02150e08 .ctor start:0x02150f9c end:0x02150fa0 - .bss start:0x02152940 end:0x021529c4 + .bss start:0x02152930 end:0x02152a1c src/030_TrainFlame/Actor/ActorUnkGOVT.cpp: .text start:0x0214ce3c end:0x0214d658 .init start:0x02150e08 end:0x02150e8c .ctor start:0x02150fa0 end:0x02150fa4 - .bss start:0x02152a28 end:0x02152a64 + .bss start:0x02152a1c end:0x02152a64 src/030_TrainFlame/Actor/ActorUnkTTFT.cpp: .text start:0x0214d658 end:0x0214d7d0 .init start:0x02150e8c end:0x02150edc .ctor start:0x02150fa4 end:0x02150fa8 - .bss start:0x02152a74 end:0x02152ab0 + .bss start:0x02152a64 end:0x02152ab0 src/030_TrainFlame/Actor/ActorUnkSGMG.cpp: .text start:0x0214d7d0 end:0x0214dcb8 .init start:0x02150edc end:0x02150f2c .ctor start:0x02150fa8 end:0x02150fac - .bss start:0x02152ac0 end:0x02152afc + .bss start:0x02152ab0 end:0x02152c04 src/030_TrainFlame/Actor/ActorUnkWKTR.cpp: .text start:0x0214dcb8 end:0x021505c0 .init start:0x02150f2c end:0x02150f7c .ctor start:0x02150fac end:0x02150fb0 - .bss start:0x02152c24 end:0x02152d00 + .bss start:0x02152c04 end:0x02152d00 diff --git a/config/eur/arm9/overlays/ov030/relocs.txt b/config/eur/arm9/overlays/ov030/relocs.txt index 298edee4..f749a53e 100644 --- a/config/eur/arm9/overlays/ov030/relocs.txt +++ b/config/eur/arm9/overlays/ov030/relocs.txt @@ -1042,7 +1042,7 @@ from:0x0214a710 kind:load to:0x027e0d24 module:dtcm from:0x0214a714 kind:load to:0x027e0cd8 module:dtcm from:0x0214a718 kind:load to:0x0215093a module:overlay(30) from:0x0214a71c kind:load to:0x021522f8 module:overlay(30) -from:0x0214a720 kind:load to:0x0215230a module:overlay(30) +from:0x0214a720 kind:load to:0x021522fc add:0xe module:overlay(30) from:0x0214a724 kind:load to:0x0215230c module:overlay(30) from:0x0214a728 kind:load to:0x02150950 module:overlay(30) from:0x0214a740 kind:arm_call to:0x02144110 module:overlay(30) diff --git a/config/eur/arm9/overlays/ov030/symbols.txt b/config/eur/arm9/overlays/ov030/symbols.txt index ad20b121..a4c1c328 100644 --- a/config/eur/arm9/overlays/ov030/symbols.txt +++ b/config/eur/arm9/overlays/ov030/symbols.txt @@ -500,56 +500,55 @@ _ZTV19data_ov030_02151c88 kind:data(any) addr:0x02151c88 data_ov030_02151cb4 kind:data(any) addr:0x02151cb4 _ZTV19data_ov030_02151cf4 kind:data(any) addr:0x02151cf4 _ZTV19data_ov030_02151d58 kind:data(any) addr:0x02151d58 -data_ov030_02151d80 kind:bss addr:0x02151d80 -data_ov030_02151d84 kind:bss addr:0x02151d84 -sMapObjectProfileUnkETTV kind:bss addr:0x02151d90 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkETTVE8sProfileE kind:bss addr:0x02151d80 +@10680 kind:bss addr:0x02151d84 +_ZN15ProfileInstanceI23MapObjectProfileUnkETTVE8sProfileE kind:bss addr:0x02151d90 data_ov030_02151db0 kind:bss addr:0x02151db0 -data_ov030_02151e64 kind:bss addr:0x02151e64 -data_ov030_02151e68 kind:bss addr:0x02151e68 -sMapObjectProfileUnkTRFI kind:bss addr:0x02151e74 -data_ov030_02151f48 kind:bss addr:0x02151f48 -data_ov030_02151f4c kind:bss addr:0x02151f4c -sMapObjectProfileUnkTRGM kind:bss addr:0x02151f58 -data_ov030_02152018 kind:bss addr:0x02152018 ambiguous -data_ov030_0215202c kind:bss addr:0x0215202c -data_ov030_02152030 kind:bss addr:0x02152030 -sMapObjectProfileUnkTRH2 kind:bss addr:0x0215203c +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRFIE8sProfileE kind:bss addr:0x02151e64 +@10686 kind:bss addr:0x02151e68 +_ZN15ProfileInstanceI23MapObjectProfileUnkTRFIE8sProfileE kind:bss addr:0x02151e74 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRGME8sProfileE kind:bss addr:0x02151f48 +@10692 kind:bss addr:0x02151f4c +_ZN15ProfileInstanceI23MapObjectProfileUnkTRGME8sProfileE kind:bss addr:0x02151f58 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRH2E8sProfileE kind:bss addr:0x0215202c +@10698 kind:bss addr:0x02152030 +_ZN15ProfileInstanceI23MapObjectProfileUnkTRH2E8sProfileE kind:bss addr:0x0215203c data_ov030_02152054 kind:bss addr:0x02152054 ambiguous data_ov030_02152074 kind:bss addr:0x02152074 ambiguous data_ov030_021520e8 kind:bss addr:0x021520e8 ambiguous -data_ov030_02152110 kind:bss addr:0x02152110 -data_ov030_02152114 kind:bss addr:0x02152114 -sMapObjectProfileUnkTRH3 kind:bss addr:0x02152120 -data_ov030_021521f4 kind:bss addr:0x021521f4 -data_ov030_021521f8 kind:bss addr:0x021521f8 -sMapObjectProfileUnkTRST kind:bss addr:0x02152204 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRH3E8sProfileE kind:bss addr:0x02152110 +@10704 kind:bss addr:0x02152114 +_ZN15ProfileInstanceI23MapObjectProfileUnkTRH3E8sProfileE kind:bss addr:0x02152120 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRSTE8sProfileE kind:bss addr:0x021521f4 +@10710 kind:bss addr:0x021521f8 +_ZN15ProfileInstanceI23MapObjectProfileUnkTRSTE8sProfileE kind:bss addr:0x02152204 data_ov030_021522d8 kind:bss addr:0x021522d8 data_ov030_021522e0 kind:bss addr:0x021522e0 data_ov030_021522ec kind:bss addr:0x021522ec data_ov030_021522f8 kind:bss addr:0x021522f8 data_ov030_021522fc kind:bss addr:0x021522fc -data_ov030_0215230a kind:bss addr:0x0215230a -data_ov030_0215230c kind:bss addr:0x0215230c -sActorProfileUnkHELA kind:bss addr:0x02152340 +_ZGVN15ProfileInstanceI19ActorProfileUnkHELAE8sProfileE kind:bss addr:0x02152308 +@10727 kind:bss addr:0x0215230c +_ZN15ProfileInstanceI19ActorProfileUnkHELAE8sProfileE kind:bss addr:0x02152340 data_ov030_02152418 kind:bss addr:0x02152418 data_ov030_0215242c kind:bss addr:0x0215242c -data_ov030_021528e4 kind:bss addr:0x021528e4 -data_ov030_021528e8 kind:bss addr:0x021528e8 -sActorProfileUnkHLMG kind:bss addr:0x021528f4 -data_ov030_02152930 kind:bss addr:0x02152930 -data_ov030_02152934 kind:bss addr:0x02152934 -sActorProfileUnkFDKY kind:bss addr:0x02152940 +_ZGVN15ProfileInstanceI19ActorProfileUnkHLMGE8sProfileE kind:bss addr:0x021528e4 +@10733 kind:bss addr:0x021528e8 +_ZN15ProfileInstanceI19ActorProfileUnkHLMGE8sProfileE kind:bss addr:0x021528f4 +_ZGVN15ProfileInstanceI19ActorProfileUnkFDKYE8sProfileE kind:bss addr:0x02152930 +@10739 kind:bss addr:0x02152934 +_ZN15ProfileInstanceI19ActorProfileUnkFDKYE8sProfileE kind:bss addr:0x02152940 data_ov030_021529c4 kind:bss addr:0x021529c4 ambiguous data_ov030_02152a18 kind:bss addr:0x02152a18 -data_ov030_02152a1c kind:bss addr:0x02152a1c -data_ov030_02152a25 kind:bss addr:0x02152a25 ambiguous -sActorProfileUnkGOVT kind:bss addr:0x02152a28 -data_ov030_02152a64 kind:bss addr:0x02152a64 -data_ov030_02152a68 kind:bss addr:0x02152a68 -sActorProfileUnkTTFT kind:bss addr:0x02152a74 -data_ov030_02152ab0 kind:bss addr:0x02152ab0 -data_ov030_02152ab4 kind:bss addr:0x02152ab4 -sActorProfileUnkSGMG kind:bss addr:0x02152ac0 +_ZGVN15ProfileInstanceI19ActorProfileUnkGOVTE8sProfileE kind:bss addr:0x02152a1c +@10745 kind:bss addr:0x02152a25 ambiguous +_ZN15ProfileInstanceI19ActorProfileUnkGOVTE8sProfileE kind:bss addr:0x02152a28 +_ZGVN15ProfileInstanceI19ActorProfileUnkTTFTE8sProfileE kind:bss addr:0x02152a64 +@10751 kind:bss addr:0x02152a68 +_ZN15ProfileInstanceI19ActorProfileUnkTTFTE8sProfileE kind:bss addr:0x02152a74 +_ZGVN15ProfileInstanceI19ActorProfileUnkSGMGE8sProfileE kind:bss addr:0x02152ab0 +@10757 kind:bss addr:0x02152ab4 +_ZN15ProfileInstanceI19ActorProfileUnkSGMGE8sProfileE kind:bss addr:0x02152ac0 data_ov030_02152afc kind:bss addr:0x02152afc data_ov030_02152b00 kind:bss addr:0x02152b00 data_ov030_02152b04 kind:bss addr:0x02152b04 @@ -578,6 +577,6 @@ data_ov030_02152bc4 kind:bss addr:0x02152bc4 data_ov030_02152bd4 kind:bss addr:0x02152bd4 data_ov030_02152be4 kind:bss addr:0x02152be4 data_ov030_02152bf4 kind:bss addr:0x02152bf4 -data_ov030_02152c04 kind:bss addr:0x02152c04 -data_ov030_02152c14 kind:bss addr:0x02152c14 -sActorProfileUnkWKTR kind:bss addr:0x02152c24 +_ZGVN15ProfileInstanceI19ActorProfileUnkWKTRE8sProfileE kind:bss addr:0x02152c04 +@10763 kind:bss addr:0x02152c14 +_ZN15ProfileInstanceI19ActorProfileUnkWKTRE8sProfileE kind:bss addr:0x02152c24 diff --git a/config/eur/arm9/overlays/ov031/delinks.txt b/config/eur/arm9/overlays/ov031/delinks.txt index 1b7f0707..a3851a66 100644 --- a/config/eur/arm9/overlays/ov031/delinks.txt +++ b/config/eur/arm9/overlays/ov031/delinks.txt @@ -9,353 +9,353 @@ src/031_Land/Actor/ActorUnkBOMB.cpp: .text start:0x020e14c4 end:0x020e34b4 .init start:0x02110ff8 end:0x02111048 .ctor start:0x0211279c end:0x021127a0 - .bss start:0x02116414 end:0x02116450 + .bss start:0x02116404 end:0x02116450 src/031_Land/Actor/ActorUnkBLST.cpp: .text start:0x020e34b4 end:0x020e3ca4 .init start:0x02111048 end:0x02111098 .ctor start:0x021127a0 end:0x021127a4 - .bss start:0x02116460 end:0x0211649c + .bss start:0x02116450 end:0x0211649c src/031_Land/Actor/ActorUnkTLKT.cpp: .text start:0x020e40d8 end:0x020e4584 .init start:0x02111098 end:0x021110e8 .ctor start:0x021127a4 end:0x021127a8 - .bss start:0x021164ac end:0x021164e8 + .bss start:0x0211649c end:0x021164e8 src/031_Land/Actor/ActorUnkITBM.cpp: .text start:0x020e45a4 end:0x020e575c .init start:0x021110e8 end:0x02111138 .ctor start:0x021127a8 end:0x021127ac - .bss start:0x021164f8 end:0x02116534 + .bss start:0x021164e8 end:0x02116534 src/031_Land/Actor/ActorUnkITTD.cpp: .text start:0x020e58c8 end:0x020e64d8 .init start:0x02111138 end:0x021111ac .ctor start:0x021127ac end:0x021127b0 - .bss start:0x02116544 end:0x02116580 + .bss start:0x02116534 end:0x02116580 src/031_Land/Actor/ActorUnkSWBM.cpp: .text start:0x020e6b34 end:0x020e7378 .init start:0x021111ac end:0x02111220 .ctor start:0x021127b0 end:0x021127b4 - .bss start:0x02116590 end:0x021165cc + .bss start:0x02116580 end:0x021165d0 src/031_Land/Actor/ActorUnkROCK.cpp: .text start:0x020e8824 end:0x020e8cb8 .init start:0x02111220 end:0x02111270 .ctor start:0x021127b4 end:0x021127b8 - .bss start:0x021165e0 end:0x021165f0 + .bss start:0x021165d0 end:0x021166e8 src/031_Land/Actor/ActorRupee.cpp: .text start:0x020e8cb8 end:0x020ea02c .init start:0x02111270 end:0x02111308 .ctor start:0x021127b8 end:0x021127bc .data start:0x02113488 end:0x02113520 - .bss start:0x021166e8 end:0x02116724 + .bss start:0x021166e8 end:0x0211672c src/031_Land/Actor/ActorUnkZLSL_ZSRS.cpp: .text start:0x020ea02c end:0x020ee8cc .init start:0x02111308 end:0x0211139c .ctor start:0x021127bc end:0x021127c0 - .bss start:0x02116744 end:0x021167c4 + .bss start:0x0211672c end:0x02116858 src/031_Land/Actor/ActorUnkHERT.cpp: .text start:0x020eecf4 end:0x020ef81c .init start:0x0211139c end:0x02111408 .ctor start:0x021127c0 end:0x021127c4 - .bss start:0x02116868 end:0x021168a4 + .bss start:0x02116858 end:0x021168a4 src/031_Land/Actor/ActorUnkRMTG.cpp: .text start:0x020ef81c end:0x020efa0c .init start:0x02111408 end:0x02111458 .ctor start:0x021127c4 end:0x021127c8 - .bss start:0x021168b4 end:0x0211698c + .bss start:0x021168a4 end:0x0211698c src/031_Land/Actor/ActorUnkSCCN.cpp: .text start:0x020efa0c end:0x020efcd4 .init start:0x02111458 end:0x021114a8 .ctor start:0x021127c8 end:0x021127cc - .bss start:0x0211699c end:0x021169d8 + .bss start:0x0211698c end:0x021169d8 src/031_Land/Actor/ActorUnkNTUB.cpp: .text start:0x020f0c00 end:0x020f0fcc .init start:0x021114a8 end:0x021114f8 .ctor start:0x021127cc end:0x021127d0 - .bss start:0x021169e8 end:0x02116a24 + .bss start:0x021169d8 end:0x02116a24 src/031_Land/Actor/ActorUnkNITF.cpp: .text start:0x020f0fcc end:0x020f1390 .init start:0x021114f8 end:0x02111548 .ctor start:0x021127d0 end:0x021127d4 - .bss start:0x02116a34 end:0x02116a70 + .bss start:0x02116a24 end:0x02116a70 src/031_Land/Actor/ActorUnkAROW.cpp: .text start:0x020f1390 end:0x020f3d7c .init start:0x02111548 end:0x02111598 .ctor start:0x021127d4 end:0x021127d8 - .bss start:0x02116a80 end:0x02116abc + .bss start:0x02116a70 end:0x02116abc src/031_Land/Actor/ActorUnkATTG.cpp: .text start:0x020f3d7c end:0x020f409c .init start:0x02111598 end:0x021115e8 .ctor start:0x021127d8 end:0x021127dc - .bss start:0x02116acc end:0x02116b08 + .bss start:0x02116abc end:0x02116b08 src/031_Land/Actor/ActorUnkNTTZ.cpp: .text start:0x020f6108 end:0x020f6284 .init start:0x021115e8 end:0x02111638 .ctor start:0x021127dc end:0x021127e0 - .bss start:0x02116b18 end:0x02116b54 + .bss start:0x02116b08 end:0x02116b64 src/031_Land/Actor/ActorUnkTGTZ.cpp: .text start:0x020f6834 end:0x020f7474 .init start:0x0211165c end:0x021116c0 .ctor start:0x021127e4 end:0x021127e8 - .bss start:0x02116b7c end:0x02116c54 + .bss start:0x02116b64 end:0x02116c54 src/031_Land/Actor/ActorUnkSWCH.cpp: .text start:0x020f7a84 end:0x020f7bdc .init start:0x021116c0 end:0x02111710 .ctor start:0x021127e8 end:0x021127ec - .bss start:0x02116c64 end:0x02116ca0 + .bss start:0x02116c54 end:0x02116ca0 src/031_Land/Actor/ActorUnkSWON.cpp: .text start:0x020f7dbc end:0x020f7f14 .init start:0x02111710 end:0x02111760 .ctor start:0x021127ec end:0x021127f0 - .bss start:0x02116cb0 end:0x02116cec + .bss start:0x02116ca0 end:0x02116cec src/031_Land/Actor/ActorUnkNORE.cpp: .text start:0x020f7f14 end:0x020f8024 .init start:0x02111760 end:0x021117b0 .ctor start:0x021127f0 end:0x021127f4 - .bss start:0x02116cfc end:0x02116d38 + .bss start:0x02116cec end:0x02116d38 src/031_Land/Actor/ActorUnkFLEN.cpp: .text start:0x020f8024 end:0x020f82e0 .init start:0x021117b0 end:0x02111800 .ctor start:0x021127f4 end:0x021127f8 - .bss start:0x02116d48 end:0x02116d84 + .bss start:0x02116d38 end:0x02116d84 src/031_Land/Actor/ActorUnkRLST.cpp: .text start:0x020f82e0 end:0x020f9dcc .init start:0x02111800 end:0x02111850 .ctor start:0x021127f8 end:0x021127fc - .bss start:0x02116d94 end:0x02116e6c + .bss start:0x02116d84 end:0x02116e94 src/031_Land/Actor/ActorUnkSPAR_SPBM_SPDR_SPTR.cpp: .text start:0x020f9dcc end:0x020fab5c .init start:0x02111850 end:0x02111988 .ctor start:0x021127fc end:0x02112800 - .bss start:0x02116eac end:0x02116f9c + .bss start:0x02116e94 end:0x02116f9c src/031_Land/Actor/ActorUnkMLCK.cpp: .text start:0x020fab5c end:0x020fb2ac .init start:0x02111988 end:0x021119fc .ctor start:0x02112800 end:0x02112804 - .bss start:0x02116fac end:0x02116fe8 + .bss start:0x02116f9c end:0x02116fe8 src/031_Land/Actor/ActorUnkCLLT.cpp: .text start:0x020fb30c end:0x020fb4ac .init start:0x021119fc end:0x02111a4c .ctor start:0x02112804 end:0x02112808 - .bss start:0x02116ff8 end:0x02117034 + .bss start:0x02116fe8 end:0x02117034 src/031_Land/Actor/ActorUnkEFSB.cpp: .text start:0x020fb4ac end:0x020fb80c .init start:0x02111a4c end:0x02111a9c .ctor start:0x02112808 end:0x0211280c - .bss start:0x02117044 end:0x0211711c + .bss start:0x02117034 end:0x0211711c src/031_Land/Actor/ActorUnkNFSP.cpp: .text start:0x020fb80c end:0x020fbd6c .init start:0x02111a9c end:0x02111aec .ctor start:0x0211280c end:0x02112810 - .bss start:0x0211712c end:0x02117204 + .bss start:0x0211711c end:0x0211727c src/031_Land/MapObject/MapObjectUnkDRDS.cpp: .text start:0x020fd0f8 end:0x020fe714 .init start:0x02111b28 end:0x02111b8c .ctor start:0x02112814 end:0x02112818 - .bss start:0x0211728c end:0x02117360 + .bss start:0x0211727c end:0x02117360 src/031_Land/MapObject/MapObjectUnkDRKY.cpp: .text start:0x020fe734 end:0x020fee6c .init start:0x02111b8c end:0x02111bf0 .ctor start:0x02112818 end:0x0211281c - .bss start:0x02117370 end:0x02117444 + .bss start:0x02117360 end:0x02117444 src/031_Land/MapObject/MapObjectUnkDRSW.cpp: .text start:0x020fee6c end:0x020ff518 .init start:0x02111bf0 end:0x02111c54 .ctor start:0x0211281c end:0x02112820 - .bss start:0x02117454 end:0x02117528 + .bss start:0x02117444 end:0x02117528 src/031_Land/MapObject/MapObjectUnkDRCK.cpp: .text start:0x020ff518 end:0x02100230 .init start:0x02111c54 end:0x02111cb8 .ctor start:0x02112820 end:0x02112824 - .bss start:0x02117538 end:0x02117558 + .bss start:0x02117528 end:0x021175a0 src/031_Land/MapObject/MapObjectUnkDRTC.cpp: .text start:0x0210024c end:0x021004bc .init start:0x02111cb8 end:0x02111d08 .ctor start:0x02112824 end:0x02112828 - .bss start:0x021175b0 end:0x021175d0 + .bss start:0x021175a0 end:0x02117618 src/031_Land/MapObject/MapObjectUnkEXIT.cpp: .text start:0x021004d8 end:0x021007b4 .init start:0x02111d08 end:0x02111d58 .ctor start:0x02112828 end:0x0211282c - .bss start:0x02117628 end:0x021176fc + .bss start:0x02117618 end:0x021176fc src/031_Land/MapObject/MapObjectUnkGATE.cpp: .text start:0x021007b4 end:0x02100ac0 .init start:0x02111d58 end:0x02111da8 .ctor start:0x0211282c end:0x02112830 - .bss start:0x0211770c end:0x0211772c + .bss start:0x021176fc end:0x02117774 src/031_Land/MapObject/MapObjectUnkSTIR.cpp: .text start:0x02100adc end:0x0210100c .init start:0x02111da8 end:0x02111df8 .ctor start:0x02112830 end:0x02112834 - .bss start:0x02117784 end:0x02117858 + .bss start:0x02117774 end:0x02117868 src/031_Land/MapObject/MapObjectUnkGRSS.cpp: .text start:0x0210100c end:0x021019dc .init start:0x02111df8 end:0x02111e88 .ctor start:0x02112834 end:0x02112838 - .bss start:0x021178c4 end:0x02117998 + .bss start:0x02117868 end:0x021179b8 src/031_Land/MapObject/MapObjectUnkSWHT.cpp: .text start:0x02101a14 end:0x02102438 .init start:0x02111e88 end:0x02111ef8 .ctor start:0x02112838 end:0x0211283c - .bss start:0x021179c8 end:0x021179e8 + .bss start:0x021179b8 end:0x02117abc src/031_Land/MapObject/MapObjectUnkBMFL.cpp: .text start:0x02102438 end:0x02102bc0 .init start:0x02111ef8 end:0x02111f48 .ctor start:0x0211283c end:0x02112840 - .bss start:0x02117acc end:0x02117ba0 + .bss start:0x02117abc end:0x02117ba0 src/031_Land/MapObject/MapObjectUnkTRES.cpp: .text start:0x02102e70 end:0x02102fe8 .init start:0x02111f48 end:0x02111fb4 .ctor start:0x02112840 end:0x02112844 - .bss start:0x02117bb0 end:0x02117c84 + .bss start:0x02117ba0 end:0x02117cfc src/031_Land/MapObject/MapObjectUnkTRED.cpp: .text start:0x0210401c end:0x021041b8 .init start:0x02111fe4 end:0x02112050 .ctor start:0x02112848 end:0x0211284c - .bss start:0x02117d0c end:0x02117d30 + .bss start:0x02117cfc end:0x02117d30 src/031_Land/MapObject/MapObjectUnkTREW.cpp: .text start:0x021041b8 end:0x02104378 .init start:0x02112050 end:0x021120bc .ctor start:0x0211284c end:0x02112850 - .bss start:0x02117d40 end:0x02117d64 + .bss start:0x02117d30 end:0x02117d64 src/031_Land/MapObject/MapObjectUnkTREN.cpp: .text start:0x02104378 end:0x021044c0 .init start:0x021120bc end:0x02112128 .ctor start:0x02112850 end:0x02112854 - .bss start:0x02117d74 end:0x02117e48 + .bss start:0x02117d64 end:0x02117e48 src/031_Land/MapObject/MapObjectUnkTRWS.cpp: .text start:0x021044c0 end:0x02104f00 .init start:0x02112128 end:0x02112178 .ctor start:0x02112854 end:0x02112858 - .bss start:0x02117e58 end:0x02117f2c + .bss start:0x02117e48 end:0x02117f2c src/031_Land/MapObject/MapObjectUnkTSUB.cpp: .text start:0x02104f30 end:0x0210549c .init start:0x02112178 end:0x021121c8 .ctor start:0x02112858 end:0x0211285c - .bss start:0x02117f3c end:0x02118010 + .bss start:0x02117f2c end:0x02118030 src/031_Land/MapObject/MapObjectUnkSKBN.cpp: .text start:0x0210549c end:0x02105840 .init start:0x021121c8 end:0x0211223c .ctor start:0x0211285c end:0x02112860 - .bss start:0x02118040 end:0x02118114 + .bss start:0x02118030 end:0x02118138 src/031_Land/MapObject/MapObjectUnkITFL.cpp: .text start:0x02105840 end:0x02106000 .init start:0x0211223c end:0x0211228c .ctor start:0x02112860 end:0x02112864 - .bss start:0x02118148 end:0x0211821c + .bss start:0x02118138 end:0x0211821c src/031_Land/MapObject/MapObjectUnkSKDI.cpp: .text start:0x02106000 end:0x02106d60 .init start:0x0211228c end:0x021122dc .ctor start:0x02112864 end:0x02112868 - .bss start:0x0211822c end:0x02118300 + .bss start:0x0211821c end:0x02118300 src/031_Land/Actor/ActorUnkSKDO.cpp: .text start:0x02106d60 end:0x02106f18 .init start:0x021122dc end:0x0211232c .ctor start:0x02112868 end:0x0211286c - .bss start:0x02118310 end:0x0211834c + .bss start:0x02118300 end:0x0211834c src/031_Land/MapObject/MapObjectUnkCRWL.cpp: .text start:0x02106f18 end:0x02107550 .init start:0x0211232c end:0x0211239c .ctor start:0x0211286c end:0x02112870 - .bss start:0x0211835c end:0x0211837c + .bss start:0x0211834c end:0x021183d4 src/031_Land/MapObject/MapObjectUnkBREX.cpp: .text start:0x0210756c end:0x0210896c .init start:0x0211239c end:0x02112400 .ctor start:0x02112870 end:0x02112874 - .bss start:0x021183ec end:0x021184c0 + .bss start:0x021183d4 end:0x021184d0 src/031_Land/MapObject/MapObjectUnkTATZ.cpp: .text start:0x0210896c end:0x0210965c .init start:0x02112400 end:0x02112464 .ctor start:0x02112874 end:0x02112878 - .bss start:0x021184e8 end:0x021185e0 + .bss start:0x021184d0 end:0x021185e0 src/031_Land/MapObject/MapObjectUnkSTSP.cpp: .text start:0x0210965c end:0x021099ec .init start:0x02112464 end:0x021124b4 .ctor start:0x02112878 end:0x0211287c - .bss start:0x021185f0 end:0x021186c4 + .bss start:0x021185e0 end:0x021186c8 src/031_Land/MapObject/MapObjectUnkBLCC.cpp: .text start:0x021099ec end:0x02109f20 .init start:0x021124b4 end:0x02112510 .ctor start:0x0211287c end:0x02112880 - .bss start:0x021186e0 end:0x021187b4 + .bss start:0x021186c8 end:0x021187d8 src/031_Land/MapObject/MapObjectUnkRLSG.cpp: .text start:0x02109f20 end:0x0210ab0c .init start:0x02112510 end:0x02112580 .ctor start:0x02112880 end:0x02112884 - .bss start:0x021187e8 end:0x021188bc + .bss start:0x021187d8 end:0x02118900 src/031_Land/MapObject/MapObjectUnkSAND.cpp: .text start:0x0210ab0c end:0x0210b388 .init start:0x02112580 end:0x02112660 .ctor start:0x02112884 end:0x02112888 - .bss start:0x021189d0 end:0x02118aa4 + .bss start:0x02118900 end:0x02118c90 src/031_Land/MapObject/MapObjectUnkSPTB.cpp: .text start:0x0210b388 end:0x0210ba64 .init start:0x02112660 end:0x021126d4 .ctor start:0x02112888 end:0x0211288c - .bss start:0x02118ca4 end:0x02118d78 + .bss start:0x02118c90 end:0x02118d98 src/031_Land/MapObject/MapObjectUnkGSST.cpp: .text start:0x0210bab4 end:0x0210cebc .init start:0x021126d4 end:0x02112724 .ctor start:0x0211288c end:0x02112890 - .bss start:0x02118da8 end:0x02118dc8 + .bss start:0x02118d98 end:0x02118e9c src/031_Land/MapObject/MapObjectUnkSWFS.cpp: .text start:0x0210ceec end:0x0210d9ac .init start:0x02112724 end:0x02112794 .ctor start:0x02112890 end:0x02112894 - .bss start:0x02118eac end:0x02118ecc + .bss start:0x02118e9c end:0x02118ecc diff --git a/config/eur/arm9/overlays/ov031/relocs.txt b/config/eur/arm9/overlays/ov031/relocs.txt index 3712557c..1496fecb 100644 --- a/config/eur/arm9/overlays/ov031/relocs.txt +++ b/config/eur/arm9/overlays/ov031/relocs.txt @@ -140,7 +140,7 @@ from:0x020d96c0 kind:thumb_call to:0x020d96c8 module:overlay(31) from:0x020d96d2 kind:thumb_call_arm to:0x020d9bc0 module:overlay(31) from:0x020d96f0 kind:load to:0x0208d8f0 module:overlay(0) from:0x020d9700 kind:load to:0x0208d928 module:overlay(0) -from:0x020d9710 kind:load to:0x021529c4 module:overlays(29,30,58,81) +from:0x020d9710 kind:load to:0x021529c4 module:overlays(30,58,81) from:0x020d9754 kind:load to:0x020930b8 module:overlay(0) from:0x020d97c0 kind:load to:0x020dda94 module:overlay(31) from:0x020d97d0 kind:load to:0x0209316c module:overlay(0) diff --git a/config/eur/arm9/overlays/ov031/symbols.txt b/config/eur/arm9/overlays/ov031/symbols.txt index 87ccb41c..b2540087 100644 --- a/config/eur/arm9/overlays/ov031/symbols.txt +++ b/config/eur/arm9/overlays/ov031/symbols.txt @@ -2526,230 +2526,229 @@ data_ov031_0211632c kind:data(any) addr:0x0211632c data_ov031_02116340 kind:data(any) addr:0x02116340 ambiguous data_ov031_02116358 kind:data(any) addr:0x02116358 data_ov031_02116380 kind:bss addr:0x02116380 -data_ov031_02116404 kind:bss addr:0x02116404 -data_ov031_02116408 kind:bss addr:0x02116408 -sActorProfileUnkBOMB kind:bss addr:0x02116414 -data_ov031_02116450 kind:bss addr:0x02116450 -data_ov031_02116454 kind:bss addr:0x02116454 -sActorProfileUnkBLST kind:bss addr:0x02116460 -data_ov031_0211649c kind:bss addr:0x0211649c -data_ov031_021164a0 kind:bss addr:0x021164a0 -sActorProfileUnkTLKT kind:bss addr:0x021164ac -data_ov031_021164e8 kind:bss addr:0x021164e8 -data_ov031_021164ec kind:bss addr:0x021164ec -sActorProfileUnkITBM kind:bss addr:0x021164f8 -data_ov031_02116534 kind:bss addr:0x02116534 -data_ov031_02116538 kind:bss addr:0x02116538 -sActorProfileUnkITTD kind:bss addr:0x02116544 -data_ov031_02116580 kind:bss addr:0x02116580 -data_ov031_02116584 kind:bss addr:0x02116584 -sActorProfileUnkSWBM kind:bss addr:0x02116590 +_ZGVN15ProfileInstanceI19ActorProfileUnkBOMBE8sProfileE kind:bss addr:0x02116404 +@10775 kind:bss addr:0x02116408 +_ZN15ProfileInstanceI19ActorProfileUnkBOMBE8sProfileE kind:bss addr:0x02116414 +_ZGVN15ProfileInstanceI19ActorProfileUnkBLSTE8sProfileE kind:bss addr:0x02116450 +@10781 kind:bss addr:0x02116454 +_ZN15ProfileInstanceI19ActorProfileUnkBLSTE8sProfileE kind:bss addr:0x02116460 +_ZGVN15ProfileInstanceI19ActorProfileUnkTLKTE8sProfileE kind:bss addr:0x0211649c +@10787 kind:bss addr:0x021164a0 +_ZN15ProfileInstanceI19ActorProfileUnkTLKTE8sProfileE kind:bss addr:0x021164ac +_ZGVN15ProfileInstanceI19ActorProfileUnkITBME8sProfileE kind:bss addr:0x021164e8 +@10793 kind:bss addr:0x021164ec +_ZN15ProfileInstanceI19ActorProfileUnkITBME8sProfileE kind:bss addr:0x021164f8 +_ZGVN15ProfileInstanceI19ActorProfileUnkITTDE8sProfileE kind:bss addr:0x02116534 +@10799 kind:bss addr:0x02116538 +_ZN15ProfileInstanceI19ActorProfileUnkITTDE8sProfileE kind:bss addr:0x02116544 +_ZGVN15ProfileInstanceI19ActorProfileUnkSWBME8sProfileE kind:bss addr:0x02116580 +@10805 kind:bss addr:0x02116584 +_ZN15ProfileInstanceI19ActorProfileUnkSWBME8sProfileE kind:bss addr:0x02116590 data_ov031_021165cc kind:bss addr:0x021165cc -data_ov031_021165d0 kind:bss addr:0x021165d0 -data_ov031_021165d4 kind:bss addr:0x021165d4 -sActorProfileUnkROCK kind:bss addr:0x021165e0 +_ZGVN15ProfileInstanceI19ActorProfileUnkROCKE8sProfileE kind:bss addr:0x021165d0 +@10811 kind:bss addr:0x021165d4 +_ZN15ProfileInstanceI19ActorProfileUnkROCKE8sProfileE kind:bss addr:0x021165e0 data_ov031_021165f0 kind:bss addr:0x021165f0 ambiguous data_ov031_021166b8 kind:bss addr:0x021166b8 data_ov031_021166d8 kind:bss addr:0x021166d8 data_ov031_021166dc kind:bss addr:0x021166dc -sActorProfileRupee kind:bss addr:0x021166e8 +_ZN15ProfileInstanceI17ActorProfileRupeeE8sProfileE kind:bss addr:0x021166e8 data_ov031_02116724 kind:bss addr:0x02116724 -data_ov031_0211672c kind:bss addr:0x0211672c -data_ov031_02116738 kind:bss addr:0x02116738 -sActorProfileUnkZLSL kind:bss addr:0x02116744 -sActorProfileUnkZSRS kind:bss addr:0x02116780 -data_ov031_021167c4 kind:bss addr:0x021167c4 ambiguous -data_ov031_02116858 kind:bss addr:0x02116858 -data_ov031_0211685c kind:bss addr:0x0211685c -sActorProfileUnkHERT kind:bss addr:0x02116868 -data_ov031_021168a4 kind:bss addr:0x021168a4 -data_ov031_021168a8 kind:bss addr:0x021168a8 -sActorProfileUnkRMTG kind:bss addr:0x021168b4 -data_ov031_0211698c kind:bss addr:0x0211698c -data_ov031_02116990 kind:bss addr:0x02116990 -sActorProfileUnkSCCN kind:bss addr:0x0211699c -data_ov031_021169d8 kind:bss addr:0x021169d8 -data_ov031_021169dc kind:bss addr:0x021169dc -sActorProfileUnkNTUB kind:bss addr:0x021169e8 -data_ov031_02116a24 kind:bss addr:0x02116a24 -data_ov031_02116a28 kind:bss addr:0x02116a28 -sActorProfileUnkNITF kind:bss addr:0x02116a34 -data_ov031_02116a70 kind:bss addr:0x02116a70 -data_ov031_02116a74 kind:bss addr:0x02116a74 -sActorProfileUnkAROW kind:bss addr:0x02116a80 -data_ov031_02116abc kind:bss addr:0x02116abc -data_ov031_02116ac0 kind:bss addr:0x02116ac0 -sActorProfileUnkATTG kind:bss addr:0x02116acc -data_ov031_02116b08 kind:bss addr:0x02116b08 -data_ov031_02116b0c kind:bss addr:0x02116b0c -sActorProfileUnkNTTZ kind:bss addr:0x02116b18 +_ZGVN15ProfileInstanceI19ActorProfileUnkZLSLE8sProfileE kind:bss addr:0x0211672c +@10824 kind:bss addr:0x02116738 +_ZN15ProfileInstanceI19ActorProfileUnkZLSLE8sProfileE kind:bss addr:0x02116744 +_ZN15ProfileInstanceI19ActorProfileUnkZSRSE8sProfileE kind:bss addr:0x02116780 +_ZGVN15ProfileInstanceI19ActorProfileUnkHERTE8sProfileE kind:bss addr:0x02116858 +@10830 kind:bss addr:0x0211685c +_ZN15ProfileInstanceI19ActorProfileUnkHERTE8sProfileE kind:bss addr:0x02116868 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMTGE8sProfileE kind:bss addr:0x021168a4 +@10836 kind:bss addr:0x021168a8 +_ZN15ProfileInstanceI19ActorProfileUnkRMTGE8sProfileE kind:bss addr:0x021168b4 +_ZGVN15ProfileInstanceI19ActorProfileUnkSCCNE8sProfileE kind:bss addr:0x0211698c +@10842 kind:bss addr:0x02116990 +_ZN15ProfileInstanceI19ActorProfileUnkSCCNE8sProfileE kind:bss addr:0x0211699c +_ZGVN15ProfileInstanceI19ActorProfileUnkNTUBE8sProfileE kind:bss addr:0x021169d8 +@10848 kind:bss addr:0x021169dc +_ZN15ProfileInstanceI19ActorProfileUnkNTUBE8sProfileE kind:bss addr:0x021169e8 +_ZGVN15ProfileInstanceI19ActorProfileUnkNITFE8sProfileE kind:bss addr:0x02116a24 +@10854 kind:bss addr:0x02116a28 +_ZN15ProfileInstanceI19ActorProfileUnkNITFE8sProfileE kind:bss addr:0x02116a34 +_ZGVN15ProfileInstanceI19ActorProfileUnkAROWE8sProfileE kind:bss addr:0x02116a70 +@10860 kind:bss addr:0x02116a74 +_ZN15ProfileInstanceI19ActorProfileUnkAROWE8sProfileE kind:bss addr:0x02116a80 +_ZGVN15ProfileInstanceI19ActorProfileUnkATTGE8sProfileE kind:bss addr:0x02116abc +@10866 kind:bss addr:0x02116ac0 +_ZN15ProfileInstanceI19ActorProfileUnkATTGE8sProfileE kind:bss addr:0x02116acc +_ZGVN15ProfileInstanceI19ActorProfileUnkNTTZE8sProfileE kind:bss addr:0x02116b08 +@10872 kind:bss addr:0x02116b0c +_ZN15ProfileInstanceI19ActorProfileUnkNTTZE8sProfileE kind:bss addr:0x02116b18 data_ov031_02116b54 kind:bss addr:0x02116b54 data_ov031_02116b58 kind:bss addr:0x02116b58 -data_ov031_02116b64 kind:bss addr:0x02116b64 -data_ov031_02116b70 kind:bss addr:0x02116b70 -sActorProfileUnkTGTZ kind:bss addr:0x02116b7c -data_ov031_02116c54 kind:bss addr:0x02116c54 -data_ov031_02116c58 kind:bss addr:0x02116c58 -sActorProfileUnkSWCH kind:bss addr:0x02116c64 -data_ov031_02116ca0 kind:bss addr:0x02116ca0 -data_ov031_02116ca4 kind:bss addr:0x02116ca4 -sActorProfileUnkSWON kind:bss addr:0x02116cb0 -data_ov031_02116cec kind:bss addr:0x02116cec -data_ov031_02116cf0 kind:bss addr:0x02116cf0 -sActorProfileUnkNORE kind:bss addr:0x02116cfc -data_ov031_02116d38 kind:bss addr:0x02116d38 -data_ov031_02116d3c kind:bss addr:0x02116d3c -sActorProfileUnkFLEN kind:bss addr:0x02116d48 -data_ov031_02116d84 kind:bss addr:0x02116d84 -data_ov031_02116d88 kind:bss addr:0x02116d88 -sActorProfileUnkRLST kind:bss addr:0x02116d94 +_ZGVN15ProfileInstanceI19ActorProfileUnkTGTZE8sProfileE kind:bss addr:0x02116b64 +@10878 kind:bss addr:0x02116b70 +_ZN15ProfileInstanceI19ActorProfileUnkTGTZE8sProfileE kind:bss addr:0x02116b7c +_ZGVN15ProfileInstanceI19ActorProfileUnkSWCHE8sProfileE kind:bss addr:0x02116c54 +@10884 kind:bss addr:0x02116c58 +_ZN15ProfileInstanceI19ActorProfileUnkSWCHE8sProfileE kind:bss addr:0x02116c64 +_ZGVN15ProfileInstanceI19ActorProfileUnkSWONE8sProfileE kind:bss addr:0x02116ca0 +@10890 kind:bss addr:0x02116ca4 +_ZN15ProfileInstanceI19ActorProfileUnkSWONE8sProfileE kind:bss addr:0x02116cb0 +_ZGVN15ProfileInstanceI19ActorProfileUnkNOREE8sProfileE kind:bss addr:0x02116cec +@10896 kind:bss addr:0x02116cf0 +_ZN15ProfileInstanceI19ActorProfileUnkNOREE8sProfileE kind:bss addr:0x02116cfc +_ZGVN15ProfileInstanceI19ActorProfileUnkFLENE8sProfileE kind:bss addr:0x02116d38 +@10902 kind:bss addr:0x02116d3c +_ZN15ProfileInstanceI19ActorProfileUnkFLENE8sProfileE kind:bss addr:0x02116d48 +_ZGVN15ProfileInstanceI19ActorProfileUnkRLSTE8sProfileE kind:bss addr:0x02116d84 +@10908 kind:bss addr:0x02116d88 +_ZN15ProfileInstanceI19ActorProfileUnkRLSTE8sProfileE kind:bss addr:0x02116d94 data_ov031_02116e6c kind:bss addr:0x02116e6c data_ov031_02116e7c kind:bss addr:0x02116e7c data_ov031_02116e88 kind:bss addr:0x02116e88 -data_ov031_02116e94 kind:bss addr:0x02116e94 -data_ov031_02116ea0 kind:bss addr:0x02116ea0 -sActorProfileUnkSPDR kind:bss addr:0x02116eac -sActorProfileUnkSPTR kind:bss addr:0x02116ee8 -sActorProfileUnkSPAR kind:bss addr:0x02116f24 -sActorProfileUnkSPBM kind:bss addr:0x02116f60 -data_ov031_02116f9c kind:bss addr:0x02116f9c -data_ov031_02116fa0 kind:bss addr:0x02116fa0 -sActorProfileUnkMLCK kind:bss addr:0x02116fac -data_ov031_02116fe8 kind:bss addr:0x02116fe8 -data_ov031_02116fec kind:bss addr:0x02116fec -sActorProfileUnkCLLT kind:bss addr:0x02116ff8 -data_ov031_02117034 kind:bss addr:0x02117034 -data_ov031_02117038 kind:bss addr:0x02117038 -sActorProfileUnkEFSB kind:bss addr:0x02117044 -data_ov031_0211711c kind:bss addr:0x0211711c -data_ov031_02117120 kind:bss addr:0x02117120 -sActorProfileUnkNFSP kind:bss addr:0x0211712c +_ZGVN15ProfileInstanceI19ActorProfileUnkSPDRE8sProfileE kind:bss addr:0x02116e94 +@10914 kind:bss addr:0x02116ea0 +_ZN15ProfileInstanceI19ActorProfileUnkSPDRE8sProfileE kind:bss addr:0x02116eac +_ZN15ProfileInstanceI19ActorProfileUnkSPTRE8sProfileE kind:bss addr:0x02116ee8 +_ZN15ProfileInstanceI19ActorProfileUnkSPARE8sProfileE kind:bss addr:0x02116f24 +_ZN15ProfileInstanceI19ActorProfileUnkSPBME8sProfileE kind:bss addr:0x02116f60 +_ZGVN15ProfileInstanceI19ActorProfileUnkMLCKE8sProfileE kind:bss addr:0x02116f9c +@10920 kind:bss addr:0x02116fa0 +_ZN15ProfileInstanceI19ActorProfileUnkMLCKE8sProfileE kind:bss addr:0x02116fac +_ZGVN15ProfileInstanceI19ActorProfileUnkCLLTE8sProfileE kind:bss addr:0x02116fe8 +@10926 kind:bss addr:0x02116fec +_ZN15ProfileInstanceI19ActorProfileUnkCLLTE8sProfileE kind:bss addr:0x02116ff8 +_ZGVN15ProfileInstanceI19ActorProfileUnkEFSBE8sProfileE kind:bss addr:0x02117034 +@10932 kind:bss addr:0x02117038 +_ZN15ProfileInstanceI19ActorProfileUnkEFSBE8sProfileE kind:bss addr:0x02117044 +_ZGVN15ProfileInstanceI19ActorProfileUnkNFSPE8sProfileE kind:bss addr:0x0211711c +@10938 kind:bss addr:0x02117120 +_ZN15ProfileInstanceI19ActorProfileUnkNFSPE8sProfileE kind:bss addr:0x0211712c data_ov031_02117204 kind:bss addr:0x02117204 data_ov031_02117210 kind:bss addr:0x02117210 data_ov031_02117234 kind:bss addr:0x02117234 data_ov031_02117258 kind:bss addr:0x02117258 -data_ov031_0211727c kind:bss addr:0x0211727c -data_ov031_02117280 kind:bss addr:0x02117280 -sMapObjectProfileUnkDRDS kind:bss addr:0x0211728c -data_ov031_02117360 kind:bss addr:0x02117360 -data_ov031_02117364 kind:bss addr:0x02117364 -sMapObjectProfileUnkDRKY kind:bss addr:0x02117370 -data_ov031_02117444 kind:bss addr:0x02117444 -data_ov031_02117448 kind:bss addr:0x02117448 -sMapObjectProfileUnkDRSW kind:bss addr:0x02117454 -data_ov031_02117528 kind:bss addr:0x02117528 -data_ov031_0211752c kind:bss addr:0x0211752c -sMapObjectProfileUnkDRCK kind:bss addr:0x02117538 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkDRDSE8sProfileE kind:bss addr:0x0211727c +@10933 kind:bss addr:0x02117280 +_ZN15ProfileInstanceI23MapObjectProfileUnkDRDSE8sProfileE kind:bss addr:0x0211728c +_ZGVN15ProfileInstanceI23MapObjectProfileUnkDRKYE8sProfileE kind:bss addr:0x02117360 +@10939 kind:bss addr:0x02117364 +_ZN15ProfileInstanceI23MapObjectProfileUnkDRKYE8sProfileE kind:bss addr:0x02117370 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkDRSWE8sProfileE kind:bss addr:0x02117444 +@10945 kind:bss addr:0x02117448 +_ZN15ProfileInstanceI23MapObjectProfileUnkDRSWE8sProfileE kind:bss addr:0x02117454 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkDRCKE8sProfileE kind:bss addr:0x02117528 +@10951 kind:bss addr:0x0211752c +_ZN15ProfileInstanceI23MapObjectProfileUnkDRCKE8sProfileE kind:bss addr:0x02117538 data_ov031_02117558 kind:bss addr:0x02117558 -data_ov031_021175a0 kind:bss addr:0x021175a0 -data_ov031_021175a4 kind:bss addr:0x021175a4 -sMapObjectProfileUnkDRTC kind:bss addr:0x021175b0 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkDRTCE8sProfileE kind:bss addr:0x021175a0 +@10957 kind:bss addr:0x021175a4 +_ZN15ProfileInstanceI23MapObjectProfileUnkDRTCE8sProfileE kind:bss addr:0x021175b0 data_ov031_021175d0 kind:bss addr:0x021175d0 -data_ov031_02117618 kind:bss addr:0x02117618 -data_ov031_0211761c kind:bss addr:0x0211761c -sMapObjectProfileUnkEXIT kind:bss addr:0x02117628 -data_ov031_021176fc kind:bss addr:0x021176fc -data_ov031_02117700 kind:bss addr:0x02117700 -sMapObjectProfileUnkGATE kind:bss addr:0x0211770c +_ZGVN15ProfileInstanceI23MapObjectProfileUnkEXITE8sProfileE kind:bss addr:0x02117618 +@10963 kind:bss addr:0x0211761c +_ZN15ProfileInstanceI23MapObjectProfileUnkEXITE8sProfileE kind:bss addr:0x02117628 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkGATEE8sProfileE kind:bss addr:0x021176fc +@10969 kind:bss addr:0x02117700 +_ZN15ProfileInstanceI23MapObjectProfileUnkGATEE8sProfileE kind:bss addr:0x0211770c data_ov031_0211772c kind:bss addr:0x0211772c -data_ov031_02117774 kind:bss addr:0x02117774 -data_ov031_02117778 kind:bss addr:0x02117778 -sMapObjectProfileUnkSTIR kind:bss addr:0x02117784 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkSTIRE8sProfileE kind:bss addr:0x02117774 +@10975 kind:bss addr:0x02117778 +_ZN15ProfileInstanceI23MapObjectProfileUnkSTIRE8sProfileE kind:bss addr:0x02117784 data_ov031_02117858 kind:bss addr:0x02117858 data_ov031_0211785c kind:bss addr:0x0211785c -data_ov031_02117868 kind:bss addr:0x02117868 -data_ov031_02117874 kind:bss addr:0x02117874 -sMapObjectProfileUnkGRSS kind:bss addr:0x021178c4 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkGRSSE8sProfileE kind:bss addr:0x02117868 +@10981 kind:bss addr:0x02117874 +_ZN15ProfileInstanceI23MapObjectProfileUnkGRSSE8sProfileE kind:bss addr:0x021178c4 data_ov031_02117998 kind:bss addr:0x02117998 -data_ov031_021179b8 kind:bss addr:0x021179b8 -data_ov031_021179bc kind:bss addr:0x021179bc -sMapObjectProfileUnkSWHT kind:bss addr:0x021179c8 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkSWHTE8sProfileE kind:bss addr:0x021179b8 +@10987 kind:bss addr:0x021179bc +_ZN15ProfileInstanceI23MapObjectProfileUnkSWHTE8sProfileE kind:bss addr:0x021179c8 data_ov031_021179e8 kind:bss addr:0x021179e8 data_ov031_02117a9c kind:bss addr:0x02117a9c -data_ov031_02117abc kind:bss addr:0x02117abc -data_ov031_02117ac0 kind:bss addr:0x02117ac0 -sMapObjectProfileUnkBMFL kind:bss addr:0x02117acc -data_ov031_02117ba0 kind:bss addr:0x02117ba0 -data_ov031_02117ba4 kind:bss addr:0x02117ba4 -sMapObjectProfileUnkTRES kind:bss addr:0x02117bb0 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkBMFLE8sProfileE kind:bss addr:0x02117abc +@10993 kind:bss addr:0x02117ac0 +_ZN15ProfileInstanceI23MapObjectProfileUnkBMFLE8sProfileE kind:bss addr:0x02117acc +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRESE8sProfileE kind:bss addr:0x02117ba0 +@10999 kind:bss addr:0x02117ba4 +_ZN15ProfileInstanceI23MapObjectProfileUnkTRESE8sProfileE kind:bss addr:0x02117bb0 data_ov031_02117c84 kind:bss addr:0x02117c84 -data_ov031_02117cfc kind:bss addr:0x02117cfc -data_ov031_02117d00 kind:bss addr:0x02117d00 -sMapObjectProfileUnkTRED kind:bss addr:0x02117d0c -data_ov031_02117d30 kind:bss addr:0x02117d30 -data_ov031_02117d34 kind:bss addr:0x02117d34 -sMapObjectProfileUnkTREW kind:bss addr:0x02117d40 -data_ov031_02117d64 kind:bss addr:0x02117d64 -data_ov031_02117d68 kind:bss addr:0x02117d68 -sMapObjectProfileUnkTREN kind:bss addr:0x02117d74 -data_ov031_02117e48 kind:bss addr:0x02117e48 -data_ov031_02117e4c kind:bss addr:0x02117e4c -sMapObjectProfileUnkTRWS kind:bss addr:0x02117e58 -data_ov031_02117f2c kind:bss addr:0x02117f2c -data_ov031_02117f30 kind:bss addr:0x02117f30 -sMapObjectProfileUnkTSUB kind:bss addr:0x02117f3c +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTREDE8sProfileE kind:bss addr:0x02117cfc +@11005 kind:bss addr:0x02117d00 +_ZN15ProfileInstanceI23MapObjectProfileUnkTREDE8sProfileE kind:bss addr:0x02117d0c +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTREWE8sProfileE kind:bss addr:0x02117d30 +@11011 kind:bss addr:0x02117d34 +_ZN15ProfileInstanceI23MapObjectProfileUnkTREWE8sProfileE kind:bss addr:0x02117d40 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRENE8sProfileE kind:bss addr:0x02117d64 +@11017 kind:bss addr:0x02117d68 +_ZN15ProfileInstanceI23MapObjectProfileUnkTRENE8sProfileE kind:bss addr:0x02117d74 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRWSE8sProfileE kind:bss addr:0x02117e48 +@11023 kind:bss addr:0x02117e4c +_ZN15ProfileInstanceI23MapObjectProfileUnkTRWSE8sProfileE kind:bss addr:0x02117e58 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTSUBE8sProfileE kind:bss addr:0x02117f2c +@11029 kind:bss addr:0x02117f30 +_ZN15ProfileInstanceI23MapObjectProfileUnkTSUBE8sProfileE kind:bss addr:0x02117f3c data_ov031_02118010 kind:bss addr:0x02118010 -data_ov031_02118030 kind:bss addr:0x02118030 -data_ov031_02118034 kind:bss addr:0x02118034 -sMapObjectProfileUnkSKBN kind:bss addr:0x02118040 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkSKBNE8sProfileE kind:bss addr:0x02118030 +@11035 kind:bss addr:0x02118034 +_ZN15ProfileInstanceI23MapObjectProfileUnkSKBNE8sProfileE kind:bss addr:0x02118040 data_ov031_02118114 kind:bss addr:0x02118114 -data_ov031_02118138 kind:bss addr:0x02118138 -data_ov031_0211813c kind:bss addr:0x0211813c -sMapObjectProfileUnkITFL kind:bss addr:0x02118148 -data_ov031_0211821c kind:bss addr:0x0211821c -data_ov031_02118220 kind:bss addr:0x02118220 -sMapObjectProfileUnkSKDI kind:bss addr:0x0211822c -data_ov031_02118300 kind:bss addr:0x02118300 -data_ov031_02118304 kind:bss addr:0x02118304 -sActorProfileUnkSKDO kind:bss addr:0x02118310 -data_ov031_0211834c kind:bss addr:0x0211834c -data_ov031_02118350 kind:bss addr:0x02118350 -sMapObjectProfileUnkCRWL kind:bss addr:0x0211835c +_ZGVN15ProfileInstanceI23MapObjectProfileUnkITFLE8sProfileE kind:bss addr:0x02118138 +@11041 kind:bss addr:0x0211813c +_ZN15ProfileInstanceI23MapObjectProfileUnkITFLE8sProfileE kind:bss addr:0x02118148 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkSKDIE8sProfileE kind:bss addr:0x0211821c +@11047 kind:bss addr:0x02118220 +_ZN15ProfileInstanceI23MapObjectProfileUnkSKDIE8sProfileE kind:bss addr:0x0211822c +_ZGVN15ProfileInstanceI19ActorProfileUnkSKDOE8sProfileE kind:bss addr:0x02118300 +@11064 kind:bss addr:0x02118304 +_ZN15ProfileInstanceI19ActorProfileUnkSKDOE8sProfileE kind:bss addr:0x02118310 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkCRWLE8sProfileE kind:bss addr:0x0211834c +@11059 kind:bss addr:0x02118350 +_ZN15ProfileInstanceI23MapObjectProfileUnkCRWLE8sProfileE kind:bss addr:0x0211835c data_ov031_0211837c kind:bss addr:0x0211837c data_ov031_021183c4 kind:bss addr:0x021183c4 data_ov031_021183c8 kind:bss addr:0x021183c8 -data_ov031_021183d4 kind:bss addr:0x021183d4 -data_ov031_021183e0 kind:bss addr:0x021183e0 -sMapObjectProfileUnkBREX kind:bss addr:0x021183ec +_ZGVN15ProfileInstanceI23MapObjectProfileUnkBREXE8sProfileE kind:bss addr:0x021183d4 +@11065 kind:bss addr:0x021183e0 +_ZN15ProfileInstanceI23MapObjectProfileUnkBREXE8sProfileE kind:bss addr:0x021183ec data_ov031_021184c0 kind:bss addr:0x021184c0 data_ov031_021184c4 kind:bss addr:0x021184c4 -data_ov031_021184d0 kind:bss addr:0x021184d0 -data_ov031_021184dc kind:bss addr:0x021184dc -sMapObjectProfileUnkTATZ kind:bss addr:0x021184e8 -data_ov031_021185e0 kind:bss addr:0x021185e0 -data_ov031_021185e4 kind:bss addr:0x021185e4 -sMapObjectProfileUnkSTSP kind:bss addr:0x021185f0 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTATZE8sProfileE kind:bss addr:0x021184d0 +@11071 kind:bss addr:0x021184dc +_ZN15ProfileInstanceI23MapObjectProfileUnkTATZE8sProfileE kind:bss addr:0x021184e8 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkSTSPE8sProfileE kind:bss addr:0x021185e0 +@11077 kind:bss addr:0x021185e4 +_ZN15ProfileInstanceI23MapObjectProfileUnkSTSPE8sProfileE kind:bss addr:0x021185f0 data_ov031_021186c4 kind:bss addr:0x021186c4 -data_ov031_021186c8 kind:bss addr:0x021186c8 -data_ov031_021186d4 kind:bss addr:0x021186d4 -sMapObjectProfileUnkBLCC kind:bss addr:0x021186e0 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkBLCCE8sProfileE kind:bss addr:0x021186c8 +@11083 kind:bss addr:0x021186d4 +_ZN15ProfileInstanceI23MapObjectProfileUnkBLCCE8sProfileE kind:bss addr:0x021186e0 data_ov031_021187b4 kind:bss addr:0x021187b4 -data_ov031_021187d8 kind:bss addr:0x021187d8 -data_ov031_021187dc kind:bss addr:0x021187dc -sMapObjectProfileUnkRLSG kind:bss addr:0x021187e8 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkRLSGE8sProfileE kind:bss addr:0x021187d8 +@11089 kind:bss addr:0x021187dc +_ZN15ProfileInstanceI23MapObjectProfileUnkRLSGE8sProfileE kind:bss addr:0x021187e8 data_ov031_021188bc kind:bss addr:0x021188bc data_ov031_021188e0 kind:bss addr:0x021188e0 data_ov031_021188e8 kind:bss addr:0x021188e8 data_ov031_021188f4 kind:bss addr:0x021188f4 -data_ov031_02118900 kind:bss addr:0x02118900 -data_ov031_02118918 kind:bss addr:0x02118918 -sMapObjectProfileUnkSAND kind:bss addr:0x021189d0 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkSANDE8sProfileE kind:bss addr:0x02118900 +@11095 kind:bss addr:0x02118918 +_ZN15ProfileInstanceI23MapObjectProfileUnkSANDE8sProfileE kind:bss addr:0x021189d0 data_ov031_02118aa4 kind:bss addr:0x02118aa4 data_ov031_02118ac8 kind:bss addr:0x02118ac8 data_ov031_02118aec kind:bss addr:0x02118aec data_ov031_02118b10 kind:bss addr:0x02118b10 -data_ov031_02118c90 kind:bss addr:0x02118c90 -data_ov031_02118c98 kind:bss addr:0x02118c98 -sMapObjectProfileUnkSPTB kind:bss addr:0x02118ca4 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkSPTBE8sProfileE kind:bss addr:0x02118c90 +@11101 kind:bss addr:0x02118c98 +_ZN15ProfileInstanceI23MapObjectProfileUnkSPTBE8sProfileE kind:bss addr:0x02118ca4 data_ov031_02118d78 kind:bss addr:0x02118d78 -data_ov031_02118d98 kind:bss addr:0x02118d98 -data_ov031_02118d9c kind:bss addr:0x02118d9c -sMapObjectProfileUnkGSST kind:bss addr:0x02118da8 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkGSSTE8sProfileE kind:bss addr:0x02118d98 +@11107 kind:bss addr:0x02118d9c +_ZN15ProfileInstanceI23MapObjectProfileUnkGSSTE8sProfileE kind:bss addr:0x02118da8 data_ov031_02118dc8 kind:bss addr:0x02118dc8 data_ov031_02118e7c kind:bss addr:0x02118e7c -data_ov031_02118e9c kind:bss addr:0x02118e9c -data_ov031_02118ea0 kind:bss addr:0x02118ea0 -sMapObjectProfileUnkSWFS kind:bss addr:0x02118eac +_ZGVN15ProfileInstanceI23MapObjectProfileUnkSWFSE8sProfileE kind:bss addr:0x02118e9c +@11113 kind:bss addr:0x02118ea0 +_ZN15ProfileInstanceI23MapObjectProfileUnkSWFSE8sProfileE kind:bss addr:0x02118eac data_ov031_02118ecc kind:bss addr:0x02118ecc data_ov031_02118f80 kind:bss addr:0x02118f80 data_ov031_02118fa4 kind:bss addr:0x02118fa4 diff --git a/config/eur/arm9/overlays/ov032/delinks.txt b/config/eur/arm9/overlays/ov032/delinks.txt index 19714ce2..4a7fb5b3 100644 --- a/config/eur/arm9/overlays/ov032/delinks.txt +++ b/config/eur/arm9/overlays/ov032/delinks.txt @@ -9,28 +9,28 @@ src/032_MapA1/Actor/ActorUnkKURI.cpp: .text start:0x02118fc0 end:0x0211b6cc .init start:0x02121f34 end:0x02121fa0 .ctor start:0x0212212c end:0x02122130 - .bss start:0x02122830 end:0x02122908 + .bss start:0x02122820 end:0x02122918 src/032_MapA1/Actor/ActorUnkMKUR.cpp: .text start:0x0211b6cc end:0x0211db40 .init start:0x02121fa0 end:0x02122020 .ctor start:0x02122130 end:0x02122134 - .bss start:0x02122930 end:0x02122974 + .bss start:0x02122918 end:0x02122974 src/032_MapA1/Actor/ActorUnkKETH.cpp: .text start:0x0211db40 end:0x0211fd80 .init start:0x02122020 end:0x0212208c .ctor start:0x02122134 end:0x02122138 - .bss start:0x02122984 end:0x02122a5c + .bss start:0x02122974 end:0x02122a5c src/032_MapA1/Actor/ActorUnkNSSW.cpp: .text start:0x0211fd80 end:0x02120e90 .init start:0x0212208c end:0x021220dc .ctor start:0x02122138 end:0x0212213c - .bss start:0x02122a6c end:0x02122aa8 + .bss start:0x02122a5c end:0x02122aa8 src/032_MapA1/MapObject/MapObjectUnkSWSW.cpp: .text start:0x02120e90 end:0x02121ed0 .init start:0x021220dc end:0x0212212c .ctor start:0x0212213c end:0x02122140 - .bss start:0x02122ab8 end:0x02122ad8 + .bss start:0x02122aa8 end:0x02122ad8 diff --git a/config/eur/arm9/overlays/ov032/symbols.txt b/config/eur/arm9/overlays/ov032/symbols.txt index 69513663..0066c280 100644 --- a/config/eur/arm9/overlays/ov032/symbols.txt +++ b/config/eur/arm9/overlays/ov032/symbols.txt @@ -272,22 +272,22 @@ data_ov032_02122784 kind:data(any) addr:0x02122784 data_ov032_021227ac kind:data(any) addr:0x021227ac data_ov032_021227d8 kind:data(any) addr:0x021227d8 data_ov032_02122810 kind:data(any) addr:0x02122810 ambiguous -data_ov032_02122820 kind:bss addr:0x02122820 -data_ov032_02122824 kind:bss addr:0x02122824 -sActorProfileUnkKURI kind:bss addr:0x02122830 +_ZGVN15ProfileInstanceI19ActorProfileUnkKURIE8sProfileE kind:bss addr:0x02122820 +@11136 kind:bss addr:0x02122824 +_ZN15ProfileInstanceI19ActorProfileUnkKURIE8sProfileE kind:bss addr:0x02122830 data_ov032_02122908 kind:bss addr:0x02122908 data_ov032_0212290c kind:bss addr:0x0212290c -data_ov032_02122918 kind:bss addr:0x02122918 -data_ov032_02122924 kind:bss addr:0x02122924 -sActorProfileUnkMKUR kind:bss addr:0x02122930 -data_ov032_02122974 kind:bss addr:0x02122974 -data_ov032_02122978 kind:bss addr:0x02122978 -sActorProfileUnkKETH kind:bss addr:0x02122984 -data_ov032_02122a5c kind:bss addr:0x02122a5c -data_ov032_02122a60 kind:bss addr:0x02122a60 -sActorProfileUnkNSSW kind:bss addr:0x02122a6c -data_ov032_02122aa8 kind:bss addr:0x02122aa8 -data_ov032_02122aac kind:bss addr:0x02122aac -sMapObjectProfileUnkSWSW kind:bss addr:0x02122ab8 +_ZGVN15ProfileInstanceI19ActorProfileUnkMKURE8sProfileE kind:bss addr:0x02122918 +@11142 kind:bss addr:0x02122924 +_ZN15ProfileInstanceI19ActorProfileUnkMKURE8sProfileE kind:bss addr:0x02122930 +_ZGVN15ProfileInstanceI19ActorProfileUnkKETHE8sProfileE kind:bss addr:0x02122974 +@11148 kind:bss addr:0x02122978 +_ZN15ProfileInstanceI19ActorProfileUnkKETHE8sProfileE kind:bss addr:0x02122984 +_ZGVN15ProfileInstanceI19ActorProfileUnkNSSWE8sProfileE kind:bss addr:0x02122a5c +@11154 kind:bss addr:0x02122a60 +_ZN15ProfileInstanceI19ActorProfileUnkNSSWE8sProfileE kind:bss addr:0x02122a6c +_ZGVN15ProfileInstanceI23MapObjectProfileUnkSWSWE8sProfileE kind:bss addr:0x02122aa8 +@11149 kind:bss addr:0x02122aac +_ZN15ProfileInstanceI23MapObjectProfileUnkSWSWE8sProfileE kind:bss addr:0x02122ab8 data_ov032_02122ad8 kind:bss addr:0x02122ad8 data_ov032_02122b8c kind:bss addr:0x02122b8c diff --git a/config/eur/arm9/overlays/ov033/delinks.txt b/config/eur/arm9/overlays/ov033/delinks.txt index b125281f..a2bd6168 100644 --- a/config/eur/arm9/overlays/ov033/delinks.txt +++ b/config/eur/arm9/overlays/ov033/delinks.txt @@ -9,16 +9,16 @@ src/033_MapA2/Actor/ActorUnkRCFO.cpp: .text start:0x02119348 end:0x02119d80 .init start:0x0212103c end:0x0212108c .ctor start:0x0212114c end:0x02121150 - .bss start:0x02121c74 end:0x02121cb0 + .bss start:0x02121c64 end:0x02121cb4 src/033_MapA2/MapObject/MapObjectUnkDOPA.cpp: .text start:0x02119d80 end:0x0211b724 .init start:0x0212108c end:0x021210fc .ctor start:0x02121150 end:0x02121154 - .bss start:0x02121ccc end:0x02121da0 + .bss start:0x02121cb4 end:0x02122640 src/033_MapA2/MapObject/MapObjectUnkRCFL.cpp: .text start:0x0211b784 end:0x0211be8c .init start:0x021210fc end:0x0212114c .ctor start:0x02121154 end:0x02121158 - .bss start:0x02122650 end:0x02122724 + .bss start:0x02122640 end:0x02122724 diff --git a/config/eur/arm9/overlays/ov033/symbols.txt b/config/eur/arm9/overlays/ov033/symbols.txt index 48c26159..8c41440c 100644 --- a/config/eur/arm9/overlays/ov033/symbols.txt +++ b/config/eur/arm9/overlays/ov033/symbols.txt @@ -317,21 +317,21 @@ data_ov033_0212184c kind:data(any) addr:0x0212184c data_ov033_02121868 kind:data(any) addr:0x02121868 data_ov033_021218c0 kind:bss addr:0x021218c0 data_ov033_021218c4 kind:bss addr:0x021218c4 -data_ov033_02121c64 kind:bss addr:0x02121c64 -data_ov033_02121c68 kind:bss addr:0x02121c68 -sActorProfileUnkRCFO kind:bss addr:0x02121c74 +_ZGVN15ProfileInstanceI19ActorProfileUnkRCFOE8sProfileE kind:bss addr:0x02121c64 +@11172 kind:bss addr:0x02121c68 +_ZN15ProfileInstanceI19ActorProfileUnkRCFOE8sProfileE kind:bss addr:0x02121c74 data_ov033_02121cb0 kind:bss addr:0x02121cb0 -data_ov033_02121cb4 kind:bss addr:0x02121cb4 -data_ov033_02121cc0 kind:bss addr:0x02121cc0 -sMapObjectProfileUnkDOPA kind:bss addr:0x02121ccc +_ZGVN15ProfileInstanceI23MapObjectProfileUnkDOPAE8sProfileE kind:bss addr:0x02121cb4 +@11167 kind:bss addr:0x02121cc0 +_ZN15ProfileInstanceI23MapObjectProfileUnkDOPAE8sProfileE kind:bss addr:0x02121ccc data_ov033_02121da0 kind:bss addr:0x02121da0 data_ov033_02121dc4 kind:bss addr:0x02121dc4 data_ov033_02121ed4 kind:bss addr:0x02121ed4 ambiguous data_ov033_021220fc kind:bss addr:0x021220fc ambiguous data_ov033_021223f1 kind:bss addr:0x021223f1 ambiguous data_ov033_021225a8 kind:bss addr:0x021225a8 ambiguous -data_ov033_02122640 kind:bss addr:0x02122640 -data_ov033_02122644 kind:bss addr:0x02122644 -sMapObjectProfileUnkRCFL kind:bss addr:0x02122650 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkRCFLE8sProfileE kind:bss addr:0x02122640 +@11173 kind:bss addr:0x02122644 +_ZN15ProfileInstanceI23MapObjectProfileUnkRCFLE8sProfileE kind:bss addr:0x02122650 data_ov033_02122724 kind:bss addr:0x02122724 data_ov033_02122748 kind:bss addr:0x02122748 diff --git a/config/eur/arm9/overlays/ov034/delinks.txt b/config/eur/arm9/overlays/ov034/delinks.txt index a81e077f..ec082ee6 100644 --- a/config/eur/arm9/overlays/ov034/delinks.txt +++ b/config/eur/arm9/overlays/ov034/delinks.txt @@ -9,46 +9,46 @@ src/034_MapA3/Actor/ActorUnkRMM1.cpp: .text start:0x02118fc0 end:0x02119324 .init start:0x021224ec end:0x0212253c .ctor start:0x021227cc end:0x021227d0 - .bss start:0x02122e70 end:0x02122ebc + .bss start:0x02122e60 end:0x02122f48 src/034_MapA3/Actor/ActorUnkBSFC.cpp: .text start:0x02119324 end:0x02119ea4 .init start:0x0212253c end:0x0212258c .ctor start:0x021227d0 end:0x021227d4 - .bss start:0x02122f58 end:0x02122f94 + .bss start:0x02122f48 end:0x02123030 src/034_MapA3/Actor/ActorUnkFCHL.cpp: .text start:0x02119ea4 end:0x0211a2d4 .init start:0x0212258c end:0x021225dc .ctor start:0x021227d4 end:0x021227d8 - .bss start:0x02123040 end:0x02123118 + .bss start:0x02123030 end:0x02123118 src/034_MapA3/Actor/ActorUnkTRLY.cpp: .text start:0x0211a31c end:0x0211e300 .init start:0x021225dc end:0x0212264c .ctor start:0x021227d8 end:0x021227dc - .bss start:0x02123128 end:0x02123200 + .bss start:0x02123118 end:0x02123200 src/034_MapA3/Actor/ActorUnkTRRL.cpp: .text start:0x0211e300 end:0x02120d80 .init start:0x0212264c end:0x0212269c .ctor start:0x021227dc end:0x021227e0 - .bss start:0x02123214 end:0x02123308 + .bss start:0x02123200 end:0x02123308 src/034_MapA3/MapObject/MapObjectUnkTRSW.cpp: .text start:0x02120d80 end:0x0212169c .init start:0x0212269c end:0x021226ec .ctor start:0x021227e0 end:0x021227e4 - .bss start:0x02123318 end:0x02123338 + .bss start:0x02123308 end:0x02123410 src/034_MapA3/MapObject/MapObjectUnkWPHL.cpp: .text start:0x0212171c end:0x02121ed4 .init start:0x021226ec end:0x02122748 .ctor start:0x021227e4 end:0x021227e8 - .bss start:0x02123428 end:0x02123448 + .bss start:0x02123410 end:0x02123448 src/034_MapA3/MapObject/MapObjectUnkGELG.cpp: .text start:0x02121ed4 end:0x021223d4 .init start:0x02122748 end:0x021227cc .ctor start:0x021227e8 end:0x021227ec - .bss start:0x02123458 end:0x02123478 + .bss start:0x02123448 end:0x02123478 diff --git a/config/eur/arm9/overlays/ov034/symbols.txt b/config/eur/arm9/overlays/ov034/symbols.txt index 192a7a47..b5b5ec59 100644 --- a/config/eur/arm9/overlays/ov034/symbols.txt +++ b/config/eur/arm9/overlays/ov034/symbols.txt @@ -288,34 +288,34 @@ data_ov034_02122d8c kind:data(any) addr:0x02122d8c data_ov034_02122dc4 kind:data(any) addr:0x02122dc4 data_ov034_02122de0 kind:data(any) addr:0x02122de0 data_ov034_02122e08 kind:data(any) addr:0x02122e08 -data_ov034_02122e60 kind:bss addr:0x02122e60 -data_ov034_02122e64 kind:bss addr:0x02122e64 -sActorProfileUnkRMM1 kind:bss addr:0x02122e70 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMM1E8sProfileE kind:bss addr:0x02122e60 +@11196 kind:bss addr:0x02122e64 +_ZN15ProfileInstanceI19ActorProfileUnkRMM1E8sProfileE kind:bss addr:0x02122e70 data_ov034_02122ebc kind:bss addr:0x02122ebc ambiguous -data_ov034_02122f48 kind:bss addr:0x02122f48 -data_ov034_02122f4c kind:bss addr:0x02122f4c -sActorProfileUnkBSFC kind:bss addr:0x02122f58 +_ZGVN15ProfileInstanceI19ActorProfileUnkBSFCE8sProfileE kind:bss addr:0x02122f48 +@11202 kind:bss addr:0x02122f4c +_ZN15ProfileInstanceI19ActorProfileUnkBSFCE8sProfileE kind:bss addr:0x02122f58 data_ov034_02122f94 kind:bss addr:0x02122f94 ambiguous data_ov034_02122ff8 kind:bss addr:0x02122ff8 ambiguous -data_ov034_02123030 kind:bss addr:0x02123030 -data_ov034_02123034 kind:bss addr:0x02123034 -sActorProfileUnkFCHL kind:bss addr:0x02123040 -data_ov034_02123118 kind:bss addr:0x02123118 -data_ov034_0212311c kind:bss addr:0x0212311c -sActorProfileUnkTRLY kind:bss addr:0x02123128 -data_ov034_02123200 kind:bss addr:0x02123200 -data_ov034_02123208 kind:bss addr:0x02123208 -sActorProfileUnkTRRL kind:bss addr:0x02123214 -data_ov034_02123308 kind:bss addr:0x02123308 -data_ov034_0212330c kind:bss addr:0x0212330c -sMapObjectProfileUnkTRSW kind:bss addr:0x02123318 +_ZGVN15ProfileInstanceI19ActorProfileUnkFCHLE8sProfileE kind:bss addr:0x02123030 +@11208 kind:bss addr:0x02123034 +_ZN15ProfileInstanceI19ActorProfileUnkFCHLE8sProfileE kind:bss addr:0x02123040 +_ZGVN15ProfileInstanceI19ActorProfileUnkTRLYE8sProfileE kind:bss addr:0x02123118 +@11214 kind:bss addr:0x0212311c +_ZN15ProfileInstanceI19ActorProfileUnkTRLYE8sProfileE kind:bss addr:0x02123128 +_ZGVN15ProfileInstanceI19ActorProfileUnkTRRLE8sProfileE kind:bss addr:0x02123200 +@11220 kind:bss addr:0x02123208 +_ZN15ProfileInstanceI19ActorProfileUnkTRRLE8sProfileE kind:bss addr:0x02123214 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRSWE8sProfileE kind:bss addr:0x02123308 +@11215 kind:bss addr:0x0212330c +_ZN15ProfileInstanceI23MapObjectProfileUnkTRSWE8sProfileE kind:bss addr:0x02123318 data_ov034_02123338 kind:bss addr:0x02123338 data_ov034_021233ec kind:bss addr:0x021233ec data_ov034_0212340c kind:bss addr:0x0212340c -data_ov034_02123410 kind:bss addr:0x02123410 -data_ov034_0212341c kind:bss addr:0x0212341c -sMapObjectProfileUnkWPHL kind:bss addr:0x02123428 -data_ov034_02123448 kind:bss addr:0x02123448 -data_ov034_0212344c kind:bss addr:0x0212344c -sMapObjectProfileUnkGELG kind:bss addr:0x02123458 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkWPHLE8sProfileE kind:bss addr:0x02123410 +@11221 kind:bss addr:0x0212341c +_ZN15ProfileInstanceI23MapObjectProfileUnkWPHLE8sProfileE kind:bss addr:0x02123428 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkGELGE8sProfileE kind:bss addr:0x02123448 +@11227 kind:bss addr:0x0212344c +_ZN15ProfileInstanceI23MapObjectProfileUnkGELGE8sProfileE kind:bss addr:0x02123458 data_ov034_02123478 kind:bss addr:0x02123478 diff --git a/config/eur/arm9/overlays/ov035/delinks.txt b/config/eur/arm9/overlays/ov035/delinks.txt index 7b902139..b756907c 100644 --- a/config/eur/arm9/overlays/ov035/delinks.txt +++ b/config/eur/arm9/overlays/ov035/delinks.txt @@ -9,22 +9,22 @@ src/035_MapA4/Actor/ActorUnkFIMA.cpp: .text start:0x02118fc0 end:0x0211aa68 .init start:0x02120f9c end:0x02120fec .ctor start:0x02121180 end:0x02121184 - .bss start:0x02121b10 end:0x02121be8 + .bss start:0x02121b00 end:0x02121bf0 src/035_MapA4/Actor/ActorUnkFMAS_FMLS.cpp: .text start:0x0211aa68 end:0x0211bb30 .init start:0x02120fec end:0x021210c8 .ctor start:0x02121184 end:0x02121188 - .bss start:0x02121c08 end:0x02121db8 + .bss start:0x02121bf0 end:0x02121dc4 src/035_MapA4/Actor/ActorUnkFIML.cpp: .text start:0x0211bbbc end:0x0211e4a4 .init start:0x021210c8 end:0x02121130 .ctor start:0x02121188 end:0x0212118c - .bss start:0x02121ddc end:0x02121eb4 + .bss start:0x02121dc4 end:0x02121eb4 src/035_MapA4/Actor/ActorUnkFIFI.cpp: .text start:0x0211e4a4 end:0x0211e910 .init start:0x02121130 end:0x02121180 .ctor start:0x0212118c end:0x02121190 - .bss start:0x02121ec4 end:0x02121f00 + .bss start:0x02121eb4 end:0x02121f00 diff --git a/config/eur/arm9/overlays/ov035/symbols.txt b/config/eur/arm9/overlays/ov035/symbols.txt index 52d88889..b668e8b7 100644 --- a/config/eur/arm9/overlays/ov035/symbols.txt +++ b/config/eur/arm9/overlays/ov035/symbols.txt @@ -255,19 +255,19 @@ data_ov035_02121a80 kind:data(any) addr:0x02121a80 data_ov035_02121ab0 kind:data(any) addr:0x02121ab0 data_ov035_02121ac8 kind:data(any) addr:0x02121ac8 data_ov035_02121ae0 kind:data(any) addr:0x02121ae0 -data_ov035_02121b00 kind:bss addr:0x02121b00 -data_ov035_02121b04 kind:bss addr:0x02121b04 -sActorProfileUnkFIMA kind:bss addr:0x02121b10 +_ZGVN15ProfileInstanceI19ActorProfileUnkFIMAE8sProfileE kind:bss addr:0x02121b00 +@11250 kind:bss addr:0x02121b04 +_ZN15ProfileInstanceI19ActorProfileUnkFIMAE8sProfileE kind:bss addr:0x02121b10 data_ov035_02121be8 kind:bss addr:0x02121be8 -data_ov035_02121bf0 kind:bss addr:0x02121bf0 -data_ov035_02121bfc kind:bss addr:0x02121bfc -sActorProfileUnkFMAS kind:bss addr:0x02121c08 -sActorProfileUnkFMLS kind:bss addr:0x02121ce0 +_ZGVN15ProfileInstanceI19ActorProfileUnkFMASE8sProfileE kind:bss addr:0x02121bf0 +@11256 kind:bss addr:0x02121bfc +_ZN15ProfileInstanceI19ActorProfileUnkFMASE8sProfileE kind:bss addr:0x02121c08 +_ZN15ProfileInstanceI19ActorProfileUnkFMLSE8sProfileE kind:bss addr:0x02121ce0 data_ov035_02121db8 kind:bss addr:0x02121db8 data_ov035_02121dbc kind:bss addr:0x02121dbc -data_ov035_02121dc4 kind:bss addr:0x02121dc4 -data_ov035_02121dd0 kind:bss addr:0x02121dd0 -sActorProfileUnkFIML kind:bss addr:0x02121ddc -data_ov035_02121eb4 kind:bss addr:0x02121eb4 -data_ov035_02121eb8 kind:bss addr:0x02121eb8 -sActorProfileUnkFIFI kind:bss addr:0x02121ec4 +_ZGVN15ProfileInstanceI19ActorProfileUnkFIMLE8sProfileE kind:bss addr:0x02121dc4 +@11262 kind:bss addr:0x02121dd0 +_ZN15ProfileInstanceI19ActorProfileUnkFIMLE8sProfileE kind:bss addr:0x02121ddc +_ZGVN15ProfileInstanceI19ActorProfileUnkFIFIE8sProfileE kind:bss addr:0x02121eb4 +@11268 kind:bss addr:0x02121eb8 +_ZN15ProfileInstanceI19ActorProfileUnkFIFIE8sProfileE kind:bss addr:0x02121ec4 diff --git a/config/eur/arm9/overlays/ov036/delinks.txt b/config/eur/arm9/overlays/ov036/delinks.txt index 07ccf30b..d27844ce 100644 --- a/config/eur/arm9/overlays/ov036/delinks.txt +++ b/config/eur/arm9/overlays/ov036/delinks.txt @@ -9,52 +9,52 @@ src/036_MapA5/Actor/ActorUnkCAMY.cpp: .text start:0x0211af7c end:0x0211b228 .init start:0x02120e70 end:0x02120ec0 .ctor start:0x02121140 end:0x02121144 - .bss start:0x02122774 end:0x02122810 + .bss start:0x02122764 end:0x0212284c src/036_MapA5/Actor/ActorUnkFOMY.cpp: .text start:0x0211b248 end:0x0211b500 .init start:0x02120ec0 end:0x02120f10 .ctor start:0x02121144 end:0x02121148 - .bss start:0x0212285c end:0x02122934 + .bss start:0x0212284c end:0x02122934 src/036_MapA5/Actor/ActorUnkYUKY.cpp: .text start:0x0211b520 end:0x0211b7ec .init start:0x02120f10 end:0x02120f60 .ctor start:0x02121148 end:0x0212114c - .bss start:0x02122944 end:0x02122a1c + .bss start:0x02122934 end:0x02122a1c src/036_MapA5/Actor/ActorUnkWAWY.cpp: .text start:0x0211b80c end:0x0211bab4 .init start:0x02120f60 end:0x02120fb0 .ctor start:0x0212114c end:0x02121150 - .bss start:0x02122a2c end:0x02122b04 + .bss start:0x02122a1c end:0x02122b04 src/036_MapA5/Actor/ActorUnkGORY.cpp: .text start:0x0211bad4 end:0x0211bdc0 .init start:0x02120fb0 end:0x02121000 .ctor start:0x02121150 end:0x02121154 - .bss start:0x02122b14 end:0x02122bec + .bss start:0x02122b04 end:0x02122bec src/036_MapA5/Actor/ActorUnkTERY.cpp: .text start:0x0211bde0 end:0x0211c184 .init start:0x02121000 end:0x02121050 .ctor start:0x02121154 end:0x02121158 - .bss start:0x02122bfc end:0x02122cd4 + .bss start:0x02122bec end:0x02122cd4 src/036_MapA5/Actor/ActorUnkSHIT.cpp: .text start:0x0211c1a4 end:0x0211d7b0 .init start:0x02121050 end:0x021210a0 .ctor start:0x02121158 end:0x0212115c - .bss start:0x02122ce4 end:0x02122dbc + .bss start:0x02122cd4 end:0x02122dbc src/036_MapA5/Actor/ActorUnkTEHT.cpp: .text start:0x0211d850 end:0x0211dd88 .init start:0x021210a0 end:0x021210f0 .ctor start:0x0212115c end:0x02121160 - .bss start:0x02122dd8 end:0x02122e14 + .bss start:0x02122dbc end:0x02122e14 src/036_MapA5/Actor/ActorUnkRMST.cpp: .text start:0x0211de28 end:0x0211df4c .init start:0x021210f0 end:0x02121140 .ctor start:0x02121160 end:0x02121164 - .bss start:0x02122e24 end:0x02122f00 + .bss start:0x02122e14 end:0x02122f00 diff --git a/config/eur/arm9/overlays/ov036/symbols.txt b/config/eur/arm9/overlays/ov036/symbols.txt index ee2fbaeb..5d20ed1a 100644 --- a/config/eur/arm9/overlays/ov036/symbols.txt +++ b/config/eur/arm9/overlays/ov036/symbols.txt @@ -442,31 +442,31 @@ data_ov036_0212273c kind:data(any) addr:0x0212273c data_ov036_02122748 kind:data(any) addr:0x02122748 data_ov036_02122754 kind:data(any) addr:0x02122754 data_ov036_02122760 kind:bss addr:0x02122760 -data_ov036_02122764 kind:bss addr:0x02122764 -data_ov036_02122768 kind:bss addr:0x02122768 -sActorProfileUnkCAMY kind:bss addr:0x02122774 +_ZGVN15ProfileInstanceI19ActorProfileUnkCAMYE8sProfileE kind:bss addr:0x02122764 +@11280 kind:bss addr:0x02122768 +_ZN15ProfileInstanceI19ActorProfileUnkCAMYE8sProfileE kind:bss addr:0x02122774 data_ov036_02122810 kind:bss addr:0x02122810 ambiguous -data_ov036_0212284c kind:bss addr:0x0212284c -data_ov036_02122850 kind:bss addr:0x02122850 -sActorProfileUnkFOMY kind:bss addr:0x0212285c -data_ov036_02122934 kind:bss addr:0x02122934 -data_ov036_02122938 kind:bss addr:0x02122938 -sActorProfileUnkYUKY kind:bss addr:0x02122944 -data_ov036_02122a1c kind:bss addr:0x02122a1c -data_ov036_02122a20 kind:bss addr:0x02122a20 -sActorProfileUnkWAWY kind:bss addr:0x02122a2c -data_ov036_02122b04 kind:bss addr:0x02122b04 -data_ov036_02122b08 kind:bss addr:0x02122b08 -sActorProfileUnkGORY kind:bss addr:0x02122b14 -data_ov036_02122bec kind:bss addr:0x02122bec -data_ov036_02122bf0 kind:bss addr:0x02122bf0 -sActorProfileUnkTERY kind:bss addr:0x02122bfc -data_ov036_02122cd4 kind:bss addr:0x02122cd4 -data_ov036_02122cd8 kind:bss addr:0x02122cd8 -sActorProfileUnkSHIT kind:bss addr:0x02122ce4 -data_ov036_02122dbc kind:bss addr:0x02122dbc -data_ov036_02122dcc kind:bss addr:0x02122dcc -sActorProfileUnkTEHT kind:bss addr:0x02122dd8 -data_ov036_02122e14 kind:bss addr:0x02122e14 -data_ov036_02122e18 kind:bss addr:0x02122e18 -sActorProfileUnkRMST kind:bss addr:0x02122e24 +_ZGVN15ProfileInstanceI19ActorProfileUnkFOMYE8sProfileE kind:bss addr:0x0212284c +@11286 kind:bss addr:0x02122850 +_ZN15ProfileInstanceI19ActorProfileUnkFOMYE8sProfileE kind:bss addr:0x0212285c +_ZGVN15ProfileInstanceI19ActorProfileUnkYUKYE8sProfileE kind:bss addr:0x02122934 +@11292 kind:bss addr:0x02122938 +_ZN15ProfileInstanceI19ActorProfileUnkYUKYE8sProfileE kind:bss addr:0x02122944 +_ZGVN15ProfileInstanceI19ActorProfileUnkWAWYE8sProfileE kind:bss addr:0x02122a1c +@11298 kind:bss addr:0x02122a20 +_ZN15ProfileInstanceI19ActorProfileUnkWAWYE8sProfileE kind:bss addr:0x02122a2c +_ZGVN15ProfileInstanceI19ActorProfileUnkGORYE8sProfileE kind:bss addr:0x02122b04 +@11304 kind:bss addr:0x02122b08 +_ZN15ProfileInstanceI19ActorProfileUnkGORYE8sProfileE kind:bss addr:0x02122b14 +_ZGVN15ProfileInstanceI19ActorProfileUnkTERYE8sProfileE kind:bss addr:0x02122bec +@11310 kind:bss addr:0x02122bf0 +_ZN15ProfileInstanceI19ActorProfileUnkTERYE8sProfileE kind:bss addr:0x02122bfc +_ZGVN15ProfileInstanceI19ActorProfileUnkSHITE8sProfileE kind:bss addr:0x02122cd4 +@11316 kind:bss addr:0x02122cd8 +_ZN15ProfileInstanceI19ActorProfileUnkSHITE8sProfileE kind:bss addr:0x02122ce4 +_ZGVN15ProfileInstanceI19ActorProfileUnkTEHTE8sProfileE kind:bss addr:0x02122dbc +@11322 kind:bss addr:0x02122dcc +_ZN15ProfileInstanceI19ActorProfileUnkTEHTE8sProfileE kind:bss addr:0x02122dd8 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMSTE8sProfileE kind:bss addr:0x02122e14 +@11328 kind:bss addr:0x02122e18 +_ZN15ProfileInstanceI19ActorProfileUnkRMSTE8sProfileE kind:bss addr:0x02122e24 diff --git a/config/eur/arm9/overlays/ov037/delinks.txt b/config/eur/arm9/overlays/ov037/delinks.txt index 7f7c14af..93ce260a 100644 --- a/config/eur/arm9/overlays/ov037/delinks.txt +++ b/config/eur/arm9/overlays/ov037/delinks.txt @@ -9,13 +9,13 @@ src/037_MapA6/Actor/ActorUnkSOLF.cpp: .text start:0x0211b3f8 end:0x0211e940 .init start:0x02121cac end:0x02121cfc .ctor start:0x02121dec end:0x02121df0 - .bss start:0x02122978 end:0x021229bc + .bss start:0x02122968 end:0x021229bc src/037_MapA6/Actor/ActorUnkSOLT.cpp: .text start:0x0211e940 end:0x021209b8 .init start:0x02121cfc end:0x02121d4c .ctor start:0x02121df0 end:0x02121df4 - .bss start:0x021229cc end:0x02122aa4 + .bss start:0x021229bc end:0x02122aa4 src/037_MapA6/Actor/ActorUnkTUTO.cpp: .text start:0x021209b8 end:0x02121bb8 diff --git a/config/eur/arm9/overlays/ov037/symbols.txt b/config/eur/arm9/overlays/ov037/symbols.txt index 554ef567..3d0b611d 100644 --- a/config/eur/arm9/overlays/ov037/symbols.txt +++ b/config/eur/arm9/overlays/ov037/symbols.txt @@ -287,12 +287,12 @@ _ZTV19data_ov037_0212278c kind:data(any) addr:0x0212278c data_ov037_02122800 kind:bss addr:0x02122800 data_ov037_02122804 kind:bss addr:0x02122804 data_ov037_02122810 kind:bss addr:0x02122810 -data_ov037_02122968 kind:bss addr:0x02122968 -data_ov037_0212296c kind:bss addr:0x0212296c -sActorProfileUnkSOLF kind:bss addr:0x02122978 -data_ov037_021229bc kind:bss addr:0x021229bc -data_ov037_021229c0 kind:bss addr:0x021229c0 -sActorProfileUnkSOLT kind:bss addr:0x021229cc +_ZGVN15ProfileInstanceI19ActorProfileUnkSOLFE8sProfileE kind:bss addr:0x02122968 +@11340 kind:bss addr:0x0212296c +_ZN15ProfileInstanceI19ActorProfileUnkSOLFE8sProfileE kind:bss addr:0x02122978 +_ZGVN15ProfileInstanceI19ActorProfileUnkSOLTE8sProfileE kind:bss addr:0x021229bc +@11346 kind:bss addr:0x021229c0 +_ZN15ProfileInstanceI19ActorProfileUnkSOLTE8sProfileE kind:bss addr:0x021229cc data_ov037_02122aa4 kind:bss addr:0x02122aa4 data_ov037_02122aa8 kind:bss addr:0x02122aa8 -sActorProfileUnkTUTO kind:bss addr:0x02122ab4 +_ZN15ProfileInstanceI19ActorProfileUnkTUTOE8sProfileE kind:bss addr:0x02122ab4 diff --git a/config/eur/arm9/overlays/ov038/delinks.txt b/config/eur/arm9/overlays/ov038/delinks.txt index 89c974eb..23f5031b 100644 --- a/config/eur/arm9/overlays/ov038/delinks.txt +++ b/config/eur/arm9/overlays/ov038/delinks.txt @@ -9,46 +9,46 @@ src/038_MapA7/Actor/ActorUnkWWFS.cpp: .text start:0x021190d0 end:0x0211cd98 .init start:0x02120a74 end:0x02120b04 .ctor start:0x02120d34 end:0x02120d38 - .bss start:0x0212149c end:0x021214a0 + .bss start:0x02121488 end:0x02121574 src/038_MapA7/Actor/ActorUnkBLBR.cpp: .text start:0x0211cd98 end:0x0211e430 .init start:0x02120b04 end:0x02120b54 .ctor start:0x02120d38 end:0x02120d3c - .bss start:0x02121584 end:0x0212165c + .bss start:0x02121574 end:0x0212165c src/038_MapA7/MapObject/MapObjectUnkBLSR.cpp: .text start:0x0211e430 end:0x0211e770 .init start:0x02120b54 end:0x02120ba4 .ctor start:0x02120d3c end:0x02120d40 - .bss start:0x0212166c end:0x0212171c + .bss start:0x0212165c end:0x02121760 src/038_MapA7/MapObject/MapObjectUnkSWBR.cpp: .text start:0x0211e770 end:0x0211ea48 .init start:0x02120ba4 end:0x02120bf4 .ctor start:0x02120d40 end:0x02120d44 - .bss start:0x02121770 end:0x02121844 + .bss start:0x02121760 end:0x02121844 src/038_MapA7/Actor/ActorUnkBLBL.cpp: .text start:0x0211ea48 end:0x0211ec64 .init start:0x02120bf4 end:0x02120c44 .ctor start:0x02120d44 end:0x02120d48 - .bss start:0x02121854 end:0x0212192c + .bss start:0x02121844 end:0x0212192c src/038_MapA7/Actor/ActorUnkGRCF.cpp: .text start:0x0211ec64 end:0x0211ee78 .init start:0x02120c44 end:0x02120c94 .ctor start:0x02120d48 end:0x02120d4c - .bss start:0x0212193c end:0x02121978 + .bss start:0x0212192c end:0x02121978 src/038_MapA7/MapObject/MapObjectUnkFSSN.cpp: .text start:0x0211ee78 end:0x0211f0a0 .init start:0x02120c94 end:0x02120ce4 .ctor start:0x02120d4c end:0x02120d50 - .bss start:0x02121988 end:0x02121a5c + .bss start:0x02121978 end:0x02121a5c src/038_MapA7/Actor/ActorUnkPLSR.cpp: .text start:0x0211f0a0 end:0x02120980 .init start:0x02120ce4 end:0x02120d34 .ctor start:0x02120d50 end:0x02120d54 - .bss start:0x02121a6c end:0x02121b44 + .bss start:0x02121a5c end:0x02121b44 diff --git a/config/eur/arm9/overlays/ov038/symbols.txt b/config/eur/arm9/overlays/ov038/symbols.txt index 2b9b2b64..f668deb6 100644 --- a/config/eur/arm9/overlays/ov038/symbols.txt +++ b/config/eur/arm9/overlays/ov038/symbols.txt @@ -241,32 +241,32 @@ data_ov038_021213fc kind:data(any) addr:0x021213fc _ZTV19data_ov038_02121418 kind:data(any) addr:0x02121418 data_ov038_02121480 kind:bss addr:0x02121480 data_ov038_02121484 kind:bss addr:0x02121484 -data_ov038_02121488 kind:bss addr:0x02121488 -data_ov038_02121490 kind:bss addr:0x02121490 -sActorProfileUnkWWFS kind:bss addr:0x0212149c +_ZGVN15ProfileInstanceI19ActorProfileUnkWWFSE8sProfileE kind:bss addr:0x02121488 +@11363 kind:bss addr:0x02121490 +_ZN15ProfileInstanceI19ActorProfileUnkWWFSE8sProfileE kind:bss addr:0x0212149c data_ov038_021214a0 kind:bss addr:0x021214a0 -data_ov038_02121574 kind:bss addr:0x02121574 -data_ov038_02121578 kind:bss addr:0x02121578 -sActorProfileUnkBLBR kind:bss addr:0x02121584 -data_ov038_0212165c kind:bss addr:0x0212165c -data_ov038_02121660 kind:bss addr:0x02121660 -sMapObjectProfileUnkBLSR kind:bss addr:0x0212166c +_ZGVN15ProfileInstanceI19ActorProfileUnkBLBRE8sProfileE kind:bss addr:0x02121574 +@11369 kind:bss addr:0x02121578 +_ZN15ProfileInstanceI19ActorProfileUnkBLBRE8sProfileE kind:bss addr:0x02121584 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkBLSRE8sProfileE kind:bss addr:0x0212165c +@11251 kind:bss addr:0x02121660 +_ZN15ProfileInstanceI23MapObjectProfileUnkBLSRE8sProfileE kind:bss addr:0x0212166c data_ov038_0212171c kind:bss addr:0x0212171c ambiguous data_ov038_02121740 kind:bss addr:0x02121740 -data_ov038_02121760 kind:bss addr:0x02121760 -data_ov038_02121764 kind:bss addr:0x02121764 -sMapObjectProfileUnkSWBR kind:bss addr:0x02121770 -data_ov038_02121844 kind:bss addr:0x02121844 -data_ov038_02121848 kind:bss addr:0x02121848 -sActorProfileUnkBLBL kind:bss addr:0x02121854 -data_ov038_0212192c kind:bss addr:0x0212192c -data_ov038_02121930 kind:bss addr:0x02121930 -sActorProfileUnkGRCF kind:bss addr:0x0212193c -data_ov038_02121978 kind:bss addr:0x02121978 -data_ov038_0212197c kind:bss addr:0x0212197c -sMapObjectProfileUnkFSSN kind:bss addr:0x02121988 -data_ov038_02121a5c kind:bss addr:0x02121a5c -data_ov038_02121a60 kind:bss addr:0x02121a60 -sActorProfileUnkPLSR kind:bss addr:0x02121a6c +_ZGVN15ProfileInstanceI23MapObjectProfileUnkSWBRE8sProfileE kind:bss addr:0x02121760 +@11257 kind:bss addr:0x02121764 +_ZN15ProfileInstanceI23MapObjectProfileUnkSWBRE8sProfileE kind:bss addr:0x02121770 +_ZGVN15ProfileInstanceI19ActorProfileUnkBLBLE8sProfileE kind:bss addr:0x02121844 +@11387 kind:bss addr:0x02121848 +_ZN15ProfileInstanceI19ActorProfileUnkBLBLE8sProfileE kind:bss addr:0x02121854 +_ZGVN15ProfileInstanceI19ActorProfileUnkGRCFE8sProfileE kind:bss addr:0x0212192c +@11393 kind:bss addr:0x02121930 +_ZN15ProfileInstanceI19ActorProfileUnkGRCFE8sProfileE kind:bss addr:0x0212193c +_ZGVN15ProfileInstanceI23MapObjectProfileUnkFSSNE8sProfileE kind:bss addr:0x02121978 +@11275 kind:bss addr:0x0212197c +_ZN15ProfileInstanceI23MapObjectProfileUnkFSSNE8sProfileE kind:bss addr:0x02121988 +_ZGVN15ProfileInstanceI19ActorProfileUnkPLSRE8sProfileE kind:bss addr:0x02121a5c +@11405 kind:bss addr:0x02121a60 +_ZN15ProfileInstanceI19ActorProfileUnkPLSRE8sProfileE kind:bss addr:0x02121a6c data_ov038_02121b44 kind:bss addr:0x02121b44 data_ov038_02121b58 kind:bss addr:0x02121b58 diff --git a/config/eur/arm9/overlays/ov039/delinks.txt b/config/eur/arm9/overlays/ov039/delinks.txt index bc5e5357..8e1d7c0a 100644 --- a/config/eur/arm9/overlays/ov039/delinks.txt +++ b/config/eur/arm9/overlays/ov039/delinks.txt @@ -9,25 +9,25 @@ src/039_MapA8/Actor/ActorUnkZELD.cpp: .text start:0x02118fec end:0x02119e5c .init start:0x0211cb80 end:0x0211cbd0 .ctor start:0x0211ce08 end:0x0211ce0c - .bss start:0x0211dd90 end:0x0211de28 + .bss start:0x0211dd80 end:0x0211de90 src/039_MapA8/Actor/ActorUnkSIRO_SIRS_SRNM_SRSL.cpp: .text start:0x02119e5c end:0x0211aa28 .init start:0x0211cbd0 end:0x0211cd18 .ctor start:0x0211ce0c end:0x0211ce10 - .bss start:0x0211dea8 end:0x0211e0a4 + .bss start:0x0211de90 end:0x0211e174 src/039_MapA8/Actor/ActorUnkRMM4.cpp: .text start:0x0211ab28 end:0x0211b508 .init start:0x0211cd18 end:0x0211cd68 .ctor start:0x0211ce10 end:0x0211ce14 - .bss start:0x0211e184 end:0x0211e25c + .bss start:0x0211e174 end:0x0211e25c src/039_MapA8/Actor/ActorUnkZLSS.cpp: .text start:0x0211b508 end:0x0211c704 .init start:0x0211cd68 end:0x0211cdb8 .ctor start:0x0211ce14 end:0x0211ce18 - .bss start:0x0211e26c end:0x0211e2b0 + .bss start:0x0211e25c end:0x0211e2b0 src/039_MapA8/MapObject/MapObjectUnkGTAT.cpp: .text start:0x0211c704 end:0x0211c9ac diff --git a/config/eur/arm9/overlays/ov039/symbols.txt b/config/eur/arm9/overlays/ov039/symbols.txt index 433dd220..4dd1afee 100644 --- a/config/eur/arm9/overlays/ov039/symbols.txt +++ b/config/eur/arm9/overlays/ov039/symbols.txt @@ -216,33 +216,33 @@ data_ov039_0211dcc8 kind:data(any) addr:0x0211dcc8 data_ov039_0211dce8 kind:data(any) addr:0x0211dce8 data_ov039_0211dd04 kind:data(any) addr:0x0211dd04 data_ov039_0211dd2c kind:data(any) addr:0x0211dd2c -data_ov039_0211dd80 kind:bss addr:0x0211dd80 -data_ov039_0211dd84 kind:bss addr:0x0211dd84 -sActorProfileUnkZELD kind:bss addr:0x0211dd90 +_ZGVN15ProfileInstanceI19ActorProfileUnkZELDE8sProfileE kind:bss addr:0x0211dd80 +@21417 kind:bss addr:0x0211dd84 +_ZN15ProfileInstanceI19ActorProfileUnkZELDE8sProfileE kind:bss addr:0x0211dd90 data_ov039_0211de28 kind:bss addr:0x0211de28 ambiguous data_ov039_0211de68 kind:bss addr:0x0211de68 data_ov039_0211de78 kind:bss addr:0x0211de78 data_ov039_0211de84 kind:bss addr:0x0211de84 -data_ov039_0211de90 kind:bss addr:0x0211de90 -data_ov039_0211de9c kind:bss addr:0x0211de9c -sActorProfileUnkSIRS kind:bss addr:0x0211dea8 -sActorProfileUnkSRNM kind:bss addr:0x0211deec +_ZGVN15ProfileInstanceI19ActorProfileUnkSIRSE8sProfileE kind:bss addr:0x0211de90 +@11423 kind:bss addr:0x0211de9c +_ZN15ProfileInstanceI19ActorProfileUnkSIRSE8sProfileE kind:bss addr:0x0211dea8 +_ZN15ProfileInstanceI19ActorProfileUnkSRNME8sProfileE kind:bss addr:0x0211deec data_ov039_0211df64 kind:bss addr:0x0211df64 ambiguous data_ov039_0211df9c kind:bss addr:0x0211df9c ambiguous -sActorProfileUnkSRSL kind:bss addr:0x0211dfc4 +_ZN15ProfileInstanceI19ActorProfileUnkSRSLE8sProfileE kind:bss addr:0x0211dfc4 data_ov039_0211dfc8 kind:bss addr:0x0211dfc8 ambiguous data_ov039_0211dfcc kind:bss addr:0x0211dfcc ambiguous data_ov039_0211e030 kind:bss addr:0x0211e030 ambiguous data_ov039_0211e070 kind:bss addr:0x0211e070 ambiguous -sActorProfileUnkSIRO kind:bss addr:0x0211e09c +_ZN15ProfileInstanceI19ActorProfileUnkSIROE8sProfileE kind:bss addr:0x0211e09c data_ov039_0211e0a4 kind:bss addr:0x0211e0a4 ambiguous data_ov039_0211e0f8 kind:bss addr:0x0211e0f8 ambiguous -data_ov039_0211e174 kind:bss addr:0x0211e174 -data_ov039_0211e178 kind:bss addr:0x0211e178 -sActorProfileUnkRMM4 kind:bss addr:0x0211e184 -data_ov039_0211e25c kind:bss addr:0x0211e25c -data_ov039_0211e260 kind:bss addr:0x0211e260 -sActorProfileUnkZLSS kind:bss addr:0x0211e26c +_ZGVN15ProfileInstanceI19ActorProfileUnkRMM4E8sProfileE kind:bss addr:0x0211e174 +@11429 kind:bss addr:0x0211e178 +_ZN15ProfileInstanceI19ActorProfileUnkRMM4E8sProfileE kind:bss addr:0x0211e184 +_ZGVN15ProfileInstanceI19ActorProfileUnkZLSSE8sProfileE kind:bss addr:0x0211e25c +@11435 kind:bss addr:0x0211e260 +_ZN15ProfileInstanceI19ActorProfileUnkZLSSE8sProfileE kind:bss addr:0x0211e26c data_ov039_0211e2b0 kind:bss addr:0x0211e2b0 data_ov039_0211e2b4 kind:bss addr:0x0211e2b4 -sMapObjectProfileUnkGTAT kind:bss addr:0x0211e2c0 +_ZN15ProfileInstanceI23MapObjectProfileUnkGTATE8sProfileE kind:bss addr:0x0211e2c0 diff --git a/config/eur/arm9/overlays/ov040/delinks.txt b/config/eur/arm9/overlays/ov040/delinks.txt index 841501f1..07c077b4 100644 --- a/config/eur/arm9/overlays/ov040/delinks.txt +++ b/config/eur/arm9/overlays/ov040/delinks.txt @@ -9,43 +9,43 @@ src/040_MapB1/Actor/ActorUnkFTRN.cpp: .text start:0x02123510 end:0x0212744c .init start:0x0212ddb8 end:0x0212ded8 .ctor start:0x0212e490 end:0x0212e494 - .bss start:0x0212f3bc end:0x0212f3f8 + .bss start:0x0212f3a4 end:0x0212f3f8 src/040_MapB1/Actor/ActorUnkZSTG.cpp: .text start:0x0212a7c4 end:0x0212ab2c .init start:0x0212ded8 end:0x0212df28 .ctor start:0x0212e494 end:0x0212e498 - .bss start:0x0212f408 end:0x0212f444 + .bss start:0x0212f3f8 end:0x0212f444 src/040_MapB1/Actor/ActorUnkCAWB_CRFP_FOMA_FOMB_FOMC_FOMR_FOMS_FOPD_GOCP_GORP_NCCA_NCCS_WAMA.cpp: .text start:0x0212abe8 end:0x0212c788 .init start:0x0212df28 end:0x0212e278 .ctor start:0x0212e498 end:0x0212e49c - .bss start:0x0212f514 end:0x0213001c + .bss start:0x0212f444 end:0x02130034 src/040_MapB1/Actor/ActorUnkYKAP_YKCP_YKEP.cpp: .text start:0x0212c788 end:0x0212ccb0 .init start:0x0212e278 end:0x0212e350 .ctor start:0x0212e49c end:0x0212e4a0 - .bss start:0x0213004c end:0x021301ac + .bss start:0x02130034 end:0x021301ac src/040_MapB1/Actor/ActorUnkOLDS.cpp: .text start:0x0212ccb0 end:0x0212d11c .init start:0x0212e350 end:0x0212e3a0 .ctor start:0x0212e4a0 end:0x0212e4a4 - .bss start:0x021301bc end:0x02130294 + .bss start:0x021301ac end:0x02130294 src/040_MapB1/Actor/ActorUnkTMNP.cpp: .text start:0x0212d11c end:0x0212d354 .init start:0x0212e3a0 end:0x0212e3f0 .ctor start:0x0212e4a4 end:0x0212e4a8 - .bss start:0x021302a4 end:0x0213037c + .bss start:0x02130294 end:0x0213037c src/040_MapB1/MapObject/MapObjectUnkFSTA.cpp: .text start:0x0212d354 end:0x0212d718 .init start:0x0212e3f0 end:0x0212e440 .ctor start:0x0212e4a8 end:0x0212e4ac - .bss start:0x0213038c end:0x021303ac + .bss start:0x0213037c end:0x021303ac src/040_MapB1/MapObject/MapObjectUnkFRAI.cpp: .text start:0x0212d764 end:0x0212db9c diff --git a/config/eur/arm9/overlays/ov040/symbols.txt b/config/eur/arm9/overlays/ov040/symbols.txt index 909d2867..1f9c48d3 100644 --- a/config/eur/arm9/overlays/ov040/symbols.txt +++ b/config/eur/arm9/overlays/ov040/symbols.txt @@ -388,56 +388,68 @@ data_ov040_0212f2f0 kind:data(any) addr:0x0212f2f0 data_ov040_0212f330 kind:data(any) addr:0x0212f330 data_ov040_0212f358 kind:data(any) addr:0x0212f358 data_ov040_0212f3a0 kind:bss addr:0x0212f3a0 -data_ov040_0212f3a4 kind:bss addr:0x0212f3a4 -data_ov040_0212f3b0 kind:bss addr:0x0212f3b0 -sActorProfileUnkFTRN kind:bss addr:0x0212f3bc -data_ov040_0212f3f8 kind:bss addr:0x0212f3f8 -data_ov040_0212f3fc kind:bss addr:0x0212f3fc -sActorProfileUnkZSTG kind:bss addr:0x0212f408 -data_ov040_0212f444 kind:bss addr:0x0212f444 -data_ov040_0212f478 kind:bss addr:0x0212f478 -data_ov040_0212f484 kind:bss addr:0x0212f484 -data_ov040_0212f490 kind:bss addr:0x0212f490 -data_ov040_0212f49c kind:bss addr:0x0212f49c -data_ov040_0212f4a8 kind:bss addr:0x0212f4a8 -data_ov040_0212f4b4 kind:bss addr:0x0212f4b4 -data_ov040_0212f4c0 kind:bss addr:0x0212f4c0 -data_ov040_0212f4cc kind:bss addr:0x0212f4cc -data_ov040_0212f4d8 kind:bss addr:0x0212f4d8 -data_ov040_0212f4e4 kind:bss addr:0x0212f4e4 -data_ov040_0212f4f0 kind:bss addr:0x0212f4f0 -data_ov040_0212f4fc kind:bss addr:0x0212f4fc -data_ov040_0212f508 kind:bss addr:0x0212f508 -sActorProfileUnkFOMS kind:bss addr:0x0212f514 -sActorProfileUnkNCCA kind:bss addr:0x0212f5ec -sActorProfileUnkWAMA kind:bss addr:0x0212f6c4 -sActorProfileUnkCAWB kind:bss addr:0x0212f79c -sActorProfileUnkFOPD kind:bss addr:0x0212f874 -sActorProfileUnkFOMA kind:bss addr:0x0212f94c -sActorProfileUnkFOMB kind:bss addr:0x0212fa24 -sActorProfileUnkFOMC kind:bss addr:0x0212fafc -sActorProfileUnkFOMR kind:bss addr:0x0212fbd4 -sActorProfileUnkCRFP kind:bss addr:0x0212fcac -sActorProfileUnkNCCS kind:bss addr:0x0212fd84 -sActorProfileUnkGORP kind:bss addr:0x0212fe5c -sActorProfileUnkGOCP kind:bss addr:0x0212ff3c +_ZGVN15ProfileInstanceI19ActorProfileUnkFTRNE8sProfileE kind:bss addr:0x0212f3a4 +@11452 kind:bss addr:0x0212f3b0 +_ZN15ProfileInstanceI19ActorProfileUnkFTRNE8sProfileE kind:bss addr:0x0212f3bc +_ZGVN15ProfileInstanceI19ActorProfileUnkZSTGE8sProfileE kind:bss addr:0x0212f3f8 +@21458 kind:bss addr:0x0212f3fc +_ZN15ProfileInstanceI19ActorProfileUnkZSTGE8sProfileE kind:bss addr:0x0212f408 +_ZGVN15ProfileInstanceI19ActorProfileUnkFOMCE8sProfileE kind:bss addr:0x0212f444 +_ZGVN15ProfileInstanceI19ActorProfileUnkNCCSE8sProfileE kind:bss addr:0x0212f448 +_ZGVN15ProfileInstanceI19ActorProfileUnkFOMBE8sProfileE kind:bss addr:0x0212f44c +_ZGVN15ProfileInstanceI19ActorProfileUnkWAMAE8sProfileE kind:bss addr:0x0212f450 +_ZGVN15ProfileInstanceI19ActorProfileUnkFOMSE8sProfileE kind:bss addr:0x0212f454 +_ZGVN15ProfileInstanceI19ActorProfileUnkGOCPE8sProfileE kind:bss addr:0x0212f458 +_ZGVN15ProfileInstanceI19ActorProfileUnkNCCAE8sProfileE kind:bss addr:0x0212f45c +_ZGVN15ProfileInstanceI19ActorProfileUnkCRFPE8sProfileE kind:bss addr:0x0212f460 +_ZGVN15ProfileInstanceI19ActorProfileUnkFOPDE8sProfileE kind:bss addr:0x0212f464 +_ZGVN15ProfileInstanceI19ActorProfileUnkGORPE8sProfileE kind:bss addr:0x0212f468 +_ZGVN15ProfileInstanceI19ActorProfileUnkFOMAE8sProfileE kind:bss addr:0x0212f46c +_ZGVN15ProfileInstanceI19ActorProfileUnkFOMRE8sProfileE kind:bss addr:0x0212f470 +_ZGVN15ProfileInstanceI19ActorProfileUnkCAWBE8sProfileE kind:bss addr:0x0212f474 +@452 kind:bss addr:0x0212f478 +@456 kind:bss addr:0x0212f484 +@460 kind:bss addr:0x0212f490 +@464 kind:bss addr:0x0212f49c +@468 kind:bss addr:0x0212f4a8 +@472 kind:bss addr:0x0212f4b4 +@476 kind:bss addr:0x0212f4c0 +@480 kind:bss addr:0x0212f4cc +@484 kind:bss addr:0x0212f4d8 +@488 kind:bss addr:0x0212f4e4 +@448 kind:bss addr:0x0212f4f0 +@440 kind:bss addr:0x0212f4fc +@444 kind:bss addr:0x0212f508 +_ZN15ProfileInstanceI19ActorProfileUnkFOMSE8sProfileE kind:bss addr:0x0212f514 +_ZN15ProfileInstanceI19ActorProfileUnkNCCAE8sProfileE kind:bss addr:0x0212f5ec +_ZN15ProfileInstanceI19ActorProfileUnkWAMAE8sProfileE kind:bss addr:0x0212f6c4 +_ZN15ProfileInstanceI19ActorProfileUnkCAWBE8sProfileE kind:bss addr:0x0212f79c +_ZN15ProfileInstanceI19ActorProfileUnkFOPDE8sProfileE kind:bss addr:0x0212f874 +_ZN15ProfileInstanceI19ActorProfileUnkFOMAE8sProfileE kind:bss addr:0x0212f94c +_ZN15ProfileInstanceI19ActorProfileUnkFOMBE8sProfileE kind:bss addr:0x0212fa24 +_ZN15ProfileInstanceI19ActorProfileUnkFOMCE8sProfileE kind:bss addr:0x0212fafc +_ZN15ProfileInstanceI19ActorProfileUnkFOMRE8sProfileE kind:bss addr:0x0212fbd4 +_ZN15ProfileInstanceI19ActorProfileUnkCRFPE8sProfileE kind:bss addr:0x0212fcac +_ZN15ProfileInstanceI19ActorProfileUnkNCCSE8sProfileE kind:bss addr:0x0212fd84 +_ZN15ProfileInstanceI19ActorProfileUnkGORPE8sProfileE kind:bss addr:0x0212fe5c +_ZN15ProfileInstanceI19ActorProfileUnkGOCPE8sProfileE kind:bss addr:0x0212ff3c data_ov040_0213001c kind:bss addr:0x0213001c data_ov040_02130028 kind:bss addr:0x02130028 -data_ov040_02130034 kind:bss addr:0x02130034 -data_ov040_02130040 kind:bss addr:0x02130040 -sActorProfileUnkYKCP kind:bss addr:0x0213004c -sActorProfileUnkYKEP kind:bss addr:0x02130090 -sActorProfileUnkYKAP kind:bss addr:0x021300d4 -data_ov040_021301ac kind:bss addr:0x021301ac -data_ov040_021301b0 kind:bss addr:0x021301b0 -sActorProfileUnkOLDS kind:bss addr:0x021301bc -data_ov040_02130294 kind:bss addr:0x02130294 -data_ov040_02130298 kind:bss addr:0x02130298 -sActorProfileUnkTMNP kind:bss addr:0x021302a4 -data_ov040_0213037c kind:bss addr:0x0213037c -data_ov040_02130380 kind:bss addr:0x02130380 -sMapObjectProfileUnkFSTA kind:bss addr:0x0213038c +_ZGVN15ProfileInstanceI19ActorProfileUnkYKCPE8sProfileE kind:bss addr:0x02130034 +@11470 kind:bss addr:0x02130040 +_ZN15ProfileInstanceI19ActorProfileUnkYKCPE8sProfileE kind:bss addr:0x0213004c +_ZN15ProfileInstanceI19ActorProfileUnkYKEPE8sProfileE kind:bss addr:0x02130090 +_ZN15ProfileInstanceI19ActorProfileUnkYKAPE8sProfileE kind:bss addr:0x021300d4 +_ZGVN15ProfileInstanceI19ActorProfileUnkOLDSE8sProfileE kind:bss addr:0x021301ac +@11476 kind:bss addr:0x021301b0 +_ZN15ProfileInstanceI19ActorProfileUnkOLDSE8sProfileE kind:bss addr:0x021301bc +_ZGVN15ProfileInstanceI19ActorProfileUnkTMNPE8sProfileE kind:bss addr:0x02130294 +@11482 kind:bss addr:0x02130298 +_ZN15ProfileInstanceI19ActorProfileUnkTMNPE8sProfileE kind:bss addr:0x021302a4 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkFSTAE8sProfileE kind:bss addr:0x0213037c +@11364 kind:bss addr:0x02130380 +_ZN15ProfileInstanceI23MapObjectProfileUnkFSTAE8sProfileE kind:bss addr:0x0213038c data_ov040_021303ac kind:bss addr:0x021303ac data_ov040_02130414 kind:bss addr:0x02130414 data_ov040_02130418 kind:bss addr:0x02130418 -sMapObjectProfileUnkFRAI kind:bss addr:0x02130424 +_ZN15ProfileInstanceI23MapObjectProfileUnkFRAIE8sProfileE kind:bss addr:0x02130424 diff --git a/config/eur/arm9/overlays/ov041/delinks.txt b/config/eur/arm9/overlays/ov041/delinks.txt index 8737644a..31024397 100644 --- a/config/eur/arm9/overlays/ov041/delinks.txt +++ b/config/eur/arm9/overlays/ov041/delinks.txt @@ -9,43 +9,43 @@ src/041_MapB2/Actor/ActorUnkKEYB.cpp: .text start:0x021234c0 end:0x021236a0 .init start:0x0212d460 end:0x0212d4b0 .ctor start:0x0212d7cc end:0x0212d7d0 - .bss start:0x0212e190 end:0x0212e268 + .bss start:0x0212e180 end:0x0212e268 src/041_MapB2/Actor/ActorUnkKGDB.cpp: .text start:0x021236a0 end:0x02123b70 .init start:0x0212d4b0 end:0x0212d51c .ctor start:0x0212d7d0 end:0x0212d7d4 - .bss start:0x0212e278 end:0x0212e350 + .bss start:0x0212e268 end:0x0212e350 src/041_MapB2/Actor/ActorUnkKEYT.cpp: .text start:0x02123b70 end:0x0212418c .init start:0x0212d51c end:0x0212d578 .ctor start:0x0212d7d4 end:0x0212d7d8 - .bss start:0x0212e36c end:0x0212e3b0 + .bss start:0x0212e350 end:0x0212e3b0 src/041_MapB2/Actor/ActorUnkKGDN.cpp: .text start:0x0212418c end:0x02124c08 .init start:0x0212d578 end:0x0212d5c8 .ctor start:0x0212d7d8 end:0x0212d7dc - .bss start:0x0212e3c0 end:0x0212e404 + .bss start:0x0212e3b0 end:0x0212e420 src/041_MapB2/Actor/ActorUnkRPMT.cpp: .text start:0x0212a798 end:0x0212b998 .init start:0x0212d614 end:0x0212d664 .ctor start:0x0212d7e4 end:0x0212d7e8 - .bss start:0x0212e430 end:0x0212e46c + .bss start:0x0212e420 end:0x0212e470 src/041_MapB2/MapObject/MapObjectUnkDRBK.cpp: .text start:0x0212b998 end:0x0212c7d0 .init start:0x0212d664 end:0x0212d6e4 .ctor start:0x0212d7e8 end:0x0212d7ec - .bss start:0x0212e488 end:0x0212e55c + .bss start:0x0212e470 end:0x0212e580 src/041_MapB2/MapObject/MapObjectUnkDRTK.cpp: .text start:0x0212c7d0 end:0x0212cfa8 .init start:0x0212d6e4 end:0x0212d758 .ctor start:0x0212d7ec end:0x0212d7f0 - .bss start:0x0212e590 end:0x0212e664 + .bss start:0x0212e580 end:0x0212e664 src/041_MapB2/MapObject/MapObjectUnkDRMC.cpp: .text start:0x0212cfa8 end:0x0212d2c8 diff --git a/config/eur/arm9/overlays/ov041/symbols.txt b/config/eur/arm9/overlays/ov041/symbols.txt index 379443c3..82c81ed7 100644 --- a/config/eur/arm9/overlays/ov041/symbols.txt +++ b/config/eur/arm9/overlays/ov041/symbols.txt @@ -305,33 +305,33 @@ data_ov041_0212e0d0 kind:data(any) addr:0x0212e0d0 data_ov041_0212e110 kind:data(any) addr:0x0212e110 data_ov041_0212e124 kind:data(any) addr:0x0212e124 data_ov041_0212e140 kind:data(any) addr:0x0212e140 -data_ov041_0212e180 kind:bss addr:0x0212e180 -data_ov041_0212e184 kind:bss addr:0x0212e184 -sActorProfileUnkKEYB kind:bss addr:0x0212e190 -data_ov041_0212e268 kind:bss addr:0x0212e268 -data_ov041_0212e26c kind:bss addr:0x0212e26c -sActorProfileUnkKGDB kind:bss addr:0x0212e278 -data_ov041_0212e350 kind:bss addr:0x0212e350 -data_ov041_0212e354 kind:bss addr:0x0212e354 -sActorProfileUnkKEYT kind:bss addr:0x0212e36c -data_ov041_0212e3b0 kind:bss addr:0x0212e3b0 -data_ov041_0212e3b4 kind:bss addr:0x0212e3b4 -sActorProfileUnkKGDN kind:bss addr:0x0212e3c0 +_ZGVN15ProfileInstanceI19ActorProfileUnkKEYBE8sProfileE kind:bss addr:0x0212e180 +@11505 kind:bss addr:0x0212e184 +_ZN15ProfileInstanceI19ActorProfileUnkKEYBE8sProfileE kind:bss addr:0x0212e190 +_ZGVN15ProfileInstanceI19ActorProfileUnkKGDBE8sProfileE kind:bss addr:0x0212e268 +@11511 kind:bss addr:0x0212e26c +_ZN15ProfileInstanceI19ActorProfileUnkKGDBE8sProfileE kind:bss addr:0x0212e278 +_ZGVN15ProfileInstanceI19ActorProfileUnkKEYTE8sProfileE kind:bss addr:0x0212e350 +@11517 kind:bss addr:0x0212e354 +_ZN15ProfileInstanceI19ActorProfileUnkKEYTE8sProfileE kind:bss addr:0x0212e36c +_ZGVN15ProfileInstanceI19ActorProfileUnkKGDNE8sProfileE kind:bss addr:0x0212e3b0 +@11523 kind:bss addr:0x0212e3b4 +_ZN15ProfileInstanceI19ActorProfileUnkKGDNE8sProfileE kind:bss addr:0x0212e3c0 data_ov041_0212e404 kind:bss addr:0x0212e404 data_ov041_0212e408 kind:bss addr:0x0212e408 data_ov041_0212e414 kind:bss addr:0x0212e414 -data_ov041_0212e420 kind:bss addr:0x0212e420 -data_ov041_0212e424 kind:bss addr:0x0212e424 -sActorProfileUnkRPMT kind:bss addr:0x0212e430 +_ZGVN15ProfileInstanceI19ActorProfileUnkRPMTE8sProfileE kind:bss addr:0x0212e420 +@11529 kind:bss addr:0x0212e424 +_ZN15ProfileInstanceI19ActorProfileUnkRPMTE8sProfileE kind:bss addr:0x0212e430 data_ov041_0212e46c kind:bss addr:0x0212e46c -data_ov041_0212e470 kind:bss addr:0x0212e470 -data_ov041_0212e47c kind:bss addr:0x0212e47c -sMapObjectProfileUnkDRBK kind:bss addr:0x0212e488 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkDRBKE8sProfileE kind:bss addr:0x0212e470 +@11411 kind:bss addr:0x0212e47c +_ZN15ProfileInstanceI23MapObjectProfileUnkDRBKE8sProfileE kind:bss addr:0x0212e488 data_ov041_0212e55c kind:bss addr:0x0212e55c -data_ov041_0212e580 kind:bss addr:0x0212e580 -data_ov041_0212e584 kind:bss addr:0x0212e584 -sMapObjectProfileUnkDRTK kind:bss addr:0x0212e590 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkDRTKE8sProfileE kind:bss addr:0x0212e580 +@11417 kind:bss addr:0x0212e584 +_ZN15ProfileInstanceI23MapObjectProfileUnkDRTKE8sProfileE kind:bss addr:0x0212e590 data_ov041_0212e664 kind:bss addr:0x0212e664 data_ov041_0212e688 kind:bss addr:0x0212e688 data_ov041_0212e68c kind:bss addr:0x0212e68c -sMapObjectProfileUnkDRMC kind:bss addr:0x0212e698 +_ZN15ProfileInstanceI23MapObjectProfileUnkDRMCE8sProfileE kind:bss addr:0x0212e698 diff --git a/config/eur/arm9/overlays/ov042/delinks.txt b/config/eur/arm9/overlays/ov042/delinks.txt index 522f0100..aa951bcd 100644 --- a/config/eur/arm9/overlays/ov042/delinks.txt +++ b/config/eur/arm9/overlays/ov042/delinks.txt @@ -9,28 +9,28 @@ src/042_MapB3/Actor/ActorUnkOCTS.cpp: .text start:0x021234c0 end:0x02123c4c .init start:0x0212bae4 end:0x0212bb34 .ctor start:0x0212bcc4 end:0x0212bcc8 - .bss start:0x0212c670 end:0x0212c748 + .bss start:0x0212c660 end:0x0212c748 src/042_MapB3/Actor/ActorUnkOCTA.cpp: .text start:0x02123c4c end:0x021251a8 .init start:0x0212bb34 end:0x0212bba0 .ctor start:0x0212bcc8 end:0x0212bccc - .bss start:0x0212c758 end:0x0212c788 + .bss start:0x0212c748 end:0x0212c834 src/042_MapB3/Actor/ActorUnkMIFR.cpp: .text start:0x021251a8 end:0x02126964 .init start:0x0212bba0 end:0x0212bbf0 .ctor start:0x0212bccc end:0x0212bcd0 - .bss start:0x0212c840 end:0x0212c888 + .bss start:0x0212c834 end:0x0212c924 src/042_MapB3/Actor/ActorUnkPHEY.cpp: .text start:0x021288bc end:0x0212b64c .init start:0x0212bc08 end:0x0212bc74 .ctor start:0x0212bcd4 end:0x0212bcd8 - .bss start:0x0212c934 end:0x0212ca0c + .bss start:0x0212c924 end:0x0212ca0c src/042_MapB3/MapObject/MapObjectUnkSWRA.cpp: .text start:0x0212b64c end:0x0212ba74 .init start:0x0212bc74 end:0x0212bcc4 .ctor start:0x0212bcd8 end:0x0212bcdc - .bss start:0x0212ca1c end:0x0212ca3c + .bss start:0x0212ca0c end:0x0212ca3c diff --git a/config/eur/arm9/overlays/ov042/symbols.txt b/config/eur/arm9/overlays/ov042/symbols.txt index fe4d1eae..aba3266a 100644 --- a/config/eur/arm9/overlays/ov042/symbols.txt +++ b/config/eur/arm9/overlays/ov042/symbols.txt @@ -249,26 +249,26 @@ data_ov042_0212c5dc kind:data(any) addr:0x0212c5dc data_ov042_0212c5f8 kind:data(any) addr:0x0212c5f8 data_ov042_0212c620 kind:data(any) addr:0x0212c620 data_ov042_0212c644 kind:data(any) addr:0x0212c644 ambiguous -data_ov042_0212c660 kind:bss addr:0x0212c660 -data_ov042_0212c664 kind:bss addr:0x0212c664 -sActorProfileUnkOCTS kind:bss addr:0x0212c670 -data_ov042_0212c748 kind:bss addr:0x0212c748 -data_ov042_0212c74c kind:bss addr:0x0212c74c -sActorProfileUnkOCTA kind:bss addr:0x0212c758 +_ZGVN15ProfileInstanceI19ActorProfileUnkOCTSE8sProfileE kind:bss addr:0x0212c660 +@11558 kind:bss addr:0x0212c664 +_ZN15ProfileInstanceI19ActorProfileUnkOCTSE8sProfileE kind:bss addr:0x0212c670 +_ZGVN15ProfileInstanceI19ActorProfileUnkOCTAE8sProfileE kind:bss addr:0x0212c748 +@11564 kind:bss addr:0x0212c74c +_ZN15ProfileInstanceI19ActorProfileUnkOCTAE8sProfileE kind:bss addr:0x0212c758 data_ov042_0212c788 kind:bss addr:0x0212c788 ambiguous data_ov042_0212c7d0 kind:bss addr:0x0212c7d0 ambiguous data_ov042_0212c830 kind:bss addr:0x0212c830 -data_ov042_0212c834 kind:bss addr:0x0212c834 -data_ov042_0212c83c kind:bss addr:0x0212c83c ambiguous -sActorProfileUnkMIFR kind:bss addr:0x0212c840 +_ZGVN15ProfileInstanceI19ActorProfileUnkMIFRE8sProfileE kind:bss addr:0x0212c834 +@11570 kind:bss addr:0x0212c83c ambiguous +_ZN15ProfileInstanceI19ActorProfileUnkMIFRE8sProfileE kind:bss addr:0x0212c840 data_ov042_0212c888 kind:bss addr:0x0212c888 ambiguous data_ov042_0212c8d8 kind:bss addr:0x0212c8d8 ambiguous data_ov042_0212c918 kind:bss addr:0x0212c918 -data_ov042_0212c924 kind:bss addr:0x0212c924 -data_ov042_0212c928 kind:bss addr:0x0212c928 -sActorProfileUnkPHEY kind:bss addr:0x0212c934 -data_ov042_0212ca0c kind:bss addr:0x0212ca0c -data_ov042_0212ca10 kind:bss addr:0x0212ca10 -sMapObjectProfileUnkSWRA kind:bss addr:0x0212ca1c +_ZGVN15ProfileInstanceI19ActorProfileUnkPHEYE8sProfileE kind:bss addr:0x0212c924 +@11576 kind:bss addr:0x0212c928 +_ZN15ProfileInstanceI19ActorProfileUnkPHEYE8sProfileE kind:bss addr:0x0212c934 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkSWRAE8sProfileE kind:bss addr:0x0212ca0c +@11458 kind:bss addr:0x0212ca10 +_ZN15ProfileInstanceI23MapObjectProfileUnkSWRAE8sProfileE kind:bss addr:0x0212ca1c data_ov042_0212ca3c kind:bss addr:0x0212ca3c data_ov042_0212caf0 kind:bss addr:0x0212caf0 diff --git a/config/eur/arm9/overlays/ov043/delinks.txt b/config/eur/arm9/overlays/ov043/delinks.txt index 3448e42a..5b1dadd6 100644 --- a/config/eur/arm9/overlays/ov043/delinks.txt +++ b/config/eur/arm9/overlays/ov043/delinks.txt @@ -9,22 +9,22 @@ src/043_MapB4/Actor/ActorUnkSTLF.cpp: .text start:0x021234c0 end:0x02126718 .init start:0x0212cb48 end:0x0212cc48 .ctor start:0x0212cdf0 end:0x0212cdf4 - .bss start:0x0212dbb8 end:0x0212dc90 + .bss start:0x0212dba0 end:0x0212dc90 src/043_MapB4/Actor/ActorUnkSTFH.cpp: .text start:0x02126718 end:0x02128348 .init start:0x0212cc48 end:0x0212cd28 .ctor start:0x0212cdf4 end:0x0212cdf8 - .bss start:0x0212dca0 end:0x0212dd78 + .bss start:0x0212dc90 end:0x0212dd78 src/043_MapB4/Actor/ActorUnkSTFB.cpp: .text start:0x02128348 end:0x02128a54 .init start:0x0212cd28 end:0x0212cd78 .ctor start:0x0212cdf8 end:0x0212cdfc - .bss start:0x0212dd88 end:0x0212ddcc + .bss start:0x0212dd78 end:0x0212ddcc src/043_MapB4/Actor/ActorUnkSHDL.cpp: .text start:0x02128ad8 end:0x0212ca04 .init start:0x0212cd78 end:0x0212cdf0 .ctor start:0x0212cdfc end:0x0212ce00 - .bss start:0x0212dde0 end:0x0212de20 + .bss start:0x0212ddcc end:0x0212de20 diff --git a/config/eur/arm9/overlays/ov043/symbols.txt b/config/eur/arm9/overlays/ov043/symbols.txt index a1ec707a..2c0b6a9f 100644 --- a/config/eur/arm9/overlays/ov043/symbols.txt +++ b/config/eur/arm9/overlays/ov043/symbols.txt @@ -303,17 +303,17 @@ data_ov043_0212d7e0 kind:data(any) addr:0x0212d7e0 data_ov043_0212d7e4 kind:data(any) addr:0x0212d7e4 data_ov043_0212d7e8 kind:data(any) addr:0x0212d7e8 data_ov043_0212d7ec kind:data(any) addr:0x0212d7ec -data_ov043_0212dba0 kind:bss addr:0x0212dba0 -data_ov043_0212dbac kind:bss addr:0x0212dbac -sActorProfileUnkSTLF kind:bss addr:0x0212dbb8 -data_ov043_0212dc90 kind:bss addr:0x0212dc90 -data_ov043_0212dc94 kind:bss addr:0x0212dc94 -sActorProfileUnkSTFH kind:bss addr:0x0212dca0 -data_ov043_0212dd78 kind:bss addr:0x0212dd78 -data_ov043_0212dd7c kind:bss addr:0x0212dd7c -sActorProfileUnkSTFB kind:bss addr:0x0212dd88 -data_ov043_0212ddcc kind:bss addr:0x0212ddcc -data_ov043_0212ddd4 kind:bss addr:0x0212ddd4 -sActorProfileUnkSHDL kind:bss addr:0x0212dde0 +_ZGVN15ProfileInstanceI19ActorProfileUnkSTLFE8sProfileE kind:bss addr:0x0212dba0 +@11594 kind:bss addr:0x0212dbac +_ZN15ProfileInstanceI19ActorProfileUnkSTLFE8sProfileE kind:bss addr:0x0212dbb8 +_ZGVN15ProfileInstanceI19ActorProfileUnkSTFHE8sProfileE kind:bss addr:0x0212dc90 +@11600 kind:bss addr:0x0212dc94 +_ZN15ProfileInstanceI19ActorProfileUnkSTFHE8sProfileE kind:bss addr:0x0212dca0 +_ZGVN15ProfileInstanceI19ActorProfileUnkSTFBE8sProfileE kind:bss addr:0x0212dd78 +@11606 kind:bss addr:0x0212dd7c +_ZN15ProfileInstanceI19ActorProfileUnkSTFBE8sProfileE kind:bss addr:0x0212dd88 +_ZGVN15ProfileInstanceI19ActorProfileUnkSHDLE8sProfileE kind:bss addr:0x0212ddcc +@11612 kind:bss addr:0x0212ddd4 +_ZN15ProfileInstanceI19ActorProfileUnkSHDLE8sProfileE kind:bss addr:0x0212dde0 data_ov043_0212de20 kind:bss addr:0x0212de20 data_ov043_0212de60 kind:bss addr:0x0212de60 diff --git a/config/eur/arm9/overlays/ov044/delinks.txt b/config/eur/arm9/overlays/ov044/delinks.txt index 4390b8a8..93d48384 100644 --- a/config/eur/arm9/overlays/ov044/delinks.txt +++ b/config/eur/arm9/overlays/ov044/delinks.txt @@ -9,37 +9,37 @@ src/044_MapB5/Actor/ActorUnkICBB.cpp: .text start:0x02125eb4 end:0x0212a440 .init start:0x0212cb1c end:0x0212cb80 .ctor start:0x0212cd8c end:0x0212cd90 - .bss start:0x0212d6e0 end:0x0212d764 + .bss start:0x0212d6c8 end:0x0212d7b8 src/044_MapB5/Actor/ActorUnkIBBA.cpp: .text start:0x0212a440 end:0x0212b710 .init start:0x0212cb80 end:0x0212cbf4 .ctor start:0x0212cd90 end:0x0212cd94 - .bss start:0x0212d7c8 end:0x0212d804 + .bss start:0x0212d7b8 end:0x0212d824 src/044_MapB5/Actor/ActorUnkIBSP.cpp: .text start:0x0212b710 end:0x0212bbd0 .init start:0x0212cbf4 end:0x0212cc44 .ctor start:0x0212cd94 end:0x0212cd98 - .bss start:0x0212d834 end:0x0212d870 + .bss start:0x0212d824 end:0x0212d870 src/044_MapB5/Actor/ActorUnkRBL2.cpp: .text start:0x0212bd48 end:0x0212c1a8 .init start:0x0212cc44 end:0x0212cc94 .ctor start:0x0212cd98 end:0x0212cd9c - .bss start:0x0212d880 end:0x0212d958 + .bss start:0x0212d870 end:0x0212d968 src/044_MapB5/Actor/ActorUnkL2V1.cpp: .text start:0x0212c1a8 end:0x0212c644 .init start:0x0212cc94 end:0x0212cce4 .ctor start:0x0212cd9c end:0x0212cda0 - .bss start:0x0212da38 end:0x0212db10 + .bss start:0x0212d968 end:0x0212db10 src/044_MapB5/Actor/ActorUnkL2V2.cpp: .text start:0x0212c644 end:0x0212c888 .init start:0x0212cce4 end:0x0212cd34 .ctor start:0x0212cda0 end:0x0212cda4 - .bss start:0x0212db20 end:0x0212dbf8 + .bss start:0x0212db10 end:0x0212dbf8 src/044_MapB5/Actor/ActorUnkL2MT.cpp: .text start:0x0212c888 end:0x0212c9f4 diff --git a/config/eur/arm9/overlays/ov044/symbols.txt b/config/eur/arm9/overlays/ov044/symbols.txt index 779b7af3..2afff573 100644 --- a/config/eur/arm9/overlays/ov044/symbols.txt +++ b/config/eur/arm9/overlays/ov044/symbols.txt @@ -295,28 +295,28 @@ data_ov044_0212d5e8 kind:bss addr:0x0212d5e8 data_ov044_0212d650 kind:bss addr:0x0212d650 data_ov044_0212d6b8 kind:bss addr:0x0212d6b8 data_ov044_0212d6bc kind:bss addr:0x0212d6bc -data_ov044_0212d6c8 kind:bss addr:0x0212d6c8 -data_ov044_0212d6d4 kind:bss addr:0x0212d6d4 -sActorProfileUnkICBB kind:bss addr:0x0212d6e0 +_ZGVN15ProfileInstanceI19ActorProfileUnkICBBE8sProfileE kind:bss addr:0x0212d6c8 +@11624 kind:bss addr:0x0212d6d4 +_ZN15ProfileInstanceI19ActorProfileUnkICBBE8sProfileE kind:bss addr:0x0212d6e0 data_ov044_0212d764 kind:bss addr:0x0212d764 ambiguous -data_ov044_0212d7b8 kind:bss addr:0x0212d7b8 -data_ov044_0212d7bc kind:bss addr:0x0212d7bc -sActorProfileUnkIBBA kind:bss addr:0x0212d7c8 +_ZGVN15ProfileInstanceI19ActorProfileUnkIBBAE8sProfileE kind:bss addr:0x0212d7b8 +@11630 kind:bss addr:0x0212d7bc +_ZN15ProfileInstanceI19ActorProfileUnkIBBAE8sProfileE kind:bss addr:0x0212d7c8 data_ov044_0212d804 kind:bss addr:0x0212d804 -data_ov044_0212d824 kind:bss addr:0x0212d824 -data_ov044_0212d828 kind:bss addr:0x0212d828 -sActorProfileUnkIBSP kind:bss addr:0x0212d834 -data_ov044_0212d870 kind:bss addr:0x0212d870 -data_ov044_0212d874 kind:bss addr:0x0212d874 -sActorProfileUnkRBL2 kind:bss addr:0x0212d880 +_ZGVN15ProfileInstanceI19ActorProfileUnkIBSPE8sProfileE kind:bss addr:0x0212d824 +@11636 kind:bss addr:0x0212d828 +_ZN15ProfileInstanceI19ActorProfileUnkIBSPE8sProfileE kind:bss addr:0x0212d834 +_ZGVN15ProfileInstanceI19ActorProfileUnkRBL2E8sProfileE kind:bss addr:0x0212d870 +@11642 kind:bss addr:0x0212d874 +_ZN15ProfileInstanceI19ActorProfileUnkRBL2E8sProfileE kind:bss addr:0x0212d880 data_ov044_0212d958 kind:bss addr:0x0212d958 data_ov044_0212d95c kind:bss addr:0x0212d95c -data_ov044_0212d968 kind:bss addr:0x0212d968 -data_ov044_0212d9d0 kind:bss addr:0x0212d9d0 -sActorProfileUnkL2V1 kind:bss addr:0x0212da38 -data_ov044_0212db10 kind:bss addr:0x0212db10 -data_ov044_0212db14 kind:bss addr:0x0212db14 -sActorProfileUnkL2V2 kind:bss addr:0x0212db20 +_ZGVN15ProfileInstanceI19ActorProfileUnkL2V1E8sProfileE kind:bss addr:0x0212d968 +@11648 kind:bss addr:0x0212d9d0 +_ZN15ProfileInstanceI19ActorProfileUnkL2V1E8sProfileE kind:bss addr:0x0212da38 +_ZGVN15ProfileInstanceI19ActorProfileUnkL2V2E8sProfileE kind:bss addr:0x0212db10 +@11654 kind:bss addr:0x0212db14 +_ZN15ProfileInstanceI19ActorProfileUnkL2V2E8sProfileE kind:bss addr:0x0212db20 data_ov044_0212dbf8 kind:bss addr:0x0212dbf8 data_ov044_0212dbfc kind:bss addr:0x0212dbfc -sActorProfileUnkL2MT kind:bss addr:0x0212dc08 +_ZN15ProfileInstanceI19ActorProfileUnkL2MTE8sProfileE kind:bss addr:0x0212dc08 diff --git a/config/eur/arm9/overlays/ov045/delinks.txt b/config/eur/arm9/overlays/ov045/delinks.txt index 6939cafb..4c000649 100644 --- a/config/eur/arm9/overlays/ov045/delinks.txt +++ b/config/eur/arm9/overlays/ov045/delinks.txt @@ -9,31 +9,31 @@ src/045_MapB6/Actor/ActorUnkRMBD.cpp: .text start:0x021234c0 end:0x02124188 .init start:0x02129620 end:0x02129864 .ctor start:0x02129ad4 end:0x02129ad8 - .bss start:0x0212a250 end:0x0212a328 + .bss start:0x0212a240 end:0x0212a33c src/045_MapB6/Actor/ActorUnkBDGA.cpp: .text start:0x02124188 end:0x021278b8 .init start:0x02129864 end:0x02129994 .ctor start:0x02129ad8 end:0x02129adc - .bss start:0x0212a34c end:0x0212a424 + .bss start:0x0212a33c end:0x0212a424 src/045_MapB6/Actor/ActorUnkBDBA.cpp: .text start:0x021278b8 end:0x02128300 .init start:0x02129994 end:0x021299e4 .ctor start:0x02129adc end:0x02129ae0 - .bss start:0x0212a434 end:0x0212a440 + .bss start:0x0212a424 end:0x0212a50c src/045_MapB6/Actor/ActorUnkBDLB.cpp: .text start:0x02128300 end:0x02128ebc .init start:0x021299e4 end:0x02129a34 .ctor start:0x02129ae0 end:0x02129ae4 - .bss start:0x0212a51c end:0x0212a5f4 + .bss start:0x0212a50c end:0x0212a5f4 src/045_MapB6/Actor/ActorUnkWPCL.cpp: .text start:0x02128ebc end:0x02129048 .init start:0x02129a34 end:0x02129a84 .ctor start:0x02129ae4 end:0x02129ae8 - .bss start:0x0212a604 end:0x0212a640 + .bss start:0x0212a5f4 end:0x0212a640 src/045_MapB6/MapObject/MapObjectUnkRDSD.cpp: .text start:0x02129048 end:0x0212939c diff --git a/config/eur/arm9/overlays/ov045/symbols.txt b/config/eur/arm9/overlays/ov045/symbols.txt index 92753494..37692f0b 100644 --- a/config/eur/arm9/overlays/ov045/symbols.txt +++ b/config/eur/arm9/overlays/ov045/symbols.txt @@ -235,23 +235,23 @@ _ZTV19data_ov045_0212a130 kind:data(any) addr:0x0212a130 data_ov045_0212a194 kind:data(any) addr:0x0212a194 data_ov045_0212a1bc kind:data(any) addr:0x0212a1bc data_ov045_0212a22c kind:data(any) addr:0x0212a22c -data_ov045_0212a240 kind:bss addr:0x0212a240 -data_ov045_0212a244 kind:bss addr:0x0212a244 -sActorProfileUnkRMBD kind:bss addr:0x0212a250 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMBDE8sProfileE kind:bss addr:0x0212a240 +@11671 kind:bss addr:0x0212a244 +_ZN15ProfileInstanceI19ActorProfileUnkRMBDE8sProfileE kind:bss addr:0x0212a250 data_ov045_0212a328 kind:bss addr:0x0212a328 -data_ov045_0212a33c kind:bss addr:0x0212a33c -data_ov045_0212a340 kind:bss addr:0x0212a340 -sActorProfileUnkBDGA kind:bss addr:0x0212a34c -data_ov045_0212a424 kind:bss addr:0x0212a424 -data_ov045_0212a428 kind:bss addr:0x0212a428 -sActorProfileUnkBDBA kind:bss addr:0x0212a434 +_ZGVN15ProfileInstanceI19ActorProfileUnkBDGAE8sProfileE kind:bss addr:0x0212a33c +@11677 kind:bss addr:0x0212a340 +_ZN15ProfileInstanceI19ActorProfileUnkBDGAE8sProfileE kind:bss addr:0x0212a34c +_ZGVN15ProfileInstanceI19ActorProfileUnkBDBAE8sProfileE kind:bss addr:0x0212a424 +@11683 kind:bss addr:0x0212a428 +_ZN15ProfileInstanceI19ActorProfileUnkBDBAE8sProfileE kind:bss addr:0x0212a434 data_ov045_0212a440 kind:bss addr:0x0212a440 ambiguous -data_ov045_0212a50c kind:bss addr:0x0212a50c -data_ov045_0212a510 kind:bss addr:0x0212a510 -sActorProfileUnkBDLB kind:bss addr:0x0212a51c -data_ov045_0212a5f4 kind:bss addr:0x0212a5f4 -data_ov045_0212a5f8 kind:bss addr:0x0212a5f8 -sActorProfileUnkWPCL kind:bss addr:0x0212a604 +_ZGVN15ProfileInstanceI19ActorProfileUnkBDLBE8sProfileE kind:bss addr:0x0212a50c +@11689 kind:bss addr:0x0212a510 +_ZN15ProfileInstanceI19ActorProfileUnkBDLBE8sProfileE kind:bss addr:0x0212a51c +_ZGVN15ProfileInstanceI19ActorProfileUnkWPCLE8sProfileE kind:bss addr:0x0212a5f4 +@11695 kind:bss addr:0x0212a5f8 +_ZN15ProfileInstanceI19ActorProfileUnkWPCLE8sProfileE kind:bss addr:0x0212a604 data_ov045_0212a640 kind:bss addr:0x0212a640 data_ov045_0212a644 kind:bss addr:0x0212a644 -sMapObjectProfileUnkRDSD kind:bss addr:0x0212a650 +_ZN15ProfileInstanceI23MapObjectProfileUnkRDSDE8sProfileE kind:bss addr:0x0212a650 diff --git a/config/eur/arm9/overlays/ov046/delinks.txt b/config/eur/arm9/overlays/ov046/delinks.txt index e3958706..8c9ec5fd 100644 --- a/config/eur/arm9/overlays/ov046/delinks.txt +++ b/config/eur/arm9/overlays/ov046/delinks.txt @@ -9,28 +9,28 @@ src/046_MapB7/Actor/ActorUnkWTTH.cpp: .text start:0x021234c0 end:0x02124dc8 .init start:0x02129cd0 end:0x02129d58 .ctor start:0x02129f60 end:0x02129f64 - .bss start:0x0212a710 end:0x0212a798 + .bss start:0x0212a700 end:0x0212a7e8 src/046_MapB7/Actor/ActorUnkWTH2.cpp: .text start:0x02124dc8 end:0x02126504 .init start:0x02129d58 end:0x02129e10 .ctor start:0x02129f64 end:0x02129f68 - .bss start:0x0212a7f8 end:0x0212a8d0 + .bss start:0x0212a7e8 end:0x0212a8d0 src/046_MapB7/Actor/ActorUnkWTH3.cpp: .text start:0x02126504 end:0x02127840 .init start:0x02129e10 end:0x02129ec0 .ctor start:0x02129f68 end:0x02129f6c - .bss start:0x0212a8e0 end:0x0212a9b8 + .bss start:0x0212a8d0 end:0x0212a9b8 src/046_MapB7/Actor/ActorUnkWBTN.cpp: .text start:0x02127840 end:0x02128890 .init start:0x02129ec0 end:0x02129f10 .ctor start:0x02129f6c end:0x02129f70 - .bss start:0x0212a9c8 end:0x0212a9cc + .bss start:0x0212a9b8 end:0x0212aaa0 src/046_MapB7/Actor/ActorUnkWBN2.cpp: .text start:0x02128890 end:0x021295f8 .init start:0x02129f10 end:0x02129f60 .ctor start:0x02129f70 end:0x02129f74 - .bss start:0x0212aab0 end:0x0212aab4 + .bss start:0x0212aaa0 end:0x0212aab4 diff --git a/config/eur/arm9/overlays/ov046/symbols.txt b/config/eur/arm9/overlays/ov046/symbols.txt index b75f5d46..a48a86e5 100644 --- a/config/eur/arm9/overlays/ov046/symbols.txt +++ b/config/eur/arm9/overlays/ov046/symbols.txt @@ -256,22 +256,22 @@ data_ov046_0212a608 kind:data(any) addr:0x0212a608 _ZTV19data_ov046_0212a61c kind:data(any) addr:0x0212a61c data_ov046_0212a640 kind:data(any) addr:0x0212a640 _ZTV19data_ov046_0212a690 kind:data(any) addr:0x0212a690 -data_ov046_0212a700 kind:bss addr:0x0212a700 -data_ov046_0212a704 kind:bss addr:0x0212a704 -sActorProfileUnkWTTH kind:bss addr:0x0212a710 +_ZGVN15ProfileInstanceI19ActorProfileUnkWTTHE8sProfileE kind:bss addr:0x0212a700 +@11712 kind:bss addr:0x0212a704 +_ZN15ProfileInstanceI19ActorProfileUnkWTTHE8sProfileE kind:bss addr:0x0212a710 data_ov046_0212a798 kind:bss addr:0x0212a798 ambiguous data_ov046_0212a7c4 kind:bss addr:0x0212a7c4 ambiguous -data_ov046_0212a7e8 kind:bss addr:0x0212a7e8 -data_ov046_0212a7ec kind:bss addr:0x0212a7ec -sActorProfileUnkWTH2 kind:bss addr:0x0212a7f8 -data_ov046_0212a8d0 kind:bss addr:0x0212a8d0 -data_ov046_0212a8d4 kind:bss addr:0x0212a8d4 -sActorProfileUnkWTH3 kind:bss addr:0x0212a8e0 -data_ov046_0212a9b8 kind:bss addr:0x0212a9b8 -data_ov046_0212a9bc kind:bss addr:0x0212a9bc -sActorProfileUnkWBTN kind:bss addr:0x0212a9c8 +_ZGVN15ProfileInstanceI19ActorProfileUnkWTH2E8sProfileE kind:bss addr:0x0212a7e8 +@11718 kind:bss addr:0x0212a7ec +_ZN15ProfileInstanceI19ActorProfileUnkWTH2E8sProfileE kind:bss addr:0x0212a7f8 +_ZGVN15ProfileInstanceI19ActorProfileUnkWTH3E8sProfileE kind:bss addr:0x0212a8d0 +@11724 kind:bss addr:0x0212a8d4 +_ZN15ProfileInstanceI19ActorProfileUnkWTH3E8sProfileE kind:bss addr:0x0212a8e0 +_ZGVN15ProfileInstanceI19ActorProfileUnkWBTNE8sProfileE kind:bss addr:0x0212a9b8 +@11730 kind:bss addr:0x0212a9bc +_ZN15ProfileInstanceI19ActorProfileUnkWBTNE8sProfileE kind:bss addr:0x0212a9c8 data_ov046_0212a9cc kind:bss addr:0x0212a9cc -data_ov046_0212aaa0 kind:bss addr:0x0212aaa0 -data_ov046_0212aaa4 kind:bss addr:0x0212aaa4 -sActorProfileUnkWBN2 kind:bss addr:0x0212aab0 +_ZGVN15ProfileInstanceI19ActorProfileUnkWBN2E8sProfileE kind:bss addr:0x0212aaa0 +@11736 kind:bss addr:0x0212aaa4 +_ZN15ProfileInstanceI19ActorProfileUnkWBN2E8sProfileE kind:bss addr:0x0212aab0 data_ov046_0212aab4 kind:bss addr:0x0212aab4 diff --git a/config/eur/arm9/overlays/ov047/delinks.txt b/config/eur/arm9/overlays/ov047/delinks.txt index d3d5f597..9098f3f9 100644 --- a/config/eur/arm9/overlays/ov047/delinks.txt +++ b/config/eur/arm9/overlays/ov047/delinks.txt @@ -9,19 +9,19 @@ src/047_MapC1/Actor/ActorUnkGHOS.cpp: .text start:0x02131478 end:0x021351ac .init start:0x02135d44 end:0x02135d94 .ctor start:0x02135e88 end:0x02135e8c - .bss start:0x02136350 end:0x02136428 + .bss start:0x02136340 end:0x02136428 src/047_MapC1/Actor/ActorUnkEVCH.cpp: .text start:0x021351ac end:0x02135408 .init start:0x02135d94 end:0x02135de4 .ctor start:0x02135e8c end:0x02135e90 - .bss start:0x02136438 end:0x02136474 + .bss start:0x02136428 end:0x02136474 src/047_MapC1/Actor/ActorUnkFLDK.cpp: .text start:0x02135408 end:0x02135650 .init start:0x02135de4 end:0x02135e34 .ctor start:0x02135e90 end:0x02135e94 - .bss start:0x02136484 end:0x021364c0 + .bss start:0x02136474 end:0x021364c0 src/047_MapC1/Actor/ActorUnkDLTG.cpp: .text start:0x021356e0 end:0x02135aa8 diff --git a/config/eur/arm9/overlays/ov047/symbols.txt b/config/eur/arm9/overlays/ov047/symbols.txt index e1c36958..c9e2b447 100644 --- a/config/eur/arm9/overlays/ov047/symbols.txt +++ b/config/eur/arm9/overlays/ov047/symbols.txt @@ -167,15 +167,15 @@ _ZTV19data_ov047_02136230 kind:data(any) addr:0x02136230 _ZTV19data_ov047_02136254 kind:data(any) addr:0x02136254 _ZTV19data_ov047_021362b0 kind:data(any) addr:0x021362b0 _ZTV19data_ov047_021362d4 kind:data(any) addr:0x021362d4 -data_ov047_02136340 kind:bss addr:0x02136340 -data_ov047_02136344 kind:bss addr:0x02136344 -sActorProfileUnkGHOS kind:bss addr:0x02136350 -data_ov047_02136428 kind:bss addr:0x02136428 -data_ov047_0213642c kind:bss addr:0x0213642c -sActorProfileUnkEVCH kind:bss addr:0x02136438 -data_ov047_02136474 kind:bss addr:0x02136474 -data_ov047_02136478 kind:bss addr:0x02136478 -sActorProfileUnkFLDK kind:bss addr:0x02136484 +_ZGVN15ProfileInstanceI19ActorProfileUnkGHOSE8sProfileE kind:bss addr:0x02136340 +@11748 kind:bss addr:0x02136344 +_ZN15ProfileInstanceI19ActorProfileUnkGHOSE8sProfileE kind:bss addr:0x02136350 +_ZGVN15ProfileInstanceI19ActorProfileUnkEVCHE8sProfileE kind:bss addr:0x02136428 +@11754 kind:bss addr:0x0213642c +_ZN15ProfileInstanceI19ActorProfileUnkEVCHE8sProfileE kind:bss addr:0x02136438 +_ZGVN15ProfileInstanceI19ActorProfileUnkFLDKE8sProfileE kind:bss addr:0x02136474 +@11760 kind:bss addr:0x02136478 +_ZN15ProfileInstanceI19ActorProfileUnkFLDKE8sProfileE kind:bss addr:0x02136484 data_ov047_021364c0 kind:bss addr:0x021364c0 data_ov047_021364c4 kind:bss addr:0x021364c4 -sActorProfileUnkDLTG kind:bss addr:0x021364d0 +_ZN15ProfileInstanceI19ActorProfileUnkDLTGE8sProfileE kind:bss addr:0x021364d0 diff --git a/config/eur/arm9/overlays/ov048/delinks.txt b/config/eur/arm9/overlays/ov048/delinks.txt index 26075de6..894ae95d 100644 --- a/config/eur/arm9/overlays/ov048/delinks.txt +++ b/config/eur/arm9/overlays/ov048/delinks.txt @@ -9,16 +9,16 @@ src/048_MapC2/Actor/ActorUnkPSBK.cpp: .text start:0x02130be0 end:0x021320e8 .init start:0x02137478 end:0x021374f0 .ctor start:0x021375a0 end:0x021375a4 - .bss start:0x02137aa4 end:0x02137b7c + .bss start:0x02137a80 end:0x02137c58 src/048_MapC2/Actor/ActorUnkPBK2.cpp: .text start:0x021320e8 end:0x02133bac .init start:0x021374f0 end:0x02137540 .ctor start:0x021375a4 end:0x021375a8 - .bss start:0x02137c70 end:0x02137d48 + .bss start:0x02137c58 end:0x02137d4c src/048_MapC2/MapObject/MapObjectUnkDRTW.cpp: .text start:0x02133bac end:0x0213494c .init start:0x02137540 end:0x0213759c .ctor start:0x021375a8 end:0x021375ac - .bss start:0x02137d64 end:0x02137d84 + .bss start:0x02137d4c end:0x02137d84 diff --git a/config/eur/arm9/overlays/ov048/symbols.txt b/config/eur/arm9/overlays/ov048/symbols.txt index cb356502..80fa36ed 100644 --- a/config/eur/arm9/overlays/ov048/symbols.txt +++ b/config/eur/arm9/overlays/ov048/symbols.txt @@ -205,16 +205,16 @@ data_ov048_02137a2c kind:data(any) addr:0x02137a2c data_ov048_02137a60 kind:bss addr:0x02137a60 data_ov048_02137a6c kind:bss addr:0x02137a6c data_ov048_02137a74 kind:bss addr:0x02137a74 -data_ov048_02137a80 kind:bss addr:0x02137a80 -data_ov048_02137a8c kind:bss addr:0x02137a8c -sActorProfileUnkPSBK kind:bss addr:0x02137aa4 +_ZGVN15ProfileInstanceI19ActorProfileUnkPSBKE8sProfileE kind:bss addr:0x02137a80 +@11777 kind:bss addr:0x02137a8c +_ZN15ProfileInstanceI19ActorProfileUnkPSBKE8sProfileE kind:bss addr:0x02137aa4 data_ov048_02137b7c kind:bss addr:0x02137b7c -data_ov048_02137c58 kind:bss addr:0x02137c58 -data_ov048_02137c64 kind:bss addr:0x02137c64 -sActorProfileUnkPBK2 kind:bss addr:0x02137c70 +_ZGVN15ProfileInstanceI19ActorProfileUnkPBK2E8sProfileE kind:bss addr:0x02137c58 +@11783 kind:bss addr:0x02137c64 +_ZN15ProfileInstanceI19ActorProfileUnkPBK2E8sProfileE kind:bss addr:0x02137c70 data_ov048_02137d48 kind:bss addr:0x02137d48 -data_ov048_02137d4c kind:bss addr:0x02137d4c -data_ov048_02137d58 kind:bss addr:0x02137d58 -sMapObjectProfileUnkDRTW kind:bss addr:0x02137d64 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkDRTWE8sProfileE kind:bss addr:0x02137d4c +@21523 kind:bss addr:0x02137d58 +_ZN15ProfileInstanceI23MapObjectProfileUnkDRTWE8sProfileE kind:bss addr:0x02137d64 data_ov048_02137d84 kind:bss addr:0x02137d84 data_ov048_02137e38 kind:bss addr:0x02137e38 diff --git a/config/eur/arm9/overlays/ov049/delinks.txt b/config/eur/arm9/overlays/ov049/delinks.txt index d9742bfa..426103cf 100644 --- a/config/eur/arm9/overlays/ov049/delinks.txt +++ b/config/eur/arm9/overlays/ov049/delinks.txt @@ -9,31 +9,31 @@ src/049_MapC3/Actor/ActorUnkBEEE.cpp: .text start:0x021304a0 end:0x02131478 .init start:0x02136b70 end:0x02136bc0 .ctor start:0x021372c8 end:0x021372cc - .bss start:0x02138010 end:0x021380e8 + .bss start:0x02138000 end:0x021380e8 src/049_MapC3/Actor/ActorUnkBEEH.cpp: .text start:0x02131478 end:0x021320ec .init start:0x02136bc0 end:0x02136c10 .ctor start:0x021372cc end:0x021372d0 - .bss start:0x021380f8 end:0x021381d0 + .bss start:0x021380e8 end:0x021381d0 src/049_MapC3/Actor/ActorUnkCROW.cpp: .text start:0x021320ec end:0x02134134 .init start:0x02136c10 end:0x02136c60 .ctor start:0x021372d0 end:0x021372d4 - .bss start:0x021381e0 end:0x021382b8 + .bss start:0x021381d0 end:0x021382b8 src/049_MapC3/Actor/ActorUnkCRCH.cpp: .text start:0x02134134 end:0x0213444c .init start:0x02136c60 end:0x02136cb0 .ctor start:0x021372d4 end:0x021372d8 - .bss start:0x021382c8 end:0x02138304 + .bss start:0x021382b8 end:0x02138304 src/049_MapC3/Actor/ActorUnkPOST.cpp: .text start:0x021347bc end:0x02135228 .init start:0x02136cb0 end:0x02136fbc .ctor start:0x021372d8 end:0x021372dc - .bss start:0x02138314 end:0x021383ec + .bss start:0x02138304 end:0x021383ec src/049_MapC3/Actor/ActorUnkPTMN.cpp: .text start:0x02135548 end:0x02136b40 diff --git a/config/eur/arm9/overlays/ov049/symbols.txt b/config/eur/arm9/overlays/ov049/symbols.txt index e649e701..c3215fed 100644 --- a/config/eur/arm9/overlays/ov049/symbols.txt +++ b/config/eur/arm9/overlays/ov049/symbols.txt @@ -327,21 +327,21 @@ data_ov049_02137fc0 kind:data(any) addr:0x02137fc0 data_ov049_02137fd0 kind:data(any) addr:0x02137fd0 data_ov049_02137fe0 kind:data(any) addr:0x02137fe0 data_ov049_02137ff0 kind:data(any) addr:0x02137ff0 -data_ov049_02138000 kind:bss addr:0x02138000 -data_ov049_02138004 kind:bss addr:0x02138004 -sActorProfileUnkBEEE kind:bss addr:0x02138010 -data_ov049_021380e8 kind:bss addr:0x021380e8 -data_ov049_021380ec kind:bss addr:0x021380ec -sActorProfileUnkBEEH kind:bss addr:0x021380f8 -data_ov049_021381d0 kind:bss addr:0x021381d0 -data_ov049_021381d4 kind:bss addr:0x021381d4 -sActorProfileUnkCROW kind:bss addr:0x021381e0 -data_ov049_021382b8 kind:bss addr:0x021382b8 -data_ov049_021382bc kind:bss addr:0x021382bc -sActorProfileUnkCRCH kind:bss addr:0x021382c8 -data_ov049_02138304 kind:bss addr:0x02138304 -data_ov049_02138308 kind:bss addr:0x02138308 -sActorProfileUnkPOST kind:bss addr:0x02138314 +_ZGVN15ProfileInstanceI19ActorProfileUnkBEEEE8sProfileE kind:bss addr:0x02138000 +@11801 kind:bss addr:0x02138004 +_ZN15ProfileInstanceI19ActorProfileUnkBEEEE8sProfileE kind:bss addr:0x02138010 +_ZGVN15ProfileInstanceI19ActorProfileUnkBEEHE8sProfileE kind:bss addr:0x021380e8 +@11807 kind:bss addr:0x021380ec +_ZN15ProfileInstanceI19ActorProfileUnkBEEHE8sProfileE kind:bss addr:0x021380f8 +_ZGVN15ProfileInstanceI19ActorProfileUnkCROWE8sProfileE kind:bss addr:0x021381d0 +@11813 kind:bss addr:0x021381d4 +_ZN15ProfileInstanceI19ActorProfileUnkCROWE8sProfileE kind:bss addr:0x021381e0 +_ZGVN15ProfileInstanceI19ActorProfileUnkCRCHE8sProfileE kind:bss addr:0x021382b8 +@11819 kind:bss addr:0x021382bc +_ZN15ProfileInstanceI19ActorProfileUnkCRCHE8sProfileE kind:bss addr:0x021382c8 +_ZGVN15ProfileInstanceI19ActorProfileUnkPOSTE8sProfileE kind:bss addr:0x02138304 +@11825 kind:bss addr:0x02138308 +_ZN15ProfileInstanceI19ActorProfileUnkPOSTE8sProfileE kind:bss addr:0x02138314 data_ov049_021383ec kind:bss addr:0x021383ec data_ov049_021383f0 kind:bss addr:0x021383f0 -sActorProfileUnkPTMN kind:bss addr:0x021383fc +_ZN15ProfileInstanceI19ActorProfileUnkPTMNE8sProfileE kind:bss addr:0x021383fc diff --git a/config/eur/arm9/overlays/ov050/delinks.txt b/config/eur/arm9/overlays/ov050/delinks.txt index db0e343e..8f3a1638 100644 --- a/config/eur/arm9/overlays/ov050/delinks.txt +++ b/config/eur/arm9/overlays/ov050/delinks.txt @@ -9,19 +9,19 @@ src/050_MapC4/Actor/ActorUnkKMOS.cpp: .text start:0x021304a0 end:0x02132ec0 .init start:0x021367e4 end:0x02136840 .ctor start:0x02136958 end:0x0213695c - .bss start:0x0213703c end:0x02137114 + .bss start:0x02137024 end:0x02137114 src/050_MapC4/Actor/ActorUnkKMOH.cpp: .text start:0x02132ec0 end:0x02135314 .init start:0x02136840 end:0x021368a8 .ctor start:0x0213695c end:0x02136960 - .bss start:0x02137124 end:0x021371fc + .bss start:0x02137114 end:0x021371fc src/050_MapC4/Actor/ActorUnkFRTN.cpp: .text start:0x02135314 end:0x0213622c .init start:0x021368a8 end:0x02136908 .ctor start:0x02136960 end:0x02136964 - .bss start:0x02137218 end:0x021372f0 + .bss start:0x021371fc end:0x021372f0 src/050_MapC4/MapObject/MapObjectUnkGTTN.cpp: .text start:0x0213622c end:0x021367c4 diff --git a/config/eur/arm9/overlays/ov050/symbols.txt b/config/eur/arm9/overlays/ov050/symbols.txt index aa45bbf6..924a6deb 100644 --- a/config/eur/arm9/overlays/ov050/symbols.txt +++ b/config/eur/arm9/overlays/ov050/symbols.txt @@ -213,15 +213,15 @@ data_ov050_02136f88 kind:data(any) addr:0x02136f88 data_ov050_02136fb0 kind:data(any) addr:0x02136fb0 data_ov050_02136fdc kind:data(any) addr:0x02136fdc data_ov050_02137020 kind:bss addr:0x02137020 -data_ov050_02137024 kind:bss addr:0x02137024 -data_ov050_02137030 kind:bss addr:0x02137030 -sActorProfileUnkKMOS kind:bss addr:0x0213703c -data_ov050_02137114 kind:bss addr:0x02137114 -data_ov050_02137118 kind:bss addr:0x02137118 -sActorProfileUnkKMOH kind:bss addr:0x02137124 -data_ov050_021371fc kind:bss addr:0x021371fc -data_ov050_02137200 kind:bss addr:0x02137200 -sActorProfileUnkFRTN kind:bss addr:0x02137218 +_ZGVN15ProfileInstanceI19ActorProfileUnkKMOSE8sProfileE kind:bss addr:0x02137024 +@11842 kind:bss addr:0x02137030 +_ZN15ProfileInstanceI19ActorProfileUnkKMOSE8sProfileE kind:bss addr:0x0213703c +_ZGVN15ProfileInstanceI19ActorProfileUnkKMOHE8sProfileE kind:bss addr:0x02137114 +@11848 kind:bss addr:0x02137118 +_ZN15ProfileInstanceI19ActorProfileUnkKMOHE8sProfileE kind:bss addr:0x02137124 +_ZGVN15ProfileInstanceI19ActorProfileUnkFRTNE8sProfileE kind:bss addr:0x021371fc +@11854 kind:bss addr:0x02137200 +_ZN15ProfileInstanceI19ActorProfileUnkFRTNE8sProfileE kind:bss addr:0x02137218 data_ov050_021372f0 kind:bss addr:0x021372f0 data_ov050_021372f4 kind:bss addr:0x021372f4 -sMapObjectProfileUnkGTTN kind:bss addr:0x02137300 +_ZN15ProfileInstanceI23MapObjectProfileUnkGTTNE8sProfileE kind:bss addr:0x02137300 diff --git a/config/eur/arm9/overlays/ov051/symbols.txt b/config/eur/arm9/overlays/ov051/symbols.txt index d716745c..964fcba3 100644 --- a/config/eur/arm9/overlays/ov051/symbols.txt +++ b/config/eur/arm9/overlays/ov051/symbols.txt @@ -131,4 +131,4 @@ data_ov051_02137170 kind:data(any) addr:0x02137170 data_ov051_02137188 kind:data(any) addr:0x02137188 data_ov051_021371a0 kind:bss addr:0x021371a0 data_ov051_021371a4 kind:bss addr:0x021371a4 -sActorProfileUnkGYAM kind:bss addr:0x021371b0 +_ZN15ProfileInstanceI19ActorProfileUnkGYAME8sProfileE kind:bss addr:0x021371b0 diff --git a/config/eur/arm9/overlays/ov052/delinks.txt b/config/eur/arm9/overlays/ov052/delinks.txt index a1aca4c8..2e2c7f38 100644 --- a/config/eur/arm9/overlays/ov052/delinks.txt +++ b/config/eur/arm9/overlays/ov052/delinks.txt @@ -9,13 +9,13 @@ src/052_MapC6/Actor/ActorUnkSTLW.cpp: .text start:0x021304a0 end:0x02133164 .init start:0x02135bac end:0x02135c8c .ctor start:0x02135e04 end:0x02135e08 - .bss start:0x02136758 end:0x02136830 + .bss start:0x02136740 end:0x02136830 src/052_MapC6/Actor/ActorUnkSTWH.cpp: .text start:0x02133164 end:0x02134d84 .init start:0x02135c8c end:0x02135d74 .ctor start:0x02135e08 end:0x02135e0c - .bss start:0x02136840 end:0x02136918 + .bss start:0x02136830 end:0x02136918 src/052_MapC6/Actor/ActorUnkNAVI.cpp: .text start:0x02134d84 end:0x02135b84 diff --git a/config/eur/arm9/overlays/ov052/symbols.txt b/config/eur/arm9/overlays/ov052/symbols.txt index dc89aa93..42aea029 100644 --- a/config/eur/arm9/overlays/ov052/symbols.txt +++ b/config/eur/arm9/overlays/ov052/symbols.txt @@ -200,12 +200,12 @@ data_ov052_02136474 kind:data(any) addr:0x02136474 data_ov052_021364c4 kind:data(any) addr:0x021364c4 _ZTV19data_ov052_02136508 kind:data(any) addr:0x02136508 _ZTV19data_ov052_02136624 kind:data(any) addr:0x02136624 -data_ov052_02136740 kind:bss addr:0x02136740 -data_ov052_0213674c kind:bss addr:0x0213674c -sActorProfileUnkSTLW kind:bss addr:0x02136758 -data_ov052_02136830 kind:bss addr:0x02136830 -data_ov052_02136834 kind:bss addr:0x02136834 -sActorProfileUnkSTWH kind:bss addr:0x02136840 +_ZGVN15ProfileInstanceI19ActorProfileUnkSTLWE8sProfileE kind:bss addr:0x02136740 +@11882 kind:bss addr:0x0213674c +_ZN15ProfileInstanceI19ActorProfileUnkSTLWE8sProfileE kind:bss addr:0x02136758 +_ZGVN15ProfileInstanceI19ActorProfileUnkSTWHE8sProfileE kind:bss addr:0x02136830 +@11888 kind:bss addr:0x02136834 +_ZN15ProfileInstanceI19ActorProfileUnkSTWHE8sProfileE kind:bss addr:0x02136840 data_ov052_02136918 kind:bss addr:0x02136918 data_ov052_0213691c kind:bss addr:0x0213691c -sActorProfileUnkNAVI kind:bss addr:0x02136928 +_ZN15ProfileInstanceI19ActorProfileUnkNAVIE8sProfileE kind:bss addr:0x02136928 diff --git a/config/eur/arm9/overlays/ov053/delinks.txt b/config/eur/arm9/overlays/ov053/delinks.txt index b28af811..63985fbd 100644 --- a/config/eur/arm9/overlays/ov053/delinks.txt +++ b/config/eur/arm9/overlays/ov053/delinks.txt @@ -9,7 +9,7 @@ src/053_MapD1/Actor/ActorUnkLIKE.cpp: .text start:0x0213859c end:0x0213b2a8 .init start:0x0213cd5c end:0x0213cdac .ctor start:0x0213ce74 end:0x0213ce78 - .bss start:0x0213d3d0 end:0x0213d4a8 + .bss start:0x0213d3c0 end:0x0213d4a8 src/053_MapD1/Actor/ActorUnkRAT0.cpp: .text start:0x0213b2a8 end:0x0213caf0 diff --git a/config/eur/arm9/overlays/ov053/symbols.txt b/config/eur/arm9/overlays/ov053/symbols.txt index 4f178430..7cdee555 100644 --- a/config/eur/arm9/overlays/ov053/symbols.txt +++ b/config/eur/arm9/overlays/ov053/symbols.txt @@ -149,9 +149,9 @@ _ZTV19data_ov053_0213d280 kind:data(any) addr:0x0213d280 data_ov053_0213d2e0 kind:data(any) addr:0x0213d2e0 data_ov053_0213d2f0 kind:data(any) addr:0x0213d2f0 data_ov053_0213d3b8 kind:data(any) addr:0x0213d3b8 -data_ov053_0213d3c0 kind:bss addr:0x0213d3c0 -data_ov053_0213d3c4 kind:bss addr:0x0213d3c4 -sActorProfileUnkLIKE kind:bss addr:0x0213d3d0 +_ZGVN15ProfileInstanceI19ActorProfileUnkLIKEE8sProfileE kind:bss addr:0x0213d3c0 +@11905 kind:bss addr:0x0213d3c4 +_ZN15ProfileInstanceI19ActorProfileUnkLIKEE8sProfileE kind:bss addr:0x0213d3d0 data_ov053_0213d4a8 kind:bss addr:0x0213d4a8 data_ov053_0213d4b0 kind:bss addr:0x0213d4b0 -sActorProfileUnkRAT0 kind:bss addr:0x0213d4bc +_ZN15ProfileInstanceI19ActorProfileUnkRAT0E8sProfileE kind:bss addr:0x0213d4bc diff --git a/config/eur/arm9/overlays/ov054/delinks.txt b/config/eur/arm9/overlays/ov054/delinks.txt index 730f124c..634403a1 100644 --- a/config/eur/arm9/overlays/ov054/delinks.txt +++ b/config/eur/arm9/overlays/ov054/delinks.txt @@ -8,13 +8,13 @@ src/054_MapD2/Actor/ActorUnkFBBH.cpp: .text start:0x02138564 end:0x0213c21c .init start:0x0213da18 end:0x0213db48 .ctor start:0x0213dc70 end:0x0213dc74 - .bss start:0x0213e530 end:0x0213e608 + .bss start:0x0213e520 end:0x0213e608 src/054_MapD2/Actor/ActorUnkFIBB.cpp: .text start:0x0213c21c end:0x0213d600 .init start:0x0213db48 end:0x0213dc20 .ctor start:0x0213dc74 end:0x0213dc78 - .bss start:0x0213e618 end:0x0213e6f0 + .bss start:0x0213e608 end:0x0213e6f0 src/054_MapD2/Actor/ActorUnkFBBF.cpp: .text start:0x0213d600 end:0x0213da18 diff --git a/config/eur/arm9/overlays/ov054/symbols.txt b/config/eur/arm9/overlays/ov054/symbols.txt index b7b394c6..73adf7a6 100644 --- a/config/eur/arm9/overlays/ov054/symbols.txt +++ b/config/eur/arm9/overlays/ov054/symbols.txt @@ -191,12 +191,12 @@ data_ov054_0213e458 kind:data(any) addr:0x0213e458 data_ov054_0213e470 kind:data(any) addr:0x0213e470 _ZTV19data_ov054_0213e488 kind:data(any) addr:0x0213e488 _ZTV19data_ov054_0213e4ac kind:data(any) addr:0x0213e4ac -data_ov054_0213e520 kind:bss addr:0x0213e520 -data_ov054_0213e524 kind:bss addr:0x0213e524 -sActorProfileUnkFBBH kind:bss addr:0x0213e530 -data_ov054_0213e608 kind:bss addr:0x0213e608 -data_ov054_0213e60c kind:bss addr:0x0213e60c -sActorProfileUnkFIBB kind:bss addr:0x0213e618 +_ZGVN15ProfileInstanceI19ActorProfileUnkFBBHE8sProfileE kind:bss addr:0x0213e520 +@11921 kind:bss addr:0x0213e524 +_ZN15ProfileInstanceI19ActorProfileUnkFBBHE8sProfileE kind:bss addr:0x0213e530 +_ZGVN15ProfileInstanceI19ActorProfileUnkFIBBE8sProfileE kind:bss addr:0x0213e608 +@11927 kind:bss addr:0x0213e60c +_ZN15ProfileInstanceI19ActorProfileUnkFIBBE8sProfileE kind:bss addr:0x0213e618 data_ov054_0213e6f0 kind:bss addr:0x0213e6f0 data_ov054_0213e6f4 kind:bss addr:0x0213e6f4 -sActorProfileUnkFBBF kind:bss addr:0x0213e700 +_ZN15ProfileInstanceI19ActorProfileUnkFBBFE8sProfileE kind:bss addr:0x0213e700 diff --git a/config/eur/arm9/overlays/ov055/delinks.txt b/config/eur/arm9/overlays/ov055/delinks.txt index 9d7daa56..115cf927 100644 --- a/config/eur/arm9/overlays/ov055/delinks.txt +++ b/config/eur/arm9/overlays/ov055/delinks.txt @@ -9,13 +9,13 @@ src/055_MapD3/Actor/ActorUnkCHUC.cpp: .text start:0x02139808 end:0x0213b2a8 .init start:0x0213d288 end:0x0213d2f4 .ctor start:0x0213d3f4 end:0x0213d3f8 - .bss start:0x0213dbf0 end:0x0213dcc8 + .bss start:0x0213dbe0 end:0x0213dcc8 src/055_MapD3/Actor/ActorUnkRCHU.cpp: .text start:0x0213b2a8 end:0x0213be7c .init start:0x0213d2f4 end:0x0213d360 .ctor start:0x0213d3f8 end:0x0213d3fc - .bss start:0x0213dcd8 end:0x0213dd1c + .bss start:0x0213dcc8 end:0x0213dd1c src/055_MapD3/Actor/ActorUnkRCMS.cpp: .text start:0x0213be7c end:0x0213d258 diff --git a/config/eur/arm9/overlays/ov055/symbols.txt b/config/eur/arm9/overlays/ov055/symbols.txt index a339acd9..a55f57b3 100644 --- a/config/eur/arm9/overlays/ov055/symbols.txt +++ b/config/eur/arm9/overlays/ov055/symbols.txt @@ -229,12 +229,12 @@ data_ov055_0213daf0 kind:data(any) addr:0x0213daf0 _ZTV19data_ov055_0213db04 kind:data(any) addr:0x0213db04 data_ov055_0213db30 kind:data(any) addr:0x0213db30 _ZTV19data_ov055_0213db74 kind:data(any) addr:0x0213db74 -data_ov055_0213dbe0 kind:bss addr:0x0213dbe0 -data_ov055_0213dbe4 kind:bss addr:0x0213dbe4 -sActorProfileUnkCHUC kind:bss addr:0x0213dbf0 -data_ov055_0213dcc8 kind:bss addr:0x0213dcc8 -data_ov055_0213dccc kind:bss addr:0x0213dccc -sActorProfileUnkRCHU kind:bss addr:0x0213dcd8 +_ZGVN15ProfileInstanceI19ActorProfileUnkCHUCE8sProfileE kind:bss addr:0x0213dbe0 +@11944 kind:bss addr:0x0213dbe4 +_ZN15ProfileInstanceI19ActorProfileUnkCHUCE8sProfileE kind:bss addr:0x0213dbf0 +_ZGVN15ProfileInstanceI19ActorProfileUnkRCHUE8sProfileE kind:bss addr:0x0213dcc8 +@11950 kind:bss addr:0x0213dccc +_ZN15ProfileInstanceI19ActorProfileUnkRCHUE8sProfileE kind:bss addr:0x0213dcd8 data_ov055_0213dd1c kind:bss addr:0x0213dd1c data_ov055_0213dd20 kind:bss addr:0x0213dd20 -sActorProfileUnkRCMS kind:bss addr:0x0213dd2c +_ZN15ProfileInstanceI19ActorProfileUnkRCMSE8sProfileE kind:bss addr:0x0213dd2c diff --git a/config/eur/arm9/overlays/ov056/delinks.txt b/config/eur/arm9/overlays/ov056/delinks.txt index 0a3f1d6b..376130a9 100644 --- a/config/eur/arm9/overlays/ov056/delinks.txt +++ b/config/eur/arm9/overlays/ov056/delinks.txt @@ -9,16 +9,16 @@ src/056_MapD4/Actor/ActorUnkPASS.cpp: .text start:0x02138788 end:0x0213a978 .init start:0x0213e3dc end:0x0213e42c .ctor start:0x0213e4cc end:0x0213e4d0 - .bss start:0x0213ee30 end:0x0213ee80 + .bss start:0x0213ee20 end:0x0213ee80 src/056_MapD4/MapObject/MapObjectUnkFSVC.cpp: .text start:0x0213aa48 end:0x0213ab80 .init start:0x0213e42c end:0x0213e47c .ctor start:0x0213e4d0 end:0x0213e4d4 - .bss start:0x0213ee90 end:0x0213ef64 + .bss start:0x0213ee80 end:0x0213ef64 src/056_MapD4/Actor/ActorUnkFSIR.cpp: .text start:0x0213ab80 end:0x0213b24c .init start:0x0213e47c end:0x0213e4cc .ctor start:0x0213e4d4 end:0x0213e4d8 - .bss start:0x0213ef74 end:0x0213efb8 + .bss start:0x0213ef64 end:0x0213efb8 diff --git a/config/eur/arm9/overlays/ov056/symbols.txt b/config/eur/arm9/overlays/ov056/symbols.txt index 1c26b75d..e112a910 100644 --- a/config/eur/arm9/overlays/ov056/symbols.txt +++ b/config/eur/arm9/overlays/ov056/symbols.txt @@ -263,13 +263,13 @@ data_ov056_0213edd8 kind:data(any) addr:0x0213edd8 data_ov056_0213ede8 kind:data(any) addr:0x0213ede8 data_ov056_0213edf4 kind:data(any) addr:0x0213edf4 data_ov056_0213ee0c kind:data(any) addr:0x0213ee0c -data_ov056_0213ee20 kind:bss addr:0x0213ee20 -data_ov056_0213ee24 kind:bss addr:0x0213ee24 -sActorProfileUnkPASS kind:bss addr:0x0213ee30 -data_ov056_0213ee80 kind:bss addr:0x0213ee80 -data_ov056_0213ee84 kind:bss addr:0x0213ee84 -sMapObjectProfileUnkFSVC kind:bss addr:0x0213ee90 -data_ov056_0213ef64 kind:bss addr:0x0213ef64 -data_ov056_0213ef68 kind:bss addr:0x0213ef68 -sActorProfileUnkFSIR kind:bss addr:0x0213ef74 +_ZGVN15ProfileInstanceI19ActorProfileUnkPASSE8sProfileE kind:bss addr:0x0213ee20 +@11967 kind:bss addr:0x0213ee24 +_ZN15ProfileInstanceI19ActorProfileUnkPASSE8sProfileE kind:bss addr:0x0213ee30 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkFSVCE8sProfileE kind:bss addr:0x0213ee80 +@21570 kind:bss addr:0x0213ee84 +_ZN15ProfileInstanceI23MapObjectProfileUnkFSVCE8sProfileE kind:bss addr:0x0213ee90 +_ZGVN15ProfileInstanceI19ActorProfileUnkFSIRE8sProfileE kind:bss addr:0x0213ef64 +@11979 kind:bss addr:0x0213ef68 +_ZN15ProfileInstanceI19ActorProfileUnkFSIRE8sProfileE kind:bss addr:0x0213ef74 data_ov056_0213efb8 kind:bss addr:0x0213efb8 diff --git a/config/eur/arm9/overlays/ov057/delinks.txt b/config/eur/arm9/overlays/ov057/delinks.txt index ba062244..1ff0c387 100644 --- a/config/eur/arm9/overlays/ov057/delinks.txt +++ b/config/eur/arm9/overlays/ov057/delinks.txt @@ -9,37 +9,37 @@ src/057_MapD5/Actor/ActorUnkFSST.cpp: .text start:0x021384e0 end:0x02139e60 .init start:0x0213b960 end:0x0213b9c0 .ctor start:0x0213bd64 end:0x0213bd68 - .bss start:0x0213c2dc end:0x0213c3b4 + .bss start:0x0213c2c4 end:0x0213c3b4 src/057_MapD5/Actor/ActorUnkFSSF.cpp: .text start:0x02139e60 end:0x0213a17c .init start:0x0213b9c0 end:0x0213ba10 .ctor start:0x0213bd68 end:0x0213bd6c - .bss start:0x0213c3c4 end:0x0213c400 + .bss start:0x0213c3b4 end:0x0213c400 src/057_MapD5/Actor/ActorUnkRMFK.cpp: .text start:0x0213a17c end:0x0213a7f8 .init start:0x0213ba10 end:0x0213bc08 .ctor start:0x0213bd6c end:0x0213bd70 - .bss start:0x0213c410 end:0x0213c4e8 + .bss start:0x0213c400 end:0x0213c4e8 src/057_MapD5/Actor/ActorUnkGTTG.cpp: .text start:0x0213a7f8 end:0x0213a9fc .init start:0x0213bc08 end:0x0213bc58 .ctor start:0x0213bd70 end:0x0213bd74 - .bss start:0x0213c4f8 end:0x0213c534 + .bss start:0x0213c4e8 end:0x0213c534 src/057_MapD5/Actor/ActorUnkHYSW.cpp: .text start:0x0213a9fc end:0x0213abf0 .init start:0x0213bc58 end:0x0213bca8 .ctor start:0x0213bd74 end:0x0213bd78 - .bss start:0x0213c544 end:0x0213c580 + .bss start:0x0213c534 end:0x0213c580 src/057_MapD5/Actor/ActorUnkELVT.cpp: .text start:0x0213abf0 end:0x0213b768 .init start:0x0213bca8 end:0x0213bcf8 .ctor start:0x0213bd78 end:0x0213bd7c - .bss start:0x0213c590 end:0x0213c668 + .bss start:0x0213c580 end:0x0213c668 src/057_MapD5/MapObject/MapObjectUnkTRLN.cpp: .text start:0x0213b768 end:0x0213b8dc diff --git a/config/eur/arm9/overlays/ov057/symbols.txt b/config/eur/arm9/overlays/ov057/symbols.txt index 333fcca6..d4a31e96 100644 --- a/config/eur/arm9/overlays/ov057/symbols.txt +++ b/config/eur/arm9/overlays/ov057/symbols.txt @@ -174,24 +174,24 @@ data_ov057_0213c22c kind:data(any) addr:0x0213c22c data_ov057_0213c23c kind:data(any) addr:0x0213c23c data_ov057_0213c258 kind:data(any) addr:0x0213c258 data_ov057_0213c2c0 kind:bss addr:0x0213c2c0 -data_ov057_0213c2c4 kind:bss addr:0x0213c2c4 -data_ov057_0213c2d0 kind:bss addr:0x0213c2d0 -sActorProfileUnkFSST kind:bss addr:0x0213c2dc -data_ov057_0213c3b4 kind:bss addr:0x0213c3b4 -data_ov057_0213c3b8 kind:bss addr:0x0213c3b8 -sActorProfileUnkFSSF kind:bss addr:0x0213c3c4 -data_ov057_0213c400 kind:bss addr:0x0213c400 -data_ov057_0213c404 kind:bss addr:0x0213c404 -sActorProfileUnkRMFK kind:bss addr:0x0213c410 -data_ov057_0213c4e8 kind:bss addr:0x0213c4e8 -data_ov057_0213c4ec kind:bss addr:0x0213c4ec -sActorProfileUnkGTTG kind:bss addr:0x0213c4f8 -data_ov057_0213c534 kind:bss addr:0x0213c534 -data_ov057_0213c538 kind:bss addr:0x0213c538 -sActorProfileUnkHYSW kind:bss addr:0x0213c544 -data_ov057_0213c580 kind:bss addr:0x0213c580 -data_ov057_0213c584 kind:bss addr:0x0213c584 -sActorProfileUnkELVT kind:bss addr:0x0213c590 +_ZGVN15ProfileInstanceI19ActorProfileUnkFSSTE8sProfileE kind:bss addr:0x0213c2c4 +@11991 kind:bss addr:0x0213c2d0 +_ZN15ProfileInstanceI19ActorProfileUnkFSSTE8sProfileE kind:bss addr:0x0213c2dc +_ZGVN15ProfileInstanceI19ActorProfileUnkFSSFE8sProfileE kind:bss addr:0x0213c3b4 +@11997 kind:bss addr:0x0213c3b8 +_ZN15ProfileInstanceI19ActorProfileUnkFSSFE8sProfileE kind:bss addr:0x0213c3c4 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMFKE8sProfileE kind:bss addr:0x0213c400 +@12003 kind:bss addr:0x0213c404 +_ZN15ProfileInstanceI19ActorProfileUnkRMFKE8sProfileE kind:bss addr:0x0213c410 +_ZGVN15ProfileInstanceI19ActorProfileUnkGTTGE8sProfileE kind:bss addr:0x0213c4e8 +@12009 kind:bss addr:0x0213c4ec +_ZN15ProfileInstanceI19ActorProfileUnkGTTGE8sProfileE kind:bss addr:0x0213c4f8 +_ZGVN15ProfileInstanceI19ActorProfileUnkHYSWE8sProfileE kind:bss addr:0x0213c534 +@12015 kind:bss addr:0x0213c538 +_ZN15ProfileInstanceI19ActorProfileUnkHYSWE8sProfileE kind:bss addr:0x0213c544 +_ZGVN15ProfileInstanceI19ActorProfileUnkELVTE8sProfileE kind:bss addr:0x0213c580 +@12021 kind:bss addr:0x0213c584 +_ZN15ProfileInstanceI19ActorProfileUnkELVTE8sProfileE kind:bss addr:0x0213c590 data_ov057_0213c668 kind:bss addr:0x0213c668 data_ov057_0213c66c kind:bss addr:0x0213c66c -sMapObjectProfileUnkTRLN kind:bss addr:0x0213c678 +_ZN15ProfileInstanceI23MapObjectProfileUnkTRLNE8sProfileE kind:bss addr:0x0213c678 diff --git a/config/eur/arm9/overlays/ov058/delinks.txt b/config/eur/arm9/overlays/ov058/delinks.txt index b3a2a293..dc035336 100644 --- a/config/eur/arm9/overlays/ov058/delinks.txt +++ b/config/eur/arm9/overlays/ov058/delinks.txt @@ -9,148 +9,148 @@ src/058_Field/Actor/ActorUnkKOKO.cpp: .text start:0x0213f254 end:0x02141dd8 .init start:0x02153498 end:0x021534e8 .ctor start:0x02154120 end:0x02154124 - .bss start:0x02155eb0 end:0x02155f88 + .bss start:0x02155ea0 end:0x02155f8c src/058_Field/Actor/ActorUnkKOAT.cpp: .text start:0x02141dd8 end:0x0214237c .init start:0x021534e8 end:0x02153538 .ctor start:0x02154124 end:0x02154128 - .bss start:0x02155fa0 end:0x02155fe4 + .bss start:0x02155f8c end:0x02155fe4 src/058_Field/Actor/ActorUnkKOCH.cpp: .text start:0x0214237c end:0x021429ac .init start:0x02153538 end:0x02153588 .ctor start:0x02154128 end:0x0215412c - .bss start:0x02155ff4 end:0x02156030 + .bss start:0x02155fe4 end:0x02156030 src/058_Field/Actor/ActorUnkNSTN.cpp: .text start:0x021429cc end:0x02142d90 .init start:0x02153588 end:0x021535d8 .ctor start:0x0215412c end:0x02154130 - .bss start:0x02156040 end:0x0215607c + .bss start:0x02156030 end:0x021561a0 src/058_Field/Actor/ActorUnkSYDE_SYDL_SYDS_SYFI_SYFO_SYIL_SYIS_SYOL_SYOS_SYSL_SYSN_SYSS_SYWA_SYWL_SYWS.cpp: .text start:0x02142d90 end:0x02147ef0 .init start:0x021535d8 end:0x021539a8 .ctor start:0x02154130 end:0x02154134 - .bss start:0x02156220 end:0x02156ec8 + .bss start:0x021561a0 end:0x02156ec8 src/058_Field/Actor/ActorUnkCRFT.cpp: .text start:0x02147ef0 end:0x02148bec .init start:0x021539a8 end:0x021539f8 .ctor start:0x02154134 end:0x02154138 - .bss start:0x02156ed8 end:0x02156f38 + .bss start:0x02156ec8 end:0x02156fbc src/058_Field/Actor/ActorUnkFBRD.cpp: .text start:0x02148bec end:0x0214a988 .init start:0x021539f8 end:0x02153a74 .ctor start:0x02154138 end:0x0215413c - .bss start:0x02156fec end:0x02157064 + .bss start:0x02156fbc end:0x021570c4 src/058_Field/Actor/ActorUnkFBSC.cpp: .text start:0x0214a988 end:0x0214aba0 .init start:0x02153a74 end:0x02153ac4 .ctor start:0x0215413c end:0x02154140 - .bss start:0x021570d4 end:0x02157110 + .bss start:0x021570c4 end:0x02157110 src/058_Field/Actor/ActorUnkWPBD.cpp: .text start:0x0214abc0 end:0x0214d468 .init start:0x02153ac4 end:0x02153b44 .ctor start:0x02154140 end:0x02154144 - .bss start:0x02157124 end:0x021571fc + .bss start:0x02157110 end:0x021571fc src/058_Field/Actor/ActorUnkWPCH.cpp: .text start:0x0214d468 end:0x0214d6fc .init start:0x02153b44 end:0x02153b94 .ctor start:0x02154144 end:0x02154148 - .bss start:0x0215720c end:0x02157248 + .bss start:0x021571fc end:0x02157248 src/058_Field/Actor/ActorUnkBSTG.cpp: .text start:0x0214d71c end:0x0214d814 .init start:0x02153b94 end:0x02153be4 .ctor start:0x02154148 end:0x0215414c - .bss start:0x02157258 end:0x02157294 + .bss start:0x02157248 end:0x021572a4 src/058_Field/Actor/ActorUnkTMNA.cpp: .text start:0x0214d814 end:0x0214dcd0 .init start:0x02153be4 end:0x02153c5c .ctor start:0x0215414c end:0x02154150 - .bss start:0x021572fc end:0x021573d4 + .bss start:0x021572a4 end:0x021573d4 src/058_Field/Actor/ActorUnkTMNC.cpp: .text start:0x0214dcd0 end:0x0214df5c .init start:0x02153c5c end:0x02153cac .ctor start:0x02154150 end:0x02154154 - .bss start:0x021573e4 end:0x0215741c + .bss start:0x021573d4 end:0x021574cc src/058_Field/MapObject/MapObjectUnkTREE.cpp: .text start:0x0214df5c end:0x0214e4bc .init start:0x02153cac end:0x02153d28 .ctor start:0x02154154 end:0x02154158 - .bss start:0x021574ec end:0x02157554 + .bss start:0x021574cc end:0x02157574 src/058_Field/MapObject/MapObjectUnkLEVS.cpp: .text start:0x0214e508 end:0x0214ea70 .init start:0x02153d28 end:0x02153d78 .ctor start:0x02154158 end:0x0215415c - .bss start:0x02157584 end:0x02157658 + .bss start:0x02157574 end:0x02157678 src/058_Field/MapObject/MapObjectUnkSTNE.cpp: .text start:0x0214ea70 end:0x0214f064 .init start:0x02153d78 end:0x02153dc8 .ctor start:0x0215415c end:0x02154160 - .bss start:0x02157688 end:0x021576a4 + .bss start:0x02157678 end:0x0215777c src/058_Field/MapObject/MapObjectUnkHOUS.cpp: .text start:0x0214f064 end:0x0214f5f8 .init start:0x02153dc8 end:0x02153e18 .ctor start:0x02154160 end:0x02154164 - .bss start:0x02157794 end:0x021577b4 + .bss start:0x0215777c end:0x021577fc src/058_Field/MapObject/MapObjectUnkHOST.cpp: .text start:0x0214f7a0 end:0x0214f8ec .init start:0x02153e18 end:0x02153e68 .ctor start:0x02154164 end:0x02154168 - .bss start:0x0215780c end:0x02157878 + .bss start:0x021577fc end:0x021578e0 src/058_Field/MapObject/MapObjectUnkDRHS.cpp: .text start:0x0214f8ec end:0x0214fd18 .init start:0x02153e68 end:0x02153eb8 .ctor start:0x02154168 end:0x0215416c - .bss start:0x021578f0 end:0x02157908 + .bss start:0x021578e0 end:0x021579c4 src/058_Field/MapObject/MapObjectUnkEXHS.cpp: .text start:0x0214fd18 end:0x0214fed0 .init start:0x02153eb8 end:0x02153f08 .ctor start:0x0215416c end:0x02154170 - .bss start:0x021579d4 end:0x021579f4 + .bss start:0x021579c4 end:0x021579f4 src/058_Field/MapObject/MapObjectUnkBBFL.cpp: .text start:0x0214fed0 end:0x021509a4 .init start:0x02153f08 end:0x02153f58 .ctor start:0x02154170 end:0x02154174 - .bss start:0x02157a04 end:0x02157a70 + .bss start:0x021579f4 end:0x02157ad8 src/058_Field/MapObject/MapObjectUnkKNBN.cpp: .text start:0x021509a4 end:0x0215119c .init start:0x02153f58 end:0x02153fcc .ctor start:0x02154174 end:0x02154178 - .bss start:0x02157ae8 end:0x02157bac + .bss start:0x02157ad8 end:0x02157be0 src/058_Field/MapObject/MapObjectUnkMSCL.cpp: .text start:0x0215119c end:0x02151480 .init start:0x02153fcc end:0x02154040 .ctor start:0x02154178 end:0x0215417c - .bss start:0x02157bf0 end:0x02157c10 + .bss start:0x02157be0 end:0x02157c44 src/058_Field/MapObject/MapObjectUnkGRSV.cpp: .text start:0x02151480 end:0x02151968 .init start:0x02154040 end:0x021540d0 .ctor start:0x0215417c end:0x02154180 - .bss start:0x02157ca0 end:0x02157ca4 + .bss start:0x02157c44 end:0x02157d94 src/058_Field/MapObject/MapObjectUnkSWCB.cpp: .text start:0x021519a0 end:0x02152968 .init start:0x021540d0 end:0x02154120 .ctor start:0x02154180 end:0x02154184 - .bss start:0x02157da4 end:0x02157dc4 + .bss start:0x02157d94 end:0x02157dc4 diff --git a/config/eur/arm9/overlays/ov058/symbols.txt b/config/eur/arm9/overlays/ov058/symbols.txt index d1b93716..b28e9f14 100644 --- a/config/eur/arm9/overlays/ov058/symbols.txt +++ b/config/eur/arm9/overlays/ov058/symbols.txt @@ -911,19 +911,19 @@ _ZTV19data_ov058_02155e00 kind:data(any) addr:0x02155e00 data_ov058_02155e38 kind:data(any) addr:0x02155e38 _ZTV19data_ov058_02155e48 kind:data(any) addr:0x02155e48 _ZTV19data_ov058_02155e64 kind:data(any) addr:0x02155e64 -data_ov058_02155ea0 kind:bss addr:0x02155ea0 -data_ov058_02155ea4 kind:bss addr:0x02155ea4 -sActorProfileUnkKOKO kind:bss addr:0x02155eb0 +_ZGVN15ProfileInstanceI19ActorProfileUnkKOKOE8sProfileE kind:bss addr:0x02155ea0 +@12038 kind:bss addr:0x02155ea4 +_ZN15ProfileInstanceI19ActorProfileUnkKOKOE8sProfileE kind:bss addr:0x02155eb0 data_ov058_02155f88 kind:bss addr:0x02155f88 -data_ov058_02155f8c kind:bss addr:0x02155f8c -data_ov058_02155f94 kind:bss addr:0x02155f94 -sActorProfileUnkKOAT kind:bss addr:0x02155fa0 -data_ov058_02155fe4 kind:bss addr:0x02155fe4 -data_ov058_02155fe8 kind:bss addr:0x02155fe8 -sActorProfileUnkKOCH kind:bss addr:0x02155ff4 -data_ov058_02156030 kind:bss addr:0x02156030 -data_ov058_02156034 kind:bss addr:0x02156034 -sActorProfileUnkNSTN kind:bss addr:0x02156040 +_ZGVN15ProfileInstanceI19ActorProfileUnkKOATE8sProfileE kind:bss addr:0x02155f8c +@12044 kind:bss addr:0x02155f94 +_ZN15ProfileInstanceI19ActorProfileUnkKOATE8sProfileE kind:bss addr:0x02155fa0 +_ZGVN15ProfileInstanceI19ActorProfileUnkKOCHE8sProfileE kind:bss addr:0x02155fe4 +@12050 kind:bss addr:0x02155fe8 +_ZN15ProfileInstanceI19ActorProfileUnkKOCHE8sProfileE kind:bss addr:0x02155ff4 +_ZGVN15ProfileInstanceI19ActorProfileUnkNSTNE8sProfileE kind:bss addr:0x02156030 +@12056 kind:bss addr:0x02156034 +_ZN15ProfileInstanceI19ActorProfileUnkNSTNE8sProfileE kind:bss addr:0x02156040 data_ov058_0215607c kind:bss addr:0x0215607c data_ov058_021560b8 kind:bss addr:0x021560b8 data_ov058_021560c4 kind:bss addr:0x021560c4 @@ -953,122 +953,120 @@ data_ov058_02156190 kind:bss addr:0x02156190 data_ov058_02156194 kind:bss addr:0x02156194 data_ov058_02156198 kind:bss addr:0x02156198 data_ov058_0215619c kind:bss addr:0x0215619c -data_ov058_021561a0 kind:bss addr:0x021561a0 -data_ov058_021561a4 kind:bss addr:0x021561a4 -sActorProfileUnkSYDL kind:bss addr:0x02156220 -sActorProfileUnkSYFO kind:bss addr:0x021562f8 +_ZGVN15ProfileInstanceI19ActorProfileUnkSYDLE8sProfileE kind:bss addr:0x021561a0 +@12062 kind:bss addr:0x021561a4 +_ZN15ProfileInstanceI19ActorProfileUnkSYDLE8sProfileE kind:bss addr:0x02156220 +_ZN15ProfileInstanceI19ActorProfileUnkSYFOE8sProfileE kind:bss addr:0x021562f8 data_ov058_021563c8 kind:bss addr:0x021563c8 ambiguous -sActorProfileUnkSYSN kind:bss addr:0x021563d0 +_ZN15ProfileInstanceI19ActorProfileUnkSYSNE8sProfileE kind:bss addr:0x021563d0 data_ov058_02156468 kind:bss addr:0x02156468 ambiguous -sActorProfileUnkSYWA kind:bss addr:0x021564a8 -sActorProfileUnkSYFI kind:bss addr:0x02156580 +_ZN15ProfileInstanceI19ActorProfileUnkSYWAE8sProfileE kind:bss addr:0x021564a8 +_ZN15ProfileInstanceI19ActorProfileUnkSYFIE8sProfileE kind:bss addr:0x02156580 data_ov058_021565d8 kind:bss addr:0x021565d8 ambiguous -sActorProfileUnkSYDE kind:bss addr:0x02156658 -sActorProfileUnkSYOS kind:bss addr:0x02156730 -sActorProfileUnkSYSS kind:bss addr:0x02156808 +_ZN15ProfileInstanceI19ActorProfileUnkSYDEE8sProfileE kind:bss addr:0x02156658 +_ZN15ProfileInstanceI19ActorProfileUnkSYOSE8sProfileE kind:bss addr:0x02156730 +_ZN15ProfileInstanceI19ActorProfileUnkSYSSE8sProfileE kind:bss addr:0x02156808 data_ov058_021568d8 kind:bss addr:0x021568d8 ambiguous -sActorProfileUnkSYWS kind:bss addr:0x021568e0 +_ZN15ProfileInstanceI19ActorProfileUnkSYWSE8sProfileE kind:bss addr:0x021568e0 data_ov058_021568e8 kind:bss addr:0x021568e8 ambiguous data_ov058_0215697c kind:bss addr:0x0215697c ambiguous -sActorProfileUnkSYIS kind:bss addr:0x021569b8 -sActorProfileUnkSYDS kind:bss addr:0x02156a90 -sActorProfileUnkSYOL kind:bss addr:0x02156b68 +_ZN15ProfileInstanceI19ActorProfileUnkSYISE8sProfileE kind:bss addr:0x021569b8 +_ZN15ProfileInstanceI19ActorProfileUnkSYDSE8sProfileE kind:bss addr:0x02156a90 +_ZN15ProfileInstanceI19ActorProfileUnkSYOLE8sProfileE kind:bss addr:0x02156b68 data_ov058_02156b88 kind:bss addr:0x02156b88 ambiguous -sActorProfileUnkSYSL kind:bss addr:0x02156c40 +_ZN15ProfileInstanceI19ActorProfileUnkSYSLE8sProfileE kind:bss addr:0x02156c40 data_ov058_02156c78 kind:bss addr:0x02156c78 ambiguous data_ov058_02156cf8 kind:bss addr:0x02156cf8 ambiguous data_ov058_02156d00 kind:bss addr:0x02156d00 ambiguous -sActorProfileUnkSYWL kind:bss addr:0x02156d18 -sActorProfileUnkSYIL kind:bss addr:0x02156df0 -data_ov058_02156ec8 kind:bss addr:0x02156ec8 -data_ov058_02156ecc kind:bss addr:0x02156ecc -sActorProfileUnkCRFT kind:bss addr:0x02156ed8 +_ZN15ProfileInstanceI19ActorProfileUnkSYWLE8sProfileE kind:bss addr:0x02156d18 +_ZN15ProfileInstanceI19ActorProfileUnkSYILE8sProfileE kind:bss addr:0x02156df0 +_ZGVN15ProfileInstanceI19ActorProfileUnkCRFTE8sProfileE kind:bss addr:0x02156ec8 +@12068 kind:bss addr:0x02156ecc +_ZN15ProfileInstanceI19ActorProfileUnkCRFTE8sProfileE kind:bss addr:0x02156ed8 data_ov058_02156f38 kind:bss addr:0x02156f38 ambiguous data_ov058_02156f7c kind:bss addr:0x02156f7c ambiguous data_ov058_02156fa8 kind:bss addr:0x02156fa8 ambiguous data_ov058_02156fb0 kind:bss addr:0x02156fb0 data_ov058_02156fb8 kind:bss addr:0x02156fb8 -data_ov058_02156fbc kind:bss addr:0x02156fbc ambiguous -data_ov058_02156fc4 kind:bss addr:0x02156fc4 -sActorProfileUnkFBRD kind:bss addr:0x02156fec +_ZGVN15ProfileInstanceI19ActorProfileUnkFBRDE8sProfileE kind:bss addr:0x02156fbc ambiguous +@12074 kind:bss addr:0x02156fc4 +_ZN15ProfileInstanceI19ActorProfileUnkFBRDE8sProfileE kind:bss addr:0x02156fec data_ov058_02157064 kind:bss addr:0x02157064 ambiguous -data_ov058_021570c4 kind:bss addr:0x021570c4 -data_ov058_021570c8 kind:bss addr:0x021570c8 -sActorProfileUnkFBSC kind:bss addr:0x021570d4 -data_ov058_02157110 kind:bss addr:0x02157110 -data_ov058_02157118 kind:bss addr:0x02157118 -sActorProfileUnkWPBD kind:bss addr:0x02157124 -data_ov058_021571fc kind:bss addr:0x021571fc -data_ov058_02157200 kind:bss addr:0x02157200 -sActorProfileUnkWPCH kind:bss addr:0x0215720c -data_ov058_02157248 kind:bss addr:0x02157248 -data_ov058_0215724c kind:bss addr:0x0215724c -sActorProfileUnkBSTG kind:bss addr:0x02157258 +_ZGVN15ProfileInstanceI19ActorProfileUnkFBSCE8sProfileE kind:bss addr:0x021570c4 +@12080 kind:bss addr:0x021570c8 +_ZN15ProfileInstanceI19ActorProfileUnkFBSCE8sProfileE kind:bss addr:0x021570d4 +_ZGVN15ProfileInstanceI19ActorProfileUnkWPBDE8sProfileE kind:bss addr:0x02157110 +@12086 kind:bss addr:0x02157118 +_ZN15ProfileInstanceI19ActorProfileUnkWPBDE8sProfileE kind:bss addr:0x02157124 +_ZGVN15ProfileInstanceI19ActorProfileUnkWPCHE8sProfileE kind:bss addr:0x021571fc +@12092 kind:bss addr:0x02157200 +_ZN15ProfileInstanceI19ActorProfileUnkWPCHE8sProfileE kind:bss addr:0x0215720c +_ZGVN15ProfileInstanceI19ActorProfileUnkBSTGE8sProfileE kind:bss addr:0x02157248 +@12098 kind:bss addr:0x0215724c +_ZN15ProfileInstanceI19ActorProfileUnkBSTGE8sProfileE kind:bss addr:0x02157258 data_ov058_02157294 kind:bss addr:0x02157294 data_ov058_02157298 kind:bss addr:0x02157298 -data_ov058_021572a4 kind:bss addr:0x021572a4 -data_ov058_021572b0 kind:bss addr:0x021572b0 -sActorProfileUnkTMNA kind:bss addr:0x021572fc -data_ov058_021573d4 kind:bss addr:0x021573d4 -data_ov058_021573d8 kind:bss addr:0x021573d8 -sActorProfileUnkTMNC kind:bss addr:0x021573e4 +_ZGVN15ProfileInstanceI19ActorProfileUnkTMNAE8sProfileE kind:bss addr:0x021572a4 +@12104 kind:bss addr:0x021572b0 +_ZN15ProfileInstanceI19ActorProfileUnkTMNAE8sProfileE kind:bss addr:0x021572fc +_ZGVN15ProfileInstanceI19ActorProfileUnkTMNCE8sProfileE kind:bss addr:0x021573d4 +@12110 kind:bss addr:0x021573d8 +_ZN15ProfileInstanceI19ActorProfileUnkTMNCE8sProfileE kind:bss addr:0x021573e4 data_ov058_0215741c kind:bss addr:0x0215741c ambiguous data_ov058_021574bc kind:bss addr:0x021574bc data_ov058_021574c0 kind:bss addr:0x021574c0 -data_ov058_021574cc kind:bss addr:0x021574cc -data_ov058_021574e8 kind:bss addr:0x021574e8 ambiguous -sMapObjectProfileUnkTREE kind:bss addr:0x021574ec +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTREEE8sProfileE kind:bss addr:0x021574cc +@11713 kind:bss addr:0x021574e8 ambiguous +_ZN15ProfileInstanceI23MapObjectProfileUnkTREEE8sProfileE kind:bss addr:0x021574ec data_ov058_02157554 kind:bss addr:0x02157554 -data_ov058_02157574 kind:bss addr:0x02157574 -data_ov058_02157578 kind:bss addr:0x02157578 -sMapObjectProfileUnkLEVS kind:bss addr:0x02157584 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkLEVSE8sProfileE kind:bss addr:0x02157574 +@11719 kind:bss addr:0x02157578 +_ZN15ProfileInstanceI23MapObjectProfileUnkLEVSE8sProfileE kind:bss addr:0x02157584 data_ov058_02157658 kind:bss addr:0x02157658 -data_ov058_02157678 kind:bss addr:0x02157678 -data_ov058_0215767c kind:bss addr:0x0215767c -sMapObjectProfileUnkSTNE kind:bss addr:0x02157688 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkSTNEE8sProfileE kind:bss addr:0x02157678 +@11725 kind:bss addr:0x0215767c +_ZN15ProfileInstanceI23MapObjectProfileUnkSTNEE8sProfileE kind:bss addr:0x02157688 data_ov058_021576a4 kind:bss addr:0x021576a4 ambiguous data_ov058_021576dc kind:bss addr:0x021576dc ambiguous data_ov058_02157710 kind:bss addr:0x02157710 ambiguous data_ov058_0215775c kind:bss addr:0x0215775c -data_ov058_0215777c kind:bss addr:0x0215777c -data_ov058_02157788 kind:bss addr:0x02157788 -sMapObjectProfileUnkHOUS kind:bss addr:0x02157794 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkHOUSE8sProfileE kind:bss addr:0x0215777c +@11731 kind:bss addr:0x02157788 +_ZN15ProfileInstanceI23MapObjectProfileUnkHOUSE8sProfileE kind:bss addr:0x02157794 data_ov058_021577b4 kind:bss addr:0x021577b4 -data_ov058_021577fc kind:bss addr:0x021577fc -data_ov058_02157800 kind:bss addr:0x02157800 -sMapObjectProfileUnkHOST kind:bss addr:0x0215780c +_ZGVN15ProfileInstanceI23MapObjectProfileUnkHOSTE8sProfileE kind:bss addr:0x021577fc +@11737 kind:bss addr:0x02157800 +_ZN15ProfileInstanceI23MapObjectProfileUnkHOSTE8sProfileE kind:bss addr:0x0215780c data_ov058_02157878 kind:bss addr:0x02157878 ambiguous -data_ov058_021578e0 kind:bss addr:0x021578e0 -data_ov058_021578e4 kind:bss addr:0x021578e4 -sMapObjectProfileUnkDRHS kind:bss addr:0x021578f0 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkDRHSE8sProfileE kind:bss addr:0x021578e0 +@11743 kind:bss addr:0x021578e4 +_ZN15ProfileInstanceI23MapObjectProfileUnkDRHSE8sProfileE kind:bss addr:0x021578f0 data_ov058_02157908 kind:bss addr:0x02157908 ambiguous -data_ov058_021579c4 kind:bss addr:0x021579c4 -data_ov058_021579c8 kind:bss addr:0x021579c8 -sMapObjectProfileUnkEXHS kind:bss addr:0x021579d4 -data_ov058_021579f4 kind:bss addr:0x021579f4 -data_ov058_021579f8 kind:bss addr:0x021579f8 -sMapObjectProfileUnkBBFL kind:bss addr:0x02157a04 -data_ov058_02157a70 kind:bss addr:0x02157a70 ambiguous -data_ov058_02157ad4 kind:bss addr:0x02157ad4 ambiguous -data_ov058_02157ad8 kind:bss addr:0x02157ad8 -data_ov058_02157adc kind:bss addr:0x02157adc -sMapObjectProfileUnkKNBN kind:bss addr:0x02157ae8 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkEXHSE8sProfileE kind:bss addr:0x021579c4 +@11749 kind:bss addr:0x021579c8 +_ZN15ProfileInstanceI23MapObjectProfileUnkEXHSE8sProfileE kind:bss addr:0x021579d4 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkBBFLE8sProfileE kind:bss addr:0x021579f4 +@11755 kind:bss addr:0x021579f8 +_ZN15ProfileInstanceI23MapObjectProfileUnkBBFLE8sProfileE kind:bss addr:0x02157a04 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkKNBNE8sProfileE kind:bss addr:0x02157ad8 +@11761 kind:bss addr:0x02157adc +_ZN15ProfileInstanceI23MapObjectProfileUnkKNBNE8sProfileE kind:bss addr:0x02157ae8 data_ov058_02157bac kind:bss addr:0x02157bac ambiguous data_ov058_02157bbc kind:bss addr:0x02157bbc -data_ov058_02157be0 kind:bss addr:0x02157be0 -data_ov058_02157be4 kind:bss addr:0x02157be4 -sMapObjectProfileUnkMSCL kind:bss addr:0x02157bf0 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkMSCLE8sProfileE kind:bss addr:0x02157be0 +@11767 kind:bss addr:0x02157be4 +_ZN15ProfileInstanceI23MapObjectProfileUnkMSCLE8sProfileE kind:bss addr:0x02157bf0 data_ov058_02157c10 kind:bss addr:0x02157c10 data_ov058_02157c34 kind:bss addr:0x02157c34 data_ov058_02157c38 kind:bss addr:0x02157c38 -data_ov058_02157c44 kind:bss addr:0x02157c44 -data_ov058_02157c50 kind:bss addr:0x02157c50 -sMapObjectProfileUnkGRSV kind:bss addr:0x02157ca0 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkGRSVE8sProfileE kind:bss addr:0x02157c44 +@11773 kind:bss addr:0x02157c50 +_ZN15ProfileInstanceI23MapObjectProfileUnkGRSVE8sProfileE kind:bss addr:0x02157ca0 data_ov058_02157ca4 kind:bss addr:0x02157ca4 ambiguous data_ov058_02157d74 kind:bss addr:0x02157d74 -data_ov058_02157d94 kind:bss addr:0x02157d94 -data_ov058_02157d98 kind:bss addr:0x02157d98 -sMapObjectProfileUnkSWCB kind:bss addr:0x02157da4 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkSWCBE8sProfileE kind:bss addr:0x02157d94 +@11779 kind:bss addr:0x02157d98 +_ZN15ProfileInstanceI23MapObjectProfileUnkSWCBE8sProfileE kind:bss addr:0x02157da4 data_ov058_02157dc4 kind:bss addr:0x02157dc4 data_ov058_02157e78 kind:bss addr:0x02157e78 data_ov058_02157e98 kind:bss addr:0x02157e98 ambiguous diff --git a/config/eur/arm9/overlays/ov059/delinks.txt b/config/eur/arm9/overlays/ov059/delinks.txt index 61b754e9..b4bb7cf3 100644 --- a/config/eur/arm9/overlays/ov059/delinks.txt +++ b/config/eur/arm9/overlays/ov059/delinks.txt @@ -9,79 +9,79 @@ src/059_InTrain/Actor/ActorUnkPBSP.cpp: .text start:0x02157ea0 end:0x02158b50 .init start:0x02162eac end:0x02162efc .ctor start:0x02163394 end:0x02163398 - .bss start:0x02164350 end:0x0216438c + .bss start:0x02164340 end:0x02164390 src/059_InTrain/Actor/ActorUnkPSEM.cpp: .text start:0x02158b50 end:0x0215c438 .init start:0x02162efc end:0x02162f88 .ctor start:0x02163398 end:0x0216339c - .bss start:0x021643a8 end:0x02164480 + .bss start:0x02164390 end:0x02164484 src/059_InTrain/Actor/ActorUnkPSBS.cpp: .text start:0x0215c438 end:0x0216045c .init start:0x02162f88 end:0x02163000 .ctor start:0x0216339c end:0x021633a0 - .bss start:0x0216449c end:0x02164574 + .bss start:0x02164484 end:0x02164578 src/059_InTrain/Actor/ActorUnkPSNP.cpp: .text start:0x0216045c end:0x02160e10 .init start:0x02163000 end:0x0216305c .ctor start:0x021633a0 end:0x021633a4 - .bss start:0x02164590 end:0x02164668 + .bss start:0x02164578 end:0x02164668 src/059_InTrain/Actor/ActorUnkCAGE.cpp: .text start:0x02160e10 end:0x021614dc .init start:0x0216305c end:0x021630ac .ctor start:0x021633a4 end:0x021633a8 - .bss start:0x02164678 end:0x02164690 + .bss start:0x02164668 end:0x02164750 src/059_InTrain/Actor/ActorUnkRMVT.cpp: .text start:0x0216153c end:0x02161afc .init start:0x021630ac end:0x02163114 .ctor start:0x021633a8 end:0x021633ac - .bss start:0x02164760 end:0x02164838 + .bss start:0x02164750 end:0x02164838 src/059_InTrain/Actor/ActorUnkRMVF.cpp: .text start:0x02161bcc end:0x02161ef0 .init start:0x02163114 end:0x02163164 .ctor start:0x021633ac end:0x021633b0 - .bss start:0x02164848 end:0x02164920 + .bss start:0x02164838 end:0x02164920 src/059_InTrain/Actor/ActorUnkRMVS.cpp: .text start:0x02161ef0 end:0x021621a8 .init start:0x02163164 end:0x021631b4 .ctor start:0x021633b0 end:0x021633b4 - .bss start:0x02164930 end:0x02164a08 + .bss start:0x02164920 end:0x02164a08 src/059_InTrain/Actor/ActorUnkRMVW.cpp: .text start:0x021621a8 end:0x02162460 .init start:0x021631b4 end:0x02163204 .ctor start:0x021633b4 end:0x021633b8 - .bss start:0x02164a18 end:0x02164af0 + .bss start:0x02164a08 end:0x02164af0 src/059_InTrain/Actor/ActorUnkRMVV.cpp: .text start:0x02162460 end:0x02162718 .init start:0x02163204 end:0x02163254 .ctor start:0x021633b8 end:0x021633bc - .bss start:0x02164b00 end:0x02164bd8 + .bss start:0x02164af0 end:0x02164bd8 src/059_InTrain/Actor/ActorUnkRMVD.cpp: .text start:0x02162718 end:0x021629d0 .init start:0x02163254 end:0x021632a4 .ctor start:0x021633bc end:0x021633c0 - .bss start:0x02164be8 end:0x02164cc0 + .bss start:0x02164bd8 end:0x02164cc0 src/059_InTrain/Actor/ActorUnkRMTR.cpp: .text start:0x021629d0 end:0x02162b78 .init start:0x021632a4 end:0x021632f4 .ctor start:0x021633c0 end:0x021633c4 - .bss start:0x02164cd0 end:0x02164da8 + .bss start:0x02164cc0 end:0x02164da8 src/059_InTrain/Actor/ActorUnkRMTB.cpp: .text start:0x02162b78 end:0x02162c9c .init start:0x021632f4 end:0x02163344 .ctor start:0x021633c4 end:0x021633c8 - .bss start:0x02164db8 end:0x02164e90 + .bss start:0x02164da8 end:0x02164e90 src/059_InTrain/MapObject/MapObjectUnkEXTR.cpp: .text start:0x02162c9c end:0x02162e48 diff --git a/config/eur/arm9/overlays/ov059/symbols.txt b/config/eur/arm9/overlays/ov059/symbols.txt index b7d6d54a..7e5f979f 100644 --- a/config/eur/arm9/overlays/ov059/symbols.txt +++ b/config/eur/arm9/overlays/ov059/symbols.txt @@ -434,49 +434,49 @@ data_ov059_021642ac kind:data(any) addr:0x021642ac data_ov059_021642c8 kind:data(any) addr:0x021642c8 data_ov059_021642f0 kind:data(any) addr:0x021642f0 data_ov059_021642fc kind:data(any) addr:0x021642fc ambiguous -data_ov059_02164340 kind:bss addr:0x02164340 -data_ov059_02164344 kind:bss addr:0x02164344 -sActorProfileUnkPBSP kind:bss addr:0x02164350 +_ZGVN15ProfileInstanceI19ActorProfileUnkPBSPE8sProfileE kind:bss addr:0x02164340 +@12194 kind:bss addr:0x02164344 +_ZN15ProfileInstanceI19ActorProfileUnkPBSPE8sProfileE kind:bss addr:0x02164350 data_ov059_0216438c kind:bss addr:0x0216438c -data_ov059_02164390 kind:bss addr:0x02164390 -data_ov059_0216439c kind:bss addr:0x0216439c -sActorProfileUnkPSEM kind:bss addr:0x021643a8 +_ZGVN15ProfileInstanceI19ActorProfileUnkPSEME8sProfileE kind:bss addr:0x02164390 +@12200 kind:bss addr:0x0216439c +_ZN15ProfileInstanceI19ActorProfileUnkPSEME8sProfileE kind:bss addr:0x021643a8 data_ov059_02164480 kind:bss addr:0x02164480 -data_ov059_02164484 kind:bss addr:0x02164484 -data_ov059_02164490 kind:bss addr:0x02164490 -sActorProfileUnkPSBS kind:bss addr:0x0216449c +_ZGVN15ProfileInstanceI19ActorProfileUnkPSBSE8sProfileE kind:bss addr:0x02164484 +@12206 kind:bss addr:0x02164490 +_ZN15ProfileInstanceI19ActorProfileUnkPSBSE8sProfileE kind:bss addr:0x0216449c data_ov059_02164574 kind:bss addr:0x02164574 -data_ov059_02164578 kind:bss addr:0x02164578 -data_ov059_02164584 kind:bss addr:0x02164584 -sActorProfileUnkPSNP kind:bss addr:0x02164590 -data_ov059_02164668 kind:bss addr:0x02164668 -data_ov059_0216466c kind:bss addr:0x0216466c -sActorProfileUnkCAGE kind:bss addr:0x02164678 +_ZGVN15ProfileInstanceI19ActorProfileUnkPSNPE8sProfileE kind:bss addr:0x02164578 +@12212 kind:bss addr:0x02164584 +_ZN15ProfileInstanceI19ActorProfileUnkPSNPE8sProfileE kind:bss addr:0x02164590 +_ZGVN15ProfileInstanceI19ActorProfileUnkCAGEE8sProfileE kind:bss addr:0x02164668 +@12218 kind:bss addr:0x0216466c +_ZN15ProfileInstanceI19ActorProfileUnkCAGEE8sProfileE kind:bss addr:0x02164678 data_ov059_02164690 kind:bss addr:0x02164690 ambiguous -data_ov059_02164750 kind:bss addr:0x02164750 -data_ov059_02164754 kind:bss addr:0x02164754 -sActorProfileUnkRMVT kind:bss addr:0x02164760 -data_ov059_02164838 kind:bss addr:0x02164838 -data_ov059_0216483c kind:bss addr:0x0216483c -sActorProfileUnkRMVF kind:bss addr:0x02164848 -data_ov059_02164920 kind:bss addr:0x02164920 -data_ov059_02164924 kind:bss addr:0x02164924 -sActorProfileUnkRMVS kind:bss addr:0x02164930 -data_ov059_02164a08 kind:bss addr:0x02164a08 -data_ov059_02164a0c kind:bss addr:0x02164a0c -sActorProfileUnkRMVW kind:bss addr:0x02164a18 -data_ov059_02164af0 kind:bss addr:0x02164af0 -data_ov059_02164af4 kind:bss addr:0x02164af4 -sActorProfileUnkRMVV kind:bss addr:0x02164b00 -data_ov059_02164bd8 kind:bss addr:0x02164bd8 -data_ov059_02164bdc kind:bss addr:0x02164bdc -sActorProfileUnkRMVD kind:bss addr:0x02164be8 -data_ov059_02164cc0 kind:bss addr:0x02164cc0 -data_ov059_02164cc4 kind:bss addr:0x02164cc4 -sActorProfileUnkRMTR kind:bss addr:0x02164cd0 -data_ov059_02164da8 kind:bss addr:0x02164da8 -data_ov059_02164dac kind:bss addr:0x02164dac -sActorProfileUnkRMTB kind:bss addr:0x02164db8 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMVTE8sProfileE kind:bss addr:0x02164750 +@12224 kind:bss addr:0x02164754 +_ZN15ProfileInstanceI19ActorProfileUnkRMVTE8sProfileE kind:bss addr:0x02164760 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMVFE8sProfileE kind:bss addr:0x02164838 +@12230 kind:bss addr:0x0216483c +_ZN15ProfileInstanceI19ActorProfileUnkRMVFE8sProfileE kind:bss addr:0x02164848 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMVSE8sProfileE kind:bss addr:0x02164920 +@12236 kind:bss addr:0x02164924 +_ZN15ProfileInstanceI19ActorProfileUnkRMVSE8sProfileE kind:bss addr:0x02164930 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMVWE8sProfileE kind:bss addr:0x02164a08 +@12242 kind:bss addr:0x02164a0c +_ZN15ProfileInstanceI19ActorProfileUnkRMVWE8sProfileE kind:bss addr:0x02164a18 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMVVE8sProfileE kind:bss addr:0x02164af0 +@12248 kind:bss addr:0x02164af4 +_ZN15ProfileInstanceI19ActorProfileUnkRMVVE8sProfileE kind:bss addr:0x02164b00 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMVDE8sProfileE kind:bss addr:0x02164bd8 +@12254 kind:bss addr:0x02164bdc +_ZN15ProfileInstanceI19ActorProfileUnkRMVDE8sProfileE kind:bss addr:0x02164be8 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMTRE8sProfileE kind:bss addr:0x02164cc0 +@12260 kind:bss addr:0x02164cc4 +_ZN15ProfileInstanceI19ActorProfileUnkRMTRE8sProfileE kind:bss addr:0x02164cd0 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMTBE8sProfileE kind:bss addr:0x02164da8 +@12266 kind:bss addr:0x02164dac +_ZN15ProfileInstanceI19ActorProfileUnkRMTBE8sProfileE kind:bss addr:0x02164db8 data_ov059_02164e90 kind:bss addr:0x02164e90 data_ov059_02164e94 kind:bss addr:0x02164e94 -sMapObjectProfileUnkEXTR kind:bss addr:0x02164ea0 +_ZN15ProfileInstanceI23MapObjectProfileUnkEXTRE8sProfileE kind:bss addr:0x02164ea0 diff --git a/config/eur/arm9/overlays/ov060/delinks.txt b/config/eur/arm9/overlays/ov060/delinks.txt index 373a9602..e913840f 100644 --- a/config/eur/arm9/overlays/ov060/delinks.txt +++ b/config/eur/arm9/overlays/ov060/delinks.txt @@ -9,103 +9,103 @@ src/060_Castle/Actor/ActorUnkSOLB_SOLC_SOLD.cpp: .text start:0x02157ea0 end:0x021592a4 .init start:0x02160cdc end:0x02160db4 .ctor start:0x021613ec end:0x021613f0 - .bss start:0x02162f30 end:0x021631b8 + .bss start:0x02162f18 end:0x021631e8 src/060_Castle/Actor/ActorUnkSOGB_SOGC_SOLG.cpp: .text start:0x021592a4 end:0x0215c6dc .init start:0x02160db4 end:0x02160ecc .ctor start:0x021613f0 end:0x021613f4 - .bss start:0x02163200 end:0x021632cc + .bss start:0x021631e8 end:0x021632cc src/060_Castle/Actor/ActorUnkCOMM.cpp: .text start:0x0215c6dc end:0x0215ced8 .init start:0x02160ecc end:0x02160f3c .ctor start:0x021613f4 end:0x021613f8 - .bss start:0x021632dc end:0x021632e0 + .bss start:0x021632cc end:0x021633b4 src/060_Castle/Actor/ActorUnkOLDM.cpp: .text start:0x0215ced8 end:0x0215d4d4 .init start:0x02160f3c end:0x02160f8c .ctor start:0x021613f8 end:0x021613fc - .bss start:0x021633c4 end:0x0216349c + .bss start:0x021633b4 end:0x0216349c src/060_Castle/Actor/ActorUnkRMC0.cpp: .text start:0x0215d4d4 end:0x0215d888 .init start:0x02160f8c end:0x02160fdc .ctor start:0x021613fc end:0x02161400 - .bss start:0x021634ac end:0x02163518 + .bss start:0x0216349c end:0x02163584 src/060_Castle/Actor/ActorUnkRMC1.cpp: .text start:0x0215d888 end:0x0215d9dc .init start:0x02160fdc end:0x0216102c .ctor start:0x02161400 end:0x02161404 - .bss start:0x02163594 end:0x0216366c + .bss start:0x02163584 end:0x0216366c src/060_Castle/Actor/ActorUnkRMC2.cpp: .text start:0x0215d9dc end:0x0215e08c .init start:0x0216102c end:0x0216107c .ctor start:0x02161404 end:0x02161408 - .bss start:0x0216367c end:0x02163754 + .bss start:0x0216366c end:0x021637b8 src/060_Castle/Actor/ActorUnkRMC6.cpp: .text start:0x0215e08c end:0x0215e1b4 .init start:0x0216107c end:0x021610cc .ctor start:0x02161408 end:0x0216140c - .bss start:0x021637c8 end:0x021638a0 + .bss start:0x021637b8 end:0x021638a0 src/060_Castle/Actor/ActorUnkRMC3.cpp: .text start:0x0215e1b4 end:0x0215e608 .init start:0x021610cc end:0x0216111c .ctor start:0x0216140c end:0x02161410 - .bss start:0x021638b0 end:0x02163988 + .bss start:0x021638a0 end:0x02163988 src/060_Castle/Actor/ActorUnkRMC4.cpp: .text start:0x0215e608 end:0x0215e730 .init start:0x0216111c end:0x0216116c .ctor start:0x02161410 end:0x02161414 - .bss start:0x02163998 end:0x02163a70 + .bss start:0x02163988 end:0x02163a70 src/060_Castle/Actor/ActorUnkRMC5.cpp: .text start:0x0215e730 end:0x0215e974 .init start:0x0216116c end:0x021611bc .ctor start:0x02161414 end:0x02161418 - .bss start:0x02163a80 end:0x02163b58 + .bss start:0x02163a70 end:0x02163b58 src/060_Castle/Actor/ActorUnkCASL.cpp: .text start:0x0215e974 end:0x0215ebb0 .init start:0x021611bc end:0x0216120c .ctor start:0x02161418 end:0x0216141c - .bss start:0x02163b68 end:0x02163c40 + .bss start:0x02163b58 end:0x02163c40 src/060_Castle/Actor/ActorUnkCAST.cpp: .text start:0x0215ebb0 end:0x0215ed38 .init start:0x0216120c end:0x0216125c .ctor start:0x0216141c end:0x02161420 - .bss start:0x02163c50 end:0x02163d28 + .bss start:0x02163c40 end:0x02163d28 src/060_Castle/Actor/ActorUnkZLSN.cpp: .text start:0x0215ed64 end:0x02160134 .init start:0x0216125c end:0x021612ac .ctor start:0x02161420 end:0x02161424 - .bss start:0x02163d38 end:0x02163e10 + .bss start:0x02163d28 end:0x02163e10 src/060_Castle/Actor/ActorUnkKIMA.cpp: .text start:0x02160134 end:0x02160364 .init start:0x021612ac end:0x021612fc .ctor start:0x02161424 end:0x02161428 - .bss start:0x02163e20 end:0x02163ef8 + .bss start:0x02163e10 end:0x02163ef8 src/060_Castle/MapObject/MapObjectUnkPLCT.cpp: .text start:0x02160364 end:0x02160534 .init start:0x021612fc end:0x0216134c .ctor start:0x02161428 end:0x0216142c - .bss start:0x02163f08 end:0x02163fdc + .bss start:0x02163ef8 end:0x02163ffc src/060_Castle/MapObject/MapObjectUnkDFNC.cpp: .text start:0x02160534 end:0x021609dc .init start:0x0216134c end:0x0216139c .ctor start:0x0216142c end:0x02161430 - .bss start:0x0216400c end:0x021640e0 + .bss start:0x02163ffc end:0x021640e0 src/060_Castle/MapObject/MapObjectUnkEXCT.cpp: .text start:0x021609dc end:0x02160b94 diff --git a/config/eur/arm9/overlays/ov060/symbols.txt b/config/eur/arm9/overlays/ov060/symbols.txt index ed04fc5c..17a651f7 100644 --- a/config/eur/arm9/overlays/ov060/symbols.txt +++ b/config/eur/arm9/overlays/ov060/symbols.txt @@ -501,74 +501,74 @@ data_ov060_02162e90 kind:data(any) addr:0x02162e90 data_ov060_02162eac kind:data(any) addr:0x02162eac data_ov060_02162f00 kind:bss addr:0x02162f00 data_ov060_02162f0c kind:bss addr:0x02162f0c -data_ov060_02162f18 kind:bss addr:0x02162f18 -data_ov060_02162f24 kind:bss addr:0x02162f24 -sActorProfileUnkSOLD kind:bss addr:0x02162f30 +_ZGVN15ProfileInstanceI19ActorProfileUnkSOLDE8sProfileE kind:bss addr:0x02162f18 +@12283 kind:bss addr:0x02162f24 +_ZN15ProfileInstanceI19ActorProfileUnkSOLDE8sProfileE kind:bss addr:0x02162f30 data_ov060_02162f34 kind:bss addr:0x02162f34 ambiguous -sActorProfileUnkSOLB kind:bss addr:0x02163008 -sActorProfileUnkSOLC kind:bss addr:0x021630e0 +_ZN15ProfileInstanceI19ActorProfileUnkSOLBE8sProfileE kind:bss addr:0x02163008 +_ZN15ProfileInstanceI19ActorProfileUnkSOLCE8sProfileE kind:bss addr:0x021630e0 data_ov060_021631b8 kind:bss addr:0x021631b8 data_ov060_021631c4 kind:bss addr:0x021631c4 data_ov060_021631d0 kind:bss addr:0x021631d0 data_ov060_021631dc kind:bss addr:0x021631dc -data_ov060_021631e8 kind:bss addr:0x021631e8 -data_ov060_021631f4 kind:bss addr:0x021631f4 -sActorProfileUnkSOLG kind:bss addr:0x02163200 +_ZGVN15ProfileInstanceI19ActorProfileUnkSOLGE8sProfileE kind:bss addr:0x021631e8 +@12289 kind:bss addr:0x021631f4 +_ZN15ProfileInstanceI19ActorProfileUnkSOLGE8sProfileE kind:bss addr:0x02163200 data_ov060_02163228 kind:bss addr:0x02163228 ambiguous -sActorProfileUnkSOGB kind:bss addr:0x02163244 -sActorProfileUnkSOGC kind:bss addr:0x02163288 -data_ov060_021632cc kind:bss addr:0x021632cc -data_ov060_021632d0 kind:bss addr:0x021632d0 -sActorProfileUnkCOMM kind:bss addr:0x021632dc +_ZN15ProfileInstanceI19ActorProfileUnkSOGBE8sProfileE kind:bss addr:0x02163244 +_ZN15ProfileInstanceI19ActorProfileUnkSOGCE8sProfileE kind:bss addr:0x02163288 +_ZGVN15ProfileInstanceI19ActorProfileUnkCOMME8sProfileE kind:bss addr:0x021632cc +@12295 kind:bss addr:0x021632d0 +_ZN15ProfileInstanceI19ActorProfileUnkCOMME8sProfileE kind:bss addr:0x021632dc data_ov060_021632e0 kind:bss addr:0x021632e0 -data_ov060_021633b4 kind:bss addr:0x021633b4 -data_ov060_021633b8 kind:bss addr:0x021633b8 -sActorProfileUnkOLDM kind:bss addr:0x021633c4 -data_ov060_0216349c kind:bss addr:0x0216349c -data_ov060_021634a0 kind:bss addr:0x021634a0 -sActorProfileUnkRMC0 kind:bss addr:0x021634ac +_ZGVN15ProfileInstanceI19ActorProfileUnkOLDME8sProfileE kind:bss addr:0x021633b4 +@12301 kind:bss addr:0x021633b8 +_ZN15ProfileInstanceI19ActorProfileUnkOLDME8sProfileE kind:bss addr:0x021633c4 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMC0E8sProfileE kind:bss addr:0x0216349c +@12307 kind:bss addr:0x021634a0 +_ZN15ProfileInstanceI19ActorProfileUnkRMC0E8sProfileE kind:bss addr:0x021634ac data_ov060_02163518 kind:bss addr:0x02163518 ambiguous -data_ov060_02163584 kind:bss addr:0x02163584 -data_ov060_02163588 kind:bss addr:0x02163588 -sActorProfileUnkRMC1 kind:bss addr:0x02163594 -data_ov060_0216366c kind:bss addr:0x0216366c -data_ov060_02163670 kind:bss addr:0x02163670 -sActorProfileUnkRMC2 kind:bss addr:0x0216367c +_ZGVN15ProfileInstanceI19ActorProfileUnkRMC1E8sProfileE kind:bss addr:0x02163584 +@12313 kind:bss addr:0x02163588 +_ZN15ProfileInstanceI19ActorProfileUnkRMC1E8sProfileE kind:bss addr:0x02163594 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMC2E8sProfileE kind:bss addr:0x0216366c +@12319 kind:bss addr:0x02163670 +_ZN15ProfileInstanceI19ActorProfileUnkRMC2E8sProfileE kind:bss addr:0x0216367c data_ov060_02163754 kind:bss addr:0x02163754 -data_ov060_021637b8 kind:bss addr:0x021637b8 -data_ov060_021637bc kind:bss addr:0x021637bc -sActorProfileUnkRMC6 kind:bss addr:0x021637c8 -data_ov060_021638a0 kind:bss addr:0x021638a0 -data_ov060_021638a4 kind:bss addr:0x021638a4 -sActorProfileUnkRMC3 kind:bss addr:0x021638b0 -data_ov060_02163988 kind:bss addr:0x02163988 -data_ov060_0216398c kind:bss addr:0x0216398c -sActorProfileUnkRMC4 kind:bss addr:0x02163998 -data_ov060_02163a70 kind:bss addr:0x02163a70 -data_ov060_02163a74 kind:bss addr:0x02163a74 -sActorProfileUnkRMC5 kind:bss addr:0x02163a80 -data_ov060_02163b58 kind:bss addr:0x02163b58 -data_ov060_02163b5c kind:bss addr:0x02163b5c -sActorProfileUnkCASL kind:bss addr:0x02163b68 -data_ov060_02163c40 kind:bss addr:0x02163c40 -data_ov060_02163c44 kind:bss addr:0x02163c44 -sActorProfileUnkCAST kind:bss addr:0x02163c50 -data_ov060_02163d28 kind:bss addr:0x02163d28 -data_ov060_02163d2c kind:bss addr:0x02163d2c -sActorProfileUnkZLSN kind:bss addr:0x02163d38 -data_ov060_02163e10 kind:bss addr:0x02163e10 -data_ov060_02163e14 kind:bss addr:0x02163e14 -sActorProfileUnkKIMA kind:bss addr:0x02163e20 -data_ov060_02163ef8 kind:bss addr:0x02163ef8 -data_ov060_02163efc kind:bss addr:0x02163efc -sMapObjectProfileUnkPLCT kind:bss addr:0x02163f08 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMC6E8sProfileE kind:bss addr:0x021637b8 +@12325 kind:bss addr:0x021637bc +_ZN15ProfileInstanceI19ActorProfileUnkRMC6E8sProfileE kind:bss addr:0x021637c8 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMC3E8sProfileE kind:bss addr:0x021638a0 +@12331 kind:bss addr:0x021638a4 +_ZN15ProfileInstanceI19ActorProfileUnkRMC3E8sProfileE kind:bss addr:0x021638b0 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMC4E8sProfileE kind:bss addr:0x02163988 +@12337 kind:bss addr:0x0216398c +_ZN15ProfileInstanceI19ActorProfileUnkRMC4E8sProfileE kind:bss addr:0x02163998 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMC5E8sProfileE kind:bss addr:0x02163a70 +@12343 kind:bss addr:0x02163a74 +_ZN15ProfileInstanceI19ActorProfileUnkRMC5E8sProfileE kind:bss addr:0x02163a80 +_ZGVN15ProfileInstanceI19ActorProfileUnkCASLE8sProfileE kind:bss addr:0x02163b58 +@12349 kind:bss addr:0x02163b5c +_ZN15ProfileInstanceI19ActorProfileUnkCASLE8sProfileE kind:bss addr:0x02163b68 +_ZGVN15ProfileInstanceI19ActorProfileUnkCASTE8sProfileE kind:bss addr:0x02163c40 +@12355 kind:bss addr:0x02163c44 +_ZN15ProfileInstanceI19ActorProfileUnkCASTE8sProfileE kind:bss addr:0x02163c50 +_ZGVN15ProfileInstanceI19ActorProfileUnkZLSNE8sProfileE kind:bss addr:0x02163d28 +@12361 kind:bss addr:0x02163d2c +_ZN15ProfileInstanceI19ActorProfileUnkZLSNE8sProfileE kind:bss addr:0x02163d38 +_ZGVN15ProfileInstanceI19ActorProfileUnkKIMAE8sProfileE kind:bss addr:0x02163e10 +@12367 kind:bss addr:0x02163e14 +_ZN15ProfileInstanceI19ActorProfileUnkKIMAE8sProfileE kind:bss addr:0x02163e20 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkPLCTE8sProfileE kind:bss addr:0x02163ef8 +@11970 kind:bss addr:0x02163efc +_ZN15ProfileInstanceI23MapObjectProfileUnkPLCTE8sProfileE kind:bss addr:0x02163f08 data_ov060_02163fdc kind:bss addr:0x02163fdc data_ov060_02163fe0 kind:bss addr:0x02163fe0 ambiguous data_ov060_02163ff4 kind:bss addr:0x02163ff4 ambiguous -data_ov060_02163ffc kind:bss addr:0x02163ffc -data_ov060_02164000 kind:bss addr:0x02164000 -sMapObjectProfileUnkDFNC kind:bss addr:0x0216400c +_ZGVN15ProfileInstanceI23MapObjectProfileUnkDFNCE8sProfileE kind:bss addr:0x02163ffc +@11976 kind:bss addr:0x02164000 +_ZN15ProfileInstanceI23MapObjectProfileUnkDFNCE8sProfileE kind:bss addr:0x0216400c data_ov060_021640e0 kind:bss addr:0x021640e0 data_ov060_02164104 kind:bss addr:0x02164104 data_ov060_02164108 kind:bss addr:0x02164108 -sMapObjectProfileUnkEXCT kind:bss addr:0x02164114 +_ZN15ProfileInstanceI23MapObjectProfileUnkEXCTE8sProfileE kind:bss addr:0x02164114 diff --git a/config/eur/arm9/overlays/ov061/delinks.txt b/config/eur/arm9/overlays/ov061/delinks.txt index 548c3264..c077155a 100644 --- a/config/eur/arm9/overlays/ov061/delinks.txt +++ b/config/eur/arm9/overlays/ov061/delinks.txt @@ -9,64 +9,64 @@ src/061_CastleTown/Actor/ActorUnkRMT0.cpp: .text start:0x02157ea0 end:0x02157fc4 .init start:0x02159e98 end:0x02159ee8 .ctor start:0x0215a2d8 end:0x0215a2dc - .bss start:0x0215af90 end:0x0215afa4 + .bss start:0x0215af80 end:0x0215b068 src/061_CastleTown/Actor/ActorUnkRMT1.cpp: .text start:0x02157fc4 end:0x02158234 .init start:0x02159ee8 end:0x02159f38 .ctor start:0x0215a2dc end:0x0215a2e0 - .bss start:0x0215b078 end:0x0215b098 + .bss start:0x0215b068 end:0x0215b150 src/061_CastleTown/Actor/ActorUnkRMT2.cpp: .text start:0x02158234 end:0x02158358 .init start:0x02159f38 end:0x02159f88 .ctor start:0x0215a2e0 end:0x0215a2e4 - .bss start:0x0215b160 end:0x0215b1b4 + .bss start:0x0215b150 end:0x0215b238 src/061_CastleTown/Actor/ActorUnkRMT3.cpp: .text start:0x02158358 end:0x0215847c .init start:0x02159f88 end:0x02159fd8 .ctor start:0x0215a2e4 end:0x0215a2e8 - .bss start:0x0215b248 end:0x0215b320 + .bss start:0x0215b238 end:0x0215b320 src/061_CastleTown/Actor/ActorUnkRMT4.cpp: .text start:0x0215847c end:0x021585a0 .init start:0x02159fd8 end:0x0215a028 .ctor start:0x0215a2e8 end:0x0215a2ec - .bss start:0x0215b330 end:0x0215b388 + .bss start:0x0215b320 end:0x0215b420 src/061_CastleTown/Actor/ActorUnkCAMA_CAMB_CAMS.cpp: .text start:0x021585a0 end:0x02158af8 .init start:0x0215a028 end:0x0215a100 .ctor start:0x0215a2ec end:0x0215a2f0 - .bss start:0x0215b438 end:0x0215b6c0 + .bss start:0x0215b420 end:0x0215b6c0 src/061_CastleTown/Actor/ActorUnkCAWA.cpp: .text start:0x02158af8 end:0x02158eac .init start:0x0215a100 end:0x0215a150 .ctor start:0x0215a2f0 end:0x0215a2f4 - .bss start:0x0215b6d0 end:0x0215b6ec + .bss start:0x0215b6c0 end:0x0215b7a8 src/061_CastleTown/Actor/ActorUnkJOLN.cpp: .text start:0x02158eac end:0x021591a0 .init start:0x0215a150 end:0x0215a1a0 .ctor start:0x0215a2f4 end:0x0215a2f8 - .bss start:0x0215b7b8 end:0x0215b804 + .bss start:0x0215b7a8 end:0x0215b890 src/061_CastleTown/Actor/ActorUnkFLCT.cpp: .text start:0x021591a0 end:0x0215944c .init start:0x0215a1a0 end:0x0215a214 .ctor start:0x0215a2f8 end:0x0215a2fc - .bss start:0x0215b8a0 end:0x0215b978 + .bss start:0x0215b890 end:0x0215b978 src/061_CastleTown/MapObject/MapObjectUnkFSCT.cpp: .text start:0x0215944c end:0x02159584 .init start:0x0215a214 end:0x0215a264 .ctor start:0x0215a2fc end:0x0215a300 - .bss start:0x0215b988 end:0x0215b9a4 + .bss start:0x0215b978 end:0x0215ba5c src/061_CastleTown/MapObject/MapObjectUnkDRTY.cpp: .text start:0x02159584 end:0x02159dfc .init start:0x0215a264 end:0x0215a2d8 .ctor start:0x0215a300 end:0x0215a304 - .bss start:0x0215ba6c end:0x0215bb40 + .bss start:0x0215ba5c end:0x0215bb40 diff --git a/config/eur/arm9/overlays/ov061/symbols.txt b/config/eur/arm9/overlays/ov061/symbols.txt index d4c5772e..6ca029e8 100644 --- a/config/eur/arm9/overlays/ov061/symbols.txt +++ b/config/eur/arm9/overlays/ov061/symbols.txt @@ -221,54 +221,54 @@ data_ov061_0215ae8c kind:data(any) addr:0x0215ae8c data_ov061_0215aeb4 kind:data(any) addr:0x0215aeb4 data_ov061_0215aee4 kind:data(any) addr:0x0215aee4 ambiguous data_ov061_0215af4c kind:data(any) addr:0x0215af4c -data_ov061_0215af80 kind:bss addr:0x0215af80 -data_ov061_0215af84 kind:bss addr:0x0215af84 -sActorProfileUnkRMT0 kind:bss addr:0x0215af90 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMT0E8sProfileE kind:bss addr:0x0215af80 +@12396 kind:bss addr:0x0215af84 +_ZN15ProfileInstanceI19ActorProfileUnkRMT0E8sProfileE kind:bss addr:0x0215af90 data_ov061_0215afa4 kind:bss addr:0x0215afa4 ambiguous data_ov061_0215b004 kind:bss addr:0x0215b004 ambiguous data_ov061_0215b008 kind:bss addr:0x0215b008 ambiguous data_ov061_0215b064 kind:bss addr:0x0215b064 ambiguous -data_ov061_0215b068 kind:bss addr:0x0215b068 -data_ov061_0215b06c kind:bss addr:0x0215b06c -sActorProfileUnkRMT1 kind:bss addr:0x0215b078 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMT1E8sProfileE kind:bss addr:0x0215b068 +@12402 kind:bss addr:0x0215b06c +_ZN15ProfileInstanceI19ActorProfileUnkRMT1E8sProfileE kind:bss addr:0x0215b078 data_ov061_0215b098 kind:bss addr:0x0215b098 ambiguous -data_ov061_0215b150 kind:bss addr:0x0215b150 -data_ov061_0215b154 kind:bss addr:0x0215b154 -sActorProfileUnkRMT2 kind:bss addr:0x0215b160 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMT2E8sProfileE kind:bss addr:0x0215b150 +@12408 kind:bss addr:0x0215b154 +_ZN15ProfileInstanceI19ActorProfileUnkRMT2E8sProfileE kind:bss addr:0x0215b160 data_ov061_0215b1b4 kind:bss addr:0x0215b1b4 ambiguous -data_ov061_0215b238 kind:bss addr:0x0215b238 -data_ov061_0215b23c kind:bss addr:0x0215b23c -sActorProfileUnkRMT3 kind:bss addr:0x0215b248 -data_ov061_0215b320 kind:bss addr:0x0215b320 -data_ov061_0215b324 kind:bss addr:0x0215b324 -sActorProfileUnkRMT4 kind:bss addr:0x0215b330 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMT3E8sProfileE kind:bss addr:0x0215b238 +@12414 kind:bss addr:0x0215b23c +_ZN15ProfileInstanceI19ActorProfileUnkRMT3E8sProfileE kind:bss addr:0x0215b248 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMT4E8sProfileE kind:bss addr:0x0215b320 +@12420 kind:bss addr:0x0215b324 +_ZN15ProfileInstanceI19ActorProfileUnkRMT4E8sProfileE kind:bss addr:0x0215b330 data_ov061_0215b388 kind:bss addr:0x0215b388 ambiguous data_ov061_0215b3d4 kind:bss addr:0x0215b3d4 ambiguous data_ov061_0215b408 kind:bss addr:0x0215b408 data_ov061_0215b414 kind:bss addr:0x0215b414 -data_ov061_0215b420 kind:bss addr:0x0215b420 -data_ov061_0215b42c kind:bss addr:0x0215b42c -sActorProfileUnkCAMB kind:bss addr:0x0215b438 +_ZGVN15ProfileInstanceI19ActorProfileUnkCAMBE8sProfileE kind:bss addr:0x0215b420 +@12426 kind:bss addr:0x0215b42c +_ZN15ProfileInstanceI19ActorProfileUnkCAMBE8sProfileE kind:bss addr:0x0215b438 data_ov061_0215b50c kind:bss addr:0x0215b50c ambiguous -sActorProfileUnkCAMS kind:bss addr:0x0215b510 -sActorProfileUnkCAMA kind:bss addr:0x0215b5e8 -data_ov061_0215b6c0 kind:bss addr:0x0215b6c0 -data_ov061_0215b6c4 kind:bss addr:0x0215b6c4 -sActorProfileUnkCAWA kind:bss addr:0x0215b6d0 +_ZN15ProfileInstanceI19ActorProfileUnkCAMSE8sProfileE kind:bss addr:0x0215b510 +_ZN15ProfileInstanceI19ActorProfileUnkCAMAE8sProfileE kind:bss addr:0x0215b5e8 +_ZGVN15ProfileInstanceI19ActorProfileUnkCAWAE8sProfileE kind:bss addr:0x0215b6c0 +@12432 kind:bss addr:0x0215b6c4 +_ZN15ProfileInstanceI19ActorProfileUnkCAWAE8sProfileE kind:bss addr:0x0215b6d0 data_ov061_0215b6ec kind:bss addr:0x0215b6ec ambiguous -data_ov061_0215b7a8 kind:bss addr:0x0215b7a8 -data_ov061_0215b7ac kind:bss addr:0x0215b7ac -sActorProfileUnkJOLN kind:bss addr:0x0215b7b8 +_ZGVN15ProfileInstanceI19ActorProfileUnkJOLNE8sProfileE kind:bss addr:0x0215b7a8 +@12438 kind:bss addr:0x0215b7ac +_ZN15ProfileInstanceI19ActorProfileUnkJOLNE8sProfileE kind:bss addr:0x0215b7b8 data_ov061_0215b804 kind:bss addr:0x0215b804 ambiguous data_ov061_0215b850 kind:bss addr:0x0215b850 ambiguous -data_ov061_0215b890 kind:bss addr:0x0215b890 -data_ov061_0215b894 kind:bss addr:0x0215b894 -sActorProfileUnkFLCT kind:bss addr:0x0215b8a0 -data_ov061_0215b978 kind:bss addr:0x0215b978 -data_ov061_0215b97c kind:bss addr:0x0215b97c -sMapObjectProfileUnkFSCT kind:bss addr:0x0215b988 +_ZGVN15ProfileInstanceI19ActorProfileUnkFLCTE8sProfileE kind:bss addr:0x0215b890 +@12444 kind:bss addr:0x0215b894 +_ZN15ProfileInstanceI19ActorProfileUnkFLCTE8sProfileE kind:bss addr:0x0215b8a0 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkFSCTE8sProfileE kind:bss addr:0x0215b978 +@12047 kind:bss addr:0x0215b97c +_ZN15ProfileInstanceI23MapObjectProfileUnkFSCTE8sProfileE kind:bss addr:0x0215b988 data_ov061_0215b9a4 kind:bss addr:0x0215b9a4 ambiguous data_ov061_0215ba58 kind:bss addr:0x0215ba58 ambiguous -data_ov061_0215ba5c kind:bss addr:0x0215ba5c -data_ov061_0215ba60 kind:bss addr:0x0215ba60 -sMapObjectProfileUnkDRTY kind:bss addr:0x0215ba6c +_ZGVN15ProfileInstanceI23MapObjectProfileUnkDRTYE8sProfileE kind:bss addr:0x0215ba5c +@12053 kind:bss addr:0x0215ba60 +_ZN15ProfileInstanceI23MapObjectProfileUnkDRTYE8sProfileE kind:bss addr:0x0215ba6c diff --git a/config/eur/arm9/overlays/ov062/delinks.txt b/config/eur/arm9/overlays/ov062/delinks.txt index 9a055e5c..6cf280cb 100644 --- a/config/eur/arm9/overlays/ov062/delinks.txt +++ b/config/eur/arm9/overlays/ov062/delinks.txt @@ -9,124 +9,124 @@ src/062_Village/Actor/ActorUnkRML0.cpp: .text start:0x02157ea0 end:0x02157ff4 .init start:0x0215e8cc end:0x0215e91c .ctor start:0x0215efb4 end:0x0215efb8 - .bss start:0x02160990 end:0x021609dc + .bss start:0x02160980 end:0x02160a68 src/062_Village/Actor/ActorUnkRML1.cpp: .text start:0x02157ff4 end:0x02158118 .init start:0x0215e91c end:0x0215e96c .ctor start:0x0215efb8 end:0x0215efbc - .bss start:0x02160a78 end:0x02160ad0 + .bss start:0x02160a68 end:0x02160b50 src/062_Village/Actor/ActorUnkRML2.cpp: .text start:0x02158118 end:0x0215823c .init start:0x0215e96c end:0x0215e9bc .ctor start:0x0215efbc end:0x0215efc0 - .bss start:0x02160b60 end:0x02160b70 + .bss start:0x02160b50 end:0x02160c38 src/062_Village/Actor/ActorUnkRML3.cpp: .text start:0x0215823c end:0x02158360 .init start:0x0215e9bc end:0x0215ea0c .ctor start:0x0215efc0 end:0x0215efc4 - .bss start:0x02160c48 end:0x02160d20 + .bss start:0x02160c38 end:0x02160d20 src/062_Village/Actor/ActorUnkNICO.cpp: .text start:0x02158360 end:0x02158734 .init start:0x0215ea0c end:0x0215ea5c .ctor start:0x0215efc4 end:0x0215efc8 - .bss start:0x02160d30 end:0x02160e08 + .bss start:0x02160d20 end:0x02160e0c src/062_Village/Actor/ActorUnkFBCH.cpp: .text start:0x02158734 end:0x02158bdc .init start:0x0215ea5c end:0x0215eaac .ctor start:0x0215efc8 end:0x0215efcc - .bss start:0x02160e18 end:0x02160e98 + .bss start:0x02160e0c end:0x02160ef4 src/062_Village/Actor/ActorUnkNSHD.cpp: .text start:0x02158bdc end:0x02158fa4 .init start:0x0215eaac end:0x0215eb10 .ctor start:0x0215efcc end:0x0215efd0 - .bss start:0x02160f10 end:0x02160f4c + .bss start:0x02160ef4 end:0x02160f4c src/062_Village/Actor/ActorUnkLBCK.cpp: .text start:0x02158fa4 end:0x021599f4 .init start:0x0215eb10 end:0x0215eb60 .ctor start:0x0215efd0 end:0x0215efd4 - .bss start:0x02160f5c end:0x02161034 + .bss start:0x02160f4c end:0x02161034 src/062_Village/Actor/ActorUnkRMLF.cpp: .text start:0x021599f4 end:0x02159b18 .init start:0x0215eb60 end:0x0215ebb0 .ctor start:0x0215efd4 end:0x0215efd8 - .bss start:0x02161044 end:0x021610f0 + .bss start:0x02161034 end:0x02161124 src/062_Village/Actor/ActorUnkNCCB_NCMB.cpp: .text start:0x02159b18 end:0x02159ff4 .init start:0x0215ebb0 end:0x0215ec44 .ctor start:0x0215efd8 end:0x0215efdc - .bss start:0x0216113c end:0x0216122c + .bss start:0x02161124 end:0x021612ec src/062_Village/Actor/ActorUnkNCWA.cpp: .text start:0x02159ff4 end:0x0215a3ec .init start:0x0215ec44 end:0x0215ec94 .ctor start:0x0215efdc end:0x0215efe0 - .bss start:0x021612fc end:0x021613a8 + .bss start:0x021612ec end:0x021613d4 src/062_Village/Actor/ActorUnkRMBC.cpp: .text start:0x0215a3ec end:0x0215a510 .init start:0x0215ec94 end:0x0215ece4 .ctor start:0x0215efe0 end:0x0215efe4 - .bss start:0x021613e4 end:0x02161430 + .bss start:0x021613d4 end:0x021614bc src/062_Village/Actor/ActorUnkMOCT.cpp: .text start:0x0215a510 end:0x0215a730 .init start:0x0215ece4 end:0x0215ed34 .ctor start:0x0215efe4 end:0x0215efe8 - .bss start:0x021614cc end:0x02161508 + .bss start:0x021614bc end:0x02161508 src/062_Village/Actor/ActorUnkTSLB.cpp: .text start:0x0215a730 end:0x0215b3d4 .init start:0x0215ed34 end:0x0215ed84 .ctor start:0x0215efe8 end:0x0215efec - .bss start:0x02161518 end:0x02161520 + .bss start:0x02161508 end:0x021615f0 src/062_Village/MapObject/MapObjectUnkFSFS.cpp: .text start:0x0215b3d4 end:0x0215b50c .init start:0x0215ed84 end:0x0215edd4 .ctor start:0x0215efec end:0x0215eff0 - .bss start:0x02161600 end:0x021616d4 + .bss start:0x021615f0 end:0x021616d4 src/062_Village/MapObject/MapObjectUnkHOL2.cpp: .text start:0x0215b50c end:0x0215b850 .init start:0x0215edd4 end:0x0215ee24 .ctor start:0x0215eff0 end:0x0215eff4 - .bss start:0x021616e4 end:0x02161704 + .bss start:0x021616d4 end:0x021617dc src/062_Village/MapObject/MapObjectUnkHOL0.cpp: .text start:0x0215b850 end:0x0215b9a4 .init start:0x0215ee24 end:0x0215ee74 .ctor start:0x0215eff4 end:0x0215eff8 - .bss start:0x021617ec end:0x021618a0 + .bss start:0x021617dc end:0x021618c0 src/062_Village/MapObject/MapObjectUnkHOL1.cpp: .text start:0x0215b9a4 end:0x0215baf8 .init start:0x0215ee74 end:0x0215eec4 .ctor start:0x0215eff8 end:0x0215effc - .bss start:0x021618d0 end:0x0216195c + .bss start:0x021618c0 end:0x021619a4 src/062_Village/MapObject/MapObjectUnkHOLB.cpp: .text start:0x0215baf8 end:0x0215bc4c .init start:0x0215eec4 end:0x0215ef14 .ctor start:0x0215effc end:0x0215f000 - .bss start:0x021619b4 end:0x02161a28 + .bss start:0x021619a4 end:0x02161a88 src/062_Village/MapObject/MapObjectUnkHOSB.cpp: .text start:0x0215bc4c end:0x0215bda0 .init start:0x0215ef14 end:0x0215ef64 .ctor start:0x0215f000 end:0x0215f004 - .bss start:0x02161a98 end:0x02161aec + .bss start:0x02161a88 end:0x02161b6c src/062_Village/MapObject/MapObjectUnkGBDR.cpp: .text start:0x0215bda0 end:0x0215c054 .init start:0x0215ef64 end:0x0215efb4 .ctor start:0x0215f004 end:0x0215f008 - .bss start:0x02161b7c end:0x02161bcc + .bss start:0x02161b6c end:0x02161bcc diff --git a/config/eur/arm9/overlays/ov062/symbols.txt b/config/eur/arm9/overlays/ov062/symbols.txt index c51357bf..e4be5300 100644 --- a/config/eur/arm9/overlays/ov062/symbols.txt +++ b/config/eur/arm9/overlays/ov062/symbols.txt @@ -504,92 +504,92 @@ data_ov062_02160950 kind:data(any) addr:0x02160950 data_ov062_0216095c kind:data(any) addr:0x0216095c data_ov062_02160968 kind:data(any) addr:0x02160968 data_ov062_0216097c kind:data(any) addr:0x0216097c ambiguous -data_ov062_02160980 kind:bss addr:0x02160980 -data_ov062_02160984 kind:bss addr:0x02160984 -sActorProfileUnkRML0 kind:bss addr:0x02160990 +_ZGVN15ProfileInstanceI19ActorProfileUnkRML0E8sProfileE kind:bss addr:0x02160980 +@12468 kind:bss addr:0x02160984 +_ZN15ProfileInstanceI19ActorProfileUnkRML0E8sProfileE kind:bss addr:0x02160990 data_ov062_021609dc kind:bss addr:0x021609dc ambiguous -data_ov062_02160a68 kind:bss addr:0x02160a68 -data_ov062_02160a6c kind:bss addr:0x02160a6c -sActorProfileUnkRML1 kind:bss addr:0x02160a78 +_ZGVN15ProfileInstanceI19ActorProfileUnkRML1E8sProfileE kind:bss addr:0x02160a68 +@12474 kind:bss addr:0x02160a6c +_ZN15ProfileInstanceI19ActorProfileUnkRML1E8sProfileE kind:bss addr:0x02160a78 data_ov062_02160ad0 kind:bss addr:0x02160ad0 ambiguous -data_ov062_02160b50 kind:bss addr:0x02160b50 -data_ov062_02160b54 kind:bss addr:0x02160b54 -sActorProfileUnkRML2 kind:bss addr:0x02160b60 +_ZGVN15ProfileInstanceI19ActorProfileUnkRML2E8sProfileE kind:bss addr:0x02160b50 +@12480 kind:bss addr:0x02160b54 +_ZN15ProfileInstanceI19ActorProfileUnkRML2E8sProfileE kind:bss addr:0x02160b60 data_ov062_02160b70 kind:bss addr:0x02160b70 ambiguous data_ov062_02160bb8 kind:bss addr:0x02160bb8 ambiguous -data_ov062_02160c38 kind:bss addr:0x02160c38 -data_ov062_02160c3c kind:bss addr:0x02160c3c -sActorProfileUnkRML3 kind:bss addr:0x02160c48 -data_ov062_02160d20 kind:bss addr:0x02160d20 -data_ov062_02160d24 kind:bss addr:0x02160d24 -sActorProfileUnkNICO kind:bss addr:0x02160d30 +_ZGVN15ProfileInstanceI19ActorProfileUnkRML3E8sProfileE kind:bss addr:0x02160c38 +@12486 kind:bss addr:0x02160c3c +_ZN15ProfileInstanceI19ActorProfileUnkRML3E8sProfileE kind:bss addr:0x02160c48 +_ZGVN15ProfileInstanceI19ActorProfileUnkNICOE8sProfileE kind:bss addr:0x02160d20 +@12492 kind:bss addr:0x02160d24 +_ZN15ProfileInstanceI19ActorProfileUnkNICOE8sProfileE kind:bss addr:0x02160d30 data_ov062_02160e08 kind:bss addr:0x02160e08 -data_ov062_02160e0c kind:bss addr:0x02160e0c -data_ov062_02160e10 kind:bss addr:0x02160e10 ambiguous -sActorProfileUnkFBCH kind:bss addr:0x02160e18 +_ZGVN15ProfileInstanceI19ActorProfileUnkFBCHE8sProfileE kind:bss addr:0x02160e0c +@12498 kind:bss addr:0x02160e10 ambiguous +_ZN15ProfileInstanceI19ActorProfileUnkFBCHE8sProfileE kind:bss addr:0x02160e18 data_ov062_02160e98 kind:bss addr:0x02160e98 ambiguous data_ov062_02160ef0 kind:bss addr:0x02160ef0 -data_ov062_02160ef4 kind:bss addr:0x02160ef4 -data_ov062_02160f00 kind:bss addr:0x02160f00 -sActorProfileUnkNSHD kind:bss addr:0x02160f10 -data_ov062_02160f4c kind:bss addr:0x02160f4c -data_ov062_02160f50 kind:bss addr:0x02160f50 -sActorProfileUnkLBCK kind:bss addr:0x02160f5c -data_ov062_02161034 kind:bss addr:0x02161034 -data_ov062_02161038 kind:bss addr:0x02161038 -sActorProfileUnkRMLF kind:bss addr:0x02161044 +_ZGVN15ProfileInstanceI19ActorProfileUnkNSHDE8sProfileE kind:bss addr:0x02160ef4 +@12504 kind:bss addr:0x02160f00 +_ZN15ProfileInstanceI19ActorProfileUnkNSHDE8sProfileE kind:bss addr:0x02160f10 +_ZGVN15ProfileInstanceI19ActorProfileUnkLBCKE8sProfileE kind:bss addr:0x02160f4c +@12510 kind:bss addr:0x02160f50 +_ZN15ProfileInstanceI19ActorProfileUnkLBCKE8sProfileE kind:bss addr:0x02160f5c +_ZGVN15ProfileInstanceI19ActorProfileUnkRMLFE8sProfileE kind:bss addr:0x02161034 +@12516 kind:bss addr:0x02161038 +_ZN15ProfileInstanceI19ActorProfileUnkRMLFE8sProfileE kind:bss addr:0x02161044 data_ov062_021610f0 kind:bss addr:0x021610f0 ambiguous data_ov062_0216111c kind:bss addr:0x0216111c -data_ov062_02161124 kind:bss addr:0x02161124 -data_ov062_02161130 kind:bss addr:0x02161130 -sActorProfileUnkNCMB kind:bss addr:0x0216113c +_ZGVN15ProfileInstanceI19ActorProfileUnkNCMBE8sProfileE kind:bss addr:0x02161124 +@12522 kind:bss addr:0x02161130 +_ZN15ProfileInstanceI19ActorProfileUnkNCMBE8sProfileE kind:bss addr:0x0216113c data_ov062_02161178 kind:bss addr:0x02161178 ambiguous -sActorProfileUnkNCCB kind:bss addr:0x02161214 +_ZN15ProfileInstanceI19ActorProfileUnkNCCBE8sProfileE kind:bss addr:0x02161214 data_ov062_0216122c kind:bss addr:0x0216122c ambiguous data_ov062_021612c0 kind:bss addr:0x021612c0 ambiguous data_ov062_021612c8 kind:bss addr:0x021612c8 ambiguous -data_ov062_021612ec kind:bss addr:0x021612ec -data_ov062_021612f0 kind:bss addr:0x021612f0 -sActorProfileUnkNCWA kind:bss addr:0x021612fc +_ZGVN15ProfileInstanceI19ActorProfileUnkNCWAE8sProfileE kind:bss addr:0x021612ec +@12528 kind:bss addr:0x021612f0 +_ZN15ProfileInstanceI19ActorProfileUnkNCWAE8sProfileE kind:bss addr:0x021612fc data_ov062_021613a8 kind:bss addr:0x021613a8 ambiguous -data_ov062_021613d4 kind:bss addr:0x021613d4 -data_ov062_021613d8 kind:bss addr:0x021613d8 -sActorProfileUnkRMBC kind:bss addr:0x021613e4 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMBCE8sProfileE kind:bss addr:0x021613d4 +@12534 kind:bss addr:0x021613d8 +_ZN15ProfileInstanceI19ActorProfileUnkRMBCE8sProfileE kind:bss addr:0x021613e4 data_ov062_02161430 kind:bss addr:0x02161430 ambiguous -data_ov062_021614bc kind:bss addr:0x021614bc -data_ov062_021614c0 kind:bss addr:0x021614c0 -sActorProfileUnkMOCT kind:bss addr:0x021614cc -data_ov062_02161508 kind:bss addr:0x02161508 -data_ov062_0216150c kind:bss addr:0x0216150c -sActorProfileUnkTSLB kind:bss addr:0x02161518 +_ZGVN15ProfileInstanceI19ActorProfileUnkMOCTE8sProfileE kind:bss addr:0x021614bc +@12540 kind:bss addr:0x021614c0 +_ZN15ProfileInstanceI19ActorProfileUnkMOCTE8sProfileE kind:bss addr:0x021614cc +_ZGVN15ProfileInstanceI19ActorProfileUnkTSLBE8sProfileE kind:bss addr:0x02161508 +@12546 kind:bss addr:0x0216150c +_ZN15ProfileInstanceI19ActorProfileUnkTSLBE8sProfileE kind:bss addr:0x02161518 data_ov062_02161520 kind:bss addr:0x02161520 ambiguous data_ov062_0216153c kind:bss addr:0x0216153c ambiguous -data_ov062_021615f0 kind:bss addr:0x021615f0 -data_ov062_021615f4 kind:bss addr:0x021615f4 -sMapObjectProfileUnkFSFS kind:bss addr:0x02161600 -data_ov062_021616d4 kind:bss addr:0x021616d4 -data_ov062_021616d8 kind:bss addr:0x021616d8 -sMapObjectProfileUnkHOL2 kind:bss addr:0x021616e4 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkFSFSE8sProfileE kind:bss addr:0x021615f0 +@12149 kind:bss addr:0x021615f4 +_ZN15ProfileInstanceI23MapObjectProfileUnkFSFSE8sProfileE kind:bss addr:0x02161600 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkHOL2E8sProfileE kind:bss addr:0x021616d4 +@12155 kind:bss addr:0x021616d8 +_ZN15ProfileInstanceI23MapObjectProfileUnkHOL2E8sProfileE kind:bss addr:0x021616e4 data_ov062_02161704 kind:bss addr:0x02161704 -data_ov062_021617dc kind:bss addr:0x021617dc -data_ov062_021617e0 kind:bss addr:0x021617e0 -sMapObjectProfileUnkHOL0 kind:bss addr:0x021617ec +_ZGVN15ProfileInstanceI23MapObjectProfileUnkHOL0E8sProfileE kind:bss addr:0x021617dc +@12161 kind:bss addr:0x021617e0 +_ZN15ProfileInstanceI23MapObjectProfileUnkHOL0E8sProfileE kind:bss addr:0x021617ec data_ov062_021618a0 kind:bss addr:0x021618a0 ambiguous -data_ov062_021618c0 kind:bss addr:0x021618c0 -data_ov062_021618c4 kind:bss addr:0x021618c4 -sMapObjectProfileUnkHOL1 kind:bss addr:0x021618d0 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkHOL1E8sProfileE kind:bss addr:0x021618c0 +@12167 kind:bss addr:0x021618c4 +_ZN15ProfileInstanceI23MapObjectProfileUnkHOL1E8sProfileE kind:bss addr:0x021618d0 data_ov062_0216195c kind:bss addr:0x0216195c ambiguous -data_ov062_021619a4 kind:bss addr:0x021619a4 -data_ov062_021619a8 kind:bss addr:0x021619a8 -sMapObjectProfileUnkHOLB kind:bss addr:0x021619b4 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkHOLBE8sProfileE kind:bss addr:0x021619a4 +@12173 kind:bss addr:0x021619a8 +_ZN15ProfileInstanceI23MapObjectProfileUnkHOLBE8sProfileE kind:bss addr:0x021619b4 data_ov062_02161a28 kind:bss addr:0x02161a28 ambiguous -data_ov062_02161a88 kind:bss addr:0x02161a88 -data_ov062_02161a8c kind:bss addr:0x02161a8c -sMapObjectProfileUnkHOSB kind:bss addr:0x02161a98 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkHOSBE8sProfileE kind:bss addr:0x02161a88 +@12179 kind:bss addr:0x02161a8c +_ZN15ProfileInstanceI23MapObjectProfileUnkHOSBE8sProfileE kind:bss addr:0x02161a98 data_ov062_02161aec kind:bss addr:0x02161aec ambiguous -data_ov062_02161b6c kind:bss addr:0x02161b6c -data_ov062_02161b70 kind:bss addr:0x02161b70 -sMapObjectProfileUnkGBDR kind:bss addr:0x02161b7c +_ZGVN15ProfileInstanceI23MapObjectProfileUnkGBDRE8sProfileE kind:bss addr:0x02161b6c +@12185 kind:bss addr:0x02161b70 +_ZN15ProfileInstanceI23MapObjectProfileUnkGBDRE8sProfileE kind:bss addr:0x02161b7c data_ov062_02161bcc kind:bss addr:0x02161bcc ambiguous data_ov062_02161be0 kind:bss addr:0x02161be0 ambiguous data_ov062_02161c2c kind:bss addr:0x02161c2c ambiguous diff --git a/config/eur/arm9/overlays/ov063/delinks.txt b/config/eur/arm9/overlays/ov063/delinks.txt index 07e79e94..d2ee88af 100644 --- a/config/eur/arm9/overlays/ov063/delinks.txt +++ b/config/eur/arm9/overlays/ov063/delinks.txt @@ -9,76 +9,76 @@ src/063_Shrine/Actor/ActorUnkCANS.cpp: .text start:0x02157ea0 end:0x0215aaf8 .init start:0x02162730 end:0x021627a0 .ctor start:0x02162e40 end:0x02162e44 - .bss start:0x02163b70 end:0x02163c48 + .bss start:0x02163b60 end:0x02163c48 src/063_Shrine/Actor/ActorUnkCASE.cpp: .text start:0x0215aaf8 end:0x0215bafc .init start:0x021627a0 end:0x02162834 .ctor start:0x02162e44 end:0x02162e48 - .bss start:0x02163c58 end:0x02163d30 + .bss start:0x02163c48 end:0x02163d30 src/063_Shrine/Actor/ActorUnkRMSV.cpp: .text start:0x0215bc2c end:0x0215bf90 .init start:0x02162834 end:0x02162884 .ctor start:0x02162e48 end:0x02162e4c - .bss start:0x02163d40 end:0x02163e18 + .bss start:0x02163d30 end:0x02163e18 src/063_Shrine/Actor/ActorUnkRMSW.cpp: .text start:0x0215bf90 end:0x0215c1d8 .init start:0x02162884 end:0x021628d4 .ctor start:0x02162e4c end:0x02162e50 - .bss start:0x02163e28 end:0x02163f00 + .bss start:0x02163e18 end:0x02163f00 src/063_Shrine/Actor/ActorUnkRMSF.cpp: .text start:0x0215c1d8 end:0x0215c33c .init start:0x021628d4 end:0x02162924 .ctor start:0x02162e50 end:0x02162e54 - .bss start:0x02163f10 end:0x02163fe0 + .bss start:0x02163f00 end:0x02163fec src/063_Shrine/Actor/ActorUnkRMSD.cpp: .text start:0x0215c33c end:0x0215c584 .init start:0x02162924 end:0x02162974 .ctor start:0x02162e54 end:0x02162e58 - .bss start:0x02163ff8 end:0x021640d0 + .bss start:0x02163fec end:0x021640d0 src/063_Shrine/Actor/ActorUnkRMSS.cpp: .text start:0x0215c584 end:0x0215c6e8 .init start:0x02162974 end:0x021629c4 .ctor start:0x02162e58 end:0x02162e5c - .bss start:0x021640e0 end:0x02164144 + .bss start:0x021640d0 end:0x02164318 src/063_Shrine/Actor/ActorUnkRBLS.cpp: .text start:0x0215f2b8 end:0x0215f544 .init start:0x02162b2c end:0x02162b7c .ctor start:0x02162e60 end:0x02162e64 - .bss start:0x02164328 end:0x02164400 + .bss start:0x02164318 end:0x02164400 src/063_Shrine/MapObject/MapObjectUnkSTAT.cpp: .text start:0x0215f544 end:0x0215fd94 .init start:0x02162b7c end:0x02162bcc .ctor start:0x02162e64 end:0x02162e68 - .bss start:0x02164410 end:0x021644e4 + .bss start:0x02164400 end:0x02164514 src/063_Shrine/MapObject/MapObjectUnkWLMS.cpp: .text start:0x0215fd94 end:0x02160a60 .init start:0x02162bcc end:0x02162d20 .ctor start:0x02162e68 end:0x02162e6c - .bss start:0x02164604 end:0x02164690 + .bss start:0x02164514 end:0x021646f8 src/063_Shrine/MapObject/MapObjectUnkLTRW.cpp: .text start:0x02160ad0 end:0x02160e98 .init start:0x02162d20 end:0x02162da0 .ctor start:0x02162e6c end:0x02162e70 - .bss start:0x02164708 end:0x021647dc + .bss start:0x021646f8 end:0x02164800 src/063_Shrine/MapObject/MapObjectUnkMTJR.cpp: .text start:0x02160e98 end:0x02161430 .init start:0x02162da0 end:0x02162df0 .ctor start:0x02162e70 end:0x02162e74 - .bss start:0x02164810 end:0x021648e4 + .bss start:0x02164800 end:0x02164904 src/063_Shrine/MapObject/MapObjectUnkSWCR.cpp: .text start:0x02161430 end:0x02162148 .init start:0x02162df0 end:0x02162e40 .ctor start:0x02162e74 end:0x02162e78 - .bss start:0x02164914 end:0x02164934 + .bss start:0x02164904 end:0x02164934 diff --git a/config/eur/arm9/overlays/ov063/symbols.txt b/config/eur/arm9/overlays/ov063/symbols.txt index 96912470..5ce5b85f 100644 --- a/config/eur/arm9/overlays/ov063/symbols.txt +++ b/config/eur/arm9/overlays/ov063/symbols.txt @@ -498,59 +498,59 @@ data_ov063_02163ab8 kind:data(any) addr:0x02163ab8 data_ov063_02163af8 kind:data(any) addr:0x02163af8 data_ov063_02163b0c kind:data(any) addr:0x02163b0c data_ov063_02163b28 kind:data(any) addr:0x02163b28 -data_ov063_02163b60 kind:bss addr:0x02163b60 -data_ov063_02163b64 kind:bss addr:0x02163b64 -sActorProfileUnkCANS kind:bss addr:0x02163b70 -data_ov063_02163c48 kind:bss addr:0x02163c48 -data_ov063_02163c4c kind:bss addr:0x02163c4c -sActorProfileUnkCASE kind:bss addr:0x02163c58 -data_ov063_02163d30 kind:bss addr:0x02163d30 -data_ov063_02163d34 kind:bss addr:0x02163d34 -sActorProfileUnkRMSV kind:bss addr:0x02163d40 -data_ov063_02163e18 kind:bss addr:0x02163e18 -data_ov063_02163e1c kind:bss addr:0x02163e1c -sActorProfileUnkRMSW kind:bss addr:0x02163e28 -data_ov063_02163f00 kind:bss addr:0x02163f00 -data_ov063_02163f04 kind:bss addr:0x02163f04 -sActorProfileUnkRMSF kind:bss addr:0x02163f10 +_ZGVN15ProfileInstanceI19ActorProfileUnkCANSE8sProfileE kind:bss addr:0x02163b60 +@12600 kind:bss addr:0x02163b64 +_ZN15ProfileInstanceI19ActorProfileUnkCANSE8sProfileE kind:bss addr:0x02163b70 +_ZGVN15ProfileInstanceI19ActorProfileUnkCASEE8sProfileE kind:bss addr:0x02163c48 +@12606 kind:bss addr:0x02163c4c +_ZN15ProfileInstanceI19ActorProfileUnkCASEE8sProfileE kind:bss addr:0x02163c58 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMSVE8sProfileE kind:bss addr:0x02163d30 +@12612 kind:bss addr:0x02163d34 +_ZN15ProfileInstanceI19ActorProfileUnkRMSVE8sProfileE kind:bss addr:0x02163d40 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMSWE8sProfileE kind:bss addr:0x02163e18 +@12618 kind:bss addr:0x02163e1c +_ZN15ProfileInstanceI19ActorProfileUnkRMSWE8sProfileE kind:bss addr:0x02163e28 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMSFE8sProfileE kind:bss addr:0x02163f00 +@12624 kind:bss addr:0x02163f04 +_ZN15ProfileInstanceI19ActorProfileUnkRMSFE8sProfileE kind:bss addr:0x02163f10 data_ov063_02163fe0 kind:bss addr:0x02163fe0 ambiguous data_ov063_02163fe8 kind:bss addr:0x02163fe8 -data_ov063_02163fec kind:bss addr:0x02163fec -data_ov063_02163ff4 kind:bss addr:0x02163ff4 ambiguous -sActorProfileUnkRMSD kind:bss addr:0x02163ff8 -data_ov063_021640d0 kind:bss addr:0x021640d0 -data_ov063_021640d4 kind:bss addr:0x021640d4 -sActorProfileUnkRMSS kind:bss addr:0x021640e0 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMSDE8sProfileE kind:bss addr:0x02163fec +@12630 kind:bss addr:0x02163ff4 ambiguous +_ZN15ProfileInstanceI19ActorProfileUnkRMSDE8sProfileE kind:bss addr:0x02163ff8 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMSSE8sProfileE kind:bss addr:0x021640d0 +@12636 kind:bss addr:0x021640d4 +_ZN15ProfileInstanceI19ActorProfileUnkRMSSE8sProfileE kind:bss addr:0x021640e0 data_ov063_02164144 kind:bss addr:0x02164144 ambiguous data_ov063_021641b8 kind:bss addr:0x021641b8 data_ov063_021641bc kind:bss addr:0x021641bc data_ov063_021641c8 kind:bss addr:0x021641c8 data_ov063_021641d0 kind:bss addr:0x021641d0 ambiguous data_ov063_021642fc kind:bss addr:0x021642fc ambiguous -data_ov063_02164318 kind:bss addr:0x02164318 -data_ov063_0216431c kind:bss addr:0x0216431c -sActorProfileUnkRBLS kind:bss addr:0x02164328 -data_ov063_02164400 kind:bss addr:0x02164400 -data_ov063_02164404 kind:bss addr:0x02164404 -sMapObjectProfileUnkSTAT kind:bss addr:0x02164410 +_ZGVN15ProfileInstanceI19ActorProfileUnkRBLSE8sProfileE kind:bss addr:0x02164318 +@12642 kind:bss addr:0x0216431c +_ZN15ProfileInstanceI19ActorProfileUnkRBLSE8sProfileE kind:bss addr:0x02164328 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkSTATE8sProfileE kind:bss addr:0x02164400 +@12245 kind:bss addr:0x02164404 +_ZN15ProfileInstanceI23MapObjectProfileUnkSTATE8sProfileE kind:bss addr:0x02164410 data_ov063_021644e4 kind:bss addr:0x021644e4 data_ov063_02164504 kind:bss addr:0x02164504 data_ov063_02164508 kind:bss addr:0x02164508 -data_ov063_02164514 kind:bss addr:0x02164514 -data_ov063_0216458c kind:bss addr:0x0216458c -sMapObjectProfileUnkWLMS kind:bss addr:0x02164604 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkWLMSE8sProfileE kind:bss addr:0x02164514 +@12251 kind:bss addr:0x0216458c +_ZN15ProfileInstanceI23MapObjectProfileUnkWLMSE8sProfileE kind:bss addr:0x02164604 data_ov063_02164690 kind:bss addr:0x02164690 ambiguous data_ov063_021646d8 kind:bss addr:0x021646d8 -data_ov063_021646f8 kind:bss addr:0x021646f8 -data_ov063_021646fc kind:bss addr:0x021646fc -sMapObjectProfileUnkLTRW kind:bss addr:0x02164708 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkLTRWE8sProfileE kind:bss addr:0x021646f8 +@12257 kind:bss addr:0x021646fc +_ZN15ProfileInstanceI23MapObjectProfileUnkLTRWE8sProfileE kind:bss addr:0x02164708 data_ov063_021647dc kind:bss addr:0x021647dc -data_ov063_02164800 kind:bss addr:0x02164800 -data_ov063_02164804 kind:bss addr:0x02164804 -sMapObjectProfileUnkMTJR kind:bss addr:0x02164810 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkMTJRE8sProfileE kind:bss addr:0x02164800 +@12263 kind:bss addr:0x02164804 +_ZN15ProfileInstanceI23MapObjectProfileUnkMTJRE8sProfileE kind:bss addr:0x02164810 data_ov063_021648e4 kind:bss addr:0x021648e4 -data_ov063_02164904 kind:bss addr:0x02164904 -data_ov063_02164908 kind:bss addr:0x02164908 -sMapObjectProfileUnkSWCR kind:bss addr:0x02164914 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkSWCRE8sProfileE kind:bss addr:0x02164904 +@12269 kind:bss addr:0x02164908 +_ZN15ProfileInstanceI23MapObjectProfileUnkSWCRE8sProfileE kind:bss addr:0x02164914 data_ov063_02164934 kind:bss addr:0x02164934 data_ov063_021649e8 kind:bss addr:0x021649e8 diff --git a/config/eur/arm9/overlays/ov064/delinks.txt b/config/eur/arm9/overlays/ov064/delinks.txt index 87389cf1..f619fb44 100644 --- a/config/eur/arm9/overlays/ov064/delinks.txt +++ b/config/eur/arm9/overlays/ov064/delinks.txt @@ -9,46 +9,46 @@ src/064_FldForest/MapObject/MapObjectUnkFSFR.cpp: .text start:0x02159140 end:0x02159278 .init start:0x0215a344 end:0x0215a394 .ctor start:0x0215a5ec end:0x0215a5f0 - .bss start:0x0215adf4 end:0x0215ae50 + .bss start:0x0215ade4 end:0x0215aec8 src/064_FldForest/Actor/ActorUnkRMF0.cpp: .text start:0x02159278 end:0x0215939c .init start:0x0215a394 end:0x0215a3e4 .ctor start:0x0215a5f0 end:0x0215a5f4 - .bss start:0x0215aed8 end:0x0215aee4 + .bss start:0x0215aec8 end:0x0215afb0 src/064_FldForest/Actor/ActorUnkRMF1.cpp: .text start:0x0215939c end:0x021594c0 .init start:0x0215a3e4 end:0x0215a434 .ctor start:0x0215a5f4 end:0x0215a5f8 - .bss start:0x0215afc0 end:0x0215b004 + .bss start:0x0215afb0 end:0x0215b098 src/064_FldForest/Actor/ActorUnkRMTZ.cpp: .text start:0x021594c0 end:0x0215968c .init start:0x0215a434 end:0x0215a484 .ctor start:0x0215a5f8 end:0x0215a5fc - .bss start:0x0215b0a8 end:0x0215b180 + .bss start:0x0215b098 end:0x0215b19c src/064_FldForest/Actor/ActorUnkFOMD.cpp: .text start:0x0215968c end:0x02159e8c .init start:0x0215a484 end:0x0215a4fc .ctor start:0x0215a5fc end:0x0215a600 - .bss start:0x0215b1d8 end:0x0215b2b0 + .bss start:0x0215b19c end:0x0215b2b0 src/064_FldForest/MapObject/MapObjectUnkHOF1.cpp: .text start:0x02159e8c end:0x02159ff8 .init start:0x0215a4fc end:0x0215a54c .ctor start:0x0215a600 end:0x0215a604 - .bss start:0x0215b2c0 end:0x0215b388 + .bss start:0x0215b2b0 end:0x0215b3b8 src/064_FldForest/MapObject/MapObjectUnkHOF0.cpp: .text start:0x02159ff8 end:0x0215a170 .init start:0x0215a54c end:0x0215a59c .ctor start:0x0215a604 end:0x0215a608 - .bss start:0x0215b3c8 end:0x0215b3d4 + .bss start:0x0215b3b8 end:0x0215b4c0 src/064_FldForest/MapObject/MapObjectUnkLEVN.cpp: .text start:0x0215a170 end:0x0215a2d8 .init start:0x0215a59c end:0x0215a5ec .ctor start:0x0215a608 end:0x0215a60c - .bss start:0x0215b4d0 end:0x0215b520 + .bss start:0x0215b4c0 end:0x0215b520 diff --git a/config/eur/arm9/overlays/ov064/symbols.txt b/config/eur/arm9/overlays/ov064/symbols.txt index 8713053e..20fa6ba7 100644 --- a/config/eur/arm9/overlays/ov064/symbols.txt +++ b/config/eur/arm9/overlays/ov064/symbols.txt @@ -187,38 +187,38 @@ data_ov064_0215ad50 kind:data(any) addr:0x0215ad50 data_ov064_0215ad78 kind:data(any) addr:0x0215ad78 data_ov064_0215adc0 kind:bss addr:0x0215adc0 data_ov064_0215adc4 kind:bss addr:0x0215adc4 -data_ov064_0215ade4 kind:bss addr:0x0215ade4 -data_ov064_0215ade8 kind:bss addr:0x0215ade8 -sMapObjectProfileUnkFSFR kind:bss addr:0x0215adf4 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkFSFRE8sProfileE kind:bss addr:0x0215ade4 +@12281 kind:bss addr:0x0215ade8 +_ZN15ProfileInstanceI23MapObjectProfileUnkFSFRE8sProfileE kind:bss addr:0x0215adf4 data_ov064_0215ae50 kind:bss addr:0x0215ae50 ambiguous -data_ov064_0215aec8 kind:bss addr:0x0215aec8 -data_ov064_0215aecc kind:bss addr:0x0215aecc -sActorProfileUnkRMF0 kind:bss addr:0x0215aed8 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMF0E8sProfileE kind:bss addr:0x0215aec8 +@12690 kind:bss addr:0x0215aecc +_ZN15ProfileInstanceI19ActorProfileUnkRMF0E8sProfileE kind:bss addr:0x0215aed8 data_ov064_0215aee4 kind:bss addr:0x0215aee4 ambiguous data_ov064_0215afa4 kind:bss addr:0x0215afa4 ambiguous -data_ov064_0215afb0 kind:bss addr:0x0215afb0 -data_ov064_0215afb4 kind:bss addr:0x0215afb4 -sActorProfileUnkRMF1 kind:bss addr:0x0215afc0 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMF1E8sProfileE kind:bss addr:0x0215afb0 +@12696 kind:bss addr:0x0215afb4 +_ZN15ProfileInstanceI19ActorProfileUnkRMF1E8sProfileE kind:bss addr:0x0215afc0 data_ov064_0215b004 kind:bss addr:0x0215b004 ambiguous data_ov064_0215b008 kind:bss addr:0x0215b008 ambiguous data_ov064_0215b064 kind:bss addr:0x0215b064 ambiguous -data_ov064_0215b098 kind:bss addr:0x0215b098 -data_ov064_0215b09c kind:bss addr:0x0215b09c -sActorProfileUnkRMTZ kind:bss addr:0x0215b0a8 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMTZE8sProfileE kind:bss addr:0x0215b098 +@12702 kind:bss addr:0x0215b09c +_ZN15ProfileInstanceI19ActorProfileUnkRMTZE8sProfileE kind:bss addr:0x0215b0a8 data_ov064_0215b180 kind:bss addr:0x0215b180 data_ov064_0215b184 kind:bss addr:0x0215b184 data_ov064_0215b190 kind:bss addr:0x0215b190 -data_ov064_0215b19c kind:bss addr:0x0215b19c -data_ov064_0215b1b4 kind:bss addr:0x0215b1b4 ambiguous -sActorProfileUnkFOMD kind:bss addr:0x0215b1d8 -data_ov064_0215b2b0 kind:bss addr:0x0215b2b0 -data_ov064_0215b2b4 kind:bss addr:0x0215b2b4 -sMapObjectProfileUnkHOF1 kind:bss addr:0x0215b2c0 +_ZGVN15ProfileInstanceI19ActorProfileUnkFOMDE8sProfileE kind:bss addr:0x0215b19c +@12708 kind:bss addr:0x0215b1b4 ambiguous +_ZN15ProfileInstanceI19ActorProfileUnkFOMDE8sProfileE kind:bss addr:0x0215b1d8 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkHOF1E8sProfileE kind:bss addr:0x0215b2b0 +@12311 kind:bss addr:0x0215b2b4 +_ZN15ProfileInstanceI23MapObjectProfileUnkHOF1E8sProfileE kind:bss addr:0x0215b2c0 data_ov064_0215b388 kind:bss addr:0x0215b388 ambiguous -data_ov064_0215b3b8 kind:bss addr:0x0215b3b8 -data_ov064_0215b3bc kind:bss addr:0x0215b3bc -sMapObjectProfileUnkHOF0 kind:bss addr:0x0215b3c8 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkHOF0E8sProfileE kind:bss addr:0x0215b3b8 +@12317 kind:bss addr:0x0215b3bc +_ZN15ProfileInstanceI23MapObjectProfileUnkHOF0E8sProfileE kind:bss addr:0x0215b3c8 data_ov064_0215b3d4 kind:bss addr:0x0215b3d4 ambiguous -data_ov064_0215b4c0 kind:bss addr:0x0215b4c0 -data_ov064_0215b4c4 kind:bss addr:0x0215b4c4 -sMapObjectProfileUnkLEVN kind:bss addr:0x0215b4d0 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkLEVNE8sProfileE kind:bss addr:0x0215b4c0 +@12323 kind:bss addr:0x0215b4c4 +_ZN15ProfileInstanceI23MapObjectProfileUnkLEVNE8sProfileE kind:bss addr:0x0215b4d0 diff --git a/config/eur/arm9/overlays/ov065/delinks.txt b/config/eur/arm9/overlays/ov065/delinks.txt index b8ccf2ec..bf9ac1e7 100644 --- a/config/eur/arm9/overlays/ov065/delinks.txt +++ b/config/eur/arm9/overlays/ov065/delinks.txt @@ -9,70 +9,70 @@ src/065_FldSnow/Actor/ActorUnkYUKI.cpp: .text start:0x02157ea0 end:0x02158988 .init start:0x0215a064 end:0x0215a0dc .ctor start:0x0215a4a8 end:0x0215a4ac - .bss start:0x0215b00c end:0x0215b064 + .bss start:0x0215b004 end:0x0215b0e4 src/065_FldSnow/Actor/ActorUnkRMS0.cpp: .text start:0x02158d90 end:0x02158eb4 .init start:0x0215a0dc end:0x0215a12c .ctor start:0x0215a4ac end:0x0215a4b0 - .bss start:0x0215b0f4 end:0x0215b1b4 + .bss start:0x0215b0e4 end:0x0215b1cc src/065_FldSnow/Actor/ActorUnkRMS1.cpp: .text start:0x02158eb4 end:0x02158fd8 .init start:0x0215a12c end:0x0215a17c .ctor start:0x0215a4b0 end:0x0215a4b4 - .bss start:0x0215b1dc end:0x0215b2b4 + .bss start:0x0215b1cc end:0x0215b2b4 src/065_FldSnow/Actor/ActorUnkRMS2.cpp: .text start:0x02158fd8 end:0x021590fc .init start:0x0215a17c end:0x0215a1cc .ctor start:0x0215a4b4 end:0x0215a4b8 - .bss start:0x0215b2c4 end:0x0215b388 + .bss start:0x0215b2b4 end:0x0215b39c src/065_FldSnow/Actor/ActorUnkRMS3.cpp: .text start:0x021590fc end:0x02159220 .init start:0x0215a1cc end:0x0215a21c .ctor start:0x0215a4b8 end:0x0215a4bc - .bss start:0x0215b3ac end:0x0215b3d4 + .bss start:0x0215b39c end:0x0215b484 src/065_FldSnow/Actor/ActorUnkRMS4.cpp: .text start:0x02159220 end:0x02159344 .init start:0x0215a21c end:0x0215a26c .ctor start:0x0215a4bc end:0x0215a4c0 - .bss start:0x0215b494 end:0x0215b50c + .bss start:0x0215b484 end:0x0215b56c src/065_FldSnow/Actor/ActorUnkRMS5.cpp: .text start:0x02159344 end:0x02159468 .init start:0x0215a26c end:0x0215a2bc .ctor start:0x0215a4c0 end:0x0215a4c4 - .bss start:0x0215b57c end:0x0215b654 + .bss start:0x0215b56c end:0x0215b654 src/065_FldSnow/Actor/ActorUnkRMTE.cpp: .text start:0x02159468 end:0x021596f8 .init start:0x0215a2bc end:0x0215a30c .ctor start:0x0215a4c4 end:0x0215a4c8 - .bss start:0x0215b664 end:0x0215b6ec + .bss start:0x0215b654 end:0x0215b758 src/065_FldSnow/Actor/ActorUnkYWIS.cpp: .text start:0x021596f8 end:0x02159920 .init start:0x0215a30c end:0x0215a388 .ctor start:0x0215a4c8 end:0x0215a4cc - .bss start:0x0215b764 end:0x0215b7a0 + .bss start:0x0215b758 end:0x0215b7a0 src/065_FldSnow/MapObject/MapObjectUnkTSGM.cpp: .text start:0x02159920 end:0x02159c18 .init start:0x0215a388 end:0x0215a408 .ctor start:0x0215a4cc end:0x0215a4d0 - .bss start:0x0215b7bc end:0x0215b7dc + .bss start:0x0215b7a0 end:0x0215b800 src/065_FldSnow/MapObject/MapObjectUnkHOSO.cpp: .text start:0x02159c78 end:0x02159dcc .init start:0x0215a408 end:0x0215a458 .ctor start:0x0215a4d0 end:0x0215a4d4 - .bss start:0x0215b80c end:0x0215b850 + .bss start:0x0215b800 end:0x0215b8e0 src/065_FldSnow/MapObject/MapObjectUnkMTIC.cpp: .text start:0x02159dcc end:0x02159fd4 .init start:0x0215a458 end:0x0215a4a8 .ctor start:0x0215a4d4 end:0x0215a4d8 - .bss start:0x0215b8f0 end:0x0215b9a4 + .bss start:0x0215b8e0 end:0x0215b9a4 diff --git a/config/eur/arm9/overlays/ov065/relocs.txt b/config/eur/arm9/overlays/ov065/relocs.txt index bb250080..ebf016de 100644 --- a/config/eur/arm9/overlays/ov065/relocs.txt +++ b/config/eur/arm9/overlays/ov065/relocs.txt @@ -265,9 +265,9 @@ from:0x0215974c kind:load to:0x0215ad08 add:0x8 module:overlay(65) from:0x02159758 kind:arm_call to:0x02098388 module:overlay(0) from:0x02159790 kind:arm_call to:0x0205fc20 module:overlay(0) from:0x021597a8 kind:load to:0x0215ad2c add:0x8 module:overlay(65) -from:0x021597ac kind:load to:0x0215b75a module:overlay(65) +from:0x021597ac kind:load to:0x0215b74c add:0xe module:overlay(65) from:0x021597b0 kind:load to:0x0215b74c module:overlay(65) -from:0x021597b4 kind:load to:0x0215b756 module:overlay(65) +from:0x021597b4 kind:load to:0x0215b74c add:0xa module:overlay(65) from:0x021597b8 kind:load to:0x0215b73c module:overlay(65) from:0x021597f0 kind:load to:0x027e09b8 module:dtcm from:0x02159840 kind:arm_call to:0x020c716c module:overlay(24) diff --git a/config/eur/arm9/overlays/ov065/symbols.txt b/config/eur/arm9/overlays/ov065/symbols.txt index 9e066594..24abc60c 100644 --- a/config/eur/arm9/overlays/ov065/symbols.txt +++ b/config/eur/arm9/overlays/ov065/symbols.txt @@ -249,54 +249,54 @@ data_ov065_0215afa0 kind:bss addr:0x0215afa0 data_ov065_0215afa4 kind:bss addr:0x0215afa4 data_ov065_0215afb0 kind:bss addr:0x0215afb0 data_ov065_0215afbc kind:bss addr:0x0215afbc -data_ov065_0215b004 kind:bss addr:0x0215b004 ambiguous -data_ov065_0215b008 kind:bss addr:0x0215b008 ambiguous -sActorProfileUnkYUKI kind:bss addr:0x0215b00c +_ZGVN15ProfileInstanceI19ActorProfileUnkYUKIE8sProfileE kind:bss addr:0x0215b004 ambiguous +@12738 kind:bss addr:0x0215b008 ambiguous +_ZN15ProfileInstanceI19ActorProfileUnkYUKIE8sProfileE kind:bss addr:0x0215b00c data_ov065_0215b064 kind:bss addr:0x0215b064 ambiguous data_ov065_0215b098 kind:bss addr:0x0215b098 ambiguous -data_ov065_0215b0e4 kind:bss addr:0x0215b0e4 -data_ov065_0215b0e8 kind:bss addr:0x0215b0e8 -sActorProfileUnkRMS0 kind:bss addr:0x0215b0f4 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMS0E8sProfileE kind:bss addr:0x0215b0e4 +@12744 kind:bss addr:0x0215b0e8 +_ZN15ProfileInstanceI19ActorProfileUnkRMS0E8sProfileE kind:bss addr:0x0215b0f4 data_ov065_0215b1b4 kind:bss addr:0x0215b1b4 ambiguous -data_ov065_0215b1cc kind:bss addr:0x0215b1cc -data_ov065_0215b1d0 kind:bss addr:0x0215b1d0 -sActorProfileUnkRMS1 kind:bss addr:0x0215b1dc -data_ov065_0215b2b4 kind:bss addr:0x0215b2b4 -data_ov065_0215b2b8 kind:bss addr:0x0215b2b8 -sActorProfileUnkRMS2 kind:bss addr:0x0215b2c4 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMS1E8sProfileE kind:bss addr:0x0215b1cc +@12750 kind:bss addr:0x0215b1d0 +_ZN15ProfileInstanceI19ActorProfileUnkRMS1E8sProfileE kind:bss addr:0x0215b1dc +_ZGVN15ProfileInstanceI19ActorProfileUnkRMS2E8sProfileE kind:bss addr:0x0215b2b4 +@12756 kind:bss addr:0x0215b2b8 +_ZN15ProfileInstanceI19ActorProfileUnkRMS2E8sProfileE kind:bss addr:0x0215b2c4 data_ov065_0215b388 kind:bss addr:0x0215b388 ambiguous -data_ov065_0215b39c kind:bss addr:0x0215b39c -data_ov065_0215b3a0 kind:bss addr:0x0215b3a0 -sActorProfileUnkRMS3 kind:bss addr:0x0215b3ac +_ZGVN15ProfileInstanceI19ActorProfileUnkRMS3E8sProfileE kind:bss addr:0x0215b39c +@12762 kind:bss addr:0x0215b3a0 +_ZN15ProfileInstanceI19ActorProfileUnkRMS3E8sProfileE kind:bss addr:0x0215b3ac data_ov065_0215b3d4 kind:bss addr:0x0215b3d4 ambiguous -data_ov065_0215b484 kind:bss addr:0x0215b484 -data_ov065_0215b488 kind:bss addr:0x0215b488 -sActorProfileUnkRMS4 kind:bss addr:0x0215b494 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMS4E8sProfileE kind:bss addr:0x0215b484 +@12768 kind:bss addr:0x0215b488 +_ZN15ProfileInstanceI19ActorProfileUnkRMS4E8sProfileE kind:bss addr:0x0215b494 data_ov065_0215b50c kind:bss addr:0x0215b50c ambiguous -data_ov065_0215b56c kind:bss addr:0x0215b56c -data_ov065_0215b570 kind:bss addr:0x0215b570 -sActorProfileUnkRMS5 kind:bss addr:0x0215b57c -data_ov065_0215b654 kind:bss addr:0x0215b654 -data_ov065_0215b658 kind:bss addr:0x0215b658 -sActorProfileUnkRMTE kind:bss addr:0x0215b664 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMS5E8sProfileE kind:bss addr:0x0215b56c +@12774 kind:bss addr:0x0215b570 +_ZN15ProfileInstanceI19ActorProfileUnkRMS5E8sProfileE kind:bss addr:0x0215b57c +_ZGVN15ProfileInstanceI19ActorProfileUnkRMTEE8sProfileE kind:bss addr:0x0215b654 +@12780 kind:bss addr:0x0215b658 +_ZN15ProfileInstanceI19ActorProfileUnkRMTEE8sProfileE kind:bss addr:0x0215b664 data_ov065_0215b6ec kind:bss addr:0x0215b6ec ambiguous data_ov065_0215b73c kind:bss addr:0x0215b73c data_ov065_0215b740 kind:bss addr:0x0215b740 data_ov065_0215b74c kind:bss addr:0x0215b74c -data_ov065_0215b756 kind:bss addr:0x0215b756 -data_ov065_0215b75a kind:bss addr:0x0215b75a -sActorProfileUnkYWIS kind:bss addr:0x0215b764 -data_ov065_0215b7a0 kind:bss addr:0x0215b7a0 -data_ov065_0215b7b0 kind:bss addr:0x0215b7b0 -sMapObjectProfileUnkTSGM kind:bss addr:0x0215b7bc +_ZGVN15ProfileInstanceI19ActorProfileUnkYWISE8sProfileE kind:bss addr:0x0215b758 +@12786 kind:bss addr:0x0215b75c +_ZN15ProfileInstanceI19ActorProfileUnkYWISE8sProfileE kind:bss addr:0x0215b764 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTSGME8sProfileE kind:bss addr:0x0215b7a0 +@12389 kind:bss addr:0x0215b7b0 +_ZN15ProfileInstanceI23MapObjectProfileUnkTSGME8sProfileE kind:bss addr:0x0215b7bc data_ov065_0215b7dc kind:bss addr:0x0215b7dc data_ov065_0215b7fc kind:bss addr:0x0215b7fc -data_ov065_0215b800 kind:bss addr:0x0215b800 -data_ov065_0215b804 kind:bss addr:0x0215b804 ambiguous -sMapObjectProfileUnkHOSO kind:bss addr:0x0215b80c +_ZGVN15ProfileInstanceI23MapObjectProfileUnkHOSOE8sProfileE kind:bss addr:0x0215b800 +@12395 kind:bss addr:0x0215b804 ambiguous +_ZN15ProfileInstanceI23MapObjectProfileUnkHOSOE8sProfileE kind:bss addr:0x0215b80c data_ov065_0215b850 kind:bss addr:0x0215b850 ambiguous -data_ov065_0215b8e0 kind:bss addr:0x0215b8e0 -data_ov065_0215b8e4 kind:bss addr:0x0215b8e4 -sMapObjectProfileUnkMTIC kind:bss addr:0x0215b8f0 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkMTICE8sProfileE kind:bss addr:0x0215b8e0 +@12401 kind:bss addr:0x0215b8e4 +_ZN15ProfileInstanceI23MapObjectProfileUnkMTICE8sProfileE kind:bss addr:0x0215b8f0 data_ov065_0215b9a4 kind:bss addr:0x0215b9a4 ambiguous data_ov065_0215b9c4 kind:bss addr:0x0215b9c4 diff --git a/config/eur/arm9/overlays/ov066/delinks.txt b/config/eur/arm9/overlays/ov066/delinks.txt index ed66ecd6..a25c8203 100644 --- a/config/eur/arm9/overlays/ov066/delinks.txt +++ b/config/eur/arm9/overlays/ov066/delinks.txt @@ -9,64 +9,64 @@ src/066_FldWater/Actor/ActorUnkVCCH.cpp: .text start:0x02157ea0 end:0x02158d90 .init start:0x0215d8c8 end:0x0215d918 .ctor start:0x0215dcc0 end:0x0215dcc4 - .bss start:0x02162630 end:0x02162708 + .bss start:0x02162620 end:0x02162708 src/066_FldWater/Actor/ActorUnkVCFT.cpp: .text start:0x02158d90 end:0x0215ba58 .init start:0x0215d918 end:0x0215d968 .ctor start:0x0215dcc4 end:0x0215dcc8 - .bss start:0x02162718 end:0x021627f0 + .bss start:0x02162708 end:0x021627f8 src/066_FldWater/Actor/ActorUnkWAWB_WAWS.cpp: .text start:0x0215ba58 end:0x0215bf6c .init start:0x0215d968 end:0x0215d9fc .ctor start:0x0215dcc8 end:0x0215dccc - .bss start:0x02162810 end:0x021629c0 + .bss start:0x021627f8 end:0x021629d0 src/066_FldWater/Actor/ActorUnkWAWA_WAWC.cpp: .text start:0x0215bf6c end:0x0215c444 .init start:0x0215d9fc end:0x0215da90 .ctor start:0x0215dccc end:0x0215dcd0 - .bss start:0x021629e0 end:0x02162b78 + .bss start:0x021629d0 end:0x02162b90 src/066_FldWater/Actor/ActorUnkRMW1.cpp: .text start:0x0215c444 end:0x0215c568 .init start:0x0215da90 end:0x0215dae0 .ctor start:0x0215dcd0 end:0x0215dcd4 - .bss start:0x02162ba0 end:0x02162c78 + .bss start:0x02162b90 end:0x02162c78 src/066_FldWater/Actor/ActorUnkRMW0.cpp: .text start:0x0215c568 end:0x0215c9d8 .init start:0x0215dae0 end:0x0215db30 .ctor start:0x0215dcd4 end:0x0215dcd8 - .bss start:0x02162c88 end:0x02162c9c + .bss start:0x02162c78 end:0x02162d60 src/066_FldWater/MapObject/MapObjectUnkFSWT.cpp: .text start:0x0215c9d8 end:0x0215cb10 .init start:0x0215db30 end:0x0215db80 .ctor start:0x0215dcd8 end:0x0215dcdc - .bss start:0x02162d70 end:0x02162e44 + .bss start:0x02162d60 end:0x02162e44 src/066_FldWater/Actor/ActorUnkSWHI.cpp: .text start:0x0215cb10 end:0x0215ce14 .init start:0x0215db80 end:0x0215dbd0 .ctor start:0x0215dcdc end:0x0215dce0 - .bss start:0x02162e54 end:0x02162e90 + .bss start:0x02162e44 end:0x02162e90 src/066_FldWater/MapObject/MapObjectUnkHOW0.cpp: .text start:0x0215ce14 end:0x0215cf68 .init start:0x0215dbd0 end:0x0215dc20 .ctor start:0x0215dce0 end:0x0215dce4 - .bss start:0x02162ea0 end:0x02162f34 + .bss start:0x02162e90 end:0x02162f74 src/066_FldWater/MapObject/MapObjectUnkHOW1.cpp: .text start:0x0215cf68 end:0x0215d0bc .init start:0x0215dc20 end:0x0215dc70 .ctor start:0x0215dce4 end:0x0215dce8 - .bss start:0x02162f84 end:0x02163058 + .bss start:0x02162f74 end:0x02163058 src/066_FldWater/MapObject/MapObjectUnkMTFS.cpp: .text start:0x0215d13c end:0x0215d7a0 .init start:0x0215dc70 end:0x0215dcc0 .ctor start:0x0215dce8 end:0x0215dcec - .bss start:0x02163068 end:0x0216313c + .bss start:0x02163058 end:0x0216313c diff --git a/config/eur/arm9/overlays/ov066/symbols.txt b/config/eur/arm9/overlays/ov066/symbols.txt index 51fcef86..10bffce4 100644 --- a/config/eur/arm9/overlays/ov066/symbols.txt +++ b/config/eur/arm9/overlays/ov066/symbols.txt @@ -959,45 +959,45 @@ data_ov066_02162568 kind:data(any) addr:0x02162568 data_ov066_02162584 kind:data(any) addr:0x02162584 data_ov066_021625ac kind:data(any) addr:0x021625ac data_ov066_021625d8 kind:data(any) addr:0x021625d8 -data_ov066_02162620 kind:bss addr:0x02162620 -data_ov066_02162624 kind:bss addr:0x02162624 -sActorProfileUnkVCCH kind:bss addr:0x02162630 -data_ov066_02162708 kind:bss addr:0x02162708 -data_ov066_0216270c kind:bss addr:0x0216270c -sActorProfileUnkVCFT kind:bss addr:0x02162718 +_ZGVN15ProfileInstanceI19ActorProfileUnkVCCHE8sProfileE kind:bss addr:0x02162620 +@12816 kind:bss addr:0x02162624 +_ZN15ProfileInstanceI19ActorProfileUnkVCCHE8sProfileE kind:bss addr:0x02162630 +_ZGVN15ProfileInstanceI19ActorProfileUnkVCFTE8sProfileE kind:bss addr:0x02162708 +@12822 kind:bss addr:0x0216270c +_ZN15ProfileInstanceI19ActorProfileUnkVCFTE8sProfileE kind:bss addr:0x02162718 data_ov066_021627f0 kind:bss addr:0x021627f0 -data_ov066_021627f8 kind:bss addr:0x021627f8 -data_ov066_02162804 kind:bss addr:0x02162804 -sActorProfileUnkWAWS kind:bss addr:0x02162810 -sActorProfileUnkWAWB kind:bss addr:0x021628e8 +_ZGVN15ProfileInstanceI19ActorProfileUnkWAWSE8sProfileE kind:bss addr:0x021627f8 +@12828 kind:bss addr:0x02162804 +_ZN15ProfileInstanceI19ActorProfileUnkWAWSE8sProfileE kind:bss addr:0x02162810 +_ZN15ProfileInstanceI19ActorProfileUnkWAWBE8sProfileE kind:bss addr:0x021628e8 data_ov066_021629c0 kind:bss addr:0x021629c0 data_ov066_021629c8 kind:bss addr:0x021629c8 -data_ov066_021629d0 kind:bss addr:0x021629d0 ambiguous -data_ov066_021629d4 kind:bss addr:0x021629d4 -sActorProfileUnkWAWA kind:bss addr:0x021629e0 -sActorProfileUnkWAWC kind:bss addr:0x02162ab8 +_ZGVN15ProfileInstanceI19ActorProfileUnkWAWAE8sProfileE kind:bss addr:0x021629d0 ambiguous +@12834 kind:bss addr:0x021629d4 +_ZN15ProfileInstanceI19ActorProfileUnkWAWAE8sProfileE kind:bss addr:0x021629e0 +_ZN15ProfileInstanceI19ActorProfileUnkWAWCE8sProfileE kind:bss addr:0x02162ab8 data_ov066_02162b78 kind:bss addr:0x02162b78 ambiguous -data_ov066_02162b90 kind:bss addr:0x02162b90 -data_ov066_02162b94 kind:bss addr:0x02162b94 -sActorProfileUnkRMW1 kind:bss addr:0x02162ba0 -data_ov066_02162c78 kind:bss addr:0x02162c78 -data_ov066_02162c7c kind:bss addr:0x02162c7c -sActorProfileUnkRMW0 kind:bss addr:0x02162c88 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMW1E8sProfileE kind:bss addr:0x02162b90 +@12840 kind:bss addr:0x02162b94 +_ZN15ProfileInstanceI19ActorProfileUnkRMW1E8sProfileE kind:bss addr:0x02162ba0 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMW0E8sProfileE kind:bss addr:0x02162c78 +@12846 kind:bss addr:0x02162c7c +_ZN15ProfileInstanceI19ActorProfileUnkRMW0E8sProfileE kind:bss addr:0x02162c88 data_ov066_02162c9c kind:bss addr:0x02162c9c ambiguous -data_ov066_02162d60 kind:bss addr:0x02162d60 -data_ov066_02162d64 kind:bss addr:0x02162d64 -sMapObjectProfileUnkFSWT kind:bss addr:0x02162d70 -data_ov066_02162e44 kind:bss addr:0x02162e44 -data_ov066_02162e48 kind:bss addr:0x02162e48 -sActorProfileUnkSWHI kind:bss addr:0x02162e54 -data_ov066_02162e90 kind:bss addr:0x02162e90 -data_ov066_02162e94 kind:bss addr:0x02162e94 -sMapObjectProfileUnkHOW0 kind:bss addr:0x02162ea0 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkFSWTE8sProfileE kind:bss addr:0x02162d60 +@12449 kind:bss addr:0x02162d64 +_ZN15ProfileInstanceI23MapObjectProfileUnkFSWTE8sProfileE kind:bss addr:0x02162d70 +_ZGVN15ProfileInstanceI19ActorProfileUnkSWHIE8sProfileE kind:bss addr:0x02162e44 +@12858 kind:bss addr:0x02162e48 +_ZN15ProfileInstanceI19ActorProfileUnkSWHIE8sProfileE kind:bss addr:0x02162e54 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkHOW0E8sProfileE kind:bss addr:0x02162e90 +@12461 kind:bss addr:0x02162e94 +_ZN15ProfileInstanceI23MapObjectProfileUnkHOW0E8sProfileE kind:bss addr:0x02162ea0 data_ov066_02162f34 kind:bss addr:0x02162f34 ambiguous -data_ov066_02162f74 kind:bss addr:0x02162f74 -data_ov066_02162f78 kind:bss addr:0x02162f78 -sMapObjectProfileUnkHOW1 kind:bss addr:0x02162f84 -data_ov066_02163058 kind:bss addr:0x02163058 -data_ov066_0216305c kind:bss addr:0x0216305c -sMapObjectProfileUnkMTFS kind:bss addr:0x02163068 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkHOW1E8sProfileE kind:bss addr:0x02162f74 +@12467 kind:bss addr:0x02162f78 +_ZN15ProfileInstanceI23MapObjectProfileUnkHOW1E8sProfileE kind:bss addr:0x02162f84 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkMTFSE8sProfileE kind:bss addr:0x02163058 +@12473 kind:bss addr:0x0216305c +_ZN15ProfileInstanceI23MapObjectProfileUnkMTFSE8sProfileE kind:bss addr:0x02163068 data_ov066_0216313c kind:bss addr:0x0216313c diff --git a/config/eur/arm9/overlays/ov067/delinks.txt b/config/eur/arm9/overlays/ov067/delinks.txt index 7d9caf6a..84322aac 100644 --- a/config/eur/arm9/overlays/ov067/delinks.txt +++ b/config/eur/arm9/overlays/ov067/delinks.txt @@ -9,70 +9,70 @@ src/067_FldFlame/Actor/ActorUnkGOCA_GOCB_GORK_GORM.cpp: .text start:0x02157ea0 end:0x02159578 .init start:0x0215c600 end:0x0215c71c .ctor start:0x0215caa4 end:0x0215caa8 - .bss start:0x0215d8a0 end:0x0215db78 + .bss start:0x0215d888 end:0x0215dc00 src/067_FldFlame/Actor/ActorUnkGORS.cpp: .text start:0x02159578 end:0x02159d58 .init start:0x0215c71c end:0x0215c76c .ctor start:0x0215caa8 end:0x0215caac - .bss start:0x0215dc10 end:0x0215dca4 + .bss start:0x0215dc00 end:0x0215dce8 src/067_FldFlame/Actor/ActorUnkRMV0.cpp: .text start:0x02159d58 end:0x02159e7c .init start:0x0215c76c end:0x0215c7bc .ctor start:0x0215caac end:0x0215cab0 - .bss start:0x0215dcf8 end:0x0215ddd0 + .bss start:0x0215dce8 end:0x0215ddd0 src/067_FldFlame/Actor/ActorUnkRMV1.cpp: .text start:0x02159e7c end:0x02159fa0 .init start:0x0215c7bc end:0x0215c80c .ctor start:0x0215cab0 end:0x0215cab4 - .bss start:0x0215dde0 end:0x0215deb8 + .bss start:0x0215ddd0 end:0x0215deb8 src/067_FldFlame/Actor/ActorUnkDMFT.cpp: .text start:0x02159fc8 end:0x0215ab54 .init start:0x0215c80c end:0x0215c85c .ctor start:0x0215cab4 end:0x0215cab8 - .bss start:0x0215dec8 end:0x0215df04 + .bss start:0x0215deb8 end:0x0215df04 src/067_FldFlame/Actor/ActorUnkDMGN.cpp: .text start:0x0215ab54 end:0x0215b064 .init start:0x0215c85c end:0x0215c8ac .ctor start:0x0215cab8 end:0x0215cabc - .bss start:0x0215df14 end:0x0215df24 + .bss start:0x0215df04 end:0x0215df58 src/067_FldFlame/MapObject/MapObjectUnkBRGL.cpp: .text start:0x0215b064 end:0x0215b388 .init start:0x0215c8ac end:0x0215c8fc .ctor start:0x0215cabc end:0x0215cac0 - .bss start:0x0215df68 end:0x0215df6c + .bss start:0x0215df58 end:0x0215e044 src/067_FldFlame/MapObject/MapObjectUnkLVVT.cpp: .text start:0x0215b388 end:0x0215ba74 .init start:0x0215c8fc end:0x0215c964 .ctor start:0x0215cac0 end:0x0215cac4 - .bss start:0x0215e05c end:0x0215e07c + .bss start:0x0215e044 end:0x0215e130 src/067_FldFlame/MapObject/MapObjectUnkDRGN.cpp: .text start:0x0215ba74 end:0x0215bd40 .init start:0x0215c964 end:0x0215c9b4 .ctor start:0x0215cac4 end:0x0215cac8 - .bss start:0x0215e140 end:0x0215e160 + .bss start:0x0215e130 end:0x0215e160 src/067_FldFlame/MapObject/MapObjectUnkMTIR.cpp: .text start:0x0215bd40 end:0x0215bf40 .init start:0x0215c9b4 end:0x0215ca04 .ctor start:0x0215cac8 end:0x0215cacc - .bss start:0x0215e170 end:0x0215e1b4 + .bss start:0x0215e160 end:0x0215e268 src/067_FldFlame/MapObject/MapObjectUnkMTOR.cpp: .text start:0x0215bf40 end:0x0215c140 .init start:0x0215ca04 end:0x0215ca54 .ctor start:0x0215cacc end:0x0215cad0 - .bss start:0x0215e278 end:0x0215e284 + .bss start:0x0215e268 end:0x0215e370 src/067_FldFlame/MapObject/MapObjectUnkDRVT.cpp: .text start:0x0215c140 end:0x0215c4f4 .init start:0x0215ca54 end:0x0215caa4 .ctor start:0x0215cad0 end:0x0215cad4 - .bss start:0x0215e380 end:0x0215e3a0 + .bss start:0x0215e370 end:0x0215e3a0 diff --git a/config/eur/arm9/overlays/ov067/symbols.txt b/config/eur/arm9/overlays/ov067/symbols.txt index 85510226..0544c27d 100644 --- a/config/eur/arm9/overlays/ov067/symbols.txt +++ b/config/eur/arm9/overlays/ov067/symbols.txt @@ -334,59 +334,59 @@ data_ov067_0215d810 kind:data(any) addr:0x0215d810 data_ov067_0215d860 kind:bss addr:0x0215d860 data_ov067_0215d870 kind:bss addr:0x0215d870 data_ov067_0215d87c kind:bss addr:0x0215d87c -data_ov067_0215d888 kind:bss addr:0x0215d888 -data_ov067_0215d894 kind:bss addr:0x0215d894 -sActorProfileUnkGOCA kind:bss addr:0x0215d8a0 -sActorProfileUnkGOCB kind:bss addr:0x0215d978 +_ZGVN15ProfileInstanceI19ActorProfileUnkGOCAE8sProfileE kind:bss addr:0x0215d888 +@12888 kind:bss addr:0x0215d894 +_ZN15ProfileInstanceI19ActorProfileUnkGOCAE8sProfileE kind:bss addr:0x0215d8a0 +_ZN15ProfileInstanceI19ActorProfileUnkGOCBE8sProfileE kind:bss addr:0x0215d978 data_ov067_0215d9dc kind:bss addr:0x0215d9dc ambiguous -sActorProfileUnkGORK kind:bss addr:0x0215da50 +_ZN15ProfileInstanceI19ActorProfileUnkGORKE8sProfileE kind:bss addr:0x0215da50 data_ov067_0215da78 kind:bss addr:0x0215da78 ambiguous -sActorProfileUnkGORM kind:bss addr:0x0215db28 +_ZN15ProfileInstanceI19ActorProfileUnkGORME8sProfileE kind:bss addr:0x0215db28 data_ov067_0215db78 kind:bss addr:0x0215db78 ambiguous -data_ov067_0215dc00 kind:bss addr:0x0215dc00 -data_ov067_0215dc04 kind:bss addr:0x0215dc04 -sActorProfileUnkGORS kind:bss addr:0x0215dc10 +_ZGVN15ProfileInstanceI19ActorProfileUnkGORSE8sProfileE kind:bss addr:0x0215dc00 +@12894 kind:bss addr:0x0215dc04 +_ZN15ProfileInstanceI19ActorProfileUnkGORSE8sProfileE kind:bss addr:0x0215dc10 data_ov067_0215dca4 kind:bss addr:0x0215dca4 ambiguous -data_ov067_0215dce8 kind:bss addr:0x0215dce8 -data_ov067_0215dcec kind:bss addr:0x0215dcec -sActorProfileUnkRMV0 kind:bss addr:0x0215dcf8 -data_ov067_0215ddd0 kind:bss addr:0x0215ddd0 -data_ov067_0215ddd4 kind:bss addr:0x0215ddd4 -sActorProfileUnkRMV1 kind:bss addr:0x0215dde0 -data_ov067_0215deb8 kind:bss addr:0x0215deb8 -data_ov067_0215debc kind:bss addr:0x0215debc -sActorProfileUnkDMFT kind:bss addr:0x0215dec8 -data_ov067_0215df04 kind:bss addr:0x0215df04 -data_ov067_0215df08 kind:bss addr:0x0215df08 -sActorProfileUnkDMGN kind:bss addr:0x0215df14 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMV0E8sProfileE kind:bss addr:0x0215dce8 +@12900 kind:bss addr:0x0215dcec +_ZN15ProfileInstanceI19ActorProfileUnkRMV0E8sProfileE kind:bss addr:0x0215dcf8 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMV1E8sProfileE kind:bss addr:0x0215ddd0 +@12906 kind:bss addr:0x0215ddd4 +_ZN15ProfileInstanceI19ActorProfileUnkRMV1E8sProfileE kind:bss addr:0x0215dde0 +_ZGVN15ProfileInstanceI19ActorProfileUnkDMFTE8sProfileE kind:bss addr:0x0215deb8 +@12912 kind:bss addr:0x0215debc +_ZN15ProfileInstanceI19ActorProfileUnkDMFTE8sProfileE kind:bss addr:0x0215dec8 +_ZGVN15ProfileInstanceI19ActorProfileUnkDMGNE8sProfileE kind:bss addr:0x0215df04 +@12918 kind:bss addr:0x0215df08 +_ZN15ProfileInstanceI19ActorProfileUnkDMGNE8sProfileE kind:bss addr:0x0215df14 data_ov067_0215df24 kind:bss addr:0x0215df24 ambiguous data_ov067_0215df38 kind:bss addr:0x0215df38 ambiguous -data_ov067_0215df58 kind:bss addr:0x0215df58 -data_ov067_0215df5c kind:bss addr:0x0215df5c -sMapObjectProfileUnkBRGL kind:bss addr:0x0215df68 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkBRGLE8sProfileE kind:bss addr:0x0215df58 +@12521 kind:bss addr:0x0215df5c +_ZN15ProfileInstanceI23MapObjectProfileUnkBRGLE8sProfileE kind:bss addr:0x0215df68 data_ov067_0215df6c kind:bss addr:0x0215df6c ambiguous data_ov067_0215e03c kind:bss addr:0x0215e03c -data_ov067_0215e044 kind:bss addr:0x0215e044 -data_ov067_0215e050 kind:bss addr:0x0215e050 -sMapObjectProfileUnkLVVT kind:bss addr:0x0215e05c +_ZGVN15ProfileInstanceI23MapObjectProfileUnkLVVTE8sProfileE kind:bss addr:0x0215e044 +@12527 kind:bss addr:0x0215e050 +_ZN15ProfileInstanceI23MapObjectProfileUnkLVVTE8sProfileE kind:bss addr:0x0215e05c data_ov067_0215e07c kind:bss addr:0x0215e07c data_ov067_0215e08c kind:bss addr:0x0215e08c ambiguous data_ov067_0215e110 kind:bss addr:0x0215e110 ambiguous -data_ov067_0215e130 kind:bss addr:0x0215e130 -data_ov067_0215e134 kind:bss addr:0x0215e134 -sMapObjectProfileUnkDRGN kind:bss addr:0x0215e140 -data_ov067_0215e160 kind:bss addr:0x0215e160 -data_ov067_0215e164 kind:bss addr:0x0215e164 -sMapObjectProfileUnkMTIR kind:bss addr:0x0215e170 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkDRGNE8sProfileE kind:bss addr:0x0215e130 +@12533 kind:bss addr:0x0215e134 +_ZN15ProfileInstanceI23MapObjectProfileUnkDRGNE8sProfileE kind:bss addr:0x0215e140 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkMTIRE8sProfileE kind:bss addr:0x0215e160 +@12539 kind:bss addr:0x0215e164 +_ZN15ProfileInstanceI23MapObjectProfileUnkMTIRE8sProfileE kind:bss addr:0x0215e170 data_ov067_0215e1b4 kind:bss addr:0x0215e1b4 ambiguous data_ov067_0215e244 kind:bss addr:0x0215e244 -data_ov067_0215e268 kind:bss addr:0x0215e268 -data_ov067_0215e26c kind:bss addr:0x0215e26c -sMapObjectProfileUnkMTOR kind:bss addr:0x0215e278 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkMTORE8sProfileE kind:bss addr:0x0215e268 +@12545 kind:bss addr:0x0215e26c +_ZN15ProfileInstanceI23MapObjectProfileUnkMTORE8sProfileE kind:bss addr:0x0215e278 data_ov067_0215e284 kind:bss addr:0x0215e284 ambiguous data_ov067_0215e290 kind:bss addr:0x0215e290 ambiguous data_ov067_0215e34c kind:bss addr:0x0215e34c -data_ov067_0215e370 kind:bss addr:0x0215e370 -data_ov067_0215e374 kind:bss addr:0x0215e374 -sMapObjectProfileUnkDRVT kind:bss addr:0x0215e380 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkDRVTE8sProfileE kind:bss addr:0x0215e370 +@12551 kind:bss addr:0x0215e374 +_ZN15ProfileInstanceI23MapObjectProfileUnkDRVTE8sProfileE kind:bss addr:0x0215e380 data_ov067_0215e3a0 kind:bss addr:0x0215e3a0 diff --git a/config/eur/arm9/overlays/ov068/delinks.txt b/config/eur/arm9/overlays/ov068/delinks.txt index 10b98bb3..0dee7244 100644 --- a/config/eur/arm9/overlays/ov068/delinks.txt +++ b/config/eur/arm9/overlays/ov068/delinks.txt @@ -9,106 +9,106 @@ src/068_FldAjito/Actor/ActorUnkRMAJ.cpp: .text start:0x02157ea0 end:0x02157fa0 .init start:0x02161e6c end:0x02161ebc .ctor start:0x0216245c end:0x02162460 - .bss start:0x02163ad0 end:0x02163b0c + .bss start:0x02163ac0 end:0x02163b0c src/068_FldAjito/Actor/ActorUnkAJMN.cpp: .text start:0x02157fa0 end:0x02158ae4 .init start:0x02161ebc end:0x02161f0c .ctor start:0x02162460 end:0x02162464 - .bss start:0x02163b1c end:0x02163b58 + .bss start:0x02163b0c end:0x02163b58 src/068_FldAjito/Actor/ActorUnkAJAI.cpp: .text start:0x02158ae4 end:0x021592b0 .init start:0x02161f0c end:0x02161f5c .ctor start:0x02162464 end:0x02162468 - .bss start:0x02163b68 end:0x02163c40 + .bss start:0x02163b58 end:0x02163c40 src/068_FldAjito/Actor/ActorUnkAJEM.cpp: .text start:0x021592b0 end:0x0215a844 .init start:0x02161f5c end:0x02161fac .ctor start:0x02162468 end:0x0216246c - .bss start:0x02163c54 end:0x02163d2c + .bss start:0x02163c40 end:0x02163d2c src/068_FldAjito/Actor/ActorUnkTSCN.cpp: .text start:0x0215a844 end:0x0215aa18 .init start:0x02161fac end:0x02161ffc .ctor start:0x0216246c end:0x02162470 - .bss start:0x02163d3c end:0x02163d78 + .bss start:0x02163d2c end:0x02163d78 src/068_FldAjito/Actor/ActorUnkAJET.cpp: .text start:0x0215aa18 end:0x0215c068 .init start:0x02161ffc end:0x0216204c .ctor start:0x02162470 end:0x02162474 - .bss start:0x02163d88 end:0x02163e60 + .bss start:0x02163d78 end:0x02163e60 src/068_FldAjito/Actor/ActorUnkAJTM.cpp: .text start:0x0215c068 end:0x0215cfb4 .init start:0x0216204c end:0x0216209c .ctor start:0x02162474 end:0x02162478 - .bss start:0x02163e70 end:0x02163eac + .bss start:0x02163e60 end:0x02163eac src/068_FldAjito/Actor/ActorUnkAJNP.cpp: .text start:0x0215cfb4 end:0x0215d76c .init start:0x0216209c end:0x021620ec .ctor start:0x02162478 end:0x0216247c - .bss start:0x02163ebc end:0x02163f94 + .bss start:0x02163eac end:0x02163f94 src/068_FldAjito/Actor/ActorUnkAJCR.cpp: .text start:0x0215d76c end:0x0215d92c .init start:0x021620ec end:0x0216213c .ctor start:0x0216247c end:0x02162480 - .bss start:0x02163fa4 end:0x02163fe0 + .bss start:0x02163f94 end:0x02164254 src/068_FldAjito/Actor/ActorUnkMGAJ.cpp: .text start:0x0215e518 end:0x0215e90c .init start:0x0216218c end:0x021621dc .ctor start:0x02162484 end:0x02162488 - .bss start:0x02164264 end:0x021642fc + .bss start:0x02164254 end:0x0216433c src/068_FldAjito/Actor/ActorUnkAJBS.cpp: .text start:0x0215e90c end:0x021603d8 .init start:0x021621dc end:0x0216222c .ctor start:0x02162488 end:0x0216248c - .bss start:0x0216434c end:0x02164424 + .bss start:0x0216433c end:0x02164424 src/068_FldAjito/Actor/ActorUnkRMA1.cpp: .text start:0x021603d8 end:0x02160528 .init start:0x0216222c end:0x0216227c .ctor start:0x0216248c end:0x02162490 - .bss start:0x02164434 end:0x0216450c + .bss start:0x02164424 end:0x0216450c src/068_FldAjito/Actor/ActorUnkRMA2.cpp: .text start:0x02160528 end:0x02160678 .init start:0x0216227c end:0x021622cc .ctor start:0x02162490 end:0x02162494 - .bss start:0x0216451c end:0x021645f4 + .bss start:0x0216450c end:0x021645f4 src/068_FldAjito/Actor/ActorUnkRMA0.cpp: .text start:0x02160678 end:0x021607c8 .init start:0x021622cc end:0x0216231c .ctor start:0x02162494 end:0x02162498 - .bss start:0x02164604 end:0x02164690 + .bss start:0x021645f4 end:0x021646dc src/068_FldAjito/Actor/ActorUnkRMA3.cpp: .text start:0x021607c8 end:0x02160918 .init start:0x0216231c end:0x0216236c .ctor start:0x02162498 end:0x0216249c - .bss start:0x021646ec end:0x021647c4 + .bss start:0x021646dc end:0x021647c4 src/068_FldAjito/Actor/ActorUnkAJSP.cpp: .text start:0x02160918 end:0x02160b70 .init start:0x0216236c end:0x021623bc .ctor start:0x0216249c end:0x021624a0 - .bss start:0x021647d4 end:0x021648ac + .bss start:0x021647c4 end:0x021648ac src/068_FldAjito/MapObject/MapObjectUnkDRVC.cpp: .text start:0x02160b70 end:0x02161520 .init start:0x021623bc end:0x0216240c .ctor start:0x021624a0 end:0x021624a4 - .bss start:0x021648bc end:0x02164990 + .bss start:0x021648ac end:0x02164990 src/068_FldAjito/MapObject/MapObjectUnkRKAG.cpp: .text start:0x02161520 end:0x02161748 .init start:0x0216240c end:0x0216245c .ctor start:0x021624a4 end:0x021624a8 - .bss start:0x021649a0 end:0x02164a74 + .bss start:0x02164990 end:0x02164a74 diff --git a/config/eur/arm9/overlays/ov068/symbols.txt b/config/eur/arm9/overlays/ov068/symbols.txt index ba76b1d3..ae0be806 100644 --- a/config/eur/arm9/overlays/ov068/symbols.txt +++ b/config/eur/arm9/overlays/ov068/symbols.txt @@ -558,33 +558,33 @@ data_ov068_02163a1c kind:data(any) addr:0x02163a1c data_ov068_02163a38 kind:data(any) addr:0x02163a38 data_ov068_02163a60 kind:data(any) addr:0x02163a60 data_ov068_02163aa4 kind:data(any) addr:0x02163aa4 -data_ov068_02163ac0 kind:bss addr:0x02163ac0 -data_ov068_02163ac4 kind:bss addr:0x02163ac4 -sActorProfileUnkRMAJ kind:bss addr:0x02163ad0 -data_ov068_02163b0c kind:bss addr:0x02163b0c -data_ov068_02163b10 kind:bss addr:0x02163b10 -sActorProfileUnkAJMN kind:bss addr:0x02163b1c -data_ov068_02163b58 kind:bss addr:0x02163b58 -data_ov068_02163b5c kind:bss addr:0x02163b5c -sActorProfileUnkAJAI kind:bss addr:0x02163b68 -data_ov068_02163c40 kind:bss addr:0x02163c40 -data_ov068_02163c48 kind:bss addr:0x02163c48 -sActorProfileUnkAJEM kind:bss addr:0x02163c54 -data_ov068_02163d2c kind:bss addr:0x02163d2c -data_ov068_02163d30 kind:bss addr:0x02163d30 -sActorProfileUnkTSCN kind:bss addr:0x02163d3c -data_ov068_02163d78 kind:bss addr:0x02163d78 -data_ov068_02163d7c kind:bss addr:0x02163d7c -sActorProfileUnkAJET kind:bss addr:0x02163d88 -data_ov068_02163e60 kind:bss addr:0x02163e60 -data_ov068_02163e64 kind:bss addr:0x02163e64 -sActorProfileUnkAJTM kind:bss addr:0x02163e70 -data_ov068_02163eac kind:bss addr:0x02163eac -data_ov068_02163eb0 kind:bss addr:0x02163eb0 -sActorProfileUnkAJNP kind:bss addr:0x02163ebc -data_ov068_02163f94 kind:bss addr:0x02163f94 -data_ov068_02163f98 kind:bss addr:0x02163f98 -sActorProfileUnkAJCR kind:bss addr:0x02163fa4 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMAJE8sProfileE kind:bss addr:0x02163ac0 +@12966 kind:bss addr:0x02163ac4 +_ZN15ProfileInstanceI19ActorProfileUnkRMAJE8sProfileE kind:bss addr:0x02163ad0 +_ZGVN15ProfileInstanceI19ActorProfileUnkAJMNE8sProfileE kind:bss addr:0x02163b0c +@12972 kind:bss addr:0x02163b10 +_ZN15ProfileInstanceI19ActorProfileUnkAJMNE8sProfileE kind:bss addr:0x02163b1c +_ZGVN15ProfileInstanceI19ActorProfileUnkAJAIE8sProfileE kind:bss addr:0x02163b58 +@12978 kind:bss addr:0x02163b5c +_ZN15ProfileInstanceI19ActorProfileUnkAJAIE8sProfileE kind:bss addr:0x02163b68 +_ZGVN15ProfileInstanceI19ActorProfileUnkAJEME8sProfileE kind:bss addr:0x02163c40 +@12984 kind:bss addr:0x02163c48 +_ZN15ProfileInstanceI19ActorProfileUnkAJEME8sProfileE kind:bss addr:0x02163c54 +_ZGVN15ProfileInstanceI19ActorProfileUnkTSCNE8sProfileE kind:bss addr:0x02163d2c +@12990 kind:bss addr:0x02163d30 +_ZN15ProfileInstanceI19ActorProfileUnkTSCNE8sProfileE kind:bss addr:0x02163d3c +_ZGVN15ProfileInstanceI19ActorProfileUnkAJETE8sProfileE kind:bss addr:0x02163d78 +@12996 kind:bss addr:0x02163d7c +_ZN15ProfileInstanceI19ActorProfileUnkAJETE8sProfileE kind:bss addr:0x02163d88 +_ZGVN15ProfileInstanceI19ActorProfileUnkAJTME8sProfileE kind:bss addr:0x02163e60 +@13002 kind:bss addr:0x02163e64 +_ZN15ProfileInstanceI19ActorProfileUnkAJTME8sProfileE kind:bss addr:0x02163e70 +_ZGVN15ProfileInstanceI19ActorProfileUnkAJNPE8sProfileE kind:bss addr:0x02163eac +@13008 kind:bss addr:0x02163eb0 +_ZN15ProfileInstanceI19ActorProfileUnkAJNPE8sProfileE kind:bss addr:0x02163ebc +_ZGVN15ProfileInstanceI19ActorProfileUnkAJCRE8sProfileE kind:bss addr:0x02163f94 +@13014 kind:bss addr:0x02163f98 +_ZN15ProfileInstanceI19ActorProfileUnkAJCRE8sProfileE kind:bss addr:0x02163fa4 data_ov068_02163fe0 kind:bss addr:0x02163fe0 data_ov068_02163fe8 kind:bss addr:0x02163fe8 data_ov068_02163ff4 kind:bss addr:0x02163ff4 @@ -592,33 +592,33 @@ data_ov068_02164144 kind:bss addr:0x02164144 ambiguous data_ov068_021641c8 kind:bss addr:0x021641c8 ambiguous data_ov068_021641d0 kind:bss addr:0x021641d0 ambiguous data_ov068_021641f4 kind:bss addr:0x021641f4 -data_ov068_02164254 kind:bss addr:0x02164254 -data_ov068_02164258 kind:bss addr:0x02164258 -sActorProfileUnkMGAJ kind:bss addr:0x02164264 +_ZGVN15ProfileInstanceI19ActorProfileUnkMGAJE8sProfileE kind:bss addr:0x02164254 +@13020 kind:bss addr:0x02164258 +_ZN15ProfileInstanceI19ActorProfileUnkMGAJE8sProfileE kind:bss addr:0x02164264 data_ov068_021642fc kind:bss addr:0x021642fc ambiguous -data_ov068_0216433c kind:bss addr:0x0216433c -data_ov068_02164340 kind:bss addr:0x02164340 -sActorProfileUnkAJBS kind:bss addr:0x0216434c -data_ov068_02164424 kind:bss addr:0x02164424 -data_ov068_02164428 kind:bss addr:0x02164428 -sActorProfileUnkRMA1 kind:bss addr:0x02164434 -data_ov068_0216450c kind:bss addr:0x0216450c -data_ov068_02164510 kind:bss addr:0x02164510 -sActorProfileUnkRMA2 kind:bss addr:0x0216451c -data_ov068_021645f4 kind:bss addr:0x021645f4 -data_ov068_021645f8 kind:bss addr:0x021645f8 -sActorProfileUnkRMA0 kind:bss addr:0x02164604 +_ZGVN15ProfileInstanceI19ActorProfileUnkAJBSE8sProfileE kind:bss addr:0x0216433c +@13026 kind:bss addr:0x02164340 +_ZN15ProfileInstanceI19ActorProfileUnkAJBSE8sProfileE kind:bss addr:0x0216434c +_ZGVN15ProfileInstanceI19ActorProfileUnkRMA1E8sProfileE kind:bss addr:0x02164424 +@13032 kind:bss addr:0x02164428 +_ZN15ProfileInstanceI19ActorProfileUnkRMA1E8sProfileE kind:bss addr:0x02164434 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMA2E8sProfileE kind:bss addr:0x0216450c +@13038 kind:bss addr:0x02164510 +_ZN15ProfileInstanceI19ActorProfileUnkRMA2E8sProfileE kind:bss addr:0x0216451c +_ZGVN15ProfileInstanceI19ActorProfileUnkRMA0E8sProfileE kind:bss addr:0x021645f4 +@13044 kind:bss addr:0x021645f8 +_ZN15ProfileInstanceI19ActorProfileUnkRMA0E8sProfileE kind:bss addr:0x02164604 data_ov068_02164690 kind:bss addr:0x02164690 ambiguous -data_ov068_021646dc kind:bss addr:0x021646dc -data_ov068_021646e0 kind:bss addr:0x021646e0 -sActorProfileUnkRMA3 kind:bss addr:0x021646ec -data_ov068_021647c4 kind:bss addr:0x021647c4 -data_ov068_021647c8 kind:bss addr:0x021647c8 -sActorProfileUnkAJSP kind:bss addr:0x021647d4 -data_ov068_021648ac kind:bss addr:0x021648ac -data_ov068_021648b0 kind:bss addr:0x021648b0 -sMapObjectProfileUnkDRVC kind:bss addr:0x021648bc -data_ov068_02164990 kind:bss addr:0x02164990 -data_ov068_02164994 kind:bss addr:0x02164994 -sMapObjectProfileUnkRKAG kind:bss addr:0x021649a0 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMA3E8sProfileE kind:bss addr:0x021646dc +@13050 kind:bss addr:0x021646e0 +_ZN15ProfileInstanceI19ActorProfileUnkRMA3E8sProfileE kind:bss addr:0x021646ec +_ZGVN15ProfileInstanceI19ActorProfileUnkAJSPE8sProfileE kind:bss addr:0x021647c4 +@13056 kind:bss addr:0x021647c8 +_ZN15ProfileInstanceI19ActorProfileUnkAJSPE8sProfileE kind:bss addr:0x021647d4 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkDRVCE8sProfileE kind:bss addr:0x021648ac +@12659 kind:bss addr:0x021648b0 +_ZN15ProfileInstanceI23MapObjectProfileUnkDRVCE8sProfileE kind:bss addr:0x021648bc +_ZGVN15ProfileInstanceI23MapObjectProfileUnkRKAGE8sProfileE kind:bss addr:0x02164990 +@12665 kind:bss addr:0x02164994 +_ZN15ProfileInstanceI23MapObjectProfileUnkRKAGE8sProfileE kind:bss addr:0x021649a0 data_ov068_02164a74 kind:bss addr:0x02164a74 diff --git a/config/eur/arm9/overlays/ov069/delinks.txt b/config/eur/arm9/overlays/ov069/delinks.txt index 3da35582..c90493b0 100644 --- a/config/eur/arm9/overlays/ov069/delinks.txt +++ b/config/eur/arm9/overlays/ov069/delinks.txt @@ -9,19 +9,19 @@ src/069_FldRabbit/Actor/ActorUnkBANI.cpp: .text start:0x02157ea0 end:0x02158dc8 .init start:0x0215aaa8 end:0x0215aaf8 .ctor start:0x0215ac38 end:0x0215ac3c - .bss start:0x0215b410 end:0x0215b4e8 + .bss start:0x0215b400 end:0x0215b4e8 src/069_FldRabbit/Actor/ActorUnkRB1F.cpp: .text start:0x02158dc8 end:0x02159f0c .init start:0x0215aaf8 end:0x0215ab48 .ctor start:0x0215ac3c end:0x0215ac40 - .bss start:0x0215b4f8 end:0x0215b50c + .bss start:0x0215b4e8 end:0x0215b600 src/069_FldRabbit/Actor/ActorUnkRBRP.cpp: .text start:0x0215a22c end:0x0215a898 .init start:0x0215ab98 end:0x0215abe8 .ctor start:0x0215ac44 end:0x0215ac48 - .bss start:0x0215b610 end:0x0215b6e8 + .bss start:0x0215b600 end:0x0215b6e8 src/069_FldRabbit/MapObject/MapObjectUnkGTRB.cpp: .text start:0x0215a898 end:0x0215aa94 diff --git a/config/eur/arm9/overlays/ov069/symbols.txt b/config/eur/arm9/overlays/ov069/symbols.txt index 6925cb59..bae06322 100644 --- a/config/eur/arm9/overlays/ov069/symbols.txt +++ b/config/eur/arm9/overlays/ov069/symbols.txt @@ -150,19 +150,19 @@ _ZTV19data_ov069_0215b380 kind:data(any) addr:0x0215b380 ambiguous data_ov069_0215b3a4 kind:data(any) addr:0x0215b3a4 data_ov069_0215b3c0 kind:data(any) addr:0x0215b3c0 data_ov069_0215b3d4 kind:data(any) addr:0x0215b3d4 ambiguous -data_ov069_0215b400 kind:bss addr:0x0215b400 -data_ov069_0215b404 kind:bss addr:0x0215b404 -sActorProfileUnkBANI kind:bss addr:0x0215b410 -data_ov069_0215b4e8 kind:bss addr:0x0215b4e8 -data_ov069_0215b4ec kind:bss addr:0x0215b4ec -sActorProfileUnkRB1F kind:bss addr:0x0215b4f8 +_ZGVN15ProfileInstanceI19ActorProfileUnkBANIE8sProfileE kind:bss addr:0x0215b400 +@13080 kind:bss addr:0x0215b404 +_ZN15ProfileInstanceI19ActorProfileUnkBANIE8sProfileE kind:bss addr:0x0215b410 +_ZGVN15ProfileInstanceI19ActorProfileUnkRB1FE8sProfileE kind:bss addr:0x0215b4e8 +@13086 kind:bss addr:0x0215b4ec +_ZN15ProfileInstanceI19ActorProfileUnkRB1FE8sProfileE kind:bss addr:0x0215b4f8 data_ov069_0215b50c kind:bss addr:0x0215b50c ambiguous data_ov069_0215b5d0 kind:bss addr:0x0215b5d0 data_ov069_0215b5d4 kind:bss addr:0x0215b5d4 data_ov069_0215b5e0 kind:bss addr:0x0215b5e0 -data_ov069_0215b600 kind:bss addr:0x0215b600 -data_ov069_0215b604 kind:bss addr:0x0215b604 -sActorProfileUnkRBRP kind:bss addr:0x0215b610 +_ZGVN15ProfileInstanceI19ActorProfileUnkRBRPE8sProfileE kind:bss addr:0x0215b600 +@13092 kind:bss addr:0x0215b604 +_ZN15ProfileInstanceI19ActorProfileUnkRBRPE8sProfileE kind:bss addr:0x0215b610 data_ov069_0215b6e8 kind:bss addr:0x0215b6e8 data_ov069_0215b6ec kind:bss addr:0x0215b6ec -sMapObjectProfileUnkGTRB kind:bss addr:0x0215b6f8 +_ZN15ProfileInstanceI23MapObjectProfileUnkGTRBE8sProfileE kind:bss addr:0x0215b6f8 diff --git a/config/eur/arm9/overlays/ov070/delinks.txt b/config/eur/arm9/overlays/ov070/delinks.txt index 64457442..9d039711 100644 --- a/config/eur/arm9/overlays/ov070/delinks.txt +++ b/config/eur/arm9/overlays/ov070/delinks.txt @@ -9,145 +9,145 @@ src/070_Dungeon/Actor/ActorUnkENGE.cpp: .text start:0x0213f344 end:0x0213f794 .init start:0x0214ddd8 end:0x0214de28 .ctor start:0x0214e75c end:0x0214e760 - .bss start:0x0214f870 end:0x0214f8ac + .bss start:0x0214f860 end:0x0214f8ac src/070_Dungeon/Actor/ActorUnkALEV.cpp: .text start:0x0213f794 end:0x0213f988 .init start:0x0214de28 end:0x0214de78 .ctor start:0x0214e760 end:0x0214e764 - .bss start:0x0214f8bc end:0x0214f8ec + .bss start:0x0214f8ac end:0x0214f8f8 src/070_Dungeon/Actor/ActorUnkBROW.cpp: .text start:0x02140058 end:0x02140a00 .init start:0x0214de78 end:0x0214dec8 .ctor start:0x0214e764 end:0x0214e768 - .bss start:0x0214f908 end:0x0214f9e0 + .bss start:0x0214f8f8 end:0x0214f9e8 src/070_Dungeon/Actor/ActorUnkKEYN.cpp: .text start:0x021413b4 end:0x02142734 .init start:0x0214dec8 end:0x0214df24 .ctor start:0x0214e768 end:0x0214e76c - .bss start:0x0214fa00 end:0x0214fad8 + .bss start:0x0214f9e8 end:0x0214fadc src/070_Dungeon/Actor/ActorUnkLIRA.cpp: .text start:0x02142734 end:0x021435d0 .init start:0x0214df24 end:0x0214df80 .ctor start:0x0214e76c end:0x0214e770 - .bss start:0x0214faf4 end:0x0214fbcc + .bss start:0x0214fadc end:0x0214fcc0 src/070_Dungeon/Actor/ActorUnkBMHN.cpp: .text start:0x021435d0 end:0x021436b8 .init start:0x0214df80 end:0x0214dfd0 .ctor start:0x0214e770 end:0x0214e774 - .bss start:0x0214fcd0 end:0x0214fd0c + .bss start:0x0214fcc0 end:0x0214fd10 src/070_Dungeon/Actor/ActorUnkSWDS.cpp: .text start:0x021439c8 end:0x02143c8c .init start:0x0214dfd0 end:0x0214e020 .ctor start:0x0214e774 end:0x0214e778 - .bss start:0x0214fd1c end:0x0214fd58 + .bss start:0x0214fd10 end:0x0214fd58 src/070_Dungeon/Actor/ActorUnkRCSG.cpp: .text start:0x02143c8c end:0x02143fc4 .init start:0x0214e020 end:0x0214e070 .ctor start:0x0214e778 end:0x0214e77c - .bss start:0x0214fd68 end:0x0214fda4 + .bss start:0x0214fd58 end:0x0214fda4 src/070_Dungeon/MapObject/MapObjectUnkBLCK.cpp: .text start:0x02143ff4 end:0x021441f0 .init start:0x0214e070 end:0x0214e0c0 .ctor start:0x0214e77c end:0x0214e780 - .bss start:0x0214fdb4 end:0x0214fdd4 + .bss start:0x0214fda4 end:0x0214fe2c src/070_Dungeon/MapObject/MapObjectUnkFLSP.cpp: .text start:0x0214420c end:0x021450f4 .init start:0x0214e0c0 end:0x0214e194 .ctor start:0x0214e780 end:0x0214e784 - .bss start:0x0214fe44 end:0x0214fed0 + .bss start:0x0214fe2c end:0x0214ff3c src/070_Dungeon/MapObject/MapObjectUnkFSPS.cpp: .text start:0x021450f4 end:0x021452c4 .init start:0x0214e194 end:0x0214e1e4 .ctor start:0x0214e784 end:0x0214e788 - .bss start:0x0214ff4c end:0x02150020 + .bss start:0x0214ff3c end:0x02150048 src/070_Dungeon/MapObject/MapObjectUnkBLRB.cpp: .text start:0x02145398 end:0x02145c20 .init start:0x0214e1e4 end:0x0214e258 .ctor start:0x0214e788 end:0x0214e78c - .bss start:0x02150084 end:0x02150158 + .bss start:0x02150048 end:0x0215017c src/070_Dungeon/MapObject/MapObjectUnkSWRB.cpp: .text start:0x02145c20 end:0x0214615c .init start:0x0214e258 end:0x0214e2a8 .ctor start:0x0214e78c end:0x0214e790 - .bss start:0x0215018c end:0x021501ac + .bss start:0x0215017c end:0x02150280 src/070_Dungeon/MapObject/MapObjectUnkARWL.cpp: .text start:0x0214615c end:0x02146a9c .init start:0x0214e2a8 end:0x0214e2f8 .ctor start:0x0214e790 end:0x0214e794 - .bss start:0x02150290 end:0x02150364 + .bss start:0x02150280 end:0x02150388 src/070_Dungeon/MapObject/MapObjectUnkSWWN.cpp: .text start:0x02146a9c end:0x021473e4 .init start:0x0214e2f8 end:0x0214e348 .ctor start:0x0214e794 end:0x0214e798 - .bss start:0x02150398 end:0x0215046c + .bss start:0x02150388 end:0x02150490 src/070_Dungeon/MapObject/MapObjectUnkSWEY.cpp: .text start:0x021473e4 end:0x02147cf8 .init start:0x0214e348 end:0x0214e398 .ctor start:0x0214e798 end:0x0214e79c - .bss start:0x021504a0 end:0x021504c0 + .bss start:0x02150490 end:0x02150594 src/070_Dungeon/Actor/ActorUnkTRAP.cpp: .text start:0x02147e48 end:0x02148bd4 .init start:0x0214e398 end:0x0214e3e8 .ctor start:0x0214e79c end:0x0214e7a0 - .bss start:0x021505a4 end:0x0215067c + .bss start:0x02150594 end:0x0215067c src/070_Dungeon/MapObject/MapObjectUnkDRST.cpp: .text start:0x02148bd4 end:0x02149038 .init start:0x0214e3e8 end:0x0214e44c .ctor start:0x0214e7a0 end:0x0214e7a4 - .bss start:0x0215068c end:0x02150760 + .bss start:0x0215067c end:0x02150764 src/070_Dungeon/MapObject/MapObjectUnkFRWL.cpp: .text start:0x02149058 end:0x0214a040 .init start:0x0214e44c end:0x0214e4a8 .ctor start:0x0214e7a4 end:0x0214e7a8 - .bss start:0x0215077c end:0x02150850 + .bss start:0x02150764 end:0x02150874 src/070_Dungeon/MapObject/MapObjectUnkSTSH.cpp: .text start:0x0214a040 end:0x0214b320 .init start:0x0214e4a8 end:0x0214e544 .ctor start:0x0214e7a8 end:0x0214e7ac - .bss start:0x02150884 end:0x02150958 + .bss start:0x02150874 end:0x02150958 src/070_Dungeon/MapObject/MapObjectUnkTRLS.cpp: .text start:0x0214b330 end:0x0214b4fc .init start:0x0214e544 end:0x0214e5b4 .ctor start:0x0214e7ac end:0x0214e7b0 - .bss start:0x02150968 end:0x021509a4 + .bss start:0x02150958 end:0x02150a3c src/070_Dungeon/MapObject/MapObjectUnkTRLD.cpp: .text start:0x0214b4fc end:0x0214b6e8 .init start:0x0214e5b4 end:0x0214e624 .ctor start:0x0214e7b0 end:0x0214e7b4 - .bss start:0x02150a4c end:0x02150a70 + .bss start:0x02150a3c end:0x02150a70 src/070_Dungeon/MapObject/MapObjectUnkTRLW.cpp: .text start:0x0214b6e8 end:0x0214b8dc .init start:0x0214e624 end:0x0214e694 .ctor start:0x0214e7b4 end:0x0214e7b8 - .bss start:0x02150a80 end:0x02150aa4 + .bss start:0x02150a70 end:0x02150aa8 src/070_Dungeon/MapObject/MapObjectUnkPTFL.cpp: .text start:0x0214b8dc end:0x0214c024 .init start:0x0214e694 end:0x0214e6f0 .ctor start:0x0214e7b8 end:0x0214e7bc - .bss start:0x02150ac0 end:0x02150ae0 + .bss start:0x02150aa8 end:0x02150ae0 src/070_Dungeon/Actor/ActorUnkRYAW.cpp: .text start:0x0214c024 end:0x0214dbec diff --git a/config/eur/arm9/overlays/ov070/symbols.txt b/config/eur/arm9/overlays/ov070/symbols.txt index 96b929e8..0108073a 100644 --- a/config/eur/arm9/overlays/ov070/symbols.txt +++ b/config/eur/arm9/overlays/ov070/symbols.txt @@ -729,107 +729,107 @@ data_ov070_0214f7a0 kind:data(any) addr:0x0214f7a0 ambiguous data_ov070_0214f7ac kind:data(any) addr:0x0214f7ac _ZTV19data_ov070_0214f7c0 kind:data(any) addr:0x0214f7c0 _ZTV19data_ov070_0214f7e4 kind:data(any) addr:0x0214f7e4 -data_ov070_0214f860 kind:bss addr:0x0214f860 -data_ov070_0214f864 kind:bss addr:0x0214f864 -sActorProfileUnkENGE kind:bss addr:0x0214f870 -data_ov070_0214f8ac kind:bss addr:0x0214f8ac -data_ov070_0214f8b0 kind:bss addr:0x0214f8b0 -sActorProfileUnkALEV kind:bss addr:0x0214f8bc +_ZGVN15ProfileInstanceI19ActorProfileUnkENGEE8sProfileE kind:bss addr:0x0214f860 +@13109 kind:bss addr:0x0214f864 +_ZN15ProfileInstanceI19ActorProfileUnkENGEE8sProfileE kind:bss addr:0x0214f870 +_ZGVN15ProfileInstanceI19ActorProfileUnkALEVE8sProfileE kind:bss addr:0x0214f8ac +@13115 kind:bss addr:0x0214f8b0 +_ZN15ProfileInstanceI19ActorProfileUnkALEVE8sProfileE kind:bss addr:0x0214f8bc data_ov070_0214f8ec kind:bss addr:0x0214f8ec ambiguous -data_ov070_0214f8f8 kind:bss addr:0x0214f8f8 -data_ov070_0214f8fc kind:bss addr:0x0214f8fc -sActorProfileUnkBROW kind:bss addr:0x0214f908 +_ZGVN15ProfileInstanceI19ActorProfileUnkBROWE8sProfileE kind:bss addr:0x0214f8f8 +@13121 kind:bss addr:0x0214f8fc +_ZN15ProfileInstanceI19ActorProfileUnkBROWE8sProfileE kind:bss addr:0x0214f908 data_ov070_0214f9e0 kind:bss addr:0x0214f9e0 data_ov070_0214f9e4 kind:bss addr:0x0214f9e4 -data_ov070_0214f9e8 kind:bss addr:0x0214f9e8 -data_ov070_0214f9f4 kind:bss addr:0x0214f9f4 -sActorProfileUnkKEYN kind:bss addr:0x0214fa00 +_ZGVN15ProfileInstanceI19ActorProfileUnkKEYNE8sProfileE kind:bss addr:0x0214f9e8 +@13127 kind:bss addr:0x0214f9f4 +_ZN15ProfileInstanceI19ActorProfileUnkKEYNE8sProfileE kind:bss addr:0x0214fa00 data_ov070_0214fad8 kind:bss addr:0x0214fad8 -data_ov070_0214fadc kind:bss addr:0x0214fadc -data_ov070_0214fae8 kind:bss addr:0x0214fae8 -sActorProfileUnkLIRA kind:bss addr:0x0214faf4 +_ZGVN15ProfileInstanceI19ActorProfileUnkLIRAE8sProfileE kind:bss addr:0x0214fadc +@13133 kind:bss addr:0x0214fae8 +_ZN15ProfileInstanceI19ActorProfileUnkLIRAE8sProfileE kind:bss addr:0x0214faf4 data_ov070_0214fbcc kind:bss addr:0x0214fbcc data_ov070_0214fbf0 kind:bss addr:0x0214fbf0 data_ov070_0214fc7c kind:bss addr:0x0214fc7c ambiguous data_ov070_0214fc90 kind:bss addr:0x0214fc90 ambiguous -data_ov070_0214fcc0 kind:bss addr:0x0214fcc0 -data_ov070_0214fcc4 kind:bss addr:0x0214fcc4 -sActorProfileUnkBMHN kind:bss addr:0x0214fcd0 +_ZGVN15ProfileInstanceI19ActorProfileUnkBMHNE8sProfileE kind:bss addr:0x0214fcc0 +@13139 kind:bss addr:0x0214fcc4 +_ZN15ProfileInstanceI19ActorProfileUnkBMHNE8sProfileE kind:bss addr:0x0214fcd0 data_ov070_0214fd0c kind:bss addr:0x0214fd0c -data_ov070_0214fd10 kind:bss addr:0x0214fd10 -data_ov070_0214fd18 kind:bss addr:0x0214fd18 ambiguous -sActorProfileUnkSWDS kind:bss addr:0x0214fd1c -data_ov070_0214fd58 kind:bss addr:0x0214fd58 -data_ov070_0214fd5c kind:bss addr:0x0214fd5c -sActorProfileUnkRCSG kind:bss addr:0x0214fd68 -data_ov070_0214fda4 kind:bss addr:0x0214fda4 -data_ov070_0214fda8 kind:bss addr:0x0214fda8 -sMapObjectProfileUnkBLCK kind:bss addr:0x0214fdb4 +_ZGVN15ProfileInstanceI19ActorProfileUnkSWDSE8sProfileE kind:bss addr:0x0214fd10 +@13145 kind:bss addr:0x0214fd18 ambiguous +_ZN15ProfileInstanceI19ActorProfileUnkSWDSE8sProfileE kind:bss addr:0x0214fd1c +_ZGVN15ProfileInstanceI19ActorProfileUnkRCSGE8sProfileE kind:bss addr:0x0214fd58 +@13151 kind:bss addr:0x0214fd5c +_ZN15ProfileInstanceI19ActorProfileUnkRCSGE8sProfileE kind:bss addr:0x0214fd68 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkBLCKE8sProfileE kind:bss addr:0x0214fda4 +@12754 kind:bss addr:0x0214fda8 +_ZN15ProfileInstanceI23MapObjectProfileUnkBLCKE8sProfileE kind:bss addr:0x0214fdb4 data_ov070_0214fdd4 kind:bss addr:0x0214fdd4 data_ov070_0214fe1c kind:bss addr:0x0214fe1c data_ov070_0214fe20 kind:bss addr:0x0214fe20 -data_ov070_0214fe2c kind:bss addr:0x0214fe2c -data_ov070_0214fe38 kind:bss addr:0x0214fe38 -sMapObjectProfileUnkFLSP kind:bss addr:0x0214fe44 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkFLSPE8sProfileE kind:bss addr:0x0214fe2c +@12760 kind:bss addr:0x0214fe38 +_ZN15ProfileInstanceI23MapObjectProfileUnkFLSPE8sProfileE kind:bss addr:0x0214fe44 data_ov070_0214fed0 kind:bss addr:0x0214fed0 ambiguous data_ov070_0214ff18 kind:bss addr:0x0214ff18 -data_ov070_0214ff3c kind:bss addr:0x0214ff3c -data_ov070_0214ff40 kind:bss addr:0x0214ff40 -sMapObjectProfileUnkFSPS kind:bss addr:0x0214ff4c +_ZGVN15ProfileInstanceI23MapObjectProfileUnkFSPSE8sProfileE kind:bss addr:0x0214ff3c +@12766 kind:bss addr:0x0214ff40 +_ZN15ProfileInstanceI23MapObjectProfileUnkFSPSE8sProfileE kind:bss addr:0x0214ff4c data_ov070_02150020 kind:bss addr:0x02150020 data_ov070_02150044 kind:bss addr:0x02150044 -data_ov070_02150048 kind:bss addr:0x02150048 -data_ov070_02150054 kind:bss addr:0x02150054 -sMapObjectProfileUnkBLRB kind:bss addr:0x02150084 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkBLRBE8sProfileE kind:bss addr:0x02150048 +@12772 kind:bss addr:0x02150054 +_ZN15ProfileInstanceI23MapObjectProfileUnkBLRBE8sProfileE kind:bss addr:0x02150084 data_ov070_02150158 kind:bss addr:0x02150158 -data_ov070_0215017c kind:bss addr:0x0215017c -data_ov070_02150180 kind:bss addr:0x02150180 -sMapObjectProfileUnkSWRB kind:bss addr:0x0215018c +_ZGVN15ProfileInstanceI23MapObjectProfileUnkSWRBE8sProfileE kind:bss addr:0x0215017c +@12778 kind:bss addr:0x02150180 +_ZN15ProfileInstanceI23MapObjectProfileUnkSWRBE8sProfileE kind:bss addr:0x0215018c data_ov070_021501ac kind:bss addr:0x021501ac data_ov070_02150260 kind:bss addr:0x02150260 -data_ov070_02150280 kind:bss addr:0x02150280 -data_ov070_02150284 kind:bss addr:0x02150284 -sMapObjectProfileUnkARWL kind:bss addr:0x02150290 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkARWLE8sProfileE kind:bss addr:0x02150280 +@12784 kind:bss addr:0x02150284 +_ZN15ProfileInstanceI23MapObjectProfileUnkARWLE8sProfileE kind:bss addr:0x02150290 data_ov070_02150364 kind:bss addr:0x02150364 -data_ov070_02150388 kind:bss addr:0x02150388 -data_ov070_0215038c kind:bss addr:0x0215038c -sMapObjectProfileUnkSWWN kind:bss addr:0x02150398 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkSWWNE8sProfileE kind:bss addr:0x02150388 +@12790 kind:bss addr:0x0215038c +_ZN15ProfileInstanceI23MapObjectProfileUnkSWWNE8sProfileE kind:bss addr:0x02150398 data_ov070_0215046c kind:bss addr:0x0215046c -data_ov070_02150490 kind:bss addr:0x02150490 -data_ov070_02150494 kind:bss addr:0x02150494 -sMapObjectProfileUnkSWEY kind:bss addr:0x021504a0 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkSWEYE8sProfileE kind:bss addr:0x02150490 +@12796 kind:bss addr:0x02150494 +_ZN15ProfileInstanceI23MapObjectProfileUnkSWEYE8sProfileE kind:bss addr:0x021504a0 data_ov070_021504c0 kind:bss addr:0x021504c0 data_ov070_02150574 kind:bss addr:0x02150574 -data_ov070_02150594 kind:bss addr:0x02150594 -data_ov070_02150598 kind:bss addr:0x02150598 -sActorProfileUnkTRAP kind:bss addr:0x021505a4 -data_ov070_0215067c kind:bss addr:0x0215067c -data_ov070_02150680 kind:bss addr:0x02150680 -sMapObjectProfileUnkDRST kind:bss addr:0x0215068c +_ZGVN15ProfileInstanceI19ActorProfileUnkTRAPE8sProfileE kind:bss addr:0x02150594 +@13205 kind:bss addr:0x02150598 +_ZN15ProfileInstanceI19ActorProfileUnkTRAPE8sProfileE kind:bss addr:0x021505a4 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkDRSTE8sProfileE kind:bss addr:0x0215067c +@12808 kind:bss addr:0x02150680 +_ZN15ProfileInstanceI23MapObjectProfileUnkDRSTE8sProfileE kind:bss addr:0x0215068c data_ov070_02150760 kind:bss addr:0x02150760 -data_ov070_02150764 kind:bss addr:0x02150764 -data_ov070_02150770 kind:bss addr:0x02150770 -sMapObjectProfileUnkFRWL kind:bss addr:0x0215077c +_ZGVN15ProfileInstanceI23MapObjectProfileUnkFRWLE8sProfileE kind:bss addr:0x02150764 +@12814 kind:bss addr:0x02150770 +_ZN15ProfileInstanceI23MapObjectProfileUnkFRWLE8sProfileE kind:bss addr:0x0215077c data_ov070_02150850 kind:bss addr:0x02150850 -data_ov070_02150874 kind:bss addr:0x02150874 -data_ov070_02150878 kind:bss addr:0x02150878 -sMapObjectProfileUnkSTSH kind:bss addr:0x02150884 -data_ov070_02150958 kind:bss addr:0x02150958 -data_ov070_0215095c kind:bss addr:0x0215095c -sMapObjectProfileUnkTRLS kind:bss addr:0x02150968 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkSTSHE8sProfileE kind:bss addr:0x02150874 +@12820 kind:bss addr:0x02150878 +_ZN15ProfileInstanceI23MapObjectProfileUnkSTSHE8sProfileE kind:bss addr:0x02150884 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRLSE8sProfileE kind:bss addr:0x02150958 +@12826 kind:bss addr:0x0215095c +_ZN15ProfileInstanceI23MapObjectProfileUnkTRLSE8sProfileE kind:bss addr:0x02150968 data_ov070_021509a4 kind:bss addr:0x021509a4 ambiguous -data_ov070_02150a3c kind:bss addr:0x02150a3c -data_ov070_02150a40 kind:bss addr:0x02150a40 -sMapObjectProfileUnkTRLD kind:bss addr:0x02150a4c -data_ov070_02150a70 kind:bss addr:0x02150a70 -data_ov070_02150a74 kind:bss addr:0x02150a74 -sMapObjectProfileUnkTRLW kind:bss addr:0x02150a80 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRLDE8sProfileE kind:bss addr:0x02150a3c +@12832 kind:bss addr:0x02150a40 +_ZN15ProfileInstanceI23MapObjectProfileUnkTRLDE8sProfileE kind:bss addr:0x02150a4c +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRLWE8sProfileE kind:bss addr:0x02150a70 +@12838 kind:bss addr:0x02150a74 +_ZN15ProfileInstanceI23MapObjectProfileUnkTRLWE8sProfileE kind:bss addr:0x02150a80 data_ov070_02150aa4 kind:bss addr:0x02150aa4 -data_ov070_02150aa8 kind:bss addr:0x02150aa8 -data_ov070_02150ab4 kind:bss addr:0x02150ab4 -sMapObjectProfileUnkPTFL kind:bss addr:0x02150ac0 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkPTFLE8sProfileE kind:bss addr:0x02150aa8 +@12844 kind:bss addr:0x02150ab4 +_ZN15ProfileInstanceI23MapObjectProfileUnkPTFLE8sProfileE kind:bss addr:0x02150ac0 data_ov070_02150ae0 kind:bss addr:0x02150ae0 data_ov070_02150b04 kind:bss addr:0x02150b04 data_ov070_02150b08 kind:bss addr:0x02150b08 data_ov070_02150b14 kind:bss addr:0x02150b14 -sActorProfileUnkRYAW kind:bss addr:0x02150b24 +_ZN15ProfileInstanceI19ActorProfileUnkRYAWE8sProfileE kind:bss addr:0x02150b24 diff --git a/config/eur/arm9/overlays/ov071/delinks.txt b/config/eur/arm9/overlays/ov071/delinks.txt index b0bf0423..22cc8f33 100644 --- a/config/eur/arm9/overlays/ov071/delinks.txt +++ b/config/eur/arm9/overlays/ov071/delinks.txt @@ -9,43 +9,43 @@ src/071_Tower/Actor/ActorUnkSZKU.cpp: .text start:0x0215f210 end:0x02160118 .init start:0x02163dd0 end:0x02163e44 .ctor start:0x021640bc end:0x021640c0 - .bss start:0x02165168 end:0x02165240 + .bss start:0x02165150 end:0x02165240 src/071_Tower/Actor/ActorUnkKMSO.cpp: .text start:0x02160118 end:0x0216097c .init start:0x02163e44 end:0x02163e94 .ctor start:0x021640c0 end:0x021640c4 - .bss start:0x02165250 end:0x02165328 + .bss start:0x02165240 end:0x02165328 src/071_Tower/MapObject/MapObjectUnkRNBO.cpp: .text start:0x0216097c end:0x02160bb8 .init start:0x02163e94 end:0x02163ee4 .ctor start:0x021640c4 end:0x021640c8 - .bss start:0x02165338 end:0x0216540c + .bss start:0x02165328 end:0x02165430 src/071_Tower/MapObject/MapObjectUnkRPFL.cpp: .text start:0x02160bb8 end:0x0216195c .init start:0x02163ee4 end:0x02163f34 .ctor start:0x021640c8 end:0x021640cc - .bss start:0x02165440 end:0x02165460 + .bss start:0x02165430 end:0x02165538 src/071_Tower/MapObject/MapObjectUnkBLCE.cpp: .text start:0x0216195c end:0x02161aec .init start:0x02163f34 end:0x02163f84 .ctor start:0x021640cc end:0x021640d0 - .bss start:0x02165548 end:0x02165640 + .bss start:0x02165538 end:0x02165640 src/071_Tower/MapObject/MapObjectUnkSTAL.cpp: .text start:0x02161aec end:0x021620c0 .init start:0x02163f84 end:0x02163fd4 .ctor start:0x021640d0 end:0x021640d4 - .bss start:0x02165650 end:0x02165724 + .bss start:0x02165640 end:0x02165734 src/071_Tower/MapObject/MapObjectUnkBRGS.cpp: .text start:0x021620c0 end:0x02162f34 .init start:0x02163fd4 end:0x02164038 .ctor start:0x021640d4 end:0x021640d8 - .bss start:0x0216574c end:0x02165820 + .bss start:0x02165734 end:0x02165820 src/071_Tower/MapObject/MapObjectUnkBLCT.cpp: .text start:0x02162f34 end:0x02163760 diff --git a/config/eur/arm9/overlays/ov071/symbols.txt b/config/eur/arm9/overlays/ov071/symbols.txt index d58a382c..145b5fe1 100644 --- a/config/eur/arm9/overlays/ov071/symbols.txt +++ b/config/eur/arm9/overlays/ov071/symbols.txt @@ -572,32 +572,32 @@ data_ov071_02165128 kind:bss addr:0x02165128 data_ov071_02165134 kind:bss addr:0x02165134 data_ov071_02165140 kind:bss addr:0x02165140 data_ov071_0216514c kind:bss addr:0x0216514c -data_ov071_02165150 kind:bss addr:0x02165150 -data_ov071_0216515c kind:bss addr:0x0216515c -sActorProfileUnkSZKU kind:bss addr:0x02165168 -data_ov071_02165240 kind:bss addr:0x02165240 -data_ov071_02165244 kind:bss addr:0x02165244 -sActorProfileUnkKMSO kind:bss addr:0x02165250 -data_ov071_02165328 kind:bss addr:0x02165328 -data_ov071_0216532c kind:bss addr:0x0216532c -sMapObjectProfileUnkRNBO kind:bss addr:0x02165338 +_ZGVN15ProfileInstanceI19ActorProfileUnkSZKUE8sProfileE kind:bss addr:0x02165150 +@13264 kind:bss addr:0x0216515c +_ZN15ProfileInstanceI19ActorProfileUnkSZKUE8sProfileE kind:bss addr:0x02165168 +_ZGVN15ProfileInstanceI19ActorProfileUnkKMSOE8sProfileE kind:bss addr:0x02165240 +@13270 kind:bss addr:0x02165244 +_ZN15ProfileInstanceI19ActorProfileUnkKMSOE8sProfileE kind:bss addr:0x02165250 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkRNBOE8sProfileE kind:bss addr:0x02165328 +@12873 kind:bss addr:0x0216532c +_ZN15ProfileInstanceI23MapObjectProfileUnkRNBOE8sProfileE kind:bss addr:0x02165338 data_ov071_0216540c kind:bss addr:0x0216540c -data_ov071_02165430 kind:bss addr:0x02165430 -data_ov071_02165434 kind:bss addr:0x02165434 -sMapObjectProfileUnkRPFL kind:bss addr:0x02165440 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkRPFLE8sProfileE kind:bss addr:0x02165430 +@12879 kind:bss addr:0x02165434 +_ZN15ProfileInstanceI23MapObjectProfileUnkRPFLE8sProfileE kind:bss addr:0x02165440 data_ov071_02165460 kind:bss addr:0x02165460 data_ov071_02165514 kind:bss addr:0x02165514 -data_ov071_02165538 kind:bss addr:0x02165538 -data_ov071_0216553c kind:bss addr:0x0216553c -sMapObjectProfileUnkBLCE kind:bss addr:0x02165548 -data_ov071_02165640 kind:bss addr:0x02165640 -data_ov071_02165644 kind:bss addr:0x02165644 -sMapObjectProfileUnkSTAL kind:bss addr:0x02165650 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkBLCEE8sProfileE kind:bss addr:0x02165538 +@12885 kind:bss addr:0x0216553c +_ZN15ProfileInstanceI23MapObjectProfileUnkBLCEE8sProfileE kind:bss addr:0x02165548 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkSTALE8sProfileE kind:bss addr:0x02165640 +@12891 kind:bss addr:0x02165644 +_ZN15ProfileInstanceI23MapObjectProfileUnkSTALE8sProfileE kind:bss addr:0x02165650 data_ov071_02165724 kind:bss addr:0x02165724 -data_ov071_02165734 kind:bss addr:0x02165734 -data_ov071_02165740 kind:bss addr:0x02165740 -sMapObjectProfileUnkBRGS kind:bss addr:0x0216574c +_ZGVN15ProfileInstanceI23MapObjectProfileUnkBRGSE8sProfileE kind:bss addr:0x02165734 +@12897 kind:bss addr:0x02165740 +_ZN15ProfileInstanceI23MapObjectProfileUnkBRGSE8sProfileE kind:bss addr:0x0216574c data_ov071_02165820 kind:bss addr:0x02165820 data_ov071_02165824 kind:bss addr:0x02165824 data_ov071_02165830 kind:bss addr:0x02165830 -sMapObjectProfileUnkBLCT kind:bss addr:0x0216583c +_ZN15ProfileInstanceI23MapObjectProfileUnkBLCTE8sProfileE kind:bss addr:0x0216583c diff --git a/config/eur/arm9/overlays/ov072/delinks.txt b/config/eur/arm9/overlays/ov072/delinks.txt index e63ae1be..e79a51b3 100644 --- a/config/eur/arm9/overlays/ov072/delinks.txt +++ b/config/eur/arm9/overlays/ov072/delinks.txt @@ -9,10 +9,10 @@ src/072_TowerLobby/Actor/ActorUnkRMM0.cpp: .text start:0x02150c80 end:0x02152054 .init start:0x021525a0 end:0x021525f0 .ctor start:0x02152640 end:0x02152644 - .bss start:0x02152890 end:0x021528cc + .bss start:0x02152880 end:0x02152968 src/072_TowerLobby/Actor/ActorUnkRMM3.cpp: .text start:0x02152054 end:0x021524ec .init start:0x021525f0 end:0x02152640 .ctor start:0x02152644 end:0x02152648 - .bss start:0x02152978 end:0x02152a60 + .bss start:0x02152968 end:0x02152a60 diff --git a/config/eur/arm9/overlays/ov072/symbols.txt b/config/eur/arm9/overlays/ov072/symbols.txt index 785747fb..3335e2df 100644 --- a/config/eur/arm9/overlays/ov072/symbols.txt +++ b/config/eur/arm9/overlays/ov072/symbols.txt @@ -66,10 +66,10 @@ _ZTV19data_ov072_021527d0 kind:data(any) addr:0x021527d0 _ZTV19data_ov072_021527f4 kind:data(any) addr:0x021527f4 data_ov072_02152858 kind:data(any) addr:0x02152858 data_ov072_02152864 kind:data(any) addr:0x02152864 -data_ov072_02152880 kind:bss addr:0x02152880 -data_ov072_02152884 kind:bss addr:0x02152884 -sActorProfileUnkRMM0 kind:bss addr:0x02152890 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMM0E8sProfileE kind:bss addr:0x02152880 +@13317 kind:bss addr:0x02152884 +_ZN15ProfileInstanceI19ActorProfileUnkRMM0E8sProfileE kind:bss addr:0x02152890 data_ov072_021528cc kind:bss addr:0x021528cc -data_ov072_02152968 kind:bss addr:0x02152968 -data_ov072_0215296c kind:bss addr:0x0215296c -sActorProfileUnkRMM3 kind:bss addr:0x02152978 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMM3E8sProfileE kind:bss addr:0x02152968 +@13323 kind:bss addr:0x0215296c +_ZN15ProfileInstanceI19ActorProfileUnkRMM3E8sProfileE kind:bss addr:0x02152978 diff --git a/config/eur/arm9/overlays/ov073/delinks.txt b/config/eur/arm9/overlays/ov073/delinks.txt index 4b2a47e2..7ed07a8c 100644 --- a/config/eur/arm9/overlays/ov073/delinks.txt +++ b/config/eur/arm9/overlays/ov073/delinks.txt @@ -9,7 +9,7 @@ src/073_BossDeago/Actor/ActorUnkBDEA.cpp: .text start:0x02150c00 end:0x02163228 .init start:0x02163d48 end:0x02163e6c .ctor start:0x02163ebc end:0x02163ec0 - .bss start:0x021647d0 end:0x021647d4 + .bss start:0x021647c0 end:0x021647d4 src/073_BossDeago/Actor/ActorUnkDGPC.cpp: .text start:0x02163228 end:0x0216348c diff --git a/config/eur/arm9/overlays/ov073/symbols.txt b/config/eur/arm9/overlays/ov073/symbols.txt index 2b98d031..8b5cf1dd 100644 --- a/config/eur/arm9/overlays/ov073/symbols.txt +++ b/config/eur/arm9/overlays/ov073/symbols.txt @@ -288,10 +288,10 @@ data_ov073_021646e8 kind:data(any) addr:0x021646e8 _ZTV19data_ov073_02164700 kind:data(any) addr:0x02164700 _ZTV19data_ov073_02164724 kind:data(any) addr:0x02164724 _ZTV19data_ov073_0216478c kind:data(any) addr:0x0216478c -data_ov073_021647c0 kind:bss addr:0x021647c0 -data_ov073_021647c4 kind:bss addr:0x021647c4 -sActorProfileUnkBDEA kind:bss addr:0x021647d0 +_ZGVN15ProfileInstanceI19ActorProfileUnkBDEAE8sProfileE kind:bss addr:0x021647c0 +@13335 kind:bss addr:0x021647c4 +_ZN15ProfileInstanceI19ActorProfileUnkBDEAE8sProfileE kind:bss addr:0x021647d0 data_ov073_021647d4 kind:bss addr:0x021647d4 data_ov073_021648a8 kind:bss addr:0x021648a8 data_ov073_021648ac kind:bss addr:0x021648ac -sActorProfileUnkDGPC kind:bss addr:0x021648b8 +_ZN15ProfileInstanceI19ActorProfileUnkDGPCE8sProfileE kind:bss addr:0x021648b8 diff --git a/config/eur/arm9/overlays/ov074/delinks.txt b/config/eur/arm9/overlays/ov074/delinks.txt index 308da9e0..65f3fd24 100644 --- a/config/eur/arm9/overlays/ov074/delinks.txt +++ b/config/eur/arm9/overlays/ov074/delinks.txt @@ -9,43 +9,43 @@ src/074_BossLast1/Actor/ActorUnkRBL1.cpp: .text start:0x02150c00 end:0x02151b14 .init start:0x021621b0 end:0x02162274 .ctor start:0x0216258c end:0x02162590 - .bss start:0x02163330 end:0x02163408 + .bss start:0x02163320 end:0x02163408 src/074_BossLast1/Actor/ActorUnkMAGR.cpp: .text start:0x02151b14 end:0x02152e4c .init start:0x02162274 end:0x021622f8 .ctor start:0x02162590 end:0x02162594 - .bss start:0x02163418 end:0x021634cc + .bss start:0x02163408 end:0x021634f0 src/074_BossLast1/Actor/ActorUnkZLBS.cpp: .text start:0x02152e4c end:0x021556dc .init start:0x021622f8 end:0x0216236c .ctor start:0x02162594 end:0x02162598 - .bss start:0x02163500 end:0x02163518 + .bss start:0x021634f0 end:0x021635d8 src/074_BossLast1/Actor/ActorUnkZLBB.cpp: .text start:0x021556dc end:0x02156b88 .init start:0x0216236c end:0x021623e0 .ctor start:0x02162598 end:0x0216259c - .bss start:0x021635e8 end:0x021636c0 + .bss start:0x021635d8 end:0x021636c0 src/074_BossLast1/Actor/ActorUnkBSKM.cpp: .text start:0x02156b88 end:0x0215c9cc .init start:0x021623e0 end:0x02162454 .ctor start:0x0216259c end:0x021625a0 - .bss start:0x021636d0 end:0x021637a8 + .bss start:0x021636c0 end:0x021637a8 src/074_BossLast1/Actor/ActorUnkBKST.cpp: .text start:0x0215c9cc end:0x0215d750 .init start:0x02162454 end:0x021624a4 .ctor start:0x021625a0 end:0x021625a4 - .bss start:0x021637b8 end:0x021637f4 + .bss start:0x021637a8 end:0x021637f4 src/074_BossLast1/Actor/ActorUnkKIMB.cpp: .text start:0x0215d750 end:0x0215e688 .init start:0x021624a4 end:0x02162518 .ctor start:0x021625a4 end:0x021625a8 - .bss start:0x02163804 end:0x021638dc + .bss start:0x021637f4 end:0x021638dc src/074_BossLast1/Actor/ActorUnkPPPM.cpp: .text start:0x0215e688 end:0x02161c2c diff --git a/config/eur/arm9/overlays/ov074/symbols.txt b/config/eur/arm9/overlays/ov074/symbols.txt index 261d4520..9856ab90 100644 --- a/config/eur/arm9/overlays/ov074/symbols.txt +++ b/config/eur/arm9/overlays/ov074/symbols.txt @@ -446,29 +446,29 @@ _ZTV19data_ov074_021631dc kind:data(any) addr:0x021631dc _ZTV19data_ov074_02163220 kind:data(any) addr:0x02163220 ambiguous data_ov074_0216323c kind:data(any) addr:0x0216323c data_ov074_021632a4 kind:data(any) addr:0x021632a4 -data_ov074_02163320 kind:bss addr:0x02163320 -data_ov074_02163324 kind:bss addr:0x02163324 -sActorProfileUnkRBL1 kind:bss addr:0x02163330 -data_ov074_02163408 kind:bss addr:0x02163408 -data_ov074_0216340c kind:bss addr:0x0216340c -sActorProfileUnkMAGR kind:bss addr:0x02163418 +_ZGVN15ProfileInstanceI19ActorProfileUnkRBL1E8sProfileE kind:bss addr:0x02163320 +@13352 kind:bss addr:0x02163324 +_ZN15ProfileInstanceI19ActorProfileUnkRBL1E8sProfileE kind:bss addr:0x02163330 +_ZGVN15ProfileInstanceI19ActorProfileUnkMAGRE8sProfileE kind:bss addr:0x02163408 +@13358 kind:bss addr:0x0216340c +_ZN15ProfileInstanceI19ActorProfileUnkMAGRE8sProfileE kind:bss addr:0x02163418 data_ov074_021634cc kind:bss addr:0x021634cc ambiguous -data_ov074_021634f0 kind:bss addr:0x021634f0 -data_ov074_021634f4 kind:bss addr:0x021634f4 -sActorProfileUnkZLBS kind:bss addr:0x02163500 +_ZGVN15ProfileInstanceI19ActorProfileUnkZLBSE8sProfileE kind:bss addr:0x021634f0 +@13364 kind:bss addr:0x021634f4 +_ZN15ProfileInstanceI19ActorProfileUnkZLBSE8sProfileE kind:bss addr:0x02163500 data_ov074_02163518 kind:bss addr:0x02163518 ambiguous -data_ov074_021635d8 kind:bss addr:0x021635d8 -data_ov074_021635dc kind:bss addr:0x021635dc -sActorProfileUnkZLBB kind:bss addr:0x021635e8 -data_ov074_021636c0 kind:bss addr:0x021636c0 -data_ov074_021636c4 kind:bss addr:0x021636c4 -sActorProfileUnkBSKM kind:bss addr:0x021636d0 -data_ov074_021637a8 kind:bss addr:0x021637a8 -data_ov074_021637ac kind:bss addr:0x021637ac -sActorProfileUnkBKST kind:bss addr:0x021637b8 -data_ov074_021637f4 kind:bss addr:0x021637f4 -data_ov074_021637f8 kind:bss addr:0x021637f8 -sActorProfileUnkKIMB kind:bss addr:0x02163804 +_ZGVN15ProfileInstanceI19ActorProfileUnkZLBBE8sProfileE kind:bss addr:0x021635d8 +@13370 kind:bss addr:0x021635dc +_ZN15ProfileInstanceI19ActorProfileUnkZLBBE8sProfileE kind:bss addr:0x021635e8 +_ZGVN15ProfileInstanceI19ActorProfileUnkBSKME8sProfileE kind:bss addr:0x021636c0 +@13376 kind:bss addr:0x021636c4 +_ZN15ProfileInstanceI19ActorProfileUnkBSKME8sProfileE kind:bss addr:0x021636d0 +_ZGVN15ProfileInstanceI19ActorProfileUnkBKSTE8sProfileE kind:bss addr:0x021637a8 +@13382 kind:bss addr:0x021637ac +_ZN15ProfileInstanceI19ActorProfileUnkBKSTE8sProfileE kind:bss addr:0x021637b8 +_ZGVN15ProfileInstanceI19ActorProfileUnkKIMBE8sProfileE kind:bss addr:0x021637f4 +@13388 kind:bss addr:0x021637f8 +_ZN15ProfileInstanceI19ActorProfileUnkKIMBE8sProfileE kind:bss addr:0x02163804 data_ov074_021638dc kind:bss addr:0x021638dc data_ov074_021638e0 kind:bss addr:0x021638e0 -sActorProfileUnkPPPM kind:bss addr:0x021638ec +_ZN15ProfileInstanceI19ActorProfileUnkPPPME8sProfileE kind:bss addr:0x021638ec diff --git a/config/eur/arm9/overlays/ov075/delinks.txt b/config/eur/arm9/overlays/ov075/delinks.txt index df7dc722..eb0a93dd 100644 --- a/config/eur/arm9/overlays/ov075/delinks.txt +++ b/config/eur/arm9/overlays/ov075/delinks.txt @@ -9,22 +9,22 @@ src/075_BossLast2/Actor/ActorUnkMRDA_MRDO.cpp: .text start:0x02150c00 end:0x02154114 .init start:0x02162358 end:0x02162488 .ctor start:0x0216268c end:0x02162690 - .bss start:0x02163364 end:0x02163514 + .bss start:0x0216334c end:0x02163528 src/075_BossLast2/Actor/ActorUnkMRD2.cpp: .text start:0x021541e0 end:0x0215df24 .init start:0x02162488 end:0x02162594 .ctor start:0x02162690 end:0x02162694 - .bss start:0x02163544 end:0x02163588 + .bss start:0x02163528 end:0x02163588 src/075_BossLast2/Actor/ActorUnkMRDL.cpp: .text start:0x0215df24 end:0x0215e284 .init start:0x02162594 end:0x021625e4 .ctor start:0x02162694 end:0x02162698 - .bss start:0x02163598 end:0x021635d4 + .bss start:0x02163588 end:0x021635dc src/075_BossLast2/Actor/ActorUnkMABL.cpp: .text start:0x0215e284 end:0x0216074c .init start:0x021625e4 end:0x0216268c .ctor start:0x02162698 end:0x0216269c - .bss start:0x021635f4 end:0x021636e0 + .bss start:0x021635dc end:0x021636e0 diff --git a/config/eur/arm9/overlays/ov075/symbols.txt b/config/eur/arm9/overlays/ov075/symbols.txt index 720217dd..e171e3b7 100644 --- a/config/eur/arm9/overlays/ov075/symbols.txt +++ b/config/eur/arm9/overlays/ov075/symbols.txt @@ -395,20 +395,20 @@ data_ov075_021632fc kind:data(any) addr:0x021632fc data_ov075_02163328 kind:data(any) addr:0x02163328 data_ov075_02163340 kind:bss addr:0x02163340 data_ov075_02163344 kind:bss addr:0x02163344 -data_ov075_0216334c kind:bss addr:0x0216334c -data_ov075_02163358 kind:bss addr:0x02163358 -sActorProfileUnkMRDA kind:bss addr:0x02163364 -sActorProfileUnkMRDO kind:bss addr:0x0216343c +_ZGVN15ProfileInstanceI19ActorProfileUnkMRDAE8sProfileE kind:bss addr:0x0216334c +@13405 kind:bss addr:0x02163358 +_ZN15ProfileInstanceI19ActorProfileUnkMRDAE8sProfileE kind:bss addr:0x02163364 +_ZN15ProfileInstanceI19ActorProfileUnkMRDOE8sProfileE kind:bss addr:0x0216343c data_ov075_02163514 kind:bss addr:0x02163514 data_ov075_02163518 kind:bss addr:0x02163518 data_ov075_0216351c kind:bss addr:0x0216351c -data_ov075_02163528 kind:bss addr:0x02163528 -data_ov075_02163534 kind:bss addr:0x02163534 -sActorProfileUnkMRD2 kind:bss addr:0x02163544 -data_ov075_02163588 kind:bss addr:0x02163588 -data_ov075_0216358c kind:bss addr:0x0216358c -sActorProfileUnkMRDL kind:bss addr:0x02163598 +_ZGVN15ProfileInstanceI19ActorProfileUnkMRD2E8sProfileE kind:bss addr:0x02163528 +@13411 kind:bss addr:0x02163534 +_ZN15ProfileInstanceI19ActorProfileUnkMRD2E8sProfileE kind:bss addr:0x02163544 +_ZGVN15ProfileInstanceI19ActorProfileUnkMRDLE8sProfileE kind:bss addr:0x02163588 +@13417 kind:bss addr:0x0216358c +_ZN15ProfileInstanceI19ActorProfileUnkMRDLE8sProfileE kind:bss addr:0x02163598 data_ov075_021635d4 kind:bss addr:0x021635d4 -data_ov075_021635dc kind:bss addr:0x021635dc -data_ov075_021635e8 kind:bss addr:0x021635e8 -sActorProfileUnkMABL kind:bss addr:0x021635f4 +_ZGVN15ProfileInstanceI19ActorProfileUnkMABLE8sProfileE kind:bss addr:0x021635dc +@13423 kind:bss addr:0x021635e8 +_ZN15ProfileInstanceI19ActorProfileUnkMABLE8sProfileE kind:bss addr:0x021635f4 diff --git a/config/eur/arm9/overlays/ov076/delinks.txt b/config/eur/arm9/overlays/ov076/delinks.txt index 727da12c..00943781 100644 --- a/config/eur/arm9/overlays/ov076/delinks.txt +++ b/config/eur/arm9/overlays/ov076/delinks.txt @@ -9,4 +9,4 @@ src/076_DgnLv1/Actor/ActorUnkBGOK.cpp: .text start:0x02150c00 end:0x02152ac0 .init start:0x02152ae0 end:0x02152b30 .ctor start:0x02152b30 end:0x02152b34 - .bss start:0x02152db0 end:0x02152ea0 + .bss start:0x02152da0 end:0x02152ea0 diff --git a/config/eur/arm9/overlays/ov076/symbols.txt b/config/eur/arm9/overlays/ov076/symbols.txt index 981497d7..8bdb6564 100644 --- a/config/eur/arm9/overlays/ov076/symbols.txt +++ b/config/eur/arm9/overlays/ov076/symbols.txt @@ -74,6 +74,6 @@ data_ov076_02152d0c kind:data(any) addr:0x02152d0c data_ov076_02152d24 kind:data(any) addr:0x02152d24 _ZTV19data_ov076_02152d3c kind:data(any) addr:0x02152d3c _ZTV19data_ov076_02152d5c kind:data(any) addr:0x02152d5c ambiguous -data_ov076_02152da0 kind:bss addr:0x02152da0 -data_ov076_02152da4 kind:bss addr:0x02152da4 -sActorProfileUnkBGOK kind:bss addr:0x02152db0 +_ZGVN15ProfileInstanceI19ActorProfileUnkBGOKE8sProfileE kind:bss addr:0x02152da0 +@13435 kind:bss addr:0x02152da4 +_ZN15ProfileInstanceI19ActorProfileUnkBGOKE8sProfileE kind:bss addr:0x02152db0 diff --git a/config/eur/arm9/overlays/ov077/delinks.txt b/config/eur/arm9/overlays/ov077/delinks.txt index 96f45724..9d49656c 100644 --- a/config/eur/arm9/overlays/ov077/delinks.txt +++ b/config/eur/arm9/overlays/ov077/delinks.txt @@ -9,52 +9,52 @@ src/077_DgnForest/Actor/ActorUnkASYU.cpp: .text start:0x02152f08 end:0x02156f7c .init start:0x0215b120 end:0x0215b184 .ctor start:0x0215b404 end:0x0215b408 - .bss start:0x0215bd98 end:0x0215bda0 + .bss start:0x0215bd84 end:0x0215be70 src/077_DgnForest/Actor/ActorUnkASBA.cpp: .text start:0x02156f7c end:0x02157ad4 .init start:0x0215b184 end:0x0215b1d4 .ctor start:0x0215b408 end:0x0215b40c - .bss start:0x0215be80 end:0x0215bec4 + .bss start:0x0215be70 end:0x0215bec4 src/077_DgnForest/Actor/ActorUnkBBLE.cpp: .text start:0x02157ad4 end:0x02158b78 .init start:0x0215b1d4 end:0x0215b224 .ctor start:0x0215b40c end:0x0215b410 - .bss start:0x0215bed4 end:0x0215bf10 + .bss start:0x0215bec4 end:0x0215bfac src/077_DgnForest/Actor/ActorUnkDSFR.cpp: .text start:0x02158b78 end:0x02158c9c .init start:0x0215b224 end:0x0215b274 .ctor start:0x0215b410 end:0x0215b414 - .bss start:0x0215bfbc end:0x0215c01c + .bss start:0x0215bfac end:0x0215c094 src/077_DgnForest/Actor/ActorUnkGOKI.cpp: .text start:0x02158c9c end:0x02159d0c .init start:0x0215b274 end:0x0215b2c4 .ctor start:0x0215b414 end:0x0215b418 - .bss start:0x0215c0a4 end:0x0215c140 + .bss start:0x0215c094 end:0x0215c17c src/077_DgnForest/Actor/ActorUnkPMST.cpp: .text start:0x02159d0c end:0x0215aacc .init start:0x0215b2c4 end:0x0215b314 .ctor start:0x0215b418 end:0x0215b41c - .bss start:0x0215c190 end:0x0215c198 + .bss start:0x0215c17c end:0x0215c268 src/077_DgnForest/Actor/ActorUnkOFSW.cpp: .text start:0x0215aacc end:0x0215ac1c .init start:0x0215b314 end:0x0215b364 .ctor start:0x0215b41c end:0x0215b420 - .bss start:0x0215c278 end:0x0215c298 + .bss start:0x0215c268 end:0x0215c2b4 src/077_DgnForest/MapObject/MapObjectUnkPLFR.cpp: .text start:0x0215ac1c end:0x0215ae50 .init start:0x0215b364 end:0x0215b3b4 .ctor start:0x0215b420 end:0x0215b424 - .bss start:0x0215c2c4 end:0x0215c320 + .bss start:0x0215c2b4 end:0x0215c3bc src/077_DgnForest/MapObject/MapObjectUnkGTRK.cpp: .text start:0x0215ae50 end:0x0215b0a4 .init start:0x0215b3b4 end:0x0215b404 .ctor start:0x0215b424 end:0x0215b428 - .bss start:0x0215c3cc end:0x0215c4a0 + .bss start:0x0215c3bc end:0x0215c4a0 diff --git a/config/eur/arm9/overlays/ov077/symbols.txt b/config/eur/arm9/overlays/ov077/symbols.txt index ecf024c1..19f6ddb2 100644 --- a/config/eur/arm9/overlays/ov077/symbols.txt +++ b/config/eur/arm9/overlays/ov077/symbols.txt @@ -312,44 +312,44 @@ data_ov077_0215bd18 kind:data(any) addr:0x0215bd18 data_ov077_0215bd34 kind:data(any) addr:0x0215bd34 data_ov077_0215bd40 kind:data(any) addr:0x0215bd40 ambiguous data_ov077_0215bd80 kind:bss addr:0x0215bd80 -data_ov077_0215bd84 kind:bss addr:0x0215bd84 -data_ov077_0215bd8c kind:bss addr:0x0215bd8c -sActorProfileUnkASYU kind:bss addr:0x0215bd98 +_ZGVN15ProfileInstanceI19ActorProfileUnkASYUE8sProfileE kind:bss addr:0x0215bd84 +@13447 kind:bss addr:0x0215bd8c +_ZN15ProfileInstanceI19ActorProfileUnkASYUE8sProfileE kind:bss addr:0x0215bd98 data_ov077_0215bda0 kind:bss addr:0x0215bda0 ambiguous -data_ov077_0215be70 kind:bss addr:0x0215be70 -data_ov077_0215be74 kind:bss addr:0x0215be74 -sActorProfileUnkASBA kind:bss addr:0x0215be80 -data_ov077_0215bec4 kind:bss addr:0x0215bec4 -data_ov077_0215bec8 kind:bss addr:0x0215bec8 -sActorProfileUnkBBLE kind:bss addr:0x0215bed4 +_ZGVN15ProfileInstanceI19ActorProfileUnkASBAE8sProfileE kind:bss addr:0x0215be70 +@13453 kind:bss addr:0x0215be74 +_ZN15ProfileInstanceI19ActorProfileUnkASBAE8sProfileE kind:bss addr:0x0215be80 +_ZGVN15ProfileInstanceI19ActorProfileUnkBBLEE8sProfileE kind:bss addr:0x0215bec4 +@13459 kind:bss addr:0x0215bec8 +_ZN15ProfileInstanceI19ActorProfileUnkBBLEE8sProfileE kind:bss addr:0x0215bed4 data_ov077_0215bf10 kind:bss addr:0x0215bf10 data_ov077_0215bf40 kind:bss addr:0x0215bf40 ambiguous data_ov077_0215bf6c kind:bss addr:0x0215bf6c ambiguous data_ov077_0215bf90 kind:bss addr:0x0215bf90 ambiguous -data_ov077_0215bfac kind:bss addr:0x0215bfac -data_ov077_0215bfb0 kind:bss addr:0x0215bfb0 -sActorProfileUnkDSFR kind:bss addr:0x0215bfbc +_ZGVN15ProfileInstanceI19ActorProfileUnkDSFRE8sProfileE kind:bss addr:0x0215bfac +@13465 kind:bss addr:0x0215bfb0 +_ZN15ProfileInstanceI19ActorProfileUnkDSFRE8sProfileE kind:bss addr:0x0215bfbc data_ov077_0215c01c kind:bss addr:0x0215c01c ambiguous data_ov077_0215c068 kind:bss addr:0x0215c068 ambiguous -data_ov077_0215c094 kind:bss addr:0x0215c094 -data_ov077_0215c098 kind:bss addr:0x0215c098 -sActorProfileUnkGOKI kind:bss addr:0x0215c0a4 +_ZGVN15ProfileInstanceI19ActorProfileUnkGOKIE8sProfileE kind:bss addr:0x0215c094 +@13471 kind:bss addr:0x0215c098 +_ZN15ProfileInstanceI19ActorProfileUnkGOKIE8sProfileE kind:bss addr:0x0215c0a4 data_ov077_0215c140 kind:bss addr:0x0215c140 ambiguous -data_ov077_0215c17c kind:bss addr:0x0215c17c -data_ov077_0215c184 kind:bss addr:0x0215c184 -sActorProfileUnkPMST kind:bss addr:0x0215c190 +_ZGVN15ProfileInstanceI19ActorProfileUnkPMSTE8sProfileE kind:bss addr:0x0215c17c +@13477 kind:bss addr:0x0215c184 +_ZN15ProfileInstanceI19ActorProfileUnkPMSTE8sProfileE kind:bss addr:0x0215c190 data_ov077_0215c198 kind:bss addr:0x0215c198 ambiguous data_ov077_0215c1d8 kind:bss addr:0x0215c1d8 ambiguous -data_ov077_0215c268 kind:bss addr:0x0215c268 -data_ov077_0215c26c kind:bss addr:0x0215c26c -sActorProfileUnkOFSW kind:bss addr:0x0215c278 +_ZGVN15ProfileInstanceI19ActorProfileUnkOFSWE8sProfileE kind:bss addr:0x0215c268 +@13483 kind:bss addr:0x0215c26c +_ZN15ProfileInstanceI19ActorProfileUnkOFSWE8sProfileE kind:bss addr:0x0215c278 data_ov077_0215c298 kind:bss addr:0x0215c298 ambiguous -data_ov077_0215c2b4 kind:bss addr:0x0215c2b4 -data_ov077_0215c2b8 kind:bss addr:0x0215c2b8 -sMapObjectProfileUnkPLFR kind:bss addr:0x0215c2c4 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkPLFRE8sProfileE kind:bss addr:0x0215c2b4 +@12956 kind:bss addr:0x0215c2b8 +_ZN15ProfileInstanceI23MapObjectProfileUnkPLFRE8sProfileE kind:bss addr:0x0215c2c4 data_ov077_0215c320 kind:bss addr:0x0215c320 ambiguous data_ov077_0215c33c kind:bss addr:0x0215c33c ambiguous data_ov077_0215c398 kind:bss addr:0x0215c398 -data_ov077_0215c3bc kind:bss addr:0x0215c3bc -data_ov077_0215c3c0 kind:bss addr:0x0215c3c0 -sMapObjectProfileUnkGTRK kind:bss addr:0x0215c3cc +_ZGVN15ProfileInstanceI23MapObjectProfileUnkGTRKE8sProfileE kind:bss addr:0x0215c3bc +@12962 kind:bss addr:0x0215c3c0 +_ZN15ProfileInstanceI23MapObjectProfileUnkGTRKE8sProfileE kind:bss addr:0x0215c3cc diff --git a/config/eur/arm9/overlays/ov078/delinks.txt b/config/eur/arm9/overlays/ov078/delinks.txt index c091e2b8..dfd8263c 100644 --- a/config/eur/arm9/overlays/ov078/delinks.txt +++ b/config/eur/arm9/overlays/ov078/delinks.txt @@ -9,13 +9,13 @@ src/078_BossForest/Actor/ActorUnkFRBS.cpp: .text start:0x02152ea0 end:0x0215ccb4 .init start:0x0215d40c end:0x0215d4b0 .ctor start:0x0215d550 end:0x0215d554 - .bss start:0x0215dce4 end:0x0215ddbc + .bss start:0x0215dca8 end:0x0215ddbc src/078_BossForest/Actor/ActorUnkRBFR.cpp: .text start:0x0215ccb4 end:0x0215cfc8 .init start:0x0215d4b0 end:0x0215d500 .ctor start:0x0215d554 end:0x0215d558 - .bss start:0x0215ddcc end:0x0215dea4 + .bss start:0x0215ddbc end:0x0215dea4 src/078_BossForest/MapObject/MapObjectUnkSTSF.cpp: .text start:0x0215cfc8 end:0x0215d1c0 diff --git a/config/eur/arm9/overlays/ov078/symbols.txt b/config/eur/arm9/overlays/ov078/symbols.txt index 5fb06044..dda7f902 100644 --- a/config/eur/arm9/overlays/ov078/symbols.txt +++ b/config/eur/arm9/overlays/ov078/symbols.txt @@ -219,12 +219,12 @@ data_ov078_0215dc80 kind:bss addr:0x0215dc80 data_ov078_0215dc90 kind:bss addr:0x0215dc90 data_ov078_0215dc9c kind:bss addr:0x0215dc9c data_ov078_0215dca4 kind:bss addr:0x0215dca4 ambiguous -data_ov078_0215dca8 kind:bss addr:0x0215dca8 -data_ov078_0215dcb4 kind:bss addr:0x0215dcb4 -sActorProfileUnkFRBS kind:bss addr:0x0215dce4 -data_ov078_0215ddbc kind:bss addr:0x0215ddbc -data_ov078_0215ddc0 kind:bss addr:0x0215ddc0 -sActorProfileUnkRBFR kind:bss addr:0x0215ddcc +_ZGVN15ProfileInstanceI19ActorProfileUnkFRBSE8sProfileE kind:bss addr:0x0215dca8 +@13507 kind:bss addr:0x0215dcb4 +_ZN15ProfileInstanceI19ActorProfileUnkFRBSE8sProfileE kind:bss addr:0x0215dce4 +_ZGVN15ProfileInstanceI19ActorProfileUnkRBFRE8sProfileE kind:bss addr:0x0215ddbc +@13513 kind:bss addr:0x0215ddc0 +_ZN15ProfileInstanceI19ActorProfileUnkRBFRE8sProfileE kind:bss addr:0x0215ddcc data_ov078_0215dea4 kind:bss addr:0x0215dea4 data_ov078_0215dea8 kind:bss addr:0x0215dea8 -sMapObjectProfileUnkSTSF kind:bss addr:0x0215deb4 +_ZN15ProfileInstanceI23MapObjectProfileUnkSTSFE8sProfileE kind:bss addr:0x0215deb4 diff --git a/config/eur/arm9/overlays/ov079/delinks.txt b/config/eur/arm9/overlays/ov079/delinks.txt index 80249d58..8a566173 100644 --- a/config/eur/arm9/overlays/ov079/delinks.txt +++ b/config/eur/arm9/overlays/ov079/delinks.txt @@ -9,58 +9,58 @@ src/079_DgnSnow/Actor/ActorUnkPSBL.cpp: .text start:0x02150c00 end:0x02152b54 .init start:0x02157284 end:0x021572e0 .ctor start:0x02157610 end:0x02157614 - .bss start:0x02157d98 end:0x02157e70 + .bss start:0x02157d80 end:0x02157e70 src/079_DgnSnow/Actor/ActorUnkSSFC.cpp: .text start:0x02152b54 end:0x02152f68 .init start:0x021572e0 end:0x02157330 .ctor start:0x02157614 end:0x02157618 - .bss start:0x02157e80 end:0x02157e98 + .bss start:0x02157e70 end:0x02157ebc src/079_DgnSnow/Actor/ActorUnkOCTW.cpp: .text start:0x02152f68 end:0x021550d8 .init start:0x02157330 end:0x021573bc .ctor start:0x02157618 end:0x0215761c - .bss start:0x02157ecc end:0x02157f28 + .bss start:0x02157ebc end:0x02157fa4 src/079_DgnSnow/Actor/ActorUnkOCWS.cpp: .text start:0x021550d8 end:0x0215596c .init start:0x021573bc end:0x02157430 .ctor start:0x0215761c end:0x02157620 - .bss start:0x02157fb4 end:0x02157fc4 + .bss start:0x02157fa4 end:0x0215808c src/079_DgnSnow/Actor/ActorUnkDSSN.cpp: .text start:0x0215596c end:0x02155a90 .init start:0x02157430 end:0x02157480 .ctor start:0x02157620 end:0x02157624 - .bss start:0x0215809c end:0x021580a4 + .bss start:0x0215808c end:0x02158174 src/079_DgnSnow/MapObject/MapObjectUnkICGR.cpp: .text start:0x02155a90 end:0x021565d8 .init start:0x02157480 end:0x021574d0 .ctor start:0x02157624 end:0x02157628 - .bss start:0x02158184 end:0x02158234 + .bss start:0x02158174 end:0x0215827c src/079_DgnSnow/MapObject/MapObjectUnkBLHL.cpp: .text start:0x021565d8 end:0x021568d8 .init start:0x021574d0 end:0x02157520 .ctor start:0x02157628 end:0x0215762c - .bss start:0x0215828c end:0x02158358 + .bss start:0x0215827c end:0x02158384 src/079_DgnSnow/MapObject/MapObjectUnkDRSN.cpp: .text start:0x021568d8 end:0x02156ce0 .init start:0x02157520 end:0x02157570 .ctor start:0x0215762c end:0x02157630 - .bss start:0x02158394 end:0x021583b4 + .bss start:0x02158384 end:0x02158468 src/079_DgnSnow/MapObject/MapObjectUnkGTSN.cpp: .text start:0x02156d00 end:0x02156fbc .init start:0x02157570 end:0x021575c0 .ctor start:0x02157630 end:0x02157634 - .bss start:0x02158478 end:0x0215847c + .bss start:0x02158468 end:0x0215854c src/079_DgnSnow/MapObject/MapObjectUnkFSSV.cpp: .text start:0x02156fbc end:0x021571e4 .init start:0x021575c0 end:0x02157610 .ctor start:0x02157634 end:0x02157638 - .bss start:0x0215855c end:0x02158640 + .bss start:0x0215854c end:0x02158640 diff --git a/config/eur/arm9/overlays/ov079/symbols.txt b/config/eur/arm9/overlays/ov079/symbols.txt index eb235a4d..2811c235 100644 --- a/config/eur/arm9/overlays/ov079/symbols.txt +++ b/config/eur/arm9/overlays/ov079/symbols.txt @@ -268,53 +268,53 @@ data_ov079_02157cc8 kind:data(any) addr:0x02157cc8 data_ov079_02157ce4 kind:data(any) addr:0x02157ce4 data_ov079_02157d24 kind:data(any) addr:0x02157d24 data_ov079_02157d40 kind:data(any) addr:0x02157d40 -data_ov079_02157d80 kind:bss addr:0x02157d80 -data_ov079_02157d8c kind:bss addr:0x02157d8c -sActorProfileUnkPSBL kind:bss addr:0x02157d98 -data_ov079_02157e70 kind:bss addr:0x02157e70 -data_ov079_02157e74 kind:bss addr:0x02157e74 -sActorProfileUnkSSFC kind:bss addr:0x02157e80 +_ZGVN15ProfileInstanceI19ActorProfileUnkPSBLE8sProfileE kind:bss addr:0x02157d80 +@13530 kind:bss addr:0x02157d8c +_ZN15ProfileInstanceI19ActorProfileUnkPSBLE8sProfileE kind:bss addr:0x02157d98 +_ZGVN15ProfileInstanceI19ActorProfileUnkSSFCE8sProfileE kind:bss addr:0x02157e70 +@13536 kind:bss addr:0x02157e74 +_ZN15ProfileInstanceI19ActorProfileUnkSSFCE8sProfileE kind:bss addr:0x02157e80 data_ov079_02157e98 kind:bss addr:0x02157e98 ambiguous data_ov079_02157ea0 kind:bss addr:0x02157ea0 ambiguous -data_ov079_02157ebc kind:bss addr:0x02157ebc -data_ov079_02157ec0 kind:bss addr:0x02157ec0 -sActorProfileUnkOCTW kind:bss addr:0x02157ecc +_ZGVN15ProfileInstanceI19ActorProfileUnkOCTWE8sProfileE kind:bss addr:0x02157ebc +@13542 kind:bss addr:0x02157ec0 +_ZN15ProfileInstanceI19ActorProfileUnkOCTWE8sProfileE kind:bss addr:0x02157ecc data_ov079_02157f28 kind:bss addr:0x02157f28 ambiguous data_ov079_02157f54 kind:bss addr:0x02157f54 ambiguous data_ov079_02157fa0 kind:bss addr:0x02157fa0 ambiguous -data_ov079_02157fa4 kind:bss addr:0x02157fa4 -data_ov079_02157fa8 kind:bss addr:0x02157fa8 -sActorProfileUnkOCWS kind:bss addr:0x02157fb4 +_ZGVN15ProfileInstanceI19ActorProfileUnkOCWSE8sProfileE kind:bss addr:0x02157fa4 +@13548 kind:bss addr:0x02157fa8 +_ZN15ProfileInstanceI19ActorProfileUnkOCWSE8sProfileE kind:bss addr:0x02157fb4 data_ov079_02157fc4 kind:bss addr:0x02157fc4 ambiguous data_ov079_02157ff4 kind:bss addr:0x02157ff4 ambiguous data_ov079_02158004 kind:bss addr:0x02158004 ambiguous data_ov079_02158050 kind:bss addr:0x02158050 ambiguous data_ov079_02158070 kind:bss addr:0x02158070 ambiguous -data_ov079_0215808c kind:bss addr:0x0215808c -data_ov079_02158090 kind:bss addr:0x02158090 -sActorProfileUnkDSSN kind:bss addr:0x0215809c +_ZGVN15ProfileInstanceI19ActorProfileUnkDSSNE8sProfileE kind:bss addr:0x0215808c +@13554 kind:bss addr:0x02158090 +_ZN15ProfileInstanceI19ActorProfileUnkDSSNE8sProfileE kind:bss addr:0x0215809c data_ov079_021580a4 kind:bss addr:0x021580a4 ambiguous data_ov079_021580f4 kind:bss addr:0x021580f4 ambiguous data_ov079_02158118 kind:bss addr:0x02158118 ambiguous -data_ov079_02158174 kind:bss addr:0x02158174 -data_ov079_02158178 kind:bss addr:0x02158178 -sMapObjectProfileUnkICGR kind:bss addr:0x02158184 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkICGRE8sProfileE kind:bss addr:0x02158174 +@13027 kind:bss addr:0x02158178 +_ZN15ProfileInstanceI23MapObjectProfileUnkICGRE8sProfileE kind:bss addr:0x02158184 data_ov079_02158234 kind:bss addr:0x02158234 ambiguous data_ov079_0215823c kind:bss addr:0x0215823c ambiguous data_ov079_02158258 kind:bss addr:0x02158258 -data_ov079_0215827c kind:bss addr:0x0215827c -data_ov079_02158280 kind:bss addr:0x02158280 -sMapObjectProfileUnkBLHL kind:bss addr:0x0215828c +_ZGVN15ProfileInstanceI23MapObjectProfileUnkBLHLE8sProfileE kind:bss addr:0x0215827c +@13033 kind:bss addr:0x02158280 +_ZN15ProfileInstanceI23MapObjectProfileUnkBLHLE8sProfileE kind:bss addr:0x0215828c data_ov079_02158358 kind:bss addr:0x02158358 ambiguous data_ov079_02158360 kind:bss addr:0x02158360 -data_ov079_02158384 kind:bss addr:0x02158384 -data_ov079_02158388 kind:bss addr:0x02158388 -sMapObjectProfileUnkDRSN kind:bss addr:0x02158394 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkDRSNE8sProfileE kind:bss addr:0x02158384 +@13039 kind:bss addr:0x02158388 +_ZN15ProfileInstanceI23MapObjectProfileUnkDRSNE8sProfileE kind:bss addr:0x02158394 data_ov079_021583b4 kind:bss addr:0x021583b4 -data_ov079_02158468 kind:bss addr:0x02158468 -data_ov079_0215846c kind:bss addr:0x0215846c -sMapObjectProfileUnkGTSN kind:bss addr:0x02158478 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkGTSNE8sProfileE kind:bss addr:0x02158468 +@13045 kind:bss addr:0x0215846c +_ZN15ProfileInstanceI23MapObjectProfileUnkGTSNE8sProfileE kind:bss addr:0x02158478 data_ov079_0215847c kind:bss addr:0x0215847c ambiguous -data_ov079_0215854c kind:bss addr:0x0215854c -data_ov079_02158550 kind:bss addr:0x02158550 -sMapObjectProfileUnkFSSV kind:bss addr:0x0215855c +_ZGVN15ProfileInstanceI23MapObjectProfileUnkFSSVE8sProfileE kind:bss addr:0x0215854c +@13051 kind:bss addr:0x02158550 +_ZN15ProfileInstanceI23MapObjectProfileUnkFSSVE8sProfileE kind:bss addr:0x0215855c diff --git a/config/eur/arm9/overlays/ov080/delinks.txt b/config/eur/arm9/overlays/ov080/delinks.txt index 78900ff4..09942ed6 100644 --- a/config/eur/arm9/overlays/ov080/delinks.txt +++ b/config/eur/arm9/overlays/ov080/delinks.txt @@ -9,19 +9,19 @@ src/080_BossSnow/Actor/ActorUnkICBS.cpp: .text start:0x02150c38 end:0x0215c824 .init start:0x0215ed48 end:0x0215f2ac .ctor start:0x0215f3c0 end:0x0215f3c4 - .bss start:0x0215fe3c end:0x0215fe40 + .bss start:0x0215fe24 end:0x021600c4 src/080_BossSnow/Actor/ActorUnkICBA.cpp: .text start:0x0215c824 end:0x0215e504 .init start:0x0215f2ac end:0x0215f320 .ctor start:0x0215f3c4 end:0x0215f3c8 - .bss start:0x021600d4 end:0x02160118 + .bss start:0x021600c4 end:0x021601cc src/080_BossSnow/MapObject/MapObjectUnkSTSS.cpp: .text start:0x0215e740 end:0x0215e9e0 .init start:0x0215f320 end:0x0215f370 .ctor start:0x0215f3c8 end:0x0215f3cc - .bss start:0x021601dc end:0x02160244 + .bss start:0x021601cc end:0x02160244 src/080_BossSnow/Actor/ActorUnkRBSN.cpp: .text start:0x0215ea0c end:0x0215ec94 diff --git a/config/eur/arm9/overlays/ov080/symbols.txt b/config/eur/arm9/overlays/ov080/symbols.txt index f4eedf49..fe7cd565 100644 --- a/config/eur/arm9/overlays/ov080/symbols.txt +++ b/config/eur/arm9/overlays/ov080/symbols.txt @@ -337,20 +337,20 @@ data_ov080_0215fd70 kind:data(any) addr:0x0215fd70 data_ov080_0215fd94 kind:data(any) addr:0x0215fd94 ambiguous _ZTV19data_ov080_0215fdb0 kind:data(any) addr:0x0215fdb0 data_ov080_0215fe20 kind:bss addr:0x0215fe20 -data_ov080_0215fe24 kind:bss addr:0x0215fe24 -data_ov080_0215fe30 kind:bss addr:0x0215fe30 -sActorProfileUnkICBS kind:bss addr:0x0215fe3c +_ZGVN15ProfileInstanceI19ActorProfileUnkICBSE8sProfileE kind:bss addr:0x0215fe24 +@13596 kind:bss addr:0x0215fe30 +_ZN15ProfileInstanceI19ActorProfileUnkICBSE8sProfileE kind:bss addr:0x0215fe3c data_ov080_0215fe40 kind:bss addr:0x0215fe40 data_ov080_0215ff14 kind:bss addr:0x0215ff14 -data_ov080_021600c4 kind:bss addr:0x021600c4 -data_ov080_021600c8 kind:bss addr:0x021600c8 -sActorProfileUnkICBA kind:bss addr:0x021600d4 +_ZGVN15ProfileInstanceI19ActorProfileUnkICBAE8sProfileE kind:bss addr:0x021600c4 +@13602 kind:bss addr:0x021600c8 +_ZN15ProfileInstanceI19ActorProfileUnkICBAE8sProfileE kind:bss addr:0x021600d4 data_ov080_02160118 kind:bss addr:0x02160118 ambiguous data_ov080_02160134 kind:bss addr:0x02160134 ambiguous data_ov080_021601ac kind:bss addr:0x021601ac -data_ov080_021601cc kind:bss addr:0x021601cc -data_ov080_021601d0 kind:bss addr:0x021601d0 -sMapObjectProfileUnkSTSS kind:bss addr:0x021601dc +_ZGVN15ProfileInstanceI23MapObjectProfileUnkSTSSE8sProfileE kind:bss addr:0x021601cc +@13075 kind:bss addr:0x021601d0 +_ZN15ProfileInstanceI23MapObjectProfileUnkSTSSE8sProfileE kind:bss addr:0x021601dc data_ov080_02160244 kind:bss addr:0x02160244 data_ov080_02160248 kind:bss addr:0x02160248 -sActorProfileUnkRBSN kind:bss addr:0x02160254 +_ZN15ProfileInstanceI19ActorProfileUnkRBSNE8sProfileE kind:bss addr:0x02160254 diff --git a/config/eur/arm9/overlays/ov081/delinks.txt b/config/eur/arm9/overlays/ov081/delinks.txt index bd6b06c0..0d4f95da 100644 --- a/config/eur/arm9/overlays/ov081/delinks.txt +++ b/config/eur/arm9/overlays/ov081/delinks.txt @@ -9,16 +9,16 @@ src/081_DgnLv3/Actor/ActorUnkPRPL.cpp: .text start:0x02150c00 end:0x02151a60 .init start:0x0215271c end:0x0215276c .ctor start:0x02152838 end:0x0215283c - .bss start:0x02152b10 end:0x02152b4c + .bss start:0x02152b00 end:0x02152b50 src/081_DgnLv3/Actor/ActorUnkPRPP.cpp: .text start:0x02151a60 end:0x02152018 .init start:0x0215276c end:0x021527bc .ctor start:0x0215283c end:0x02152840 - .bss start:0x02152b5c end:0x02152b98 + .bss start:0x02152b50 end:0x02152b98 src/081_DgnLv3/MapObject/MapObjectUnkPRSH.cpp: .text start:0x02152018 end:0x021526cc .init start:0x021527bc end:0x02152838 .ctor start:0x02152840 end:0x02152844 - .bss start:0x02152ba8 end:0x02152c7c + .bss start:0x02152b98 end:0x02152c7c diff --git a/config/eur/arm9/overlays/ov081/symbols.txt b/config/eur/arm9/overlays/ov081/symbols.txt index 20f6a901..6b1c19ee 100644 --- a/config/eur/arm9/overlays/ov081/symbols.txt +++ b/config/eur/arm9/overlays/ov081/symbols.txt @@ -109,14 +109,14 @@ data_ov081_02152a58 kind:data(any) addr:0x02152a58 data_ov081_02152a74 kind:data(any) addr:0x02152a74 data_ov081_02152a9c kind:data(any) addr:0x02152a9c data_ov081_02152ac8 kind:data(any) addr:0x02152ac8 -data_ov081_02152b00 kind:bss addr:0x02152b00 -data_ov081_02152b04 kind:bss addr:0x02152b04 -sActorProfileUnkPRPL kind:bss addr:0x02152b10 +_ZGVN15ProfileInstanceI19ActorProfileUnkPRPLE8sProfileE kind:bss addr:0x02152b00 +@13625 kind:bss addr:0x02152b04 +_ZN15ProfileInstanceI19ActorProfileUnkPRPLE8sProfileE kind:bss addr:0x02152b10 data_ov081_02152b4c kind:bss addr:0x02152b4c -data_ov081_02152b50 kind:bss addr:0x02152b50 -data_ov081_02152b54 kind:bss addr:0x02152b54 ambiguous -sActorProfileUnkPRPP kind:bss addr:0x02152b5c -data_ov081_02152b98 kind:bss addr:0x02152b98 -data_ov081_02152b9c kind:bss addr:0x02152b9c -sMapObjectProfileUnkPRSH kind:bss addr:0x02152ba8 +_ZGVN15ProfileInstanceI19ActorProfileUnkPRPPE8sProfileE kind:bss addr:0x02152b50 +@13631 kind:bss addr:0x02152b54 ambiguous +_ZN15ProfileInstanceI19ActorProfileUnkPRPPE8sProfileE kind:bss addr:0x02152b5c +_ZGVN15ProfileInstanceI23MapObjectProfileUnkPRSHE8sProfileE kind:bss addr:0x02152b98 +@13104 kind:bss addr:0x02152b9c +_ZN15ProfileInstanceI23MapObjectProfileUnkPRSHE8sProfileE kind:bss addr:0x02152ba8 data_ov081_02152c7c kind:bss addr:0x02152c7c diff --git a/config/eur/arm9/overlays/ov082/delinks.txt b/config/eur/arm9/overlays/ov082/delinks.txt index c430efa2..6b1eb5b0 100644 --- a/config/eur/arm9/overlays/ov082/delinks.txt +++ b/config/eur/arm9/overlays/ov082/delinks.txt @@ -9,16 +9,16 @@ src/082_DgnWater/Actor/ActorUnkWHMA.cpp: .text start:0x02152ca0 end:0x021576dc .init start:0x02158858 end:0x021588a8 .ctor start:0x02158948 end:0x0215894c - .bss start:0x02158e90 end:0x02158eac + .bss start:0x02158e80 end:0x02158f68 src/082_DgnWater/Actor/ActorUnkEWHI.cpp: .text start:0x021576dc end:0x02157a70 .init start:0x021588a8 end:0x021588f8 .ctor start:0x0215894c end:0x02158950 - .bss start:0x02158f78 end:0x02158fa4 + .bss start:0x02158f68 end:0x02158fb4 src/082_DgnWater/Actor/ActorUnkDSWT.cpp: .text start:0x02157a70 end:0x02157b94 .init start:0x021588f8 end:0x02158948 .ctor start:0x02158950 end:0x02158954 - .bss start:0x02158fc4 end:0x021590a0 + .bss start:0x02158fb4 end:0x021590a0 diff --git a/config/eur/arm9/overlays/ov082/symbols.txt b/config/eur/arm9/overlays/ov082/symbols.txt index d6058f89..835ff84b 100644 --- a/config/eur/arm9/overlays/ov082/symbols.txt +++ b/config/eur/arm9/overlays/ov082/symbols.txt @@ -169,15 +169,15 @@ data_ov082_02158dc8 kind:data(any) addr:0x02158dc8 ambiguous _ZTV19data_ov082_02158dcc kind:data(any) addr:0x02158dcc _ZTV19data_ov082_02158df0 kind:data(any) addr:0x02158df0 _ZTV19data_ov082_02158e50 kind:data(any) addr:0x02158e50 -data_ov082_02158e80 kind:bss addr:0x02158e80 -data_ov082_02158e84 kind:bss addr:0x02158e84 -sActorProfileUnkWHMA kind:bss addr:0x02158e90 +_ZGVN15ProfileInstanceI19ActorProfileUnkWHMAE8sProfileE kind:bss addr:0x02158e80 +@13649 kind:bss addr:0x02158e84 +_ZN15ProfileInstanceI19ActorProfileUnkWHMAE8sProfileE kind:bss addr:0x02158e90 data_ov082_02158eac kind:bss addr:0x02158eac ambiguous data_ov082_02158eb4 kind:bss addr:0x02158eb4 ambiguous -data_ov082_02158f68 kind:bss addr:0x02158f68 -data_ov082_02158f6c kind:bss addr:0x02158f6c -sActorProfileUnkEWHI kind:bss addr:0x02158f78 +_ZGVN15ProfileInstanceI19ActorProfileUnkEWHIE8sProfileE kind:bss addr:0x02158f68 +@13655 kind:bss addr:0x02158f6c +_ZN15ProfileInstanceI19ActorProfileUnkEWHIE8sProfileE kind:bss addr:0x02158f78 data_ov082_02158fa4 kind:bss addr:0x02158fa4 ambiguous -data_ov082_02158fb4 kind:bss addr:0x02158fb4 -data_ov082_02158fb8 kind:bss addr:0x02158fb8 -sActorProfileUnkDSWT kind:bss addr:0x02158fc4 +_ZGVN15ProfileInstanceI19ActorProfileUnkDSWTE8sProfileE kind:bss addr:0x02158fb4 +@13661 kind:bss addr:0x02158fb8 +_ZN15ProfileInstanceI19ActorProfileUnkDSWTE8sProfileE kind:bss addr:0x02158fc4 diff --git a/config/eur/arm9/overlays/ov083/delinks.txt b/config/eur/arm9/overlays/ov083/delinks.txt index 7685ac51..a8ae5cba 100644 --- a/config/eur/arm9/overlays/ov083/delinks.txt +++ b/config/eur/arm9/overlays/ov083/delinks.txt @@ -9,49 +9,49 @@ src/083_BossWater/Actor/ActorUnkWTBS.cpp: .text start:0x02152d64 end:0x0215a570 .init start:0x0215d354 end:0x0215d468 .ctor start:0x0215d79c end:0x0215d7a0 - .bss start:0x0215e378 end:0x0215e450 + .bss start:0x0215e364 end:0x0215e454 src/083_BossWater/Actor/ActorUnkWBPS.cpp: .text start:0x0215a570 end:0x0215b098 .init start:0x0215d468 end:0x0215d4f8 .ctor start:0x0215d7a0 end:0x0215d7a4 - .bss start:0x0215e46c end:0x0215e518 + .bss start:0x0215e454 end:0x0215e544 src/083_BossWater/Actor/ActorUnkWBEF.cpp: .text start:0x0215b098 end:0x0215b6ec .init start:0x0215d4f8 end:0x0215d548 .ctor start:0x0215d7a4 end:0x0215d7a8 - .bss start:0x0215e554 end:0x0215e608 + .bss start:0x0215e544 end:0x0215e62c src/083_BossWater/Actor/ActorUnkRBWT.cpp: .text start:0x0215b6ec end:0x0215c198 .init start:0x0215d548 end:0x0215d598 .ctor start:0x0215d7a8 end:0x0215d7ac - .bss start:0x0215e63c end:0x0215e658 + .bss start:0x0215e62c end:0x0215e72c src/083_BossWater/Actor/ActorUnkRBWS.cpp: .text start:0x0215c198 end:0x0215c320 .init start:0x0215d598 end:0x0215d5e8 .ctor start:0x0215d7ac end:0x0215d7b0 - .bss start:0x0215e738 end:0x0215e740 + .bss start:0x0215e72c end:0x0215e810 src/083_BossWater/Actor/ActorUnkNPWC.cpp: .text start:0x0215c320 end:0x0215c4b4 .init start:0x0215d5e8 end:0x0215d638 .ctor start:0x0215d7b0 end:0x0215d7b4 - .bss start:0x0215e820 end:0x0215e85c + .bss start:0x0215e810 end:0x0215e85c src/083_BossWater/Actor/ActorUnkEFR3.cpp: .text start:0x0215c4b4 end:0x0215c668 .init start:0x0215d638 end:0x0215d688 .ctor start:0x0215d7b4 end:0x0215d7b8 - .bss start:0x0215e86c end:0x0215e90c + .bss start:0x0215e85c end:0x0215e944 src/083_BossWater/Actor/ActorUnkEFW3.cpp: .text start:0x0215c668 end:0x0215c81c .init start:0x0215d688 end:0x0215d6d8 .ctor start:0x0215d7b8 end:0x0215d7bc - .bss start:0x0215e954 end:0x0215e974 + .bss start:0x0215e944 end:0x0215e974 src/083_BossWater/MapObject/MapObjectUnkSHWB.cpp: .text start:0x0215c81c end:0x0215cc8c diff --git a/config/eur/arm9/overlays/ov083/symbols.txt b/config/eur/arm9/overlays/ov083/symbols.txt index 755313b1..743c480b 100644 --- a/config/eur/arm9/overlays/ov083/symbols.txt +++ b/config/eur/arm9/overlays/ov083/symbols.txt @@ -345,41 +345,41 @@ data_ov083_0215e2b0 kind:data(any) addr:0x0215e2b0 data_ov083_0215e2cc kind:data(any) addr:0x0215e2cc data_ov083_0215e33c kind:data(any) addr:0x0215e33c data_ov083_0215e360 kind:bss addr:0x0215e360 -data_ov083_0215e364 kind:bss addr:0x0215e364 -data_ov083_0215e36c kind:bss addr:0x0215e36c -sActorProfileUnkWTBS kind:bss addr:0x0215e378 +_ZGVN15ProfileInstanceI19ActorProfileUnkWTBSE8sProfileE kind:bss addr:0x0215e364 +@13673 kind:bss addr:0x0215e36c +_ZN15ProfileInstanceI19ActorProfileUnkWTBSE8sProfileE kind:bss addr:0x0215e378 data_ov083_0215e450 kind:bss addr:0x0215e450 -data_ov083_0215e454 kind:bss addr:0x0215e454 -data_ov083_0215e460 kind:bss addr:0x0215e460 -sActorProfileUnkWBPS kind:bss addr:0x0215e46c +_ZGVN15ProfileInstanceI19ActorProfileUnkWBPSE8sProfileE kind:bss addr:0x0215e454 +@13679 kind:bss addr:0x0215e460 +_ZN15ProfileInstanceI19ActorProfileUnkWBPSE8sProfileE kind:bss addr:0x0215e46c data_ov083_0215e518 kind:bss addr:0x0215e518 ambiguous -data_ov083_0215e544 kind:bss addr:0x0215e544 -data_ov083_0215e548 kind:bss addr:0x0215e548 -sActorProfileUnkWBEF kind:bss addr:0x0215e554 +_ZGVN15ProfileInstanceI19ActorProfileUnkWBEFE8sProfileE kind:bss addr:0x0215e544 +@13685 kind:bss addr:0x0215e548 +_ZN15ProfileInstanceI19ActorProfileUnkWBEFE8sProfileE kind:bss addr:0x0215e554 data_ov083_0215e608 kind:bss addr:0x0215e608 ambiguous -data_ov083_0215e62c kind:bss addr:0x0215e62c -data_ov083_0215e630 kind:bss addr:0x0215e630 -sActorProfileUnkRBWT kind:bss addr:0x0215e63c +_ZGVN15ProfileInstanceI19ActorProfileUnkRBWTE8sProfileE kind:bss addr:0x0215e62c +@13691 kind:bss addr:0x0215e630 +_ZN15ProfileInstanceI19ActorProfileUnkRBWTE8sProfileE kind:bss addr:0x0215e63c data_ov083_0215e658 kind:bss addr:0x0215e658 ambiguous data_ov083_0215e688 kind:bss addr:0x0215e688 ambiguous data_ov083_0215e714 kind:bss addr:0x0215e714 data_ov083_0215e728 kind:bss addr:0x0215e728 -data_ov083_0215e72c kind:bss addr:0x0215e72c -data_ov083_0215e730 kind:bss addr:0x0215e730 ambiguous -sActorProfileUnkRBWS kind:bss addr:0x0215e738 +_ZGVN15ProfileInstanceI19ActorProfileUnkRBWSE8sProfileE kind:bss addr:0x0215e72c +@13697 kind:bss addr:0x0215e730 ambiguous +_ZN15ProfileInstanceI19ActorProfileUnkRBWSE8sProfileE kind:bss addr:0x0215e738 data_ov083_0215e740 kind:bss addr:0x0215e740 ambiguous -data_ov083_0215e810 kind:bss addr:0x0215e810 -data_ov083_0215e814 kind:bss addr:0x0215e814 -sActorProfileUnkNPWC kind:bss addr:0x0215e820 -data_ov083_0215e85c kind:bss addr:0x0215e85c -data_ov083_0215e860 kind:bss addr:0x0215e860 -sActorProfileUnkEFR3 kind:bss addr:0x0215e86c +_ZGVN15ProfileInstanceI19ActorProfileUnkNPWCE8sProfileE kind:bss addr:0x0215e810 +@13703 kind:bss addr:0x0215e814 +_ZN15ProfileInstanceI19ActorProfileUnkNPWCE8sProfileE kind:bss addr:0x0215e820 +_ZGVN15ProfileInstanceI19ActorProfileUnkEFR3E8sProfileE kind:bss addr:0x0215e85c +@13709 kind:bss addr:0x0215e860 +_ZN15ProfileInstanceI19ActorProfileUnkEFR3E8sProfileE kind:bss addr:0x0215e86c data_ov083_0215e90c kind:bss addr:0x0215e90c ambiguous -data_ov083_0215e944 kind:bss addr:0x0215e944 -data_ov083_0215e948 kind:bss addr:0x0215e948 -sActorProfileUnkEFW3 kind:bss addr:0x0215e954 +_ZGVN15ProfileInstanceI19ActorProfileUnkEFW3E8sProfileE kind:bss addr:0x0215e944 +@13715 kind:bss addr:0x0215e948 +_ZN15ProfileInstanceI19ActorProfileUnkEFW3E8sProfileE kind:bss addr:0x0215e954 data_ov083_0215e974 kind:bss addr:0x0215e974 ambiguous data_ov083_0215ea0c kind:bss addr:0x0215ea0c ambiguous data_ov083_0215ea2c kind:bss addr:0x0215ea2c data_ov083_0215ea30 kind:bss addr:0x0215ea30 -sMapObjectProfileUnkSHWB kind:bss addr:0x0215ea3c +_ZN15ProfileInstanceI23MapObjectProfileUnkSHWBE8sProfileE kind:bss addr:0x0215ea3c diff --git a/config/eur/arm9/overlays/ov084/delinks.txt b/config/eur/arm9/overlays/ov084/delinks.txt index e49d1da3..b7171a7a 100644 --- a/config/eur/arm9/overlays/ov084/delinks.txt +++ b/config/eur/arm9/overlays/ov084/delinks.txt @@ -9,88 +9,88 @@ src/084_BossFlame/Actor/ActorUnkIWTS.cpp: .text start:0x02150c00 end:0x02159ca0 .init start:0x02161e60 end:0x0216252c .ctor start:0x02162a38 end:0x02162a3c - .bss start:0x02163b50 end:0x02163c28 + .bss start:0x02163b04 end:0x02163c28 src/084_BossFlame/Actor/ActorUnkITSC.cpp: .text start:0x02159ca0 end:0x0215a3a8 .init start:0x0216252c end:0x0216259c .ctor start:0x02162a3c end:0x02162a40 - .bss start:0x02163c38 end:0x02163d10 + .bss start:0x02163c28 end:0x02163d10 src/084_BossFlame/Actor/ActorUnkFIRB.cpp: .text start:0x0215a3a8 end:0x0215aee4 .init start:0x0216259c end:0x021625ec .ctor start:0x02162a40 end:0x02162a44 - .bss start:0x02163d20 end:0x02163df8 + .bss start:0x02163d10 end:0x02163df8 src/084_BossFlame/Actor/ActorUnkDSVC.cpp: .text start:0x0215aee4 end:0x0215b008 .init start:0x021625ec end:0x0216263c .ctor start:0x02162a44 end:0x02162a48 - .bss start:0x02163e08 end:0x02163ee0 + .bss start:0x02163df8 end:0x02163ee0 src/084_BossFlame/Actor/ActorUnkWIDR.cpp: .text start:0x0215b008 end:0x0215c65c .init start:0x0216263c end:0x0216268c .ctor start:0x02162a48 end:0x02162a4c - .bss start:0x02163ef0 end:0x02163fc8 + .bss start:0x02163ee0 end:0x02163fc8 src/084_BossFlame/Actor/ActorUnkWIDT.cpp: .text start:0x0215c65c end:0x0215d098 .init start:0x0216268c end:0x021626dc .ctor start:0x02162a4c end:0x02162a50 - .bss start:0x02163fd8 end:0x02163fe0 + .bss start:0x02163fc8 end:0x0216401c src/084_BossFlame/Actor/ActorUnkRBVC.cpp: .text start:0x0215d098 end:0x0215d468 .init start:0x021626dc end:0x0216272c .ctor start:0x02162a50 end:0x02162a54 - .bss start:0x0216402c end:0x02164104 + .bss start:0x0216401c end:0x02164104 src/084_BossFlame/MapObject/MapObjectUnkLVCM.cpp: .text start:0x0215d468 end:0x0215db78 .init start:0x0216272c end:0x0216277c .ctor start:0x02162a54 end:0x02162a58 - .bss start:0x02164114 end:0x02164144 + .bss start:0x02164104 end:0x02164208 src/084_BossFlame/MapObject/MapObjectUnkMLVC.cpp: .text start:0x0215db78 end:0x0215df6c .init start:0x0216277c end:0x021627cc .ctor start:0x02162a58 end:0x02162a5c - .bss start:0x02164218 end:0x0216423c + .bss start:0x02164208 end:0x02164240 src/084_BossFlame/Actor/ActorUnkLAVA.cpp: .text start:0x0215df6c end:0x0215eb58 .init start:0x021627cc end:0x0216282c .ctor start:0x02162a5c end:0x02162a60 - .bss start:0x02164258 end:0x021642fc + .bss start:0x02164240 end:0x02164358 src/084_BossFlame/Actor/ActorUnkLVBD.cpp: .text start:0x0215eb58 end:0x02160458 .init start:0x0216282c end:0x021628c0 .ctor start:0x02162a60 end:0x02162a64 - .bss start:0x02164428 end:0x02164500 + .bss start:0x02164358 end:0x02164500 src/084_BossFlame/MapObject/MapObjectUnkTMLV.cpp: .text start:0x02160458 end:0x0216060c .init start:0x021628c0 end:0x02162910 .ctor start:0x02162a64 end:0x02162a68 - .bss start:0x02164510 end:0x02164530 + .bss start:0x02164500 end:0x02164530 src/084_BossFlame/MapObject/MapObjectUnkSTSV.cpp: .text start:0x0216060c end:0x02160804 .init start:0x02162910 end:0x02162960 .ctor start:0x02162a68 end:0x02162a6c - .bss start:0x02164540 end:0x021645a8 + .bss start:0x02164530 end:0x021645a8 src/084_BossFlame/Actor/ActorUnkLBRC.cpp: .text start:0x02160830 end:0x0216122c .init start:0x02162960 end:0x021629e8 .ctor start:0x02162a6c end:0x02162a70 - .bss start:0x021645b8 end:0x02164690 + .bss start:0x021645a8 end:0x02164694 src/084_BossFlame/MapObject/MapObjectUnkPLV2.cpp: .text start:0x021612c8 end:0x021614a4 .init start:0x021629e8 end:0x02162a38 .ctor start:0x02162a70 end:0x02162a74 - .bss start:0x021646a4 end:0x02164778 + .bss start:0x02164694 end:0x02164778 diff --git a/config/eur/arm9/overlays/ov084/symbols.txt b/config/eur/arm9/overlays/ov084/symbols.txt index f7a45e50..e2fb66dc 100644 --- a/config/eur/arm9/overlays/ov084/symbols.txt +++ b/config/eur/arm9/overlays/ov084/symbols.txt @@ -604,61 +604,61 @@ data_ov084_02163a90 kind:data(any) addr:0x02163a90 data_ov084_02163aac kind:data(any) addr:0x02163aac data_ov084_02163ac8 kind:data(any) addr:0x02163ac8 data_ov084_02163b00 kind:bss addr:0x02163b00 -data_ov084_02163b04 kind:bss addr:0x02163b04 -data_ov084_02163b10 kind:bss addr:0x02163b10 -sActorProfileUnkIWTS kind:bss addr:0x02163b50 -data_ov084_02163c28 kind:bss addr:0x02163c28 -data_ov084_02163c2c kind:bss addr:0x02163c2c -sActorProfileUnkITSC kind:bss addr:0x02163c38 -data_ov084_02163d10 kind:bss addr:0x02163d10 -data_ov084_02163d14 kind:bss addr:0x02163d14 -sActorProfileUnkFIRB kind:bss addr:0x02163d20 -data_ov084_02163df8 kind:bss addr:0x02163df8 -data_ov084_02163dfc kind:bss addr:0x02163dfc -sActorProfileUnkDSVC kind:bss addr:0x02163e08 -data_ov084_02163ee0 kind:bss addr:0x02163ee0 -data_ov084_02163ee4 kind:bss addr:0x02163ee4 -sActorProfileUnkWIDR kind:bss addr:0x02163ef0 -data_ov084_02163fc8 kind:bss addr:0x02163fc8 -data_ov084_02163fcc kind:bss addr:0x02163fcc -sActorProfileUnkWIDT kind:bss addr:0x02163fd8 +_ZGVN15ProfileInstanceI19ActorProfileUnkIWTSE8sProfileE kind:bss addr:0x02163b04 +@13732 kind:bss addr:0x02163b10 +_ZN15ProfileInstanceI19ActorProfileUnkIWTSE8sProfileE kind:bss addr:0x02163b50 +_ZGVN15ProfileInstanceI19ActorProfileUnkITSCE8sProfileE kind:bss addr:0x02163c28 +@13738 kind:bss addr:0x02163c2c +_ZN15ProfileInstanceI19ActorProfileUnkITSCE8sProfileE kind:bss addr:0x02163c38 +_ZGVN15ProfileInstanceI19ActorProfileUnkFIRBE8sProfileE kind:bss addr:0x02163d10 +@13744 kind:bss addr:0x02163d14 +_ZN15ProfileInstanceI19ActorProfileUnkFIRBE8sProfileE kind:bss addr:0x02163d20 +_ZGVN15ProfileInstanceI19ActorProfileUnkDSVCE8sProfileE kind:bss addr:0x02163df8 +@13750 kind:bss addr:0x02163dfc +_ZN15ProfileInstanceI19ActorProfileUnkDSVCE8sProfileE kind:bss addr:0x02163e08 +_ZGVN15ProfileInstanceI19ActorProfileUnkWIDRE8sProfileE kind:bss addr:0x02163ee0 +@13756 kind:bss addr:0x02163ee4 +_ZN15ProfileInstanceI19ActorProfileUnkWIDRE8sProfileE kind:bss addr:0x02163ef0 +_ZGVN15ProfileInstanceI19ActorProfileUnkWIDTE8sProfileE kind:bss addr:0x02163fc8 +@13762 kind:bss addr:0x02163fcc +_ZN15ProfileInstanceI19ActorProfileUnkWIDTE8sProfileE kind:bss addr:0x02163fd8 data_ov084_02163fe0 kind:bss addr:0x02163fe0 ambiguous data_ov084_02163ff4 kind:bss addr:0x02163ff4 ambiguous -data_ov084_0216401c kind:bss addr:0x0216401c -data_ov084_02164020 kind:bss addr:0x02164020 -sActorProfileUnkRBVC kind:bss addr:0x0216402c -data_ov084_02164104 kind:bss addr:0x02164104 -data_ov084_02164108 kind:bss addr:0x02164108 -sMapObjectProfileUnkLVCM kind:bss addr:0x02164114 +_ZGVN15ProfileInstanceI19ActorProfileUnkRBVCE8sProfileE kind:bss addr:0x0216401c +@13768 kind:bss addr:0x02164020 +_ZN15ProfileInstanceI19ActorProfileUnkRBVCE8sProfileE kind:bss addr:0x0216402c +_ZGVN15ProfileInstanceI23MapObjectProfileUnkLVCME8sProfileE kind:bss addr:0x02164104 +@13217 kind:bss addr:0x02164108 +_ZN15ProfileInstanceI23MapObjectProfileUnkLVCME8sProfileE kind:bss addr:0x02164114 data_ov084_02164144 kind:bss addr:0x02164144 ambiguous data_ov084_021641c8 kind:bss addr:0x021641c8 ambiguous data_ov084_021641d0 kind:bss addr:0x021641d0 ambiguous data_ov084_021641e8 kind:bss addr:0x021641e8 -data_ov084_02164208 kind:bss addr:0x02164208 -data_ov084_0216420c kind:bss addr:0x0216420c -sMapObjectProfileUnkMLVC kind:bss addr:0x02164218 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkMLVCE8sProfileE kind:bss addr:0x02164208 +@13223 kind:bss addr:0x0216420c +_ZN15ProfileInstanceI23MapObjectProfileUnkMLVCE8sProfileE kind:bss addr:0x02164218 data_ov084_0216423c kind:bss addr:0x0216423c -data_ov084_02164240 kind:bss addr:0x02164240 -data_ov084_0216424c kind:bss addr:0x0216424c -sActorProfileUnkLAVA kind:bss addr:0x02164258 +_ZGVN15ProfileInstanceI19ActorProfileUnkLAVAE8sProfileE kind:bss addr:0x02164240 +@13786 kind:bss addr:0x0216424c +_ZN15ProfileInstanceI19ActorProfileUnkLAVAE8sProfileE kind:bss addr:0x02164258 data_ov084_021642fc kind:bss addr:0x021642fc ambiguous data_ov084_02164330 kind:bss addr:0x02164330 data_ov084_02164340 kind:bss addr:0x02164340 data_ov084_0216434c kind:bss addr:0x0216434c -data_ov084_02164358 kind:bss addr:0x02164358 -data_ov084_02164370 kind:bss addr:0x02164370 -sActorProfileUnkLVBD kind:bss addr:0x02164428 -data_ov084_02164500 kind:bss addr:0x02164500 -data_ov084_02164504 kind:bss addr:0x02164504 -sMapObjectProfileUnkTMLV kind:bss addr:0x02164510 -data_ov084_02164530 kind:bss addr:0x02164530 -data_ov084_02164534 kind:bss addr:0x02164534 -sMapObjectProfileUnkSTSV kind:bss addr:0x02164540 -data_ov084_021645a8 kind:bss addr:0x021645a8 -data_ov084_021645ac kind:bss addr:0x021645ac -sActorProfileUnkLBRC kind:bss addr:0x021645b8 +_ZGVN15ProfileInstanceI19ActorProfileUnkLVBDE8sProfileE kind:bss addr:0x02164358 +@13792 kind:bss addr:0x02164370 +_ZN15ProfileInstanceI19ActorProfileUnkLVBDE8sProfileE kind:bss addr:0x02164428 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTMLVE8sProfileE kind:bss addr:0x02164500 +@13241 kind:bss addr:0x02164504 +_ZN15ProfileInstanceI23MapObjectProfileUnkTMLVE8sProfileE kind:bss addr:0x02164510 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkSTSVE8sProfileE kind:bss addr:0x02164530 +@13247 kind:bss addr:0x02164534 +_ZN15ProfileInstanceI23MapObjectProfileUnkSTSVE8sProfileE kind:bss addr:0x02164540 +_ZGVN15ProfileInstanceI19ActorProfileUnkLBRCE8sProfileE kind:bss addr:0x021645a8 +@13810 kind:bss addr:0x021645ac +_ZN15ProfileInstanceI19ActorProfileUnkLBRCE8sProfileE kind:bss addr:0x021645b8 data_ov084_02164690 kind:bss addr:0x02164690 -data_ov084_02164694 kind:bss addr:0x02164694 -data_ov084_02164698 kind:bss addr:0x02164698 -sMapObjectProfileUnkPLV2 kind:bss addr:0x021646a4 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkPLV2E8sProfileE kind:bss addr:0x02164694 +@13259 kind:bss addr:0x02164698 +_ZN15ProfileInstanceI23MapObjectProfileUnkPLV2E8sProfileE kind:bss addr:0x021646a4 data_ov084_02164778 kind:bss addr:0x02164778 diff --git a/config/eur/arm9/overlays/ov085/delinks.txt b/config/eur/arm9/overlays/ov085/delinks.txt index e987afa4..c48b04e5 100644 --- a/config/eur/arm9/overlays/ov085/delinks.txt +++ b/config/eur/arm9/overlays/ov085/delinks.txt @@ -9,16 +9,16 @@ src/085_DgnLv5/Actor/ActorUnkGRCM.cpp: .text start:0x02150c00 end:0x02150f8c .init start:0x02153ebc end:0x02153f0c .ctor start:0x02153fac end:0x02153fb0 - .bss start:0x02154210 end:0x0215424c + .bss start:0x02154200 end:0x0215424c src/085_DgnLv5/Actor/ActorUnkSRST.cpp: .text start:0x02150f8c end:0x021531b4 .init start:0x02153f0c end:0x02153f5c .ctor start:0x02153fb0 end:0x02153fb4 - .bss start:0x0215425c end:0x02154334 + .bss start:0x0215424c end:0x02154334 src/085_DgnLv5/MapObject/MapObjectUnkCTPT.cpp: .text start:0x021531b4 end:0x02153e18 .init start:0x02153f5c end:0x02153fac .ctor start:0x02153fb4 end:0x02153fb8 - .bss start:0x02154344 end:0x02154364 + .bss start:0x02154334 end:0x02154364 diff --git a/config/eur/arm9/overlays/ov085/symbols.txt b/config/eur/arm9/overlays/ov085/symbols.txt index 2319b17b..f0497945 100644 --- a/config/eur/arm9/overlays/ov085/symbols.txt +++ b/config/eur/arm9/overlays/ov085/symbols.txt @@ -110,14 +110,14 @@ data_ov085_021541b0 kind:data(any) addr:0x021541b0 ambiguous data_ov085_021541b8 kind:data(any) addr:0x021541b8 data_ov085_021541e0 kind:data(any) addr:0x021541e0 ambiguous data_ov085_021541e4 kind:data(any) addr:0x021541e4 ambiguous -data_ov085_02154200 kind:bss addr:0x02154200 -data_ov085_02154204 kind:bss addr:0x02154204 -sActorProfileUnkGRCM kind:bss addr:0x02154210 -data_ov085_0215424c kind:bss addr:0x0215424c -data_ov085_02154250 kind:bss addr:0x02154250 -sActorProfileUnkSRST kind:bss addr:0x0215425c -data_ov085_02154334 kind:bss addr:0x02154334 -data_ov085_02154338 kind:bss addr:0x02154338 -sMapObjectProfileUnkCTPT kind:bss addr:0x02154344 +_ZGVN15ProfileInstanceI19ActorProfileUnkGRCME8sProfileE kind:bss addr:0x02154200 +@13828 kind:bss addr:0x02154204 +_ZN15ProfileInstanceI19ActorProfileUnkGRCME8sProfileE kind:bss addr:0x02154210 +_ZGVN15ProfileInstanceI19ActorProfileUnkSRSTE8sProfileE kind:bss addr:0x0215424c +@13834 kind:bss addr:0x02154250 +_ZN15ProfileInstanceI19ActorProfileUnkSRSTE8sProfileE kind:bss addr:0x0215425c +_ZGVN15ProfileInstanceI23MapObjectProfileUnkCTPTE8sProfileE kind:bss addr:0x02154334 +@13283 kind:bss addr:0x02154338 +_ZN15ProfileInstanceI23MapObjectProfileUnkCTPTE8sProfileE kind:bss addr:0x02154344 data_ov085_02154364 kind:bss addr:0x02154364 data_ov085_0215442c kind:bss addr:0x0215442c ambiguous diff --git a/config/eur/arm9/overlays/ov086/delinks.txt b/config/eur/arm9/overlays/ov086/delinks.txt index 7c325885..9d80c091 100644 --- a/config/eur/arm9/overlays/ov086/delinks.txt +++ b/config/eur/arm9/overlays/ov086/delinks.txt @@ -9,76 +9,76 @@ src/086_DgnDesert/Actor/ActorUnkDSDS.cpp: .text start:0x02154440 end:0x02154564 .init start:0x0215f188 end:0x0215f1d8 .ctor start:0x0215f5d4 end:0x0215f5d8 - .bss start:0x02160350 end:0x02160364 + .bss start:0x02160340 end:0x02160428 src/086_DgnDesert/Actor/ActorUnkHAMN.cpp: .text start:0x02154564 end:0x02158070 .init start:0x0215f1d8 end:0x0215f228 .ctor start:0x0215f5d8 end:0x0215f5dc - .bss start:0x02160438 end:0x02160458 + .bss start:0x02160428 end:0x02160510 src/086_DgnDesert/Actor/ActorUnkOCTG.cpp: .text start:0x02158070 end:0x0215afa4 .init start:0x0215f228 end:0x0215f2b4 .ctor start:0x0215f5dc end:0x0215f5e0 - .bss start:0x02160520 end:0x02160528 + .bss start:0x02160510 end:0x021605f8 src/086_DgnDesert/Actor/ActorUnkOCGS.cpp: .text start:0x0215afa4 end:0x0215b804 .init start:0x0215f2b4 end:0x0215f304 .ctor start:0x0215f5e0 end:0x0215f5e4 - .bss start:0x02160608 end:0x0216060c + .bss start:0x021605f8 end:0x021606e0 src/086_DgnDesert/Actor/ActorUnkEFSC.cpp: .text start:0x0215b804 end:0x0215bb34 .init start:0x0215f304 end:0x0215f354 .ctor start:0x0215f5e4 end:0x0215f5e8 - .bss start:0x021606f0 end:0x021607c8 + .bss start:0x021606e0 end:0x021607c8 src/086_DgnDesert/Actor/ActorUnkQKSD.cpp: .text start:0x0215bb34 end:0x0215bd98 .init start:0x0215f354 end:0x0215f3a4 .ctor start:0x0215f5e8 end:0x0215f5ec - .bss start:0x021607d8 end:0x02160830 + .bss start:0x021607c8 end:0x021608b0 src/086_DgnDesert/Actor/ActorUnkRNTN.cpp: .text start:0x0215bd98 end:0x0215da78 .init start:0x0215f3a4 end:0x0215f3f4 .ctor start:0x0215f5ec end:0x0215f5f0 - .bss start:0x021608c0 end:0x02160918 + .bss start:0x021608b0 end:0x02160998 src/086_DgnDesert/Actor/ActorUnkRMDS.cpp: .text start:0x0215da78 end:0x0215dca4 .init start:0x0215f3f4 end:0x0215f444 .ctor start:0x0215f5f0 end:0x0215f5f4 - .bss start:0x021609a8 end:0x021609dc + .bss start:0x02160998 end:0x02160a80 src/086_DgnDesert/Actor/ActorUnkQKTG.cpp: .text start:0x0215dca4 end:0x0215df38 .init start:0x0215f444 end:0x0215f494 .ctor start:0x0215f5f4 end:0x0215f5f8 - .bss start:0x02160a90 end:0x02160acc + .bss start:0x02160a80 end:0x02160acc src/086_DgnDesert/MapObject/MapObjectUnkSTDS.cpp: .text start:0x0215df38 end:0x0215e110 .init start:0x0215f494 end:0x0215f4e4 .ctor start:0x0215f5f8 end:0x0215f5fc - .bss start:0x02160adc end:0x02160b70 + .bss start:0x02160acc end:0x02160bb4 src/086_DgnDesert/MapObject/MapObjectUnkDRBR.cpp: .text start:0x0215e110 end:0x0215e270 .init start:0x0215f4e4 end:0x0215f534 .ctor start:0x0215f5fc end:0x0215f600 - .bss start:0x02160bc0 end:0x02160c94 + .bss start:0x02160bb4 end:0x02160c94 src/086_DgnDesert/MapObject/MapObjectUnkGRSG.cpp: .text start:0x0215e290 end:0x0215e658 .init start:0x0215f534 end:0x0215f584 .ctor start:0x0215f600 end:0x0215f604 - .bss start:0x02160ca4 end:0x02160d78 + .bss start:0x02160c94 end:0x02160d9c src/086_DgnDesert/MapObject/MapObjectUnkDRRS.cpp: .text start:0x0215e658 end:0x0215ebe4 .init start:0x0215f584 end:0x0215f5d4 .ctor start:0x0215f604 end:0x0215f608 - .bss start:0x02160dac end:0x02160e80 + .bss start:0x02160d9c end:0x02160e80 diff --git a/config/eur/arm9/overlays/ov086/symbols.txt b/config/eur/arm9/overlays/ov086/symbols.txt index 5e143e95..2a23fafc 100644 --- a/config/eur/arm9/overlays/ov086/symbols.txt +++ b/config/eur/arm9/overlays/ov086/symbols.txt @@ -397,57 +397,57 @@ data_ov086_02160288 kind:data(any) addr:0x02160288 data_ov086_021602d8 kind:data(any) addr:0x021602d8 data_ov086_021602ec kind:data(any) addr:0x021602ec data_ov086_02160308 kind:data(any) addr:0x02160308 -data_ov086_02160340 kind:bss addr:0x02160340 -data_ov086_02160344 kind:bss addr:0x02160344 -sActorProfileUnkDSDS kind:bss addr:0x02160350 +_ZGVN15ProfileInstanceI19ActorProfileUnkDSDSE8sProfileE kind:bss addr:0x02160340 +@13852 kind:bss addr:0x02160344 +_ZN15ProfileInstanceI19ActorProfileUnkDSDSE8sProfileE kind:bss addr:0x02160350 data_ov086_02160364 kind:bss addr:0x02160364 ambiguous data_ov086_021603d8 kind:bss addr:0x021603d8 ambiguous -data_ov086_02160428 kind:bss addr:0x02160428 -data_ov086_0216042c kind:bss addr:0x0216042c -sActorProfileUnkHAMN kind:bss addr:0x02160438 +_ZGVN15ProfileInstanceI19ActorProfileUnkHAMNE8sProfileE kind:bss addr:0x02160428 +@13858 kind:bss addr:0x0216042c +_ZN15ProfileInstanceI19ActorProfileUnkHAMNE8sProfileE kind:bss addr:0x02160438 data_ov086_02160458 kind:bss addr:0x02160458 ambiguous data_ov086_0216045d kind:bss addr:0x0216045d ambiguous -data_ov086_02160510 kind:bss addr:0x02160510 -data_ov086_02160514 kind:bss addr:0x02160514 -sActorProfileUnkOCTG kind:bss addr:0x02160520 +_ZGVN15ProfileInstanceI19ActorProfileUnkOCTGE8sProfileE kind:bss addr:0x02160510 +@13864 kind:bss addr:0x02160514 +_ZN15ProfileInstanceI19ActorProfileUnkOCTGE8sProfileE kind:bss addr:0x02160520 data_ov086_02160528 kind:bss addr:0x02160528 ambiguous data_ov086_02160534 kind:bss addr:0x02160534 ambiguous -data_ov086_021605f8 kind:bss addr:0x021605f8 -data_ov086_021605fc kind:bss addr:0x021605fc -sActorProfileUnkOCGS kind:bss addr:0x02160608 +_ZGVN15ProfileInstanceI19ActorProfileUnkOCGSE8sProfileE kind:bss addr:0x021605f8 +@13870 kind:bss addr:0x021605fc +_ZN15ProfileInstanceI19ActorProfileUnkOCGSE8sProfileE kind:bss addr:0x02160608 data_ov086_0216060c kind:bss addr:0x0216060c ambiguous data_ov086_02160678 kind:bss addr:0x02160678 ambiguous -data_ov086_021606e0 kind:bss addr:0x021606e0 -data_ov086_021606e4 kind:bss addr:0x021606e4 -sActorProfileUnkEFSC kind:bss addr:0x021606f0 -data_ov086_021607c8 kind:bss addr:0x021607c8 -data_ov086_021607cc kind:bss addr:0x021607cc -sActorProfileUnkQKSD kind:bss addr:0x021607d8 +_ZGVN15ProfileInstanceI19ActorProfileUnkEFSCE8sProfileE kind:bss addr:0x021606e0 +@13876 kind:bss addr:0x021606e4 +_ZN15ProfileInstanceI19ActorProfileUnkEFSCE8sProfileE kind:bss addr:0x021606f0 +_ZGVN15ProfileInstanceI19ActorProfileUnkQKSDE8sProfileE kind:bss addr:0x021607c8 +@13882 kind:bss addr:0x021607cc +_ZN15ProfileInstanceI19ActorProfileUnkQKSDE8sProfileE kind:bss addr:0x021607d8 data_ov086_02160830 kind:bss addr:0x02160830 ambiguous -data_ov086_021608b0 kind:bss addr:0x021608b0 -data_ov086_021608b4 kind:bss addr:0x021608b4 -sActorProfileUnkRNTN kind:bss addr:0x021608c0 +_ZGVN15ProfileInstanceI19ActorProfileUnkRNTNE8sProfileE kind:bss addr:0x021608b0 +@13888 kind:bss addr:0x021608b4 +_ZN15ProfileInstanceI19ActorProfileUnkRNTNE8sProfileE kind:bss addr:0x021608c0 data_ov086_02160918 kind:bss addr:0x02160918 ambiguous data_ov086_0216097c kind:bss addr:0x0216097c ambiguous -data_ov086_02160998 kind:bss addr:0x02160998 -data_ov086_0216099c kind:bss addr:0x0216099c -sActorProfileUnkRMDS kind:bss addr:0x021609a8 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMDSE8sProfileE kind:bss addr:0x02160998 +@13894 kind:bss addr:0x0216099c +_ZN15ProfileInstanceI19ActorProfileUnkRMDSE8sProfileE kind:bss addr:0x021609a8 data_ov086_021609dc kind:bss addr:0x021609dc ambiguous -data_ov086_02160a80 kind:bss addr:0x02160a80 -data_ov086_02160a84 kind:bss addr:0x02160a84 -sActorProfileUnkQKTG kind:bss addr:0x02160a90 -data_ov086_02160acc kind:bss addr:0x02160acc -data_ov086_02160ad0 kind:bss addr:0x02160ad0 -sMapObjectProfileUnkSTDS kind:bss addr:0x02160adc +_ZGVN15ProfileInstanceI19ActorProfileUnkQKTGE8sProfileE kind:bss addr:0x02160a80 +@13900 kind:bss addr:0x02160a84 +_ZN15ProfileInstanceI19ActorProfileUnkQKTGE8sProfileE kind:bss addr:0x02160a90 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkSTDSE8sProfileE kind:bss addr:0x02160acc +@13349 kind:bss addr:0x02160ad0 +_ZN15ProfileInstanceI23MapObjectProfileUnkSTDSE8sProfileE kind:bss addr:0x02160adc data_ov086_02160b70 kind:bss addr:0x02160b70 ambiguous data_ov086_02160bb0 kind:bss addr:0x02160bb0 -data_ov086_02160bb4 kind:bss addr:0x02160bb4 -data_ov086_02160bb8 kind:bss addr:0x02160bb8 ambiguous -sMapObjectProfileUnkDRBR kind:bss addr:0x02160bc0 -data_ov086_02160c94 kind:bss addr:0x02160c94 -data_ov086_02160c98 kind:bss addr:0x02160c98 -sMapObjectProfileUnkGRSG kind:bss addr:0x02160ca4 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkDRBRE8sProfileE kind:bss addr:0x02160bb4 +@13355 kind:bss addr:0x02160bb8 ambiguous +_ZN15ProfileInstanceI23MapObjectProfileUnkDRBRE8sProfileE kind:bss addr:0x02160bc0 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkGRSGE8sProfileE kind:bss addr:0x02160c94 +@13361 kind:bss addr:0x02160c98 +_ZN15ProfileInstanceI23MapObjectProfileUnkGRSGE8sProfileE kind:bss addr:0x02160ca4 data_ov086_02160d78 kind:bss addr:0x02160d78 -data_ov086_02160d9c kind:bss addr:0x02160d9c -data_ov086_02160da0 kind:bss addr:0x02160da0 -sMapObjectProfileUnkDRRS kind:bss addr:0x02160dac +_ZGVN15ProfileInstanceI23MapObjectProfileUnkDRRSE8sProfileE kind:bss addr:0x02160d9c +@13367 kind:bss addr:0x02160da0 +_ZN15ProfileInstanceI23MapObjectProfileUnkDRRSE8sProfileE kind:bss addr:0x02160dac diff --git a/config/eur/arm9/overlays/ov087/delinks.txt b/config/eur/arm9/overlays/ov087/delinks.txt index db154ec5..5e1a911e 100644 --- a/config/eur/arm9/overlays/ov087/delinks.txt +++ b/config/eur/arm9/overlays/ov087/delinks.txt @@ -9,31 +9,31 @@ src/087_BossDesert/Actor/ActorUnkDSBN.cpp: .text start:0x02154440 end:0x0215b1b4 .init start:0x02161f70 end:0x02161fc0 .ctor start:0x02162170 end:0x02162174 - .bss start:0x02162b30 end:0x02162b78 + .bss start:0x02162b20 end:0x02162c08 src/087_BossDesert/Actor/ActorUnkDSBB.cpp: .text start:0x0215b1b4 end:0x0215c298 .init start:0x02161fc0 end:0x02162010 .ctor start:0x02162174 end:0x02162178 - .bss start:0x02162c18 end:0x02162c9c + .bss start:0x02162c08 end:0x02162cf0 src/087_BossDesert/Actor/ActorUnkDSBH.cpp: .text start:0x0215c298 end:0x02161178 .init start:0x02162010 end:0x02162060 .ctor start:0x02162178 end:0x0216217c - .bss start:0x02162d00 end:0x02162dd8 + .bss start:0x02162cf0 end:0x02162dd8 src/087_BossDesert/Actor/ActorUnkRBDS.cpp: .text start:0x02161178 end:0x021613a8 .init start:0x02162060 end:0x021620b0 .ctor start:0x0216217c end:0x02162180 - .bss start:0x02162de8 end:0x02162ec0 + .bss start:0x02162dd8 end:0x02162ec0 src/087_BossDesert/Actor/ActorUnkRBD2.cpp: .text start:0x021613a8 end:0x02161a28 .init start:0x021620b0 end:0x02162100 .ctor start:0x02162180 end:0x02162184 - .bss start:0x02162ed0 end:0x02162f34 + .bss start:0x02162ec0 end:0x02162f34 src/087_BossDesert/MapObject/MapObjectUnkSTSD.cpp: .text start:0x02161a28 end:0x02161cb0 diff --git a/config/eur/arm9/overlays/ov087/symbols.txt b/config/eur/arm9/overlays/ov087/symbols.txt index 52c18a68..3086c3fd 100644 --- a/config/eur/arm9/overlays/ov087/symbols.txt +++ b/config/eur/arm9/overlays/ov087/symbols.txt @@ -294,24 +294,24 @@ data_ov087_02162a5c kind:data(any) addr:0x02162a5c data_ov087_02162a70 kind:data(any) addr:0x02162a70 data_ov087_02162a98 kind:data(any) addr:0x02162a98 data_ov087_02162b08 kind:data(any) addr:0x02162b08 -data_ov087_02162b20 kind:bss addr:0x02162b20 -data_ov087_02162b24 kind:bss addr:0x02162b24 -sActorProfileUnkDSBN kind:bss addr:0x02162b30 +_ZGVN15ProfileInstanceI19ActorProfileUnkDSBNE8sProfileE kind:bss addr:0x02162b20 +@13936 kind:bss addr:0x02162b24 +_ZN15ProfileInstanceI19ActorProfileUnkDSBNE8sProfileE kind:bss addr:0x02162b30 data_ov087_02162b78 kind:bss addr:0x02162b78 ambiguous -data_ov087_02162c08 kind:bss addr:0x02162c08 -data_ov087_02162c0c kind:bss addr:0x02162c0c -sActorProfileUnkDSBB kind:bss addr:0x02162c18 +_ZGVN15ProfileInstanceI19ActorProfileUnkDSBBE8sProfileE kind:bss addr:0x02162c08 +@13942 kind:bss addr:0x02162c0c +_ZN15ProfileInstanceI19ActorProfileUnkDSBBE8sProfileE kind:bss addr:0x02162c18 data_ov087_02162c9c kind:bss addr:0x02162c9c ambiguous -data_ov087_02162cf0 kind:bss addr:0x02162cf0 -data_ov087_02162cf4 kind:bss addr:0x02162cf4 -sActorProfileUnkDSBH kind:bss addr:0x02162d00 -data_ov087_02162dd8 kind:bss addr:0x02162dd8 -data_ov087_02162ddc kind:bss addr:0x02162ddc -sActorProfileUnkRBDS kind:bss addr:0x02162de8 -data_ov087_02162ec0 kind:bss addr:0x02162ec0 -data_ov087_02162ec4 kind:bss addr:0x02162ec4 -sActorProfileUnkRBD2 kind:bss addr:0x02162ed0 +_ZGVN15ProfileInstanceI19ActorProfileUnkDSBHE8sProfileE kind:bss addr:0x02162cf0 +@13948 kind:bss addr:0x02162cf4 +_ZN15ProfileInstanceI19ActorProfileUnkDSBHE8sProfileE kind:bss addr:0x02162d00 +_ZGVN15ProfileInstanceI19ActorProfileUnkRBDSE8sProfileE kind:bss addr:0x02162dd8 +@13954 kind:bss addr:0x02162ddc +_ZN15ProfileInstanceI19ActorProfileUnkRBDSE8sProfileE kind:bss addr:0x02162de8 +_ZGVN15ProfileInstanceI19ActorProfileUnkRBD2E8sProfileE kind:bss addr:0x02162ec0 +@13960 kind:bss addr:0x02162ec4 +_ZN15ProfileInstanceI19ActorProfileUnkRBD2E8sProfileE kind:bss addr:0x02162ed0 data_ov087_02162f34 kind:bss addr:0x02162f34 ambiguous data_ov087_02162fa8 kind:bss addr:0x02162fa8 data_ov087_02162fac kind:bss addr:0x02162fac -sMapObjectProfileUnkSTSD kind:bss addr:0x02162fb8 +_ZN15ProfileInstanceI23MapObjectProfileUnkSTSDE8sProfileE kind:bss addr:0x02162fb8 diff --git a/config/eur/arm9/overlays/ov088/delinks.txt b/config/eur/arm9/overlays/ov088/delinks.txt index 4fc331bd..cb86272e 100644 --- a/config/eur/arm9/overlays/ov088/delinks.txt +++ b/config/eur/arm9/overlays/ov088/delinks.txt @@ -9,112 +9,112 @@ src/088_Stb/Actor/ActorUnkDMCH.cpp: .text start:0x0216a56c end:0x0216c368 .init start:0x02174708 end:0x0217477c .ctor start:0x02174d20 end:0x02174d24 - .bss start:0x021760ec end:0x02176128 + .bss start:0x021760dc end:0x02176128 src/088_Stb/Actor/ActorUnkDMZS.cpp: .text start:0x0216c368 end:0x0216c6c4 .init start:0x0217477c end:0x021747cc .ctor start:0x02174d24 end:0x02174d28 - .bss start:0x0217613c end:0x02176178 + .bss start:0x02176128 end:0x02176178 src/088_Stb/Actor/ActorUnkDMTR.cpp: .text start:0x0216c6c4 end:0x0216ccd4 .init start:0x021747cc end:0x0217481c .ctor start:0x02174d28 end:0x02174d2c - .bss start:0x02176188 end:0x021761c4 + .bss start:0x02176178 end:0x021761c4 src/088_Stb/Actor/ActorUnkDMT2.cpp: .text start:0x0216ccd4 end:0x0216d2a4 .init start:0x0217481c end:0x0217486c .ctor start:0x02174d2c end:0x02174d30 - .bss start:0x021761d4 end:0x02176210 + .bss start:0x021761c4 end:0x02176210 src/088_Stb/Actor/ActorUnkDMPS.cpp: .text start:0x0216d318 end:0x0216e25c .init start:0x0217486c end:0x021748bc .ctor start:0x02174d30 end:0x02174d34 - .bss start:0x02176220 end:0x0217625c + .bss start:0x02176210 end:0x0217625c src/088_Stb/Actor/ActorUnkDMEQ.cpp: .text start:0x0216e25c end:0x0216e838 .init start:0x021748bc end:0x0217490c .ctor start:0x02174d34 end:0x02174d38 - .bss start:0x0217626c end:0x021762a8 + .bss start:0x0217625c end:0x021762a8 src/088_Stb/Actor/ActorUnkDMGM.cpp: .text start:0x0216e838 end:0x0216ed24 .init start:0x0217490c end:0x0217495c .ctor start:0x02174d38 end:0x02174d3c - .bss start:0x021762b8 end:0x021762f4 + .bss start:0x021762a8 end:0x021767d4 src/088_Stb/Actor/ActorUnkDMFR.cpp: .text start:0x021705c4 end:0x02170844 .init start:0x0217495c end:0x021749ac .ctor start:0x02174d3c end:0x02174d40 - .bss start:0x021767e4 end:0x021768bc + .bss start:0x021767d4 end:0x021768bc src/088_Stb/Actor/ActorUnkDMMT.cpp: .text start:0x021708dc end:0x02170ce8 .init start:0x021749ac end:0x021749fc .ctor start:0x02174d40 end:0x02174d44 - .bss start:0x021768cc end:0x021769a4 + .bss start:0x021768bc end:0x021769a4 src/088_Stb/Actor/ActorUnkDMPK.cpp: .text start:0x02170d80 end:0x021711a8 .init start:0x021749fc end:0x02174a4c .ctor start:0x02174d44 end:0x02174d48 - .bss start:0x021769b4 end:0x02176a8c + .bss start:0x021769a4 end:0x02176a8c src/088_Stb/Actor/ActorUnkDMST.cpp: .text start:0x021711a8 end:0x021713c8 .init start:0x02174a4c end:0x02174a9c .ctor start:0x02174d48 end:0x02174d4c - .bss start:0x02176a9c end:0x02176aa8 + .bss start:0x02176a8c end:0x02176b74 src/088_Stb/Actor/ActorUnkDMSS.cpp: .text start:0x021713c8 end:0x0217160c .init start:0x02174a9c end:0x02174aec .ctor start:0x02174d4c end:0x02174d50 - .bss start:0x02176b84 end:0x02176c5c + .bss start:0x02176b74 end:0x02176c5c src/088_Stb/Actor/ActorUnkDMWS.cpp: .text start:0x0217160c end:0x02171820 .init start:0x02174aec end:0x02174b3c .ctor start:0x02174d50 end:0x02174d54 - .bss start:0x02176c6c end:0x02176d44 + .bss start:0x02176c5c end:0x02176d44 src/088_Stb/Actor/ActorUnkDMWT.cpp: .text start:0x02171820 end:0x02171a40 .init start:0x02174b3c end:0x02174b8c .ctor start:0x02174d54 end:0x02174d58 - .bss start:0x02176d54 end:0x02176e2c + .bss start:0x02176d44 end:0x02176e2c src/088_Stb/Actor/ActorUnkRMDO.cpp: .text start:0x02171a40 end:0x02171b5c .init start:0x02174b8c end:0x02174bdc .ctor start:0x02174d58 end:0x02174d5c - .bss start:0x02176e3c end:0x02176e78 + .bss start:0x02176e2c end:0x02176e78 src/088_Stb/Actor/ActorUnkDMMS.cpp: .text start:0x02171b5c end:0x02171d70 .init start:0x02174bdc end:0x02174c2c .ctor start:0x02174d5c end:0x02174d60 - .bss start:0x02176e88 end:0x02176f60 + .bss start:0x02176e78 end:0x02176f60 src/088_Stb/Actor/ActorUnkDMMM.cpp: .text start:0x02171d70 end:0x02171f90 .init start:0x02174c2c end:0x02174c7c .ctor start:0x02174d60 end:0x02174d64 - .bss start:0x02176f70 end:0x02177048 + .bss start:0x02176f60 end:0x02177048 src/088_Stb/Actor/ActorUnkDMET.cpp: .text start:0x02171f90 end:0x021721d0 .init start:0x02174c7c end:0x02174ccc .ctor start:0x02174d64 end:0x02174d68 - .bss start:0x02177058 end:0x021770f0 + .bss start:0x02177048 end:0x02177130 src/088_Stb/Actor/ActorUnkRMM2.cpp: .text start:0x021721d0 end:0x0217230c .init start:0x02174ccc end:0x02174d1c .ctor start:0x02174d68 end:0x02174d6c - .bss start:0x02177140 end:0x02177218 + .bss start:0x02177130 end:0x02177218 diff --git a/config/eur/arm9/overlays/ov088/symbols.txt b/config/eur/arm9/overlays/ov088/symbols.txt index 48261bb2..99622b3b 100644 --- a/config/eur/arm9/overlays/ov088/symbols.txt +++ b/config/eur/arm9/overlays/ov088/symbols.txt @@ -835,65 +835,65 @@ data_ov088_021760c4 kind:bss addr:0x021760c4 data_ov088_021760c8 kind:bss addr:0x021760c8 ambiguous data_ov088_021760cc kind:bss addr:0x021760cc data_ov088_021760d0 kind:bss addr:0x021760d0 -data_ov088_021760dc kind:bss addr:0x021760dc -data_ov088_021760e4 kind:bss addr:0x021760e4 -sActorProfileUnkDMCH kind:bss addr:0x021760ec -data_ov088_02176128 kind:bss addr:0x02176128 -data_ov088_02176130 kind:bss addr:0x02176130 -sActorProfileUnkDMZS kind:bss addr:0x0217613c -data_ov088_02176178 kind:bss addr:0x02176178 -data_ov088_0217617c kind:bss addr:0x0217617c -sActorProfileUnkDMTR kind:bss addr:0x02176188 -data_ov088_021761c4 kind:bss addr:0x021761c4 -data_ov088_021761c8 kind:bss addr:0x021761c8 -sActorProfileUnkDMT2 kind:bss addr:0x021761d4 -data_ov088_02176210 kind:bss addr:0x02176210 -data_ov088_02176214 kind:bss addr:0x02176214 -sActorProfileUnkDMPS kind:bss addr:0x02176220 -data_ov088_0217625c kind:bss addr:0x0217625c -data_ov088_02176260 kind:bss addr:0x02176260 -sActorProfileUnkDMEQ kind:bss addr:0x0217626c -data_ov088_021762a8 kind:bss addr:0x021762a8 -data_ov088_021762ac kind:bss addr:0x021762ac -sActorProfileUnkDMGM kind:bss addr:0x021762b8 +_ZGVN15ProfileInstanceI19ActorProfileUnkDMCHE8sProfileE kind:bss addr:0x021760dc +@13977 kind:bss addr:0x021760e4 +_ZN15ProfileInstanceI19ActorProfileUnkDMCHE8sProfileE kind:bss addr:0x021760ec +_ZGVN15ProfileInstanceI19ActorProfileUnkDMZSE8sProfileE kind:bss addr:0x02176128 +@13983 kind:bss addr:0x02176130 +_ZN15ProfileInstanceI19ActorProfileUnkDMZSE8sProfileE kind:bss addr:0x0217613c +_ZGVN15ProfileInstanceI19ActorProfileUnkDMTRE8sProfileE kind:bss addr:0x02176178 +@13989 kind:bss addr:0x0217617c +_ZN15ProfileInstanceI19ActorProfileUnkDMTRE8sProfileE kind:bss addr:0x02176188 +_ZGVN15ProfileInstanceI19ActorProfileUnkDMT2E8sProfileE kind:bss addr:0x021761c4 +@13995 kind:bss addr:0x021761c8 +_ZN15ProfileInstanceI19ActorProfileUnkDMT2E8sProfileE kind:bss addr:0x021761d4 +_ZGVN15ProfileInstanceI19ActorProfileUnkDMPSE8sProfileE kind:bss addr:0x02176210 +@14001 kind:bss addr:0x02176214 +_ZN15ProfileInstanceI19ActorProfileUnkDMPSE8sProfileE kind:bss addr:0x02176220 +_ZGVN15ProfileInstanceI19ActorProfileUnkDMEQE8sProfileE kind:bss addr:0x0217625c +@14007 kind:bss addr:0x02176260 +_ZN15ProfileInstanceI19ActorProfileUnkDMEQE8sProfileE kind:bss addr:0x0217626c +_ZGVN15ProfileInstanceI19ActorProfileUnkDMGME8sProfileE kind:bss addr:0x021762a8 +@14013 kind:bss addr:0x021762ac +_ZN15ProfileInstanceI19ActorProfileUnkDMGME8sProfileE kind:bss addr:0x021762b8 data_ov088_021762f4 kind:bss addr:0x021762f4 -data_ov088_021767d4 kind:bss addr:0x021767d4 -data_ov088_021767d8 kind:bss addr:0x021767d8 -sActorProfileUnkDMFR kind:bss addr:0x021767e4 -data_ov088_021768bc kind:bss addr:0x021768bc -data_ov088_021768c0 kind:bss addr:0x021768c0 -sActorProfileUnkDMMT kind:bss addr:0x021768cc -data_ov088_021769a4 kind:bss addr:0x021769a4 -data_ov088_021769a8 kind:bss addr:0x021769a8 -sActorProfileUnkDMPK kind:bss addr:0x021769b4 -data_ov088_02176a8c kind:bss addr:0x02176a8c -data_ov088_02176a90 kind:bss addr:0x02176a90 -sActorProfileUnkDMST kind:bss addr:0x02176a9c +_ZGVN15ProfileInstanceI19ActorProfileUnkDMFRE8sProfileE kind:bss addr:0x021767d4 +@14019 kind:bss addr:0x021767d8 +_ZN15ProfileInstanceI19ActorProfileUnkDMFRE8sProfileE kind:bss addr:0x021767e4 +_ZGVN15ProfileInstanceI19ActorProfileUnkDMMTE8sProfileE kind:bss addr:0x021768bc +@14025 kind:bss addr:0x021768c0 +_ZN15ProfileInstanceI19ActorProfileUnkDMMTE8sProfileE kind:bss addr:0x021768cc +_ZGVN15ProfileInstanceI19ActorProfileUnkDMPKE8sProfileE kind:bss addr:0x021769a4 +@14031 kind:bss addr:0x021769a8 +_ZN15ProfileInstanceI19ActorProfileUnkDMPKE8sProfileE kind:bss addr:0x021769b4 +_ZGVN15ProfileInstanceI19ActorProfileUnkDMSTE8sProfileE kind:bss addr:0x02176a8c +@14037 kind:bss addr:0x02176a90 +_ZN15ProfileInstanceI19ActorProfileUnkDMSTE8sProfileE kind:bss addr:0x02176a9c data_ov088_02176aa8 kind:bss addr:0x02176aa8 ambiguous data_ov088_02176af4 kind:bss addr:0x02176af4 ambiguous -data_ov088_02176b74 kind:bss addr:0x02176b74 -data_ov088_02176b78 kind:bss addr:0x02176b78 -sActorProfileUnkDMSS kind:bss addr:0x02176b84 -data_ov088_02176c5c kind:bss addr:0x02176c5c -data_ov088_02176c60 kind:bss addr:0x02176c60 -sActorProfileUnkDMWS kind:bss addr:0x02176c6c -data_ov088_02176d44 kind:bss addr:0x02176d44 -data_ov088_02176d48 kind:bss addr:0x02176d48 -sActorProfileUnkDMWT kind:bss addr:0x02176d54 -data_ov088_02176e2c kind:bss addr:0x02176e2c -data_ov088_02176e30 kind:bss addr:0x02176e30 -sActorProfileUnkRMDO kind:bss addr:0x02176e3c -data_ov088_02176e78 kind:bss addr:0x02176e78 -data_ov088_02176e7c kind:bss addr:0x02176e7c -sActorProfileUnkDMMS kind:bss addr:0x02176e88 -data_ov088_02176f60 kind:bss addr:0x02176f60 -data_ov088_02176f64 kind:bss addr:0x02176f64 -sActorProfileUnkDMMM kind:bss addr:0x02176f70 -data_ov088_02177048 kind:bss addr:0x02177048 -data_ov088_0217704c kind:bss addr:0x0217704c -sActorProfileUnkDMET kind:bss addr:0x02177058 +_ZGVN15ProfileInstanceI19ActorProfileUnkDMSSE8sProfileE kind:bss addr:0x02176b74 +@14043 kind:bss addr:0x02176b78 +_ZN15ProfileInstanceI19ActorProfileUnkDMSSE8sProfileE kind:bss addr:0x02176b84 +_ZGVN15ProfileInstanceI19ActorProfileUnkDMWSE8sProfileE kind:bss addr:0x02176c5c +@14049 kind:bss addr:0x02176c60 +_ZN15ProfileInstanceI19ActorProfileUnkDMWSE8sProfileE kind:bss addr:0x02176c6c +_ZGVN15ProfileInstanceI19ActorProfileUnkDMWTE8sProfileE kind:bss addr:0x02176d44 +@14055 kind:bss addr:0x02176d48 +_ZN15ProfileInstanceI19ActorProfileUnkDMWTE8sProfileE kind:bss addr:0x02176d54 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMDOE8sProfileE kind:bss addr:0x02176e2c +@14061 kind:bss addr:0x02176e30 +_ZN15ProfileInstanceI19ActorProfileUnkRMDOE8sProfileE kind:bss addr:0x02176e3c +_ZGVN15ProfileInstanceI19ActorProfileUnkDMMSE8sProfileE kind:bss addr:0x02176e78 +@14067 kind:bss addr:0x02176e7c +_ZN15ProfileInstanceI19ActorProfileUnkDMMSE8sProfileE kind:bss addr:0x02176e88 +_ZGVN15ProfileInstanceI19ActorProfileUnkDMMME8sProfileE kind:bss addr:0x02176f60 +@14073 kind:bss addr:0x02176f64 +_ZN15ProfileInstanceI19ActorProfileUnkDMMME8sProfileE kind:bss addr:0x02176f70 +_ZGVN15ProfileInstanceI19ActorProfileUnkDMETE8sProfileE kind:bss addr:0x02177048 +@14079 kind:bss addr:0x0217704c +_ZN15ProfileInstanceI19ActorProfileUnkDMETE8sProfileE kind:bss addr:0x02177058 data_ov088_021770f0 kind:bss addr:0x021770f0 ambiguous -data_ov088_02177130 kind:bss addr:0x02177130 -data_ov088_02177134 kind:bss addr:0x02177134 -sActorProfileUnkRMM2 kind:bss addr:0x02177140 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMM2E8sProfileE kind:bss addr:0x02177130 +@14085 kind:bss addr:0x02177134 +_ZN15ProfileInstanceI19ActorProfileUnkRMM2E8sProfileE kind:bss addr:0x02177140 data_ov088_02177218 kind:bss addr:0x02177218 diff --git a/config/eur/arm9/overlays/ov090/delinks.txt b/config/eur/arm9/overlays/ov090/delinks.txt index 2692ad67..3579d5f7 100644 --- a/config/eur/arm9/overlays/ov090/delinks.txt +++ b/config/eur/arm9/overlays/ov090/delinks.txt @@ -9,118 +9,118 @@ src/090_TrainNormal/Actor/ActorUnkSZRD.cpp: .text start:0x021658a0 end:0x02168b4c .init start:0x021754fc end:0x02175604 .ctor start:0x02175c5c end:0x02175c60 - .bss start:0x02176fb4 end:0x0217708c + .bss start:0x02176f94 end:0x02177094 src/090_TrainNormal/Actor/ActorUnkWDBA.cpp: .text start:0x02168b4c end:0x0216dd2c .init start:0x02175604 end:0x02175674 .ctor start:0x02175c60 end:0x02175c64 - .bss start:0x021770ac end:0x021770f0 + .bss start:0x02177094 end:0x02177184 src/090_TrainNormal/Actor/ActorUnkWDRD.cpp: .text start:0x0216dd2c end:0x0216f4d0 .init start:0x02175674 end:0x021756c4 .ctor start:0x02175c64 end:0x02175c68 - .bss start:0x02177194 end:0x02177218 + .bss start:0x02177184 end:0x02177270 src/090_TrainNormal/Actor/ActorUnkSPID.cpp: .text start:0x0216f4d0 end:0x02170f7c .init start:0x021756c4 end:0x02175720 .ctor start:0x02175c68 end:0x02175c6c - .bss start:0x02177288 end:0x02177360 + .bss start:0x02177270 end:0x02177360 src/090_TrainNormal/Actor/ActorUnkE3GL.cpp: .text start:0x02170f7c end:0x0217111c .init start:0x02175720 end:0x02175770 .ctor start:0x02175c6c end:0x02175c70 - .bss start:0x02177370 end:0x021773ac + .bss start:0x02177360 end:0x021773ac src/090_TrainNormal/Actor/ActorUnkE3TT.cpp: .text start:0x0217111c end:0x02171448 .init start:0x02175770 end:0x021757c0 .ctor start:0x02175c70 end:0x02175c74 - .bss start:0x021773bc end:0x021773f8 + .bss start:0x021773ac end:0x021773f8 src/090_TrainNormal/Actor/ActorUnkE3ST.cpp: .text start:0x02171448 end:0x021715b8 .init start:0x021757c0 end:0x02175810 .ctor start:0x02175c74 end:0x02175c78 - .bss start:0x02177408 end:0x02177444 + .bss start:0x021773f8 end:0x02177444 src/090_TrainNormal/MapObject/MapObjectUnkTWPG.cpp: .text start:0x021715b8 end:0x021721dc .init start:0x02175810 end:0x02175860 .ctor start:0x02175c78 end:0x02175c7c - .bss start:0x02177454 end:0x02177474 + .bss start:0x02177444 end:0x02177528 src/090_TrainNormal/MapObject/MapObjectUnkTWGS.cpp: .text start:0x021721dc end:0x02172930 .init start:0x02175860 end:0x021758d4 .ctor start:0x02175c7c end:0x02175c80 - .bss start:0x02177538 end:0x02177558 + .bss start:0x02177528 end:0x02177630 src/090_TrainNormal/MapObject/MapObjectUnkTWPC.cpp: .text start:0x02172930 end:0x02172d68 .init start:0x021758d4 end:0x02175924 .ctor start:0x02175c80 end:0x02175c84 - .bss start:0x02177640 end:0x02177660 + .bss start:0x02177630 end:0x02177660 src/090_TrainNormal/MapObject/MapObjectUnkSTTR.cpp: .text start:0x02172d68 end:0x0217307c .init start:0x02175924 end:0x0217598c .ctor start:0x02175c84 end:0x02175c88 - .bss start:0x02177674 end:0x02177694 + .bss start:0x02177660 end:0x02177694 src/090_TrainNormal/MapObject/MapObjectUnkTRGW.cpp: .text start:0x0217307c end:0x02173408 .init start:0x0217598c end:0x021759dc .ctor start:0x02175c88 end:0x02175c8c - .bss start:0x021776a4 end:0x02177778 + .bss start:0x02177694 end:0x02177798 src/090_TrainNormal/MapObject/MapObjectUnkTRSD.cpp: .text start:0x02173408 end:0x0217371c .init start:0x021759dc end:0x02175a2c .ctor start:0x02175c8c end:0x02175c90 - .bss start:0x021777a8 end:0x0217787c + .bss start:0x02177798 end:0x0217789c src/090_TrainNormal/MapObject/MapObjectUnkNPST.cpp: .text start:0x0217371c end:0x021746c8 .init start:0x02175a2c end:0x02175a7c .ctor start:0x02175c90 end:0x02175c94 - .bss start:0x021778ac end:0x021778cc + .bss start:0x0217789c end:0x021779a0 src/090_TrainNormal/MapObject/MapObjectUnkRBRC.cpp: .text start:0x021746c8 end:0x021748bc .init start:0x02175a7c end:0x02175acc .ctor start:0x02175c94 end:0x02175c98 - .bss start:0x021779b0 end:0x021779f4 + .bss start:0x021779a0 end:0x021779f4 src/090_TrainNormal/MapObject/MapObjectUnkTRMR.cpp: .text start:0x021748bc end:0x02174b1c .init start:0x02175acc end:0x02175b1c .ctor start:0x02175c98 end:0x02175c9c - .bss start:0x02177a04 end:0x02177aa0 + .bss start:0x021779f4 end:0x02177af8 src/090_TrainNormal/MapObject/MapObjectUnkRBMR.cpp: .text start:0x02174b1c end:0x02174d10 .init start:0x02175b1c end:0x02175b6c .ctor start:0x02175c9c end:0x02175ca0 - .bss start:0x02177b08 end:0x02177b48 + .bss start:0x02177af8 end:0x02177b4c src/090_TrainNormal/MapObject/MapObjectUnkTRDT.cpp: .text start:0x02174d10 end:0x02174fac .init start:0x02175b6c end:0x02175bbc .ctor start:0x02175ca0 end:0x02175ca4 - .bss start:0x02177b5c end:0x02177c30 + .bss start:0x02177b4c end:0x02177c50 src/090_TrainNormal/MapObject/MapObjectUnkTRCC.cpp: .text start:0x02174fac end:0x02175248 .init start:0x02175bbc end:0x02175c0c .ctor start:0x02175ca4 end:0x02175ca8 - .bss start:0x02177c60 end:0x02177d00 + .bss start:0x02177c50 end:0x02177d54 src/090_TrainNormal/MapObject/MapObjectUnkETNM.cpp: .text start:0x02175248 end:0x02175398 .init start:0x02175c0c end:0x02175c5c .ctor start:0x02175ca8 end:0x02175cac - .bss start:0x02177d64 end:0x02177e40 + .bss start:0x02177d54 end:0x02177e40 diff --git a/config/eur/arm9/overlays/ov090/symbols.txt b/config/eur/arm9/overlays/ov090/symbols.txt index 2a686886..620bdaef 100644 --- a/config/eur/arm9/overlays/ov090/symbols.txt +++ b/config/eur/arm9/overlays/ov090/symbols.txt @@ -590,81 +590,81 @@ data_ov090_02176ed8 kind:data(any) addr:0x02176ed8 data_ov090_02176ef4 kind:data(any) addr:0x02176ef4 data_ov090_02176f80 kind:bss addr:0x02176f80 data_ov090_02176f88 kind:bss addr:0x02176f88 -data_ov090_02176f94 kind:bss addr:0x02176f94 -data_ov090_02176fa0 kind:bss addr:0x02176fa0 -sActorProfileUnkSZRD kind:bss addr:0x02176fb4 +_ZGVN15ProfileInstanceI19ActorProfileUnkSZRDE8sProfileE kind:bss addr:0x02176f94 +@14097 kind:bss addr:0x02176fa0 +_ZN15ProfileInstanceI19ActorProfileUnkSZRDE8sProfileE kind:bss addr:0x02176fb4 data_ov090_0217708c kind:bss addr:0x0217708c -data_ov090_02177094 kind:bss addr:0x02177094 -data_ov090_021770a0 kind:bss addr:0x021770a0 -sActorProfileUnkWDBA kind:bss addr:0x021770ac +_ZGVN15ProfileInstanceI19ActorProfileUnkWDBAE8sProfileE kind:bss addr:0x02177094 +@14103 kind:bss addr:0x021770a0 +_ZN15ProfileInstanceI19ActorProfileUnkWDBAE8sProfileE kind:bss addr:0x021770ac data_ov090_021770f0 kind:bss addr:0x021770f0 ambiguous -data_ov090_02177184 kind:bss addr:0x02177184 -data_ov090_02177188 kind:bss addr:0x02177188 -sActorProfileUnkWDRD kind:bss addr:0x02177194 +_ZGVN15ProfileInstanceI19ActorProfileUnkWDRDE8sProfileE kind:bss addr:0x02177184 +@14109 kind:bss addr:0x02177188 +_ZN15ProfileInstanceI19ActorProfileUnkWDRDE8sProfileE kind:bss addr:0x02177194 data_ov090_02177218 kind:bss addr:0x02177218 ambiguous data_ov090_02177228 kind:bss addr:0x02177228 ambiguous data_ov090_0217726c kind:bss addr:0x0217726c -data_ov090_02177270 kind:bss addr:0x02177270 -data_ov090_0217727c kind:bss addr:0x0217727c -sActorProfileUnkSPID kind:bss addr:0x02177288 -data_ov090_02177360 kind:bss addr:0x02177360 -data_ov090_02177364 kind:bss addr:0x02177364 -sActorProfileUnkE3GL kind:bss addr:0x02177370 -data_ov090_021773ac kind:bss addr:0x021773ac -data_ov090_021773b0 kind:bss addr:0x021773b0 -sActorProfileUnkE3TT kind:bss addr:0x021773bc -data_ov090_021773f8 kind:bss addr:0x021773f8 -data_ov090_021773fc kind:bss addr:0x021773fc -sActorProfileUnkE3ST kind:bss addr:0x02177408 -data_ov090_02177444 kind:bss addr:0x02177444 -data_ov090_02177448 kind:bss addr:0x02177448 -sMapObjectProfileUnkTWPG kind:bss addr:0x02177454 +_ZGVN15ProfileInstanceI19ActorProfileUnkSPIDE8sProfileE kind:bss addr:0x02177270 +@14115 kind:bss addr:0x0217727c +_ZN15ProfileInstanceI19ActorProfileUnkSPIDE8sProfileE kind:bss addr:0x02177288 +_ZGVN15ProfileInstanceI19ActorProfileUnkE3GLE8sProfileE kind:bss addr:0x02177360 +@14121 kind:bss addr:0x02177364 +_ZN15ProfileInstanceI19ActorProfileUnkE3GLE8sProfileE kind:bss addr:0x02177370 +_ZGVN15ProfileInstanceI19ActorProfileUnkE3TTE8sProfileE kind:bss addr:0x021773ac +@14127 kind:bss addr:0x021773b0 +_ZN15ProfileInstanceI19ActorProfileUnkE3TTE8sProfileE kind:bss addr:0x021773bc +_ZGVN15ProfileInstanceI19ActorProfileUnkE3STE8sProfileE kind:bss addr:0x021773f8 +@14133 kind:bss addr:0x021773fc +_ZN15ProfileInstanceI19ActorProfileUnkE3STE8sProfileE kind:bss addr:0x02177408 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTWPGE8sProfileE kind:bss addr:0x02177444 +@13462 kind:bss addr:0x02177448 +_ZN15ProfileInstanceI23MapObjectProfileUnkTWPGE8sProfileE kind:bss addr:0x02177454 data_ov090_02177474 kind:bss addr:0x02177474 -data_ov090_02177528 kind:bss addr:0x02177528 -data_ov090_0217752c kind:bss addr:0x0217752c -sMapObjectProfileUnkTWGS kind:bss addr:0x02177538 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTWGSE8sProfileE kind:bss addr:0x02177528 +@13468 kind:bss addr:0x0217752c +_ZN15ProfileInstanceI23MapObjectProfileUnkTWGSE8sProfileE kind:bss addr:0x02177538 data_ov090_02177558 kind:bss addr:0x02177558 data_ov090_0217756c kind:bss addr:0x0217756c ambiguous data_ov090_0217760c kind:bss addr:0x0217760c -data_ov090_02177630 kind:bss addr:0x02177630 -data_ov090_02177634 kind:bss addr:0x02177634 -sMapObjectProfileUnkTWPC kind:bss addr:0x02177640 -data_ov090_02177660 kind:bss addr:0x02177660 -data_ov090_02177668 kind:bss addr:0x02177668 -sMapObjectProfileUnkSTTR kind:bss addr:0x02177674 -data_ov090_02177694 kind:bss addr:0x02177694 -data_ov090_02177698 kind:bss addr:0x02177698 -sMapObjectProfileUnkTRGW kind:bss addr:0x021776a4 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTWPCE8sProfileE kind:bss addr:0x02177630 +@13474 kind:bss addr:0x02177634 +_ZN15ProfileInstanceI23MapObjectProfileUnkTWPCE8sProfileE kind:bss addr:0x02177640 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkSTTRE8sProfileE kind:bss addr:0x02177660 +@13480 kind:bss addr:0x02177668 +_ZN15ProfileInstanceI23MapObjectProfileUnkSTTRE8sProfileE kind:bss addr:0x02177674 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRGWE8sProfileE kind:bss addr:0x02177694 +@13486 kind:bss addr:0x02177698 +_ZN15ProfileInstanceI23MapObjectProfileUnkTRGWE8sProfileE kind:bss addr:0x021776a4 data_ov090_02177778 kind:bss addr:0x02177778 -data_ov090_02177798 kind:bss addr:0x02177798 -data_ov090_0217779c kind:bss addr:0x0217779c -sMapObjectProfileUnkTRSD kind:bss addr:0x021777a8 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRSDE8sProfileE kind:bss addr:0x02177798 +@13492 kind:bss addr:0x0217779c +_ZN15ProfileInstanceI23MapObjectProfileUnkTRSDE8sProfileE kind:bss addr:0x021777a8 data_ov090_0217787c kind:bss addr:0x0217787c -data_ov090_0217789c kind:bss addr:0x0217789c -data_ov090_021778a0 kind:bss addr:0x021778a0 -sMapObjectProfileUnkNPST kind:bss addr:0x021778ac +_ZGVN15ProfileInstanceI23MapObjectProfileUnkNPSTE8sProfileE kind:bss addr:0x0217789c +@13498 kind:bss addr:0x021778a0 +_ZN15ProfileInstanceI23MapObjectProfileUnkNPSTE8sProfileE kind:bss addr:0x021778ac data_ov090_021778cc kind:bss addr:0x021778cc data_ov090_02177948 kind:bss addr:0x02177948 ambiguous data_ov090_02177980 kind:bss addr:0x02177980 -data_ov090_021779a0 kind:bss addr:0x021779a0 -data_ov090_021779a4 kind:bss addr:0x021779a4 -sMapObjectProfileUnkRBRC kind:bss addr:0x021779b0 -data_ov090_021779f4 kind:bss addr:0x021779f4 -data_ov090_021779f8 kind:bss addr:0x021779f8 -sMapObjectProfileUnkTRMR kind:bss addr:0x02177a04 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkRBRCE8sProfileE kind:bss addr:0x021779a0 +@13504 kind:bss addr:0x021779a4 +_ZN15ProfileInstanceI23MapObjectProfileUnkRBRCE8sProfileE kind:bss addr:0x021779b0 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRMRE8sProfileE kind:bss addr:0x021779f4 +@13510 kind:bss addr:0x021779f8 +_ZN15ProfileInstanceI23MapObjectProfileUnkTRMRE8sProfileE kind:bss addr:0x02177a04 data_ov090_02177aa0 kind:bss addr:0x02177aa0 ambiguous data_ov090_02177ad8 kind:bss addr:0x02177ad8 -data_ov090_02177af8 kind:bss addr:0x02177af8 -data_ov090_02177afc kind:bss addr:0x02177afc -sMapObjectProfileUnkRBMR kind:bss addr:0x02177b08 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkRBMRE8sProfileE kind:bss addr:0x02177af8 +@13516 kind:bss addr:0x02177afc +_ZN15ProfileInstanceI23MapObjectProfileUnkRBMRE8sProfileE kind:bss addr:0x02177b08 data_ov090_02177b48 kind:bss addr:0x02177b48 ambiguous -data_ov090_02177b4c kind:bss addr:0x02177b4c -data_ov090_02177b50 kind:bss addr:0x02177b50 -sMapObjectProfileUnkTRDT kind:bss addr:0x02177b5c +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRDTE8sProfileE kind:bss addr:0x02177b4c +@13522 kind:bss addr:0x02177b50 +_ZN15ProfileInstanceI23MapObjectProfileUnkTRDTE8sProfileE kind:bss addr:0x02177b5c data_ov090_02177c30 kind:bss addr:0x02177c30 -data_ov090_02177c50 kind:bss addr:0x02177c50 -data_ov090_02177c54 kind:bss addr:0x02177c54 -sMapObjectProfileUnkTRCC kind:bss addr:0x02177c60 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRCCE8sProfileE kind:bss addr:0x02177c50 +@13528 kind:bss addr:0x02177c54 +_ZN15ProfileInstanceI23MapObjectProfileUnkTRCCE8sProfileE kind:bss addr:0x02177c60 data_ov090_02177d00 kind:bss addr:0x02177d00 ambiguous data_ov090_02177d04 kind:bss addr:0x02177d04 ambiguous data_ov090_02177d0c kind:bss addr:0x02177d0c ambiguous @@ -673,6 +673,6 @@ data_ov090_02177d28 kind:bss addr:0x02177d28 ambiguous data_ov090_02177d30 kind:bss addr:0x02177d30 ambiguous data_ov090_02177d34 kind:bss addr:0x02177d34 data_ov090_02177d38 kind:bss addr:0x02177d38 ambiguous -data_ov090_02177d54 kind:bss addr:0x02177d54 -data_ov090_02177d58 kind:bss addr:0x02177d58 -sMapObjectProfileUnkETNM kind:bss addr:0x02177d64 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkETNME8sProfileE kind:bss addr:0x02177d54 +@13534 kind:bss addr:0x02177d58 +_ZN15ProfileInstanceI23MapObjectProfileUnkETNME8sProfileE kind:bss addr:0x02177d64 diff --git a/config/eur/arm9/overlays/ov091/delinks.txt b/config/eur/arm9/overlays/ov091/delinks.txt index f5eb5d07..cf533613 100644 --- a/config/eur/arm9/overlays/ov091/delinks.txt +++ b/config/eur/arm9/overlays/ov091/delinks.txt @@ -9,103 +9,103 @@ src/091_TrainExtra/MapObject/MapObjectUnkFRSH.cpp: .text start:0x021679a4 end:0x02167b18 .init start:0x02176980 end:0x021769d0 .ctor start:0x02176ff0 end:0x02176ff4 - .bss start:0x021781b4 end:0x02178288 + .bss start:0x021781a4 end:0x02178288 src/091_TrainExtra/MapObject/MapObjectUnkMZFX.cpp: .text start:0x02167b18 end:0x02167cc0 .init start:0x021769d0 end:0x02176a20 .ctor start:0x02176ff4 end:0x02176ff8 - .bss start:0x02178298 end:0x021782bc + .bss start:0x02178288 end:0x021782bc src/091_TrainExtra/MapObject/MapObjectUnkMZTR.cpp: .text start:0x02167cc0 end:0x0216800c .init start:0x02176a20 end:0x02176a70 .ctor start:0x02176ff8 end:0x02176ffc - .bss start:0x021782cc end:0x021783a0 + .bss start:0x021782bc end:0x021783a8 src/091_TrainExtra/MapObject/MapObjectUnkTMSB.cpp: .text start:0x0216800c end:0x021685d0 .init start:0x02176a70 end:0x02176ae0 .ctor start:0x02176ffc end:0x02177000 - .bss start:0x021783c0 end:0x02178494 + .bss start:0x021783a8 end:0x02178494 src/091_TrainExtra/MapObject/MapObjectUnkETUS.cpp: .text start:0x021685d0 end:0x02168818 .init start:0x02176ae0 end:0x02176b30 .ctor start:0x02177000 end:0x02177004 - .bss start:0x021784a4 end:0x02178500 + .bss start:0x02178494 end:0x02178578 src/091_TrainExtra/MapObject/MapObjectUnkBOGN.cpp: .text start:0x02168818 end:0x02168c08 .init start:0x02176b30 end:0x02176b80 .ctor start:0x02177004 end:0x02177008 - .bss start:0x02178588 end:0x021785a8 + .bss start:0x02178578 end:0x021785a8 src/091_TrainExtra/Actor/ActorUnkMZCT.cpp: .text start:0x02168c08 end:0x02169c00 .init start:0x02176b80 end:0x02176bd0 .ctor start:0x02177008 end:0x0217700c - .bss start:0x021785b8 end:0x02178690 + .bss start:0x021785a8 end:0x02178690 src/091_TrainExtra/Actor/ActorUnkSMCT.cpp: .text start:0x02169c00 end:0x02169ddc .init start:0x02176bd0 end:0x02176c20 .ctor start:0x0217700c end:0x02177010 - .bss start:0x021786a0 end:0x021786dc + .bss start:0x02178690 end:0x021786dc src/091_TrainExtra/Actor/ActorUnkSTCT.cpp: .text start:0x02169ddc end:0x02169f78 .init start:0x02176c20 end:0x02176c70 .ctor start:0x02177010 end:0x02177014 - .bss start:0x021786ec end:0x021787c4 + .bss start:0x021786dc end:0x021787c8 src/091_TrainExtra/Actor/ActorUnkCTFS.cpp: .text start:0x02169f78 end:0x0216b328 .init start:0x02176c70 end:0x02176ce8 .ctor start:0x02177014 end:0x02177018 - .bss start:0x021787e0 end:0x02178824 + .bss start:0x021787c8 end:0x021788c0 src/091_TrainExtra/Actor/ActorUnkNLTR.cpp: .text start:0x0216b328 end:0x0216c018 .init start:0x02176ce8 end:0x02176d38 .ctor start:0x02177018 end:0x0217701c - .bss start:0x021788dc end:0x021789b4 + .bss start:0x021788c0 end:0x02178a3c src/091_TrainExtra/Actor/ActorUnkSEFS.cpp: .text start:0x0216c018 end:0x0216d9c8 .init start:0x02176d38 end:0x02176db8 .ctor start:0x0217701c end:0x02177020 - .bss start:0x02178a70 end:0x02178b48 + .bss start:0x02178a3c end:0x02178b60 src/091_TrainExtra/Actor/ActorUnkTPDO.cpp: .text start:0x0216d9c8 end:0x0216e6a0 .init start:0x02176db8 end:0x02176e08 .ctor start:0x02177020 end:0x02177024 - .bss start:0x02178b80 end:0x02178c58 + .bss start:0x02178b60 end:0x02178c58 src/091_TrainExtra/Actor/ActorUnkBMOC.cpp: .text start:0x0216e6a0 end:0x0216ef30 .init start:0x02176e08 end:0x02176e58 .ctor start:0x02177024 end:0x02177028 - .bss start:0x02178c68 end:0x02178c80 + .bss start:0x02178c58 end:0x02178d40 src/091_TrainExtra/Actor/ActorUnkTSMT.cpp: .text start:0x0216ef30 end:0x0216f09c .init start:0x02176e58 end:0x02176ea8 .ctor start:0x02177028 end:0x0217702c - .bss start:0x02178d54 end:0x02178d90 + .bss start:0x02178d40 end:0x02178d90 src/091_TrainExtra/Actor/ActorUnkTTKB.cpp: .text start:0x0216f09c end:0x021757e0 .init start:0x02176ea8 end:0x02176f30 .ctor start:0x0217702c end:0x02177030 - .bss start:0x02178da0 end:0x02178e78 + .bss start:0x02178d90 end:0x02178e78 src/091_TrainExtra/Actor/ActorUnkTTUT.cpp: .text start:0x021757e0 end:0x02175cd0 .init start:0x02176f30 end:0x02176f80 .ctor start:0x02177030 end:0x02177034 - .bss start:0x02178e88 end:0x02178ec4 + .bss start:0x02178e78 end:0x02178ec4 src/091_TrainExtra/Actor/ActorUnkTRIC.cpp: .text start:0x02175cd0 end:0x02176850 diff --git a/config/eur/arm9/overlays/ov091/symbols.txt b/config/eur/arm9/overlays/ov091/symbols.txt index 951b774b..a53c51a9 100644 --- a/config/eur/arm9/overlays/ov091/symbols.txt +++ b/config/eur/arm9/overlays/ov091/symbols.txt @@ -588,46 +588,46 @@ data_ov091_021780b4 kind:bss addr:0x021780b4 data_ov091_021780c4 kind:bss addr:0x021780c4 data_ov091_021780d4 kind:bss addr:0x021780d4 data_ov091_0217813c kind:bss addr:0x0217813c -data_ov091_021781a4 kind:bss addr:0x021781a4 -data_ov091_021781a8 kind:bss addr:0x021781a8 -sMapObjectProfileUnkFRSH kind:bss addr:0x021781b4 -data_ov091_02178288 kind:bss addr:0x02178288 -data_ov091_0217828c kind:bss addr:0x0217828c -sMapObjectProfileUnkMZFX kind:bss addr:0x02178298 -data_ov091_021782bc kind:bss addr:0x021782bc -data_ov091_021782c0 kind:bss addr:0x021782c0 -sMapObjectProfileUnkMZTR kind:bss addr:0x021782cc +_ZGVN15ProfileInstanceI23MapObjectProfileUnkFRSHE8sProfileE kind:bss addr:0x021781a4 +@13546 kind:bss addr:0x021781a8 +_ZN15ProfileInstanceI23MapObjectProfileUnkFRSHE8sProfileE kind:bss addr:0x021781b4 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkMZFXE8sProfileE kind:bss addr:0x02178288 +@13552 kind:bss addr:0x0217828c +_ZN15ProfileInstanceI23MapObjectProfileUnkMZFXE8sProfileE kind:bss addr:0x02178298 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkMZTRE8sProfileE kind:bss addr:0x021782bc +@13558 kind:bss addr:0x021782c0 +_ZN15ProfileInstanceI23MapObjectProfileUnkMZTRE8sProfileE kind:bss addr:0x021782cc data_ov091_021783a0 kind:bss addr:0x021783a0 -data_ov091_021783a8 kind:bss addr:0x021783a8 -data_ov091_021783b4 kind:bss addr:0x021783b4 -sMapObjectProfileUnkTMSB kind:bss addr:0x021783c0 -data_ov091_02178494 kind:bss addr:0x02178494 -data_ov091_02178498 kind:bss addr:0x02178498 -sMapObjectProfileUnkETUS kind:bss addr:0x021784a4 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTMSBE8sProfileE kind:bss addr:0x021783a8 +@13564 kind:bss addr:0x021783b4 +_ZN15ProfileInstanceI23MapObjectProfileUnkTMSBE8sProfileE kind:bss addr:0x021783c0 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkETUSE8sProfileE kind:bss addr:0x02178494 +@13570 kind:bss addr:0x02178498 +_ZN15ProfileInstanceI23MapObjectProfileUnkETUSE8sProfileE kind:bss addr:0x021784a4 data_ov091_02178500 kind:bss addr:0x02178500 ambiguous data_ov091_02178530 kind:bss addr:0x02178530 ambiguous -data_ov091_02178578 kind:bss addr:0x02178578 -data_ov091_0217857c kind:bss addr:0x0217857c -sMapObjectProfileUnkBOGN kind:bss addr:0x02178588 -data_ov091_021785a8 kind:bss addr:0x021785a8 -data_ov091_021785ac kind:bss addr:0x021785ac -sActorProfileUnkMZCT kind:bss addr:0x021785b8 -data_ov091_02178690 kind:bss addr:0x02178690 -data_ov091_02178694 kind:bss addr:0x02178694 -sActorProfileUnkSMCT kind:bss addr:0x021786a0 -data_ov091_021786dc kind:bss addr:0x021786dc -data_ov091_021786e0 kind:bss addr:0x021786e0 -sActorProfileUnkSTCT kind:bss addr:0x021786ec +_ZGVN15ProfileInstanceI23MapObjectProfileUnkBOGNE8sProfileE kind:bss addr:0x02178578 +@13576 kind:bss addr:0x0217857c +_ZN15ProfileInstanceI23MapObjectProfileUnkBOGNE8sProfileE kind:bss addr:0x02178588 +_ZGVN15ProfileInstanceI19ActorProfileUnkMZCTE8sProfileE kind:bss addr:0x021785a8 +@14259 kind:bss addr:0x021785ac +_ZN15ProfileInstanceI19ActorProfileUnkMZCTE8sProfileE kind:bss addr:0x021785b8 +_ZGVN15ProfileInstanceI19ActorProfileUnkSMCTE8sProfileE kind:bss addr:0x02178690 +@14265 kind:bss addr:0x02178694 +_ZN15ProfileInstanceI19ActorProfileUnkSMCTE8sProfileE kind:bss addr:0x021786a0 +_ZGVN15ProfileInstanceI19ActorProfileUnkSTCTE8sProfileE kind:bss addr:0x021786dc +@14271 kind:bss addr:0x021786e0 +_ZN15ProfileInstanceI19ActorProfileUnkSTCTE8sProfileE kind:bss addr:0x021786ec data_ov091_021787c4 kind:bss addr:0x021787c4 -data_ov091_021787c8 kind:bss addr:0x021787c8 -data_ov091_021787d4 kind:bss addr:0x021787d4 -sActorProfileUnkCTFS kind:bss addr:0x021787e0 +_ZGVN15ProfileInstanceI19ActorProfileUnkCTFSE8sProfileE kind:bss addr:0x021787c8 +@14277 kind:bss addr:0x021787d4 +_ZN15ProfileInstanceI19ActorProfileUnkCTFSE8sProfileE kind:bss addr:0x021787e0 data_ov091_02178824 kind:bss addr:0x02178824 ambiguous data_ov091_021788b8 kind:bss addr:0x021788b8 data_ov091_021788bc kind:bss addr:0x021788bc -data_ov091_021788c0 kind:bss addr:0x021788c0 -data_ov091_021788cc kind:bss addr:0x021788cc -sActorProfileUnkNLTR kind:bss addr:0x021788dc +_ZGVN15ProfileInstanceI19ActorProfileUnkNLTRE8sProfileE kind:bss addr:0x021788c0 +@14283 kind:bss addr:0x021788cc +_ZN15ProfileInstanceI19ActorProfileUnkNLTRE8sProfileE kind:bss addr:0x021788dc data_ov091_021789b4 kind:bss addr:0x021789b4 data_ov091_021789b8 kind:bss addr:0x021789b8 data_ov091_021789c8 kind:bss addr:0x021789c8 @@ -637,29 +637,29 @@ data_ov091_021789ec kind:bss addr:0x021789ec data_ov091_021789f8 kind:bss addr:0x021789f8 data_ov091_02178a04 kind:bss addr:0x02178a04 data_ov091_02178a10 kind:bss addr:0x02178a10 -data_ov091_02178a3c kind:bss addr:0x02178a3c -data_ov091_02178a48 kind:bss addr:0x02178a48 -sActorProfileUnkSEFS kind:bss addr:0x02178a70 +_ZGVN15ProfileInstanceI19ActorProfileUnkSEFSE8sProfileE kind:bss addr:0x02178a3c +@14289 kind:bss addr:0x02178a48 +_ZN15ProfileInstanceI19ActorProfileUnkSEFSE8sProfileE kind:bss addr:0x02178a70 data_ov091_02178b48 kind:bss addr:0x02178b48 data_ov091_02178b4c kind:bss addr:0x02178b4c data_ov091_02178b50 kind:bss addr:0x02178b50 data_ov091_02178b5c kind:bss addr:0x02178b5c -data_ov091_02178b60 kind:bss addr:0x02178b60 -data_ov091_02178b70 kind:bss addr:0x02178b70 -sActorProfileUnkTPDO kind:bss addr:0x02178b80 -data_ov091_02178c58 kind:bss addr:0x02178c58 -data_ov091_02178c5c kind:bss addr:0x02178c5c -sActorProfileUnkBMOC kind:bss addr:0x02178c68 +_ZGVN15ProfileInstanceI19ActorProfileUnkTPDOE8sProfileE kind:bss addr:0x02178b60 +@14295 kind:bss addr:0x02178b70 +_ZN15ProfileInstanceI19ActorProfileUnkTPDOE8sProfileE kind:bss addr:0x02178b80 +_ZGVN15ProfileInstanceI19ActorProfileUnkBMOCE8sProfileE kind:bss addr:0x02178c58 +@14301 kind:bss addr:0x02178c5c +_ZN15ProfileInstanceI19ActorProfileUnkBMOCE8sProfileE kind:bss addr:0x02178c68 data_ov091_02178c80 kind:bss addr:0x02178c80 ambiguous -data_ov091_02178d40 kind:bss addr:0x02178d40 -data_ov091_02178d48 kind:bss addr:0x02178d48 -sActorProfileUnkTSMT kind:bss addr:0x02178d54 -data_ov091_02178d90 kind:bss addr:0x02178d90 -data_ov091_02178d94 kind:bss addr:0x02178d94 -sActorProfileUnkTTKB kind:bss addr:0x02178da0 -data_ov091_02178e78 kind:bss addr:0x02178e78 -data_ov091_02178e7c kind:bss addr:0x02178e7c -sActorProfileUnkTTUT kind:bss addr:0x02178e88 +_ZGVN15ProfileInstanceI19ActorProfileUnkTSMTE8sProfileE kind:bss addr:0x02178d40 +@14307 kind:bss addr:0x02178d48 +_ZN15ProfileInstanceI19ActorProfileUnkTSMTE8sProfileE kind:bss addr:0x02178d54 +_ZGVN15ProfileInstanceI19ActorProfileUnkTTKBE8sProfileE kind:bss addr:0x02178d90 +@14313 kind:bss addr:0x02178d94 +_ZN15ProfileInstanceI19ActorProfileUnkTTKBE8sProfileE kind:bss addr:0x02178da0 +_ZGVN15ProfileInstanceI19ActorProfileUnkTTUTE8sProfileE kind:bss addr:0x02178e78 +@14319 kind:bss addr:0x02178e7c +_ZN15ProfileInstanceI19ActorProfileUnkTTUTE8sProfileE kind:bss addr:0x02178e88 data_ov091_02178ec4 kind:bss addr:0x02178ec4 data_ov091_02178ec8 kind:bss addr:0x02178ec8 -sActorProfileUnkTRIC kind:bss addr:0x02178ed4 +_ZN15ProfileInstanceI19ActorProfileUnkTRICE8sProfileE kind:bss addr:0x02178ed4 diff --git a/config/eur/arm9/overlays/ov092/delinks.txt b/config/eur/arm9/overlays/ov092/delinks.txt index b56985a5..016205ad 100644 --- a/config/eur/arm9/overlays/ov092/delinks.txt +++ b/config/eur/arm9/overlays/ov092/delinks.txt @@ -9,130 +9,130 @@ src/092_TrainDark/MapObject/MapObjectUnkTDBP.cpp: .text start:0x02166420 end:0x021665f0 .init start:0x0217ad7c end:0x0217adcc .ctor start:0x0217b994 end:0x0217b998 - .bss start:0x0217d050 end:0x0217d124 + .bss start:0x0217d040 end:0x0217d124 src/092_TrainDark/MapObject/MapObjectUnkTDBR.cpp: .text start:0x021665f0 end:0x021667b8 .init start:0x0217adcc end:0x0217ae1c .ctor start:0x0217b998 end:0x0217b99c - .bss start:0x0217d134 end:0x0217d208 + .bss start:0x0217d124 end:0x0217d208 src/092_TrainDark/MapObject/MapObjectUnkTDDR.cpp: .text start:0x021667b8 end:0x02166a58 .init start:0x0217ae1c end:0x0217ae6c .ctor start:0x0217b99c end:0x0217b9a0 - .bss start:0x0217d218 end:0x0217d2ec + .bss start:0x0217d208 end:0x0217d2ec src/092_TrainDark/MapObject/MapObjectUnkETET.cpp: .text start:0x02166a58 end:0x02166ec4 .init start:0x0217ae6c end:0x0217aebc .ctor start:0x0217b9a0 end:0x0217b9a4 - .bss start:0x0217d2fc end:0x0217d31c + .bss start:0x0217d2ec end:0x0217d3d0 src/092_TrainDark/MapObject/MapObjectUnkETFD.cpp: .text start:0x02166ec4 end:0x021672f0 .init start:0x0217aebc end:0x0217af0c .ctor start:0x0217b9a4 end:0x0217b9a8 - .bss start:0x0217d3e0 end:0x0217d400 + .bss start:0x0217d3d0 end:0x0217d400 src/092_TrainDark/MapObject/MapObjectUnkETMW.cpp: .text start:0x021672f0 end:0x021675dc .init start:0x0217af0c end:0x0217af5c .ctor start:0x0217b9a8 end:0x0217b9ac - .bss start:0x0217d410 end:0x0217d430 + .bss start:0x0217d400 end:0x0217d4e4 src/092_TrainDark/MapObject/MapObjectUnkETYG.cpp: .text start:0x021675dc end:0x02167af4 .init start:0x0217af5c end:0x0217afac .ctor start:0x0217b9ac end:0x0217b9b0 - .bss start:0x0217d4f4 end:0x0217d514 + .bss start:0x0217d4e4 end:0x0217d5c8 src/092_TrainDark/MapObject/MapObjectUnkTBSD.cpp: .text start:0x02167af4 end:0x02167d94 .init start:0x0217afac end:0x0217affc .ctor start:0x0217b9b0 end:0x0217b9b4 - .bss start:0x0217d5d8 end:0x0217d6ac + .bss start:0x0217d5c8 end:0x0217d6cc src/092_TrainDark/MapObject/MapObjectUnkTRDR.cpp: .text start:0x02167d94 end:0x021680b4 .init start:0x0217affc end:0x0217b04c .ctor start:0x0217b9b4 end:0x0217b9b8 - .bss start:0x0217d6dc end:0x0217d7b0 + .bss start:0x0217d6cc end:0x0217d7d0 src/092_TrainDark/MapObject/MapObjectUnkETDD.cpp: .text start:0x021680b4 end:0x021683e8 .init start:0x0217b04c end:0x0217b09c .ctor start:0x0217b9b8 end:0x0217b9bc - .bss start:0x0217d7e0 end:0x0217d800 + .bss start:0x0217d7d0 end:0x0217d834 src/092_TrainDark/Actor/ActorUnkMATR.cpp: .text start:0x02168cbc end:0x0216f688 .init start:0x0217b09c end:0x0217b400 .ctor start:0x0217b9bc end:0x0217b9c0 - .bss start:0x0217d84c end:0x0217d924 + .bss start:0x0217d834 end:0x0217d924 src/092_TrainDark/Actor/ActorUnkMTWP.cpp: .text start:0x0216f688 end:0x021702e4 .init start:0x0217b400 end:0x0217b450 .ctor start:0x0217b9c0 end:0x0217b9c4 - .bss start:0x0217d934 end:0x0217d970 + .bss start:0x0217d924 end:0x0217d974 src/092_TrainDark/Actor/ActorUnkMTFL.cpp: .text start:0x021702e4 end:0x02171b58 .init start:0x0217b450 end:0x0217b518 .ctor start:0x0217b9c4 end:0x0217b9c8 - .bss start:0x0217d994 end:0x0217da6c + .bss start:0x0217d974 end:0x0217da70 src/092_TrainDark/Actor/ActorUnkMTFB.cpp: .text start:0x02171b58 end:0x021735e8 .init start:0x0217b518 end:0x0217b5e0 .ctor start:0x0217b9c8 end:0x0217b9cc - .bss start:0x0217da94 end:0x0217db6c + .bss start:0x0217da70 end:0x0217db6c src/092_TrainDark/Actor/ActorUnkMBCC.cpp: .text start:0x021735e8 end:0x02174504 .init start:0x0217b5e0 end:0x0217b6b0 .ctor start:0x0217b9cc end:0x0217b9d0 - .bss start:0x0217db7c end:0x0217dc54 + .bss start:0x0217db6c end:0x0217dc54 src/092_TrainDark/Actor/ActorUnkMABC.cpp: .text start:0x02174504 end:0x02175240 .init start:0x0217b6b0 end:0x0217b700 .ctor start:0x0217b9d0 end:0x0217b9d4 - .bss start:0x0217dc64 end:0x0217dd3c + .bss start:0x0217dc54 end:0x0217dd3c src/092_TrainDark/Actor/ActorUnkMARG.cpp: .text start:0x02175240 end:0x02176af4 .init start:0x0217b700 end:0x0217b7c8 .ctor start:0x0217b9d4 end:0x0217b9d8 - .bss start:0x0217dd4c end:0x0217dd88 + .bss start:0x0217dd3c end:0x0217de28 src/092_TrainDark/Actor/ActorUnkMAFI.cpp: .text start:0x02176af4 end:0x021770f0 .init start:0x0217b7c8 end:0x0217b824 .ctor start:0x0217b9d8 end:0x0217b9dc - .bss start:0x0217de40 end:0x0217df18 + .bss start:0x0217de28 end:0x0217df1c src/092_TrainDark/Actor/ActorUnkTDKT.cpp: .text start:0x021770f0 end:0x02177d78 .init start:0x0217b824 end:0x0217b874 .ctor start:0x0217b9dc end:0x0217b9e0 - .bss start:0x0217df2c end:0x0217df68 + .bss start:0x0217df1c end:0x0217df68 src/092_TrainDark/Actor/ActorUnkTEVT.cpp: .text start:0x02177d78 end:0x02178500 .init start:0x0217b874 end:0x0217b8d8 .ctor start:0x0217b9e0 end:0x0217b9e4 - .bss start:0x0217df7c end:0x0217dfb8 + .bss start:0x0217df68 end:0x0217dfb8 src/092_TrainDark/Actor/ActorUnkSZKL.cpp: .text start:0x02178500 end:0x02178c80 .init start:0x0217b8d8 end:0x0217b928 .ctor start:0x0217b9e4 end:0x0217b9e8 - .bss start:0x0217dfc8 end:0x0217e0a0 + .bss start:0x0217dfb8 end:0x0217e0a8 src/092_TrainDark/Actor/ActorUnkDKCB.cpp: .text start:0x02178c80 end:0x021797c4 .init start:0x0217b928 end:0x0217b978 .ctor start:0x0217b9e8 end:0x0217b9ec - .bss start:0x0217e0b8 end:0x0217e0f4 + .bss start:0x0217e0a8 end:0x0217e0f4 diff --git a/config/eur/arm9/overlays/ov092/symbols.txt b/config/eur/arm9/overlays/ov092/symbols.txt index 1add34d4..45f05046 100644 --- a/config/eur/arm9/overlays/ov092/symbols.txt +++ b/config/eur/arm9/overlays/ov092/symbols.txt @@ -796,87 +796,87 @@ _ZTV19data_ov092_0217cf68 kind:data(any) addr:0x0217cf68 data_ov092_0217cfd4 kind:data(any) addr:0x0217cfd4 data_ov092_0217d018 kind:data(any) addr:0x0217d018 data_ov092_0217d038 kind:data(any) addr:0x0217d038 -data_ov092_0217d040 kind:bss addr:0x0217d040 -data_ov092_0217d044 kind:bss addr:0x0217d044 -sMapObjectProfileUnkTDBP kind:bss addr:0x0217d050 -data_ov092_0217d124 kind:bss addr:0x0217d124 -data_ov092_0217d128 kind:bss addr:0x0217d128 -sMapObjectProfileUnkTDBR kind:bss addr:0x0217d134 -data_ov092_0217d208 kind:bss addr:0x0217d208 -data_ov092_0217d20c kind:bss addr:0x0217d20c -sMapObjectProfileUnkTDDR kind:bss addr:0x0217d218 -data_ov092_0217d2ec kind:bss addr:0x0217d2ec -data_ov092_0217d2f0 kind:bss addr:0x0217d2f0 -sMapObjectProfileUnkETET kind:bss addr:0x0217d2fc +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTDBPE8sProfileE kind:bss addr:0x0217d040 +@13659 kind:bss addr:0x0217d044 +_ZN15ProfileInstanceI23MapObjectProfileUnkTDBPE8sProfileE kind:bss addr:0x0217d050 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTDBRE8sProfileE kind:bss addr:0x0217d124 +@13665 kind:bss addr:0x0217d128 +_ZN15ProfileInstanceI23MapObjectProfileUnkTDBRE8sProfileE kind:bss addr:0x0217d134 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTDDRE8sProfileE kind:bss addr:0x0217d208 +@13671 kind:bss addr:0x0217d20c +_ZN15ProfileInstanceI23MapObjectProfileUnkTDDRE8sProfileE kind:bss addr:0x0217d218 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkETETE8sProfileE kind:bss addr:0x0217d2ec +@13677 kind:bss addr:0x0217d2f0 +_ZN15ProfileInstanceI23MapObjectProfileUnkETETE8sProfileE kind:bss addr:0x0217d2fc data_ov092_0217d31c kind:bss addr:0x0217d31c -data_ov092_0217d3d0 kind:bss addr:0x0217d3d0 -data_ov092_0217d3d4 kind:bss addr:0x0217d3d4 -sMapObjectProfileUnkETFD kind:bss addr:0x0217d3e0 -data_ov092_0217d400 kind:bss addr:0x0217d400 -data_ov092_0217d404 kind:bss addr:0x0217d404 -sMapObjectProfileUnkETMW kind:bss addr:0x0217d410 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkETFDE8sProfileE kind:bss addr:0x0217d3d0 +@13683 kind:bss addr:0x0217d3d4 +_ZN15ProfileInstanceI23MapObjectProfileUnkETFDE8sProfileE kind:bss addr:0x0217d3e0 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkETMWE8sProfileE kind:bss addr:0x0217d400 +@13689 kind:bss addr:0x0217d404 +_ZN15ProfileInstanceI23MapObjectProfileUnkETMWE8sProfileE kind:bss addr:0x0217d410 data_ov092_0217d430 kind:bss addr:0x0217d430 -data_ov092_0217d4e4 kind:bss addr:0x0217d4e4 -data_ov092_0217d4e8 kind:bss addr:0x0217d4e8 -sMapObjectProfileUnkETYG kind:bss addr:0x0217d4f4 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkETYGE8sProfileE kind:bss addr:0x0217d4e4 +@13695 kind:bss addr:0x0217d4e8 +_ZN15ProfileInstanceI23MapObjectProfileUnkETYGE8sProfileE kind:bss addr:0x0217d4f4 data_ov092_0217d514 kind:bss addr:0x0217d514 -data_ov092_0217d5c8 kind:bss addr:0x0217d5c8 -data_ov092_0217d5cc kind:bss addr:0x0217d5cc -sMapObjectProfileUnkTBSD kind:bss addr:0x0217d5d8 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTBSDE8sProfileE kind:bss addr:0x0217d5c8 +@13701 kind:bss addr:0x0217d5cc +_ZN15ProfileInstanceI23MapObjectProfileUnkTBSDE8sProfileE kind:bss addr:0x0217d5d8 data_ov092_0217d6ac kind:bss addr:0x0217d6ac -data_ov092_0217d6cc kind:bss addr:0x0217d6cc -data_ov092_0217d6d0 kind:bss addr:0x0217d6d0 -sMapObjectProfileUnkTRDR kind:bss addr:0x0217d6dc +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRDRE8sProfileE kind:bss addr:0x0217d6cc +@13707 kind:bss addr:0x0217d6d0 +_ZN15ProfileInstanceI23MapObjectProfileUnkTRDRE8sProfileE kind:bss addr:0x0217d6dc data_ov092_0217d7b0 kind:bss addr:0x0217d7b0 -data_ov092_0217d7d0 kind:bss addr:0x0217d7d0 -data_ov092_0217d7d4 kind:bss addr:0x0217d7d4 -sMapObjectProfileUnkETDD kind:bss addr:0x0217d7e0 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkETDDE8sProfileE kind:bss addr:0x0217d7d0 +@13713 kind:bss addr:0x0217d7d4 +_ZN15ProfileInstanceI23MapObjectProfileUnkETDDE8sProfileE kind:bss addr:0x0217d7e0 data_ov092_0217d800 kind:bss addr:0x0217d800 data_ov092_0217d804 kind:bss addr:0x0217d804 data_ov092_0217d810 kind:bss addr:0x0217d810 data_ov092_0217d828 kind:bss addr:0x0217d828 -data_ov092_0217d834 kind:bss addr:0x0217d834 -data_ov092_0217d840 kind:bss addr:0x0217d840 -sActorProfileUnkMATR kind:bss addr:0x0217d84c -data_ov092_0217d924 kind:bss addr:0x0217d924 -data_ov092_0217d928 kind:bss addr:0x0217d928 -sActorProfileUnkMTWP kind:bss addr:0x0217d934 +_ZGVN15ProfileInstanceI19ActorProfileUnkMATRE8sProfileE kind:bss addr:0x0217d834 +@14396 kind:bss addr:0x0217d840 +_ZN15ProfileInstanceI19ActorProfileUnkMATRE8sProfileE kind:bss addr:0x0217d84c +_ZGVN15ProfileInstanceI19ActorProfileUnkMTWPE8sProfileE kind:bss addr:0x0217d924 +@14402 kind:bss addr:0x0217d928 +_ZN15ProfileInstanceI19ActorProfileUnkMTWPE8sProfileE kind:bss addr:0x0217d934 data_ov092_0217d970 kind:bss addr:0x0217d970 -data_ov092_0217d974 kind:bss addr:0x0217d974 -data_ov092_0217d980 kind:bss addr:0x0217d980 -sActorProfileUnkMTFL kind:bss addr:0x0217d994 +_ZGVN15ProfileInstanceI19ActorProfileUnkMTFLE8sProfileE kind:bss addr:0x0217d974 +@14408 kind:bss addr:0x0217d980 +_ZN15ProfileInstanceI19ActorProfileUnkMTFLE8sProfileE kind:bss addr:0x0217d994 data_ov092_0217da6c kind:bss addr:0x0217da6c -data_ov092_0217da70 kind:bss addr:0x0217da70 -data_ov092_0217da7c kind:bss addr:0x0217da7c -sActorProfileUnkMTFB kind:bss addr:0x0217da94 -data_ov092_0217db6c kind:bss addr:0x0217db6c -data_ov092_0217db70 kind:bss addr:0x0217db70 -sActorProfileUnkMBCC kind:bss addr:0x0217db7c -data_ov092_0217dc54 kind:bss addr:0x0217dc54 -data_ov092_0217dc58 kind:bss addr:0x0217dc58 -sActorProfileUnkMABC kind:bss addr:0x0217dc64 -data_ov092_0217dd3c kind:bss addr:0x0217dd3c -data_ov092_0217dd40 kind:bss addr:0x0217dd40 -sActorProfileUnkMARG kind:bss addr:0x0217dd4c +_ZGVN15ProfileInstanceI19ActorProfileUnkMTFBE8sProfileE kind:bss addr:0x0217da70 +@14414 kind:bss addr:0x0217da7c +_ZN15ProfileInstanceI19ActorProfileUnkMTFBE8sProfileE kind:bss addr:0x0217da94 +_ZGVN15ProfileInstanceI19ActorProfileUnkMBCCE8sProfileE kind:bss addr:0x0217db6c +@14420 kind:bss addr:0x0217db70 +_ZN15ProfileInstanceI19ActorProfileUnkMBCCE8sProfileE kind:bss addr:0x0217db7c +_ZGVN15ProfileInstanceI19ActorProfileUnkMABCE8sProfileE kind:bss addr:0x0217dc54 +@14426 kind:bss addr:0x0217dc58 +_ZN15ProfileInstanceI19ActorProfileUnkMABCE8sProfileE kind:bss addr:0x0217dc64 +_ZGVN15ProfileInstanceI19ActorProfileUnkMARGE8sProfileE kind:bss addr:0x0217dd3c +@14432 kind:bss addr:0x0217dd40 +_ZN15ProfileInstanceI19ActorProfileUnkMARGE8sProfileE kind:bss addr:0x0217dd4c data_ov092_0217dd88 kind:bss addr:0x0217dd88 ambiguous data_ov092_0217de24 kind:bss addr:0x0217de24 -data_ov092_0217de28 kind:bss addr:0x0217de28 -data_ov092_0217de34 kind:bss addr:0x0217de34 -sActorProfileUnkMAFI kind:bss addr:0x0217de40 +_ZGVN15ProfileInstanceI19ActorProfileUnkMAFIE8sProfileE kind:bss addr:0x0217de28 +@14438 kind:bss addr:0x0217de34 +_ZN15ProfileInstanceI19ActorProfileUnkMAFIE8sProfileE kind:bss addr:0x0217de40 data_ov092_0217df18 kind:bss addr:0x0217df18 -data_ov092_0217df1c kind:bss addr:0x0217df1c ambiguous -data_ov092_0217df20 kind:bss addr:0x0217df20 -sActorProfileUnkTDKT kind:bss addr:0x0217df2c -data_ov092_0217df68 kind:bss addr:0x0217df68 -data_ov092_0217df70 kind:bss addr:0x0217df70 -sActorProfileUnkTEVT kind:bss addr:0x0217df7c -data_ov092_0217dfb8 kind:bss addr:0x0217dfb8 -data_ov092_0217dfbc kind:bss addr:0x0217dfbc -sActorProfileUnkSZKL kind:bss addr:0x0217dfc8 +_ZGVN15ProfileInstanceI19ActorProfileUnkTDKTE8sProfileE kind:bss addr:0x0217df1c ambiguous +@14444 kind:bss addr:0x0217df20 +_ZN15ProfileInstanceI19ActorProfileUnkTDKTE8sProfileE kind:bss addr:0x0217df2c +_ZGVN15ProfileInstanceI19ActorProfileUnkTEVTE8sProfileE kind:bss addr:0x0217df68 +@14450 kind:bss addr:0x0217df70 +_ZN15ProfileInstanceI19ActorProfileUnkTEVTE8sProfileE kind:bss addr:0x0217df7c +_ZGVN15ProfileInstanceI19ActorProfileUnkSZKLE8sProfileE kind:bss addr:0x0217dfb8 +@14456 kind:bss addr:0x0217dfbc +_ZN15ProfileInstanceI19ActorProfileUnkSZKLE8sProfileE kind:bss addr:0x0217dfc8 data_ov092_0217e0a0 kind:bss addr:0x0217e0a0 data_ov092_0217e0a4 kind:bss addr:0x0217e0a4 -data_ov092_0217e0a8 kind:bss addr:0x0217e0a8 -data_ov092_0217e0ac kind:bss addr:0x0217e0ac -sActorProfileUnkDKCB kind:bss addr:0x0217e0b8 +_ZGVN15ProfileInstanceI19ActorProfileUnkDKCBE8sProfileE kind:bss addr:0x0217e0a8 +@14462 kind:bss addr:0x0217e0ac +_ZN15ProfileInstanceI19ActorProfileUnkDKCBE8sProfileE kind:bss addr:0x0217e0b8 data_ov092_0217e0f4 kind:bss addr:0x0217e0f4 data_ov092_0217e104 kind:bss addr:0x0217e104 diff --git a/config/eur/arm9/overlays/ov093/delinks.txt b/config/eur/arm9/overlays/ov093/delinks.txt index fc5ecfa6..658b861f 100644 --- a/config/eur/arm9/overlays/ov093/delinks.txt +++ b/config/eur/arm9/overlays/ov093/delinks.txt @@ -9,37 +9,37 @@ src/093_PlayerSub/Actor/ActorUnkSPTT.cpp: .text start:0x02176aa8 end:0x02177228 .init start:0x02178494 end:0x021784e4 .ctor start:0x02178720 end:0x02178724 - .bss start:0x02178d80 end:0x02178dbc + .bss start:0x02178d6c end:0x02178dbc src/093_PlayerSub/Actor/ActorUnkTCAM.cpp: .text start:0x02177228 end:0x0217756c .init start:0x021784e4 end:0x02178534 .ctor start:0x02178724 end:0x02178728 - .bss start:0x02178dcc end:0x02178e08 + .bss start:0x02178dbc end:0x02178e08 src/093_PlayerSub/Actor/ActorUnkBLON.cpp: .text start:0x0217756c end:0x02177948 .init start:0x02178534 end:0x02178584 .ctor start:0x02178728 end:0x0217872c - .bss start:0x02178e18 end:0x02178e54 + .bss start:0x02178e08 end:0x02178e54 src/093_PlayerSub/Actor/ActorUnkPHTM.cpp: .text start:0x02177948 end:0x021779f4 .init start:0x02178584 end:0x021785e0 .ctor start:0x0217872c end:0x02178730 - .bss start:0x02178e70 end:0x02178f48 + .bss start:0x02178e54 end:0x02178f48 src/093_PlayerSub/Actor/ActorUnkPMTB.cpp: .text start:0x021779f4 end:0x02177aa0 .init start:0x021785e0 end:0x0217863c .ctor start:0x02178730 end:0x02178734 - .bss start:0x02178f64 end:0x0217903c + .bss start:0x02178f48 end:0x0217903c src/093_PlayerSub/Actor/ActorUnkPMTC.cpp: .text start:0x02177aa0 end:0x02177b48 .init start:0x0217863c end:0x02178698 .ctor start:0x02178734 end:0x02178738 - .bss start:0x02179058 end:0x02179130 + .bss start:0x0217903c end:0x02179130 src/093_PlayerSub/Actor/ActorUnkPMTD.cpp: .text start:0x02177b48 end:0x02177bf4 diff --git a/config/eur/arm9/overlays/ov093/symbols.txt b/config/eur/arm9/overlays/ov093/symbols.txt index a83b0d8b..f1b2b376 100644 --- a/config/eur/arm9/overlays/ov093/symbols.txt +++ b/config/eur/arm9/overlays/ov093/symbols.txt @@ -594,24 +594,24 @@ _ZTV19data_ov093_02178d20 kind:data(any) addr:0x02178d20 data_ov093_02178d60 kind:bss addr:0x02178d60 data_ov093_02178d64 kind:bss addr:0x02178d64 data_ov093_02178d68 kind:bss addr:0x02178d68 -data_ov093_02178d6c kind:bss addr:0x02178d6c -data_ov093_02178d74 kind:bss addr:0x02178d74 -sActorProfileUnkSPTT kind:bss addr:0x02178d80 -data_ov093_02178dbc kind:bss addr:0x02178dbc -data_ov093_02178dc0 kind:bss addr:0x02178dc0 -sActorProfileUnkTCAM kind:bss addr:0x02178dcc -data_ov093_02178e08 kind:bss addr:0x02178e08 -data_ov093_02178e0c kind:bss addr:0x02178e0c -sActorProfileUnkBLON kind:bss addr:0x02178e18 -data_ov093_02178e54 kind:bss addr:0x02178e54 -data_ov093_02178e64 kind:bss addr:0x02178e64 -sActorProfileUnkPHTM kind:bss addr:0x02178e70 -data_ov093_02178f48 kind:bss addr:0x02178f48 -data_ov093_02178f58 kind:bss addr:0x02178f58 -sActorProfileUnkPMTB kind:bss addr:0x02178f64 -data_ov093_0217903c kind:bss addr:0x0217903c -data_ov093_0217904c kind:bss addr:0x0217904c -sActorProfileUnkPMTC kind:bss addr:0x02179058 +_ZGVN15ProfileInstanceI19ActorProfileUnkSPTTE8sProfileE kind:bss addr:0x02178d6c +@14474 kind:bss addr:0x02178d74 +_ZN15ProfileInstanceI19ActorProfileUnkSPTTE8sProfileE kind:bss addr:0x02178d80 +_ZGVN15ProfileInstanceI19ActorProfileUnkTCAME8sProfileE kind:bss addr:0x02178dbc +@14480 kind:bss addr:0x02178dc0 +_ZN15ProfileInstanceI19ActorProfileUnkTCAME8sProfileE kind:bss addr:0x02178dcc +_ZGVN15ProfileInstanceI19ActorProfileUnkBLONE8sProfileE kind:bss addr:0x02178e08 +@14486 kind:bss addr:0x02178e0c +_ZN15ProfileInstanceI19ActorProfileUnkBLONE8sProfileE kind:bss addr:0x02178e18 +_ZGVN15ProfileInstanceI19ActorProfileUnkPHTME8sProfileE kind:bss addr:0x02178e54 +@14492 kind:bss addr:0x02178e64 +_ZN15ProfileInstanceI19ActorProfileUnkPHTME8sProfileE kind:bss addr:0x02178e70 +_ZGVN15ProfileInstanceI19ActorProfileUnkPMTBE8sProfileE kind:bss addr:0x02178f48 +@14498 kind:bss addr:0x02178f58 +_ZN15ProfileInstanceI19ActorProfileUnkPMTBE8sProfileE kind:bss addr:0x02178f64 +_ZGVN15ProfileInstanceI19ActorProfileUnkPMTCE8sProfileE kind:bss addr:0x0217903c +@14504 kind:bss addr:0x0217904c +_ZN15ProfileInstanceI19ActorProfileUnkPMTCE8sProfileE kind:bss addr:0x02179058 data_ov093_02179130 kind:bss addr:0x02179130 data_ov093_02179140 kind:bss addr:0x02179140 -sActorProfileUnkPMTD kind:bss addr:0x0217914c +_ZN15ProfileInstanceI19ActorProfileUnkPMTDE8sProfileE kind:bss addr:0x0217914c diff --git a/config/eur/arm9/overlays/ov094/delinks.txt b/config/eur/arm9/overlays/ov094/delinks.txt index 73a6c3b0..c9e40cd0 100644 --- a/config/eur/arm9/overlays/ov094/delinks.txt +++ b/config/eur/arm9/overlays/ov094/delinks.txt @@ -9,142 +9,142 @@ src/094_Land2/Actor/ActorUnkLOCK.cpp: .text start:0x02166038 end:0x021662c8 .init start:0x021765d8 end:0x02176628 .ctor start:0x02176e78 end:0x02176e7c - .bss start:0x02178568 end:0x021785a4 + .bss start:0x02178558 end:0x021785b4 src/094_Land2/Actor/ActorUnkPSWB.cpp: .text start:0x021662c8 end:0x021683d8 .init start:0x02176628 end:0x021766a0 .ctor start:0x02176e7c end:0x02176e80 - .bss start:0x021785d8 end:0x021786b0 + .bss start:0x021785b4 end:0x0217878c src/094_Land2/Actor/ActorUnkVRGN.cpp: .text start:0x021683d8 end:0x021689c0 .init start:0x021766a0 end:0x021766f0 .ctor start:0x02176e80 end:0x02176e84 - .bss start:0x0217879c end:0x021787d8 + .bss start:0x0217878c end:0x021787d8 src/094_Land2/Actor/ActorUnkVLCR.cpp: .text start:0x021689c0 end:0x0216953c .init start:0x021766f0 end:0x02176740 .ctor start:0x02176e84 end:0x02176e88 - .bss start:0x021787e8 end:0x02178824 + .bss start:0x021787d8 end:0x021788c0 src/094_Land2/Actor/ActorUnkSYRN.cpp: .text start:0x0216953c end:0x0216a114 .init start:0x02176740 end:0x02176790 .ctor start:0x02176e88 end:0x02176e8c - .bss start:0x021788d0 end:0x021789a8 + .bss start:0x021788c0 end:0x021789a8 src/094_Land2/Actor/ActorUnkSTTG.cpp: .text start:0x0216a320 end:0x0216b1d4 .init start:0x02176790 end:0x021767e0 .ctor start:0x02176e8c end:0x02176e90 - .bss start:0x021789b8 end:0x02178a90 + .bss start:0x021789a8 end:0x02178a94 src/094_Land2/Actor/ActorUnkPCTG.cpp: .text start:0x0216b284 end:0x0216c3ac .init start:0x021767e0 end:0x0217683c .ctor start:0x02176e90 end:0x02176e94 - .bss start:0x02178ae4 end:0x02178bbc + .bss start:0x02178a94 end:0x02178bbc src/094_Land2/Actor/ActorUnkSPTG.cpp: .text start:0x0216c62c end:0x0216dac0 .init start:0x0217683c end:0x0217688c .ctor start:0x02176e94 end:0x02176e98 - .bss start:0x02178bcc end:0x02178c80 + .bss start:0x02178bbc end:0x02178ca4 src/094_Land2/Actor/ActorUnkSNOW.cpp: .text start:0x0216dac0 end:0x0216de68 .init start:0x0217688c end:0x021768dc .ctor start:0x02176e98 end:0x02176e9c - .bss start:0x02178cb4 end:0x02178cf0 + .bss start:0x02178ca4 end:0x02178cf0 src/094_Land2/Actor/ActorUnkFBRG.cpp: .text start:0x0216de68 end:0x0216e3a4 .init start:0x021768dc end:0x0217692c .ctor start:0x02176e9c end:0x02176ea0 - .bss start:0x02178d00 end:0x02178dd8 + .bss start:0x02178cf0 end:0x02178dec src/094_Land2/Actor/ActorUnkKOTA.cpp: .text start:0x0216e3a4 end:0x0216ee14 .init start:0x0217692c end:0x0217697c .ctor start:0x02176ea0 end:0x02176ea4 - .bss start:0x02178dfc end:0x02178e38 + .bss start:0x02178dec end:0x02178e38 src/094_Land2/Actor/ActorUnkEFOC.cpp: .text start:0x0216ee14 end:0x0216f544 .init start:0x0217697c end:0x021769dc .ctor start:0x02176ea4 end:0x02176ea8 - .bss start:0x02178e48 end:0x02178f20 + .bss start:0x02178e38 end:0x02178f28 src/094_Land2/Actor/ActorUnkMNCB.cpp: .text start:0x0216fa8c end:0x021706f8 .init start:0x021769dc end:0x02176a2c .ctor start:0x02176ea8 end:0x02176eac - .bss start:0x02178f38 end:0x02178f74 + .bss start:0x02178f28 end:0x02178f94 src/094_Land2/Actor/ActorUnkEFR2.cpp: .text start:0x021706f8 end:0x021708ac .init start:0x02176a2c end:0x02176a7c .ctor start:0x02176eac end:0x02176eb0 - .bss start:0x02178fa4 end:0x0217907c + .bss start:0x02178f94 end:0x0217907c src/094_Land2/Actor/ActorUnkEFW2.cpp: .text start:0x021708ac end:0x02170a60 .init start:0x02176a7c end:0x02176acc .ctor start:0x02176eb0 end:0x02176eb4 - .bss start:0x0217908c end:0x02179164 + .bss start:0x0217907c end:0x02179164 src/094_Land2/MapObject/MapObjectUnkFNCE.cpp: .text start:0x02170a60 end:0x02170e6c .init start:0x02176acc end:0x02176b1c .ctor start:0x02176eb4 end:0x02176eb8 - .bss start:0x02179174 end:0x02179248 + .bss start:0x02179164 end:0x02179248 src/094_Land2/MapObject/MapObjectUnkWLMP.cpp: .text start:0x0217107c end:0x0217176c .init start:0x02176b1c end:0x02176b6c .ctor start:0x02176eb8 end:0x02176ebc - .bss start:0x02179258 end:0x02179278 + .bss start:0x02179248 end:0x021792e0 src/094_Land2/MapObject/MapObjectUnkCLMN.cpp: .text start:0x02171808 end:0x021719d8 .init start:0x02176b6c end:0x02176bbc .ctor start:0x02176ebc end:0x02176ec0 - .bss start:0x021792f0 end:0x021793c4 + .bss start:0x021792e0 end:0x021793e4 src/094_Land2/MapObject/MapObjectUnkWDST.cpp: .text start:0x021719d8 end:0x021738d8 .init start:0x02176bbc end:0x02176c44 .ctor start:0x02176ec0 end:0x02176ec4 - .bss start:0x021793f8 end:0x021794cc + .bss start:0x021793e4 end:0x02179538 src/094_Land2/MapObject/MapObjectUnkICEB.cpp: .text start:0x02173968 end:0x02174934 .init start:0x02176c44 end:0x02176d10 .ctor start:0x02176ec4 end:0x02176ec8 - .bss start:0x02179614 end:0x021796e8 + .bss start:0x02179538 end:0x0217970c src/094_Land2/MapObject/MapObjectUnkBRGW.cpp: .text start:0x02174934 end:0x02174ecc .init start:0x02176d10 end:0x02176d60 .ctor start:0x02176ec8 end:0x02176ecc - .bss start:0x0217971c end:0x021797f0 + .bss start:0x0217970c end:0x021797f0 src/094_Land2/MapObject/MapObjectUnkMBBS.cpp: .text start:0x02174ecc end:0x02175468 .init start:0x02176d60 end:0x02176dd4 .ctor start:0x02176ecc end:0x02176ed0 - .bss start:0x02179800 end:0x021798d4 + .bss start:0x021797f0 end:0x021798f8 src/094_Land2/MapObject/MapObjectUnkTHAW.cpp: .text start:0x02175468 end:0x02175b48 .init start:0x02176dd4 end:0x02176e24 .ctor start:0x02176ed0 end:0x02176ed4 - .bss start:0x02179908 end:0x021799dc + .bss start:0x021798f8 end:0x021799fc src/094_Land2/MapObject/MapObjectUnkMTWD.cpp: .text start:0x02175b48 end:0x02175f40 .init start:0x02176e24 end:0x02176e74 .ctor start:0x02176ed4 end:0x02176ed8 - .bss start:0x02179a0c end:0x02179ae0 + .bss start:0x021799fc end:0x02179ae0 diff --git a/config/eur/arm9/overlays/ov094/symbols.txt b/config/eur/arm9/overlays/ov094/symbols.txt index 130d51f1..d7ca206b 100644 --- a/config/eur/arm9/overlays/ov094/symbols.txt +++ b/config/eur/arm9/overlays/ov094/symbols.txt @@ -735,77 +735,77 @@ data_ov094_02178500 kind:data(any) addr:0x02178500 ambiguous data_ov094_02178520 kind:bss addr:0x02178520 data_ov094_02178524 kind:bss addr:0x02178524 data_ov094_02178530 kind:bss addr:0x02178530 -data_ov094_02178558 kind:bss addr:0x02178558 -data_ov094_0217855c kind:bss addr:0x0217855c -sActorProfileUnkLOCK kind:bss addr:0x02178568 +_ZGVN15ProfileInstanceI19ActorProfileUnkLOCKE8sProfileE kind:bss addr:0x02178558 +@14521 kind:bss addr:0x0217855c +_ZN15ProfileInstanceI19ActorProfileUnkLOCKE8sProfileE kind:bss addr:0x02178568 data_ov094_021785a4 kind:bss addr:0x021785a4 data_ov094_021785a8 kind:bss addr:0x021785a8 -data_ov094_021785b4 kind:bss addr:0x021785b4 -data_ov094_021785c0 kind:bss addr:0x021785c0 -sActorProfileUnkPSWB kind:bss addr:0x021785d8 +_ZGVN15ProfileInstanceI19ActorProfileUnkPSWBE8sProfileE kind:bss addr:0x021785b4 +@14527 kind:bss addr:0x021785c0 +_ZN15ProfileInstanceI19ActorProfileUnkPSWBE8sProfileE kind:bss addr:0x021785d8 data_ov094_021786b0 kind:bss addr:0x021786b0 -data_ov094_0217878c kind:bss addr:0x0217878c -data_ov094_02178790 kind:bss addr:0x02178790 -sActorProfileUnkVRGN kind:bss addr:0x0217879c -data_ov094_021787d8 kind:bss addr:0x021787d8 -data_ov094_021787dc kind:bss addr:0x021787dc -sActorProfileUnkVLCR kind:bss addr:0x021787e8 +_ZGVN15ProfileInstanceI19ActorProfileUnkVRGNE8sProfileE kind:bss addr:0x0217878c +@14533 kind:bss addr:0x02178790 +_ZN15ProfileInstanceI19ActorProfileUnkVRGNE8sProfileE kind:bss addr:0x0217879c +_ZGVN15ProfileInstanceI19ActorProfileUnkVLCRE8sProfileE kind:bss addr:0x021787d8 +@14539 kind:bss addr:0x021787dc +_ZN15ProfileInstanceI19ActorProfileUnkVLCRE8sProfileE kind:bss addr:0x021787e8 data_ov094_02178824 kind:bss addr:0x02178824 ambiguous -data_ov094_021788c0 kind:bss addr:0x021788c0 -data_ov094_021788c4 kind:bss addr:0x021788c4 -sActorProfileUnkSYRN kind:bss addr:0x021788d0 -data_ov094_021789a8 kind:bss addr:0x021789a8 -data_ov094_021789ac kind:bss addr:0x021789ac -sActorProfileUnkSTTG kind:bss addr:0x021789b8 +_ZGVN15ProfileInstanceI19ActorProfileUnkSYRNE8sProfileE kind:bss addr:0x021788c0 +@14545 kind:bss addr:0x021788c4 +_ZN15ProfileInstanceI19ActorProfileUnkSYRNE8sProfileE kind:bss addr:0x021788d0 +_ZGVN15ProfileInstanceI19ActorProfileUnkSTTGE8sProfileE kind:bss addr:0x021789a8 +@14551 kind:bss addr:0x021789ac +_ZN15ProfileInstanceI19ActorProfileUnkSTTGE8sProfileE kind:bss addr:0x021789b8 data_ov094_02178a90 kind:bss addr:0x02178a90 -data_ov094_02178a94 kind:bss addr:0x02178a94 -data_ov094_02178aa0 kind:bss addr:0x02178aa0 -sActorProfileUnkPCTG kind:bss addr:0x02178ae4 -data_ov094_02178bbc kind:bss addr:0x02178bbc -data_ov094_02178bc0 kind:bss addr:0x02178bc0 -sActorProfileUnkSPTG kind:bss addr:0x02178bcc +_ZGVN15ProfileInstanceI19ActorProfileUnkPCTGE8sProfileE kind:bss addr:0x02178a94 +@14557 kind:bss addr:0x02178aa0 +_ZN15ProfileInstanceI19ActorProfileUnkPCTGE8sProfileE kind:bss addr:0x02178ae4 +_ZGVN15ProfileInstanceI19ActorProfileUnkSPTGE8sProfileE kind:bss addr:0x02178bbc +@14563 kind:bss addr:0x02178bc0 +_ZN15ProfileInstanceI19ActorProfileUnkSPTGE8sProfileE kind:bss addr:0x02178bcc data_ov094_02178c80 kind:bss addr:0x02178c80 ambiguous -data_ov094_02178ca4 kind:bss addr:0x02178ca4 -data_ov094_02178ca8 kind:bss addr:0x02178ca8 -sActorProfileUnkSNOW kind:bss addr:0x02178cb4 -data_ov094_02178cf0 kind:bss addr:0x02178cf0 -data_ov094_02178cf4 kind:bss addr:0x02178cf4 -sActorProfileUnkFBRG kind:bss addr:0x02178d00 +_ZGVN15ProfileInstanceI19ActorProfileUnkSNOWE8sProfileE kind:bss addr:0x02178ca4 +@14569 kind:bss addr:0x02178ca8 +_ZN15ProfileInstanceI19ActorProfileUnkSNOWE8sProfileE kind:bss addr:0x02178cb4 +_ZGVN15ProfileInstanceI19ActorProfileUnkFBRGE8sProfileE kind:bss addr:0x02178cf0 +@14575 kind:bss addr:0x02178cf4 +_ZN15ProfileInstanceI19ActorProfileUnkFBRGE8sProfileE kind:bss addr:0x02178d00 data_ov094_02178dd8 kind:bss addr:0x02178dd8 -data_ov094_02178dec kind:bss addr:0x02178dec -data_ov094_02178df0 kind:bss addr:0x02178df0 -sActorProfileUnkKOTA kind:bss addr:0x02178dfc -data_ov094_02178e38 kind:bss addr:0x02178e38 -data_ov094_02178e3c kind:bss addr:0x02178e3c -sActorProfileUnkEFOC kind:bss addr:0x02178e48 +_ZGVN15ProfileInstanceI19ActorProfileUnkKOTAE8sProfileE kind:bss addr:0x02178dec +@14581 kind:bss addr:0x02178df0 +_ZN15ProfileInstanceI19ActorProfileUnkKOTAE8sProfileE kind:bss addr:0x02178dfc +_ZGVN15ProfileInstanceI19ActorProfileUnkEFOCE8sProfileE kind:bss addr:0x02178e38 +@14587 kind:bss addr:0x02178e3c +_ZN15ProfileInstanceI19ActorProfileUnkEFOCE8sProfileE kind:bss addr:0x02178e48 data_ov094_02178f20 kind:bss addr:0x02178f20 data_ov094_02178f24 kind:bss addr:0x02178f24 -data_ov094_02178f28 kind:bss addr:0x02178f28 -data_ov094_02178f2c kind:bss addr:0x02178f2c -sActorProfileUnkMNCB kind:bss addr:0x02178f38 +_ZGVN15ProfileInstanceI19ActorProfileUnkMNCBE8sProfileE kind:bss addr:0x02178f28 +@14593 kind:bss addr:0x02178f2c +_ZN15ProfileInstanceI19ActorProfileUnkMNCBE8sProfileE kind:bss addr:0x02178f38 data_ov094_02178f74 kind:bss addr:0x02178f74 data_ov094_02178f84 kind:bss addr:0x02178f84 -data_ov094_02178f94 kind:bss addr:0x02178f94 -data_ov094_02178f98 kind:bss addr:0x02178f98 -sActorProfileUnkEFR2 kind:bss addr:0x02178fa4 -data_ov094_0217907c kind:bss addr:0x0217907c -data_ov094_02179080 kind:bss addr:0x02179080 -sActorProfileUnkEFW2 kind:bss addr:0x0217908c -data_ov094_02179164 kind:bss addr:0x02179164 -data_ov094_02179168 kind:bss addr:0x02179168 -sMapObjectProfileUnkFNCE kind:bss addr:0x02179174 -data_ov094_02179248 kind:bss addr:0x02179248 -data_ov094_0217924c kind:bss addr:0x0217924c -sMapObjectProfileUnkWLMP kind:bss addr:0x02179258 +_ZGVN15ProfileInstanceI19ActorProfileUnkEFR2E8sProfileE kind:bss addr:0x02178f94 +@14599 kind:bss addr:0x02178f98 +_ZN15ProfileInstanceI19ActorProfileUnkEFR2E8sProfileE kind:bss addr:0x02178fa4 +_ZGVN15ProfileInstanceI19ActorProfileUnkEFW2E8sProfileE kind:bss addr:0x0217907c +@14605 kind:bss addr:0x02179080 +_ZN15ProfileInstanceI19ActorProfileUnkEFW2E8sProfileE kind:bss addr:0x0217908c +_ZGVN15ProfileInstanceI23MapObjectProfileUnkFNCEE8sProfileE kind:bss addr:0x02179164 +@13887 kind:bss addr:0x02179168 +_ZN15ProfileInstanceI23MapObjectProfileUnkFNCEE8sProfileE kind:bss addr:0x02179174 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkWLMPE8sProfileE kind:bss addr:0x02179248 +@13893 kind:bss addr:0x0217924c +_ZN15ProfileInstanceI23MapObjectProfileUnkWLMPE8sProfileE kind:bss addr:0x02179258 data_ov094_02179278 kind:bss addr:0x02179278 data_ov094_021792c0 kind:bss addr:0x021792c0 -data_ov094_021792e0 kind:bss addr:0x021792e0 -data_ov094_021792e4 kind:bss addr:0x021792e4 -sMapObjectProfileUnkCLMN kind:bss addr:0x021792f0 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkCLMNE8sProfileE kind:bss addr:0x021792e0 +@13899 kind:bss addr:0x021792e4 +_ZN15ProfileInstanceI23MapObjectProfileUnkCLMNE8sProfileE kind:bss addr:0x021792f0 data_ov094_021793c4 kind:bss addr:0x021793c4 -data_ov094_021793e4 kind:bss addr:0x021793e4 -data_ov094_021793ec kind:bss addr:0x021793ec -sMapObjectProfileUnkWDST kind:bss addr:0x021793f8 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkWDSTE8sProfileE kind:bss addr:0x021793e4 +@13905 kind:bss addr:0x021793ec +_ZN15ProfileInstanceI23MapObjectProfileUnkWDSTE8sProfileE kind:bss addr:0x021793f8 data_ov094_021794cc kind:bss addr:0x021794cc data_ov094_021794ec kind:bss addr:0x021794ec data_ov094_021794f0 kind:bss addr:0x021794f0 @@ -813,22 +813,22 @@ data_ov094_021794fc kind:bss addr:0x021794fc data_ov094_02179508 kind:bss addr:0x02179508 data_ov094_02179514 kind:bss addr:0x02179514 data_ov094_02179520 kind:bss addr:0x02179520 -data_ov094_02179538 kind:bss addr:0x02179538 -data_ov094_0217955c kind:bss addr:0x0217955c -sMapObjectProfileUnkICEB kind:bss addr:0x02179614 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkICEBE8sProfileE kind:bss addr:0x02179538 +@13911 kind:bss addr:0x0217955c +_ZN15ProfileInstanceI23MapObjectProfileUnkICEBE8sProfileE kind:bss addr:0x02179614 data_ov094_021796e8 kind:bss addr:0x021796e8 -data_ov094_0217970c kind:bss addr:0x0217970c -data_ov094_02179710 kind:bss addr:0x02179710 -sMapObjectProfileUnkBRGW kind:bss addr:0x0217971c -data_ov094_021797f0 kind:bss addr:0x021797f0 -data_ov094_021797f4 kind:bss addr:0x021797f4 -sMapObjectProfileUnkMBBS kind:bss addr:0x02179800 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkBRGWE8sProfileE kind:bss addr:0x0217970c +@13917 kind:bss addr:0x02179710 +_ZN15ProfileInstanceI23MapObjectProfileUnkBRGWE8sProfileE kind:bss addr:0x0217971c +_ZGVN15ProfileInstanceI23MapObjectProfileUnkMBBSE8sProfileE kind:bss addr:0x021797f0 +@13923 kind:bss addr:0x021797f4 +_ZN15ProfileInstanceI23MapObjectProfileUnkMBBSE8sProfileE kind:bss addr:0x02179800 data_ov094_021798d4 kind:bss addr:0x021798d4 -data_ov094_021798f8 kind:bss addr:0x021798f8 -data_ov094_021798fc kind:bss addr:0x021798fc -sMapObjectProfileUnkTHAW kind:bss addr:0x02179908 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTHAWE8sProfileE kind:bss addr:0x021798f8 +@13929 kind:bss addr:0x021798fc +_ZN15ProfileInstanceI23MapObjectProfileUnkTHAWE8sProfileE kind:bss addr:0x02179908 data_ov094_021799dc kind:bss addr:0x021799dc -data_ov094_021799fc kind:bss addr:0x021799fc -data_ov094_02179a00 kind:bss addr:0x02179a00 -sMapObjectProfileUnkMTWD kind:bss addr:0x02179a0c +_ZGVN15ProfileInstanceI23MapObjectProfileUnkMTWDE8sProfileE kind:bss addr:0x021799fc +@13935 kind:bss addr:0x02179a00 +_ZN15ProfileInstanceI23MapObjectProfileUnkMTWDE8sProfileE kind:bss addr:0x02179a0c data_ov094_02179ae0 kind:bss addr:0x02179ae0 diff --git a/config/eur/arm9/overlays/ov096/delinks.txt b/config/eur/arm9/overlays/ov096/delinks.txt index 3427bb4c..bc98150e 100644 --- a/config/eur/arm9/overlays/ov096/delinks.txt +++ b/config/eur/arm9/overlays/ov096/delinks.txt @@ -9,22 +9,22 @@ src/096_PlayerZelda/Actor/ActorUnkLZET.cpp: .text start:0x0217a68c end:0x0217a738 .init start:0x0217dbc8 end:0x0217dc18 .ctor start:0x0217dd58 end:0x0217dd5c - .bss start:0x0217e250 end:0x0217e28c + .bss start:0x0217e240 end:0x0217e28c src/096_PlayerZelda/Actor/ActorUnkCLBT.cpp: .text start:0x0217a738 end:0x0217ab6c .init start:0x0217dc18 end:0x0217dc68 .ctor start:0x0217dd5c end:0x0217dd60 - .bss start:0x0217e29c end:0x0217e2d8 + .bss start:0x0217e28c end:0x0217e2d8 src/096_PlayerZelda/Actor/ActorUnkTKYT.cpp: .text start:0x0217ab8c end:0x0217ad30 .init start:0x0217dc68 end:0x0217dcb8 .ctor start:0x0217dd60 end:0x0217dd64 - .bss start:0x0217e2e8 end:0x0217e324 + .bss start:0x0217e2d8 end:0x0217e324 src/096_PlayerZelda/Actor/ActorUnkBPBS.cpp: .text start:0x0217ad30 end:0x0217d2b0 .init start:0x0217dcb8 end:0x0217dd08 .ctor start:0x0217dd64 end:0x0217dd68 - .bss start:0x0217e334 end:0x0217e40c + .bss start:0x0217e324 end:0x0217e40c diff --git a/config/eur/arm9/overlays/ov096/symbols.txt b/config/eur/arm9/overlays/ov096/symbols.txt index e8876fad..806004e8 100644 --- a/config/eur/arm9/overlays/ov096/symbols.txt +++ b/config/eur/arm9/overlays/ov096/symbols.txt @@ -160,18 +160,18 @@ data_ov096_0217e108 kind:data(any) addr:0x0217e108 data_ov096_0217e168 kind:data(any) addr:0x0217e168 data_ov096_0217e200 kind:data(any) addr:0x0217e200 data_ov096_0217e230 kind:data(any) addr:0x0217e230 -data_ov096_0217e240 kind:bss addr:0x0217e240 -data_ov096_0217e244 kind:bss addr:0x0217e244 -sActorProfileUnkLZET kind:bss addr:0x0217e250 -data_ov096_0217e28c kind:bss addr:0x0217e28c -data_ov096_0217e290 kind:bss addr:0x0217e290 -sActorProfileUnkCLBT kind:bss addr:0x0217e29c -data_ov096_0217e2d8 kind:bss addr:0x0217e2d8 -data_ov096_0217e2dc kind:bss addr:0x0217e2dc -sActorProfileUnkTKYT kind:bss addr:0x0217e2e8 -data_ov096_0217e324 kind:bss addr:0x0217e324 -data_ov096_0217e328 kind:bss addr:0x0217e328 -sActorProfileUnkBPBS kind:bss addr:0x0217e334 +_ZGVN15ProfileInstanceI19ActorProfileUnkLZETE8sProfileE kind:bss addr:0x0217e240 +@14671 kind:bss addr:0x0217e244 +_ZN15ProfileInstanceI19ActorProfileUnkLZETE8sProfileE kind:bss addr:0x0217e250 +_ZGVN15ProfileInstanceI19ActorProfileUnkCLBTE8sProfileE kind:bss addr:0x0217e28c +@14677 kind:bss addr:0x0217e290 +_ZN15ProfileInstanceI19ActorProfileUnkCLBTE8sProfileE kind:bss addr:0x0217e29c +_ZGVN15ProfileInstanceI19ActorProfileUnkTKYTE8sProfileE kind:bss addr:0x0217e2d8 +@14683 kind:bss addr:0x0217e2dc +_ZN15ProfileInstanceI19ActorProfileUnkTKYTE8sProfileE kind:bss addr:0x0217e2e8 +_ZGVN15ProfileInstanceI19ActorProfileUnkBPBSE8sProfileE kind:bss addr:0x0217e324 +@14689 kind:bss addr:0x0217e328 +_ZN15ProfileInstanceI19ActorProfileUnkBPBSE8sProfileE kind:bss addr:0x0217e334 data_ov096_0217e40c kind:bss addr:0x0217e40c data_ov096_0217e414 kind:bss addr:0x0217e414 data_ov096_0217e420 kind:bss addr:0x0217e420 diff --git a/config/eur/arm9/overlays/ov098/delinks.txt b/config/eur/arm9/overlays/ov098/delinks.txt index 7d7cffdc..ceb4a21f 100644 --- a/config/eur/arm9/overlays/ov098/delinks.txt +++ b/config/eur/arm9/overlays/ov098/delinks.txt @@ -9,28 +9,28 @@ src/098_MapWater/Actor/ActorUnkEFWV.cpp: .text start:0x021810d8 end:0x02181688 .init start:0x021821d0 end:0x02182220 .ctor start:0x02182360 end:0x02182364 - .bss start:0x02182790 end:0x02182868 + .bss start:0x02182780 end:0x02182868 src/098_MapWater/Actor/ActorUnkEFWI.cpp: .text start:0x02181688 end:0x0218186c .init start:0x02182220 end:0x02182270 .ctor start:0x02182364 end:0x02182368 - .bss start:0x02182878 end:0x02182950 + .bss start:0x02182868 end:0x02182950 src/098_MapWater/Actor/ActorUnkEFRP.cpp: .text start:0x0218186c end:0x02181d8c .init start:0x02182270 end:0x021822c0 .ctor start:0x02182368 end:0x0218236c - .bss start:0x02182960 end:0x02182a38 + .bss start:0x02182950 end:0x02182a38 src/098_MapWater/Actor/ActorUnkEFRI.cpp: .text start:0x02181d8c end:0x02181f70 .init start:0x021822c0 end:0x02182310 .ctor start:0x0218236c end:0x02182370 - .bss start:0x02182a48 end:0x02182b20 + .bss start:0x02182a38 end:0x02182b20 src/098_MapWater/Actor/ActorUnkSEAT.cpp: .text start:0x02181f70 end:0x021821bc .init start:0x02182310 end:0x02182360 .ctor start:0x02182370 end:0x02182374 - .bss start:0x02182b30 end:0x02182b6c + .bss start:0x02182b20 end:0x02182b6c diff --git a/config/eur/arm9/overlays/ov098/symbols.txt b/config/eur/arm9/overlays/ov098/symbols.txt index c9343990..1f84f5e3 100644 --- a/config/eur/arm9/overlays/ov098/symbols.txt +++ b/config/eur/arm9/overlays/ov098/symbols.txt @@ -96,19 +96,19 @@ data_ov098_02182674 kind:data(any) addr:0x02182674 _ZTV19data_ov098_0218268c kind:data(any) addr:0x0218268c _ZTV19data_ov098_021826ec kind:data(any) addr:0x021826ec _ZTV19data_ov098_02182710 kind:data(any) addr:0x02182710 -data_ov098_02182780 kind:bss addr:0x02182780 -data_ov098_02182784 kind:bss addr:0x02182784 -sActorProfileUnkEFWV kind:bss addr:0x02182790 -data_ov098_02182868 kind:bss addr:0x02182868 -data_ov098_0218286c kind:bss addr:0x0218286c -sActorProfileUnkEFWI kind:bss addr:0x02182878 -data_ov098_02182950 kind:bss addr:0x02182950 -data_ov098_02182954 kind:bss addr:0x02182954 -sActorProfileUnkEFRP kind:bss addr:0x02182960 -data_ov098_02182a38 kind:bss addr:0x02182a38 -data_ov098_02182a3c kind:bss addr:0x02182a3c -sActorProfileUnkEFRI kind:bss addr:0x02182a48 -data_ov098_02182b20 kind:bss addr:0x02182b20 -data_ov098_02182b24 kind:bss addr:0x02182b24 -sActorProfileUnkSEAT kind:bss addr:0x02182b30 +_ZGVN15ProfileInstanceI19ActorProfileUnkEFWVE8sProfileE kind:bss addr:0x02182780 +@14701 kind:bss addr:0x02182784 +_ZN15ProfileInstanceI19ActorProfileUnkEFWVE8sProfileE kind:bss addr:0x02182790 +_ZGVN15ProfileInstanceI19ActorProfileUnkEFWIE8sProfileE kind:bss addr:0x02182868 +@14707 kind:bss addr:0x0218286c +_ZN15ProfileInstanceI19ActorProfileUnkEFWIE8sProfileE kind:bss addr:0x02182878 +_ZGVN15ProfileInstanceI19ActorProfileUnkEFRPE8sProfileE kind:bss addr:0x02182950 +@14713 kind:bss addr:0x02182954 +_ZN15ProfileInstanceI19ActorProfileUnkEFRPE8sProfileE kind:bss addr:0x02182960 +_ZGVN15ProfileInstanceI19ActorProfileUnkEFRIE8sProfileE kind:bss addr:0x02182a38 +@14719 kind:bss addr:0x02182a3c +_ZN15ProfileInstanceI19ActorProfileUnkEFRIE8sProfileE kind:bss addr:0x02182a48 +_ZGVN15ProfileInstanceI19ActorProfileUnkSEATE8sProfileE kind:bss addr:0x02182b20 +@14725 kind:bss addr:0x02182b24 +_ZN15ProfileInstanceI19ActorProfileUnkSEATE8sProfileE kind:bss addr:0x02182b30 data_ov098_02182b6c kind:bss addr:0x02182b6c diff --git a/config/eur/arm9/overlays/ov099/delinks.txt b/config/eur/arm9/overlays/ov099/delinks.txt index ab896aaa..84d79f26 100644 --- a/config/eur/arm9/overlays/ov099/delinks.txt +++ b/config/eur/arm9/overlays/ov099/delinks.txt @@ -8,19 +8,19 @@ src/099_MapLava/Actor/ActorUnkEFWL.cpp: .text start:0x021810b4 end:0x0218145c .init start:0x021820d0 end:0x02182120 .ctor start:0x02182210 end:0x02182214 - .bss start:0x021825b0 end:0x02182688 + .bss start:0x021825a0 end:0x02182688 src/099_MapLava/Actor/ActorUnkEFRL.cpp: .text start:0x0218145c end:0x02181888 .init start:0x02182120 end:0x02182170 .ctor start:0x02182214 end:0x02182218 - .bss start:0x02182698 end:0x02182770 + .bss start:0x02182688 end:0x02182770 src/099_MapLava/Actor/ActorUnkVOLV.cpp: .text start:0x02181888 end:0x02181bc4 .init start:0x02182170 end:0x021821c0 .ctor start:0x02182218 end:0x0218221c - .bss start:0x02182780 end:0x02182858 + .bss start:0x02182770 end:0x02182858 src/099_MapLava/Actor/ActorUnkE3LV.cpp: .text start:0x02181bc4 end:0x02181eb4 diff --git a/config/eur/arm9/overlays/ov099/symbols.txt b/config/eur/arm9/overlays/ov099/symbols.txt index 566e5809..cfe79fb2 100644 --- a/config/eur/arm9/overlays/ov099/symbols.txt +++ b/config/eur/arm9/overlays/ov099/symbols.txt @@ -82,15 +82,15 @@ _ZTV19data_ov099_021824d8 kind:data(any) addr:0x021824d8 data_ov099_021824fc kind:data(any) addr:0x021824fc data_ov099_02182514 kind:data(any) addr:0x02182514 _ZTV19data_ov099_0218252c kind:data(any) addr:0x0218252c -data_ov099_021825a0 kind:bss addr:0x021825a0 -data_ov099_021825a4 kind:bss addr:0x021825a4 -sActorProfileUnkEFWL kind:bss addr:0x021825b0 -data_ov099_02182688 kind:bss addr:0x02182688 -data_ov099_0218268c kind:bss addr:0x0218268c -sActorProfileUnkEFRL kind:bss addr:0x02182698 -data_ov099_02182770 kind:bss addr:0x02182770 -data_ov099_02182774 kind:bss addr:0x02182774 -sActorProfileUnkVOLV kind:bss addr:0x02182780 +_ZGVN15ProfileInstanceI19ActorProfileUnkEFWLE8sProfileE kind:bss addr:0x021825a0 +@14736 kind:bss addr:0x021825a4 +_ZN15ProfileInstanceI19ActorProfileUnkEFWLE8sProfileE kind:bss addr:0x021825b0 +_ZGVN15ProfileInstanceI19ActorProfileUnkEFRLE8sProfileE kind:bss addr:0x02182688 +@14742 kind:bss addr:0x0218268c +_ZN15ProfileInstanceI19ActorProfileUnkEFRLE8sProfileE kind:bss addr:0x02182698 +_ZGVN15ProfileInstanceI19ActorProfileUnkVOLVE8sProfileE kind:bss addr:0x02182770 +@14748 kind:bss addr:0x02182774 +_ZN15ProfileInstanceI19ActorProfileUnkVOLVE8sProfileE kind:bss addr:0x02182780 data_ov099_02182858 kind:bss addr:0x02182858 data_ov099_0218285c kind:bss addr:0x0218285c -sActorProfileUnkE3LV kind:bss addr:0x02182868 +_ZN15ProfileInstanceI19ActorProfileUnkE3LVE8sProfileE kind:bss addr:0x02182868 diff --git a/config/eur/arm9/overlays/ov105/symbols.txt b/config/eur/arm9/overlays/ov105/symbols.txt index c9e3999f..364fb370 100644 --- a/config/eur/arm9/overlays/ov105/symbols.txt +++ b/config/eur/arm9/overlays/ov105/symbols.txt @@ -137,4 +137,4 @@ data_ov105_0218a2ec kind:data(any) addr:0x0218a2ec _ZTV19data_ov105_0218a2fc kind:data(any) addr:0x0218a2fc data_ov105_0218a320 kind:bss addr:0x0218a320 data_ov105_0218a324 kind:bss addr:0x0218a324 -sActorProfileUnkITWP kind:bss addr:0x0218a330 +_ZN15ProfileInstanceI19ActorProfileUnkITWPE8sProfileE kind:bss addr:0x0218a330 diff --git a/config/jp/arm9/delinks.txt b/config/jp/arm9/delinks.txt index cc6d19f5..de672397 100644 --- a/config/jp/arm9/delinks.txt +++ b/config/jp/arm9/delinks.txt @@ -68,14 +68,6 @@ libs/c/src/ansi_files.c: .data start:0x02045c1c end:0x02045d00 .bss start:0x02052d20 end:0x02053020 -libs/c/src/float.c: - complete - .data start:0x02045d00 end:0x02045d04 - -libs/c/src/locale.c: - complete - .data start:0x02045d04 end:0x02045f20 - libs/c/src/arith.c: complete .text start:0x02034e04 end:0x02034e1c @@ -122,6 +114,14 @@ libs/c/src/wmem.c: complete .text start:0x02035728 end:0x02035760 +libs/c/src/float.c: + complete + .data start:0x02045d00 end:0x02045d04 + +libs/c/src/locale.c: + complete + .data start:0x02045d04 end:0x02045f20 + libs/c/src/wprintf.c: .text start:0x02035760 end:0x0203768c .data start:0x02045f20 end:0x02045fa0 diff --git a/config/jp/arm9/overlays/ov000/delinks.txt b/config/jp/arm9/overlays/ov000/delinks.txt index 23f8a143..6df42af5 100644 --- a/config/jp/arm9/overlays/ov000/delinks.txt +++ b/config/jp/arm9/overlays/ov000/delinks.txt @@ -30,37 +30,37 @@ src/000_Second/Actor/ActorUnkSWOB.cpp: .text start:0x0209c084 end:0x0209c474 .init start:0x020b1ff8 end:0x020b2048 .ctor start:0x020b3118 end:0x020b311c - .bss start:0x020b741c end:0x020b7458 + .bss start:0x020b740c end:0x020b7458 src/000_Second/Actor/ActorUnkSWTM.cpp: .text start:0x0209c474 end:0x0209c9f8 .init start:0x020b2048 end:0x020b2098 .ctor start:0x020b311c end:0x020b3120 - .bss start:0x020b7468 end:0x020b74a4 + .bss start:0x020b7458 end:0x020b74a8 src/000_Second/Actor/ActorUnkEVIC.cpp: .text start:0x0209d754 end:0x0209d840 .init start:0x020b2098 end:0x020b20e8 .ctor start:0x020b3120 end:0x020b3124 - .bss start:0x020b74b8 end:0x020b74f4 + .bss start:0x020b74a8 end:0x020b74f4 src/000_Second/Actor/ActorUnkEFIK.cpp: .text start:0x0209d840 end:0x0209db14 .init start:0x020b20e8 end:0x020b2138 .ctor start:0x020b3124 end:0x020b3128 - .bss start:0x020b7504 end:0x020b7540 + .bss start:0x020b74f4 end:0x020b7928 src/000_Second/MapObject/MapObjectUnkSWST.cpp: .text start:0x0209f4a4 end:0x0209fbbc .init start:0x020b2160 end:0x020b21bc .ctor start:0x020b312c end:0x020b3130 - .bss start:0x020b7940 end:0x020b7960 + .bss start:0x020b7928 end:0x020b7a38 src/000_Second/MapObject/MapObjectUnkBLCM.cpp: .text start:0x0209fbbc end:0x0209ff2c .init start:0x020b21bc end:0x020b220c .ctor start:0x020b3130 end:0x020b3134 - .bss start:0x020b7a48 end:0x020b7ab0 + .bss start:0x020b7a38 end:0x020b7ab0 src/000_Second/Item/ItemManager.cpp: complete diff --git a/config/jp/arm9/overlays/ov000/symbols.txt b/config/jp/arm9/overlays/ov000/symbols.txt index f445aac2..a830cd55 100644 --- a/config/jp/arm9/overlays/ov000/symbols.txt +++ b/config/jp/arm9/overlays/ov000/symbols.txt @@ -4046,31 +4046,31 @@ data_ov000_020b6b98 kind:bss addr:0x020b6b98 data_ov000_020b6ba0 kind:bss addr:0x020b6ba0 data_ov000_020b6ba4 kind:bss addr:0x020b6ba4 data_ov000_020b6bd8 kind:bss addr:0x020b6bd8 -data_ov000_020b740c kind:bss addr:0x020b740c -data_ov000_020b7410 kind:bss addr:0x020b7410 -sActorProfileUnkSWOB kind:bss addr:0x020b741c -data_ov000_020b7458 kind:bss addr:0x020b7458 -data_ov000_020b745c kind:bss addr:0x020b745c -sActorProfileUnkSWTM kind:bss addr:0x020b7468 +_ZGVN15ProfileInstanceI19ActorProfileUnkSWOBE8sProfileE kind:bss addr:0x020b740c +@30032 kind:bss addr:0x020b7410 +_ZN15ProfileInstanceI19ActorProfileUnkSWOBE8sProfileE kind:bss addr:0x020b741c +_ZGVN15ProfileInstanceI19ActorProfileUnkSWTME8sProfileE kind:bss addr:0x020b7458 +@30038 kind:bss addr:0x020b745c +_ZN15ProfileInstanceI19ActorProfileUnkSWTME8sProfileE kind:bss addr:0x020b7468 data_ov000_020b74a4 kind:bss addr:0x020b74a4 -data_ov000_020b74a8 kind:bss addr:0x020b74a8 -data_ov000_020b74ac kind:bss addr:0x020b74ac -sActorProfileUnkEVIC kind:bss addr:0x020b74b8 -data_ov000_020b74f4 kind:bss addr:0x020b74f4 -data_ov000_020b74f8 kind:bss addr:0x020b74f8 -sActorProfileUnkEFIK kind:bss addr:0x020b7504 +_ZGVN15ProfileInstanceI19ActorProfileUnkEVICE8sProfileE kind:bss addr:0x020b74a8 +@30044 kind:bss addr:0x020b74ac +_ZN15ProfileInstanceI19ActorProfileUnkEVICE8sProfileE kind:bss addr:0x020b74b8 +_ZGVN15ProfileInstanceI19ActorProfileUnkEFIKE8sProfileE kind:bss addr:0x020b74f4 +@30050 kind:bss addr:0x020b74f8 +_ZN15ProfileInstanceI19ActorProfileUnkEFIKE8sProfileE kind:bss addr:0x020b7504 data_ov000_020b7540 kind:bss addr:0x020b7540 data_ov000_020b7544 kind:bss addr:0x020b7544 data_ov000_020b754c kind:bss addr:0x020b754c data_ov000_020b7924 kind:bss addr:0x020b7924 -data_ov000_020b7928 kind:bss addr:0x020b7928 -data_ov000_020b7934 kind:bss addr:0x020b7934 -sMapObjectProfileUnkSWST kind:bss addr:0x020b7940 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkSWSTE8sProfileE kind:bss addr:0x020b7928 +@30056 kind:bss addr:0x020b7934 +_ZN15ProfileInstanceI23MapObjectProfileUnkSWSTE8sProfileE kind:bss addr:0x020b7940 data_ov000_020b7960 kind:bss addr:0x020b7960 data_ov000_020b7a14 kind:bss addr:0x020b7a14 -data_ov000_020b7a38 kind:bss addr:0x020b7a38 -data_ov000_020b7a3c kind:bss addr:0x020b7a3c -sMapObjectProfileUnkBLCM kind:bss addr:0x020b7a48 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkBLCME8sProfileE kind:bss addr:0x020b7a38 +@30062 kind:bss addr:0x020b7a3c +_ZN15ProfileInstanceI23MapObjectProfileUnkBLCME8sProfileE kind:bss addr:0x020b7a48 data_ov000_020b7ab0 kind:bss addr:0x020b7ab0 data_ov000_020b7ab4 kind:bss addr:0x020b7ab4 gSaveManager kind:bss addr:0x020b7ab8 diff --git a/config/jp/arm9/overlays/ov021/delinks.txt b/config/jp/arm9/overlays/ov021/delinks.txt index 9917d173..7da8a219 100644 --- a/config/jp/arm9/overlays/ov021/delinks.txt +++ b/config/jp/arm9/overlays/ov021/delinks.txt @@ -9,70 +9,70 @@ src/021_BattleGame/Actor/ActorUnkBAPH.cpp: .text start:0x020ed970 end:0x020f1b6c .init start:0x0210951c end:0x02109590 .ctor start:0x02109a30 end:0x02109a34 - .bss start:0x0210aca8 end:0x0210ad80 + .bss start:0x0210ac90 end:0x0210ad80 src/021_BattleGame/Actor/ActorUnkBAEY.cpp: .text start:0x020f1b6c end:0x020f255c .init start:0x02109590 end:0x021095e0 .ctor start:0x02109a34 end:0x02109a38 - .bss start:0x0210ad90 end:0x0210ae68 + .bss start:0x0210ad80 end:0x0210ae84 src/021_BattleGame/Actor/ActorUnkBAFO.cpp: .text start:0x020f255c end:0x020f3294 .init start:0x021095e0 end:0x02109688 .ctor start:0x02109a38 end:0x02109a3c - .bss start:0x0210ae9c end:0x0210af74 + .bss start:0x0210ae84 end:0x0210af74 src/021_BattleGame/Actor/ActorUnkBTIR.cpp: .text start:0x020f3294 end:0x020f3cbc .init start:0x02109688 end:0x021096d8 .ctor start:0x02109a3c end:0x02109a40 - .bss start:0x0210af84 end:0x0210b05c + .bss start:0x0210af74 end:0x0210b05c src/021_BattleGame/Actor/ActorUnkBFFN.cpp: .text start:0x020f3cbc end:0x020f5050 .init start:0x021096d8 end:0x02109728 .ctor start:0x02109a40 end:0x02109a44 - .bss start:0x0210b06c end:0x0210b09c + .bss start:0x0210b05c end:0x0210b0a8 src/021_BattleGame/Actor/ActorUnkBPAP.cpp: .text start:0x020f5050 end:0x020f5148 .init start:0x02109728 end:0x02109778 .ctor start:0x02109a44 end:0x02109a48 - .bss start:0x0210b0b8 end:0x0210b0f4 + .bss start:0x0210b0a8 end:0x0210b0f4 src/021_BattleGame/Actor/ActorUnkCLZN.cpp: .text start:0x020f5148 end:0x020f522c .init start:0x02109778 end:0x021097c8 .ctor start:0x02109a48 end:0x02109a4c - .bss start:0x0210b104 end:0x0210b140 + .bss start:0x0210b0f4 end:0x0210b140 src/021_BattleGame/Actor/ActorUnkFOFA.cpp: .text start:0x020f522c end:0x020f5324 .init start:0x021097c8 end:0x02109818 .ctor start:0x02109a4c end:0x02109a50 - .bss start:0x0210b150 end:0x0210b18c + .bss start:0x0210b140 end:0x0210b18c src/021_BattleGame/Actor/ActorUnkLVOF.cpp: .text start:0x020f5324 end:0x020f5fb0 .init start:0x02109818 end:0x02109868 .ctor start:0x02109a50 end:0x02109a54 - .bss start:0x0210b19c end:0x0210b274 + .bss start:0x0210b18c end:0x0210b278 src/021_BattleGame/MapObject/MapObjectUnkBAPL.cpp: .text start:0x020f619c end:0x020f73a4 .init start:0x02109868 end:0x021098c4 .ctor start:0x02109a54 end:0x02109a58 - .bss start:0x0210b290 end:0x0210b2b0 + .bss start:0x0210b278 end:0x0210b2b0 src/021_BattleGame/MapObject/MapObjectUnkBFFL.cpp: .text start:0x020f73a4 end:0x020f7a1c .init start:0x021098c4 end:0x02109914 .ctor start:0x02109a58 end:0x02109a5c - .bss start:0x0210b2c0 end:0x0210b394 + .bss start:0x0210b2b0 end:0x0210b394 src/021_BattleGame/MapObject/MapObjectUnkBFSP.cpp: .text start:0x020f7a1c end:0x020f7c90 .init start:0x02109914 end:0x02109964 .ctor start:0x02109a5c end:0x02109a60 - .bss start:0x0210b3a4 end:0x0210b3c4 + .bss start:0x0210b394 end:0x0210b3c4 diff --git a/config/jp/arm9/overlays/ov021/symbols.txt b/config/jp/arm9/overlays/ov021/symbols.txt index 3484bb1b..5c69fbf8 100644 --- a/config/jp/arm9/overlays/ov021/symbols.txt +++ b/config/jp/arm9/overlays/ov021/symbols.txt @@ -1053,47 +1053,47 @@ data_ov021_0210ac64 kind:bss addr:0x0210ac64 data_ov021_0210ac6c kind:bss addr:0x0210ac6c data_ov021_0210ac78 kind:bss addr:0x0210ac78 data_ov021_0210ac84 kind:bss addr:0x0210ac84 -data_ov021_0210ac90 kind:bss addr:0x0210ac90 -data_ov021_0210ac9c kind:bss addr:0x0210ac9c -sActorProfileUnkBAPH kind:bss addr:0x0210aca8 -data_ov021_0210ad80 kind:bss addr:0x0210ad80 -data_ov021_0210ad84 kind:bss addr:0x0210ad84 -sActorProfileUnkBAEY kind:bss addr:0x0210ad90 +_ZGVN15ProfileInstanceI19ActorProfileUnkBAPHE8sProfileE kind:bss addr:0x0210ac90 +@30086 kind:bss addr:0x0210ac9c +_ZN15ProfileInstanceI19ActorProfileUnkBAPHE8sProfileE kind:bss addr:0x0210aca8 +_ZGVN15ProfileInstanceI19ActorProfileUnkBAEYE8sProfileE kind:bss addr:0x0210ad80 +@30092 kind:bss addr:0x0210ad84 +_ZN15ProfileInstanceI19ActorProfileUnkBAEYE8sProfileE kind:bss addr:0x0210ad90 data_ov021_0210ae68 kind:bss addr:0x0210ae68 data_ov021_0210ae6c kind:bss addr:0x0210ae6c data_ov021_0210ae78 kind:bss addr:0x0210ae78 -data_ov021_0210ae84 kind:bss addr:0x0210ae84 -data_ov021_0210ae90 kind:bss addr:0x0210ae90 -sActorProfileUnkBAFO kind:bss addr:0x0210ae9c -data_ov021_0210af74 kind:bss addr:0x0210af74 -data_ov021_0210af78 kind:bss addr:0x0210af78 -sActorProfileUnkBTIR kind:bss addr:0x0210af84 -data_ov021_0210b05c kind:bss addr:0x0210b05c -data_ov021_0210b060 kind:bss addr:0x0210b060 -sActorProfileUnkBFFN kind:bss addr:0x0210b06c +_ZGVN15ProfileInstanceI19ActorProfileUnkBAFOE8sProfileE kind:bss addr:0x0210ae84 +@30098 kind:bss addr:0x0210ae90 +_ZN15ProfileInstanceI19ActorProfileUnkBAFOE8sProfileE kind:bss addr:0x0210ae9c +_ZGVN15ProfileInstanceI19ActorProfileUnkBTIRE8sProfileE kind:bss addr:0x0210af74 +@30104 kind:bss addr:0x0210af78 +_ZN15ProfileInstanceI19ActorProfileUnkBTIRE8sProfileE kind:bss addr:0x0210af84 +_ZGVN15ProfileInstanceI19ActorProfileUnkBFFNE8sProfileE kind:bss addr:0x0210b05c +@30110 kind:bss addr:0x0210b060 +_ZN15ProfileInstanceI19ActorProfileUnkBFFNE8sProfileE kind:bss addr:0x0210b06c data_ov021_0210b09c kind:bss addr:0x0210b09c ambiguous -data_ov021_0210b0a8 kind:bss addr:0x0210b0a8 -data_ov021_0210b0ac kind:bss addr:0x0210b0ac -sActorProfileUnkBPAP kind:bss addr:0x0210b0b8 -data_ov021_0210b0f4 kind:bss addr:0x0210b0f4 -data_ov021_0210b0f8 kind:bss addr:0x0210b0f8 -sActorProfileUnkCLZN kind:bss addr:0x0210b104 -data_ov021_0210b140 kind:bss addr:0x0210b140 -data_ov021_0210b144 kind:bss addr:0x0210b144 -sActorProfileUnkFOFA kind:bss addr:0x0210b150 -data_ov021_0210b18c kind:bss addr:0x0210b18c -data_ov021_0210b190 kind:bss addr:0x0210b190 -sActorProfileUnkLVOF kind:bss addr:0x0210b19c +_ZGVN15ProfileInstanceI19ActorProfileUnkBPAPE8sProfileE kind:bss addr:0x0210b0a8 +@30116 kind:bss addr:0x0210b0ac +_ZN15ProfileInstanceI19ActorProfileUnkBPAPE8sProfileE kind:bss addr:0x0210b0b8 +_ZGVN15ProfileInstanceI19ActorProfileUnkCLZNE8sProfileE kind:bss addr:0x0210b0f4 +@30122 kind:bss addr:0x0210b0f8 +_ZN15ProfileInstanceI19ActorProfileUnkCLZNE8sProfileE kind:bss addr:0x0210b104 +_ZGVN15ProfileInstanceI19ActorProfileUnkFOFAE8sProfileE kind:bss addr:0x0210b140 +@30128 kind:bss addr:0x0210b144 +_ZN15ProfileInstanceI19ActorProfileUnkFOFAE8sProfileE kind:bss addr:0x0210b150 +_ZGVN15ProfileInstanceI19ActorProfileUnkLVOFE8sProfileE kind:bss addr:0x0210b18c +@30134 kind:bss addr:0x0210b190 +_ZN15ProfileInstanceI19ActorProfileUnkLVOFE8sProfileE kind:bss addr:0x0210b19c data_ov021_0210b274 kind:bss addr:0x0210b274 -data_ov021_0210b278 kind:bss addr:0x0210b278 -data_ov021_0210b284 kind:bss addr:0x0210b284 -sMapObjectProfileUnkBAPL kind:bss addr:0x0210b290 -data_ov021_0210b2b0 kind:bss addr:0x0210b2b0 -data_ov021_0210b2b4 kind:bss addr:0x0210b2b4 -sMapObjectProfileUnkBFFL kind:bss addr:0x0210b2c0 -data_ov021_0210b394 kind:bss addr:0x0210b394 -data_ov021_0210b398 kind:bss addr:0x0210b398 -sMapObjectProfileUnkBFSP kind:bss addr:0x0210b3a4 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkBAPLE8sProfileE kind:bss addr:0x0210b278 +@30140 kind:bss addr:0x0210b284 +_ZN15ProfileInstanceI23MapObjectProfileUnkBAPLE8sProfileE kind:bss addr:0x0210b290 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkBFFLE8sProfileE kind:bss addr:0x0210b2b0 +@30146 kind:bss addr:0x0210b2b4 +_ZN15ProfileInstanceI23MapObjectProfileUnkBFFLE8sProfileE kind:bss addr:0x0210b2c0 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkBFSPE8sProfileE kind:bss addr:0x0210b394 +@30152 kind:bss addr:0x0210b398 +_ZN15ProfileInstanceI23MapObjectProfileUnkBFSPE8sProfileE kind:bss addr:0x0210b3a4 data_ov021_0210b3c4 kind:bss addr:0x0210b3c4 ambiguous data_ov021_0210b478 kind:bss addr:0x0210b478 data_ov021_0210b49c kind:bss addr:0x0210b49c diff --git a/config/jp/arm9/overlays/ov024/symbols.txt b/config/jp/arm9/overlays/ov024/symbols.txt index c4780ee0..943cd6d0 100644 --- a/config/jp/arm9/overlays/ov024/symbols.txt +++ b/config/jp/arm9/overlays/ov024/symbols.txt @@ -914,4 +914,4 @@ data_ov024_020da050 kind:bss addr:0x020da050 data_ov024_020da054 kind:bss addr:0x020da054 ambiguous data_ov024_020da058 kind:bss addr:0x020da058 data_ov024_020da05c kind:bss addr:0x020da05c -sActorProfileUnkOBPC kind:bss addr:0x020da068 +_ZN15ProfileInstanceI19ActorProfileUnkOBPCE8sProfileE kind:bss addr:0x020da068 diff --git a/config/jp/arm9/overlays/ov026/delinks.txt b/config/jp/arm9/overlays/ov026/delinks.txt index 8174f6e8..52025f77 100644 --- a/config/jp/arm9/overlays/ov026/delinks.txt +++ b/config/jp/arm9/overlays/ov026/delinks.txt @@ -9,202 +9,202 @@ src/026_Train/Actor/ActorUnkDKCL.cpp: .text start:0x02107150 end:0x0210731c .init start:0x021363b0 end:0x02136400 .ctor start:0x02137540 end:0x02137544 - .bss start:0x021419a4 end:0x02141a7c + .bss start:0x02141994 end:0x02141a7c src/026_Train/MapObject/MapObjectUnkPLFM.cpp: .text start:0x0210a54c end:0x0210b09c .init start:0x0213675c end:0x021367e4 .ctor start:0x02137548 end:0x0213754c - .bss start:0x02141a8c end:0x02141b60 + .bss start:0x02141a7c end:0x02141b60 src/026_Train/MapObject/MapObjectUnkPLFA.cpp: .text start:0x0210b09c end:0x0210b520 .init start:0x021367e4 end:0x02136858 .ctor start:0x0213754c end:0x02137550 - .bss start:0x02141b70 end:0x02141b90 + .bss start:0x02141b60 end:0x02141b90 src/026_Train/MapObject/MapObjectUnkTRET.cpp: .text start:0x0210b86c end:0x0210bbcc .init start:0x02136878 end:0x021368c8 .ctor start:0x02137554 end:0x02137558 - .bss start:0x02141ba0 end:0x02141c74 + .bss start:0x02141b90 end:0x02141c94 src/026_Train/MapObject/MapObjectUnkTRRC.cpp: .text start:0x0210bbcc end:0x0210c0ec .init start:0x021368c8 end:0x02136918 .ctor start:0x02137558 end:0x0213755c - .bss start:0x02141ca4 end:0x02141d68 + .bss start:0x02141c94 end:0x02141d98 src/026_Train/MapObject/MapObjectUnkTBSF.cpp: .text start:0x0210c5f4 end:0x0210c8a0 .init start:0x02136934 end:0x02136984 .ctor start:0x02137560 end:0x02137564 - .bss start:0x02141da8 end:0x02141de0 + .bss start:0x02141d98 end:0x02141e9c src/026_Train/MapObject/MapObjectUnkMTWR.cpp: .text start:0x0210c8a0 end:0x0210cb8c .init start:0x02136984 end:0x021369d4 .ctor start:0x02137564 end:0x02137568 - .bss start:0x02141eac end:0x02141ecc + .bss start:0x02141e9c end:0x02141f80 src/026_Train/MapObject/MapObjectUnkEBRD.cpp: .text start:0x0210cb8c end:0x0210ce1c .init start:0x021369d4 end:0x02136a24 .ctor start:0x02137568 end:0x0213756c - .bss start:0x02141f90 end:0x02142064 + .bss start:0x02141f80 end:0x02142064 src/026_Train/MapObject/MapObjectUnkETNL.cpp: .text start:0x0210ce1c end:0x0210d104 .init start:0x02136a24 end:0x02136a74 .ctor start:0x0213756c end:0x02137570 - .bss start:0x02142074 end:0x02142148 + .bss start:0x02142064 end:0x02142148 src/026_Train/MapObject/MapObjectUnkMTGT.cpp: .text start:0x0210d61c end:0x0210dcfc .init start:0x02136a94 end:0x02136ae4 .ctor start:0x02137574 end:0x02137578 - .bss start:0x02142158 end:0x02142178 + .bss start:0x02142148 end:0x0214222c src/026_Train/MapObject/MapObjectUnkTRTF.cpp: .text start:0x02110494 end:0x02110740 .init start:0x02136b40 end:0x02136b90 .ctor start:0x0213757c end:0x02137580 - .bss start:0x0214223c end:0x02142310 + .bss start:0x0214222c end:0x02142330 src/026_Train/MapObject/MapObjectUnkTRPT.cpp: .text start:0x02110740 end:0x02110b20 .init start:0x02136b90 end:0x02136be0 .ctor start:0x02137580 end:0x02137584 - .bss start:0x02142340 end:0x02142414 + .bss start:0x02142330 end:0x02142434 src/026_Train/MapObject/MapObjectUnkEFRS.cpp: .text start:0x02110b20 end:0x02110f98 .init start:0x02136be0 end:0x02136c30 .ctor start:0x02137584 end:0x02137588 - .bss start:0x02142444 end:0x02142518 + .bss start:0x02142434 end:0x02142518 src/026_Train/MapObject/MapObjectUnkETSD.cpp: .text start:0x02110f98 end:0x0211138c .init start:0x02136c30 end:0x02136c80 .ctor start:0x02137588 end:0x0213758c - .bss start:0x02142528 end:0x021425fc + .bss start:0x02142518 end:0x02142604 src/026_Train/Actor/ActorUnkCNBL.cpp: .text start:0x0211138c end:0x02111fe4 .init start:0x02136c80 end:0x02136cd0 .ctor start:0x0213758c end:0x02137590 - .bss start:0x02142614 end:0x02142650 + .bss start:0x02142604 end:0x02142670 src/026_Train/Actor/ActorUnkTRBC.cpp: .text start:0x02111fe4 end:0x021124ac .init start:0x02136cd0 end:0x02136d38 .ctor start:0x02137590 end:0x02137594 - .bss start:0x02142680 end:0x02142758 + .bss start:0x02142670 end:0x02142758 src/026_Train/Actor/ActorUnkTRCB.cpp: .text start:0x021124ac end:0x02112ed4 .init start:0x02136d38 end:0x02136d88 .ctor start:0x02137594 end:0x02137598 - .bss start:0x02142768 end:0x021427a4 + .bss start:0x02142758 end:0x021427a4 src/026_Train/Actor/ActorUnkTHER.cpp: .text start:0x021132f8 end:0x0211358c .init start:0x02136d88 end:0x02136dd8 .ctor start:0x02137598 end:0x0213759c - .bss start:0x021427b4 end:0x02142800 + .bss start:0x021427a4 end:0x021427f0 src/026_Train/Actor/ActorUnkTRUP.cpp: .text start:0x0211358c end:0x02113898 .init start:0x02136dd8 end:0x02136e28 .ctor start:0x0213759c end:0x021375a0 - .bss start:0x02142800 end:0x02142964 + .bss start:0x021427f0 end:0x02142944 src/026_Train/Actor/ActorUnkKLTR.cpp: .text start:0x02113898 end:0x02115f94 .init start:0x02136e28 end:0x02136e78 .ctor start:0x021375a0 end:0x021375a4 - .bss start:0x02142964 end:0x02142a3c + .bss start:0x02142944 end:0x02142a44 src/026_Train/Actor/ActorUnkTRTT.cpp: .text start:0x02115f94 end:0x02118848 .init start:0x02136e78 end:0x02136f14 .ctor start:0x021375a4 end:0x021375a8 - .bss start:0x02142a5c end:0x02142b34 + .bss start:0x02142a44 end:0x02142b34 src/026_Train/Actor/ActorUnkTFAT.cpp: .text start:0x02118848 end:0x02118a1c .init start:0x02136f14 end:0x02136f64 .ctor start:0x021375a8 end:0x021375ac - .bss start:0x02142b44 end:0x02142b80 + .bss start:0x02142b34 end:0x02142bc4 src/026_Train/Actor/ActorUnkTBRD.cpp: .text start:0x02118a1c end:0x0211cc50 .init start:0x02136f64 end:0x02137034 .ctor start:0x021375ac end:0x021375b0 - .bss start:0x02142bdc end:0x02142cb4 + .bss start:0x02142bc4 end:0x02143180 src/026_Train/Actor/ActorUnkSNST.cpp: .text start:0x0211cc50 end:0x0211cf84 .init start:0x02137034 end:0x02137084 .ctor start:0x021375b0 end:0x021375b4 - .bss start:0x02143190 end:0x02143268 + .bss start:0x02143180 end:0x02143268 src/026_Train/Actor/ActorUnkTRSP.cpp: .text start:0x0211cf84 end:0x0211fe24 .init start:0x02137084 end:0x02137110 .ctor start:0x021375b4 end:0x021375b8 - .bss start:0x02143278 end:0x02143350 + .bss start:0x02143268 end:0x02143378 src/026_Train/Actor/ActorUnkRB1T.cpp: .text start:0x02120350 end:0x02122cd0 .init start:0x02137160 end:0x021371b0 .ctor start:0x021375bc end:0x021375c0 - .bss start:0x02143388 end:0x02143460 + .bss start:0x02143378 end:0x02143460 src/026_Train/Actor/ActorUnkRBRT.cpp: .text start:0x02122cd0 end:0x0212345c .init start:0x021371b0 end:0x02137200 .ctor start:0x021375c0 end:0x021375c4 - .bss start:0x02143470 end:0x02143548 + .bss start:0x02143460 end:0x02143548 src/026_Train/Actor/ActorUnkRBNT.cpp: .text start:0x0212345c end:0x02124360 .init start:0x02137200 end:0x02137250 .ctor start:0x021375c4 end:0x021375c8 - .bss start:0x02143558 end:0x02143630 + .bss start:0x02143548 end:0x02143630 src/026_Train/Actor/ActorUnkTVLR.cpp: .text start:0x02124360 end:0x02125120 .init start:0x02137250 end:0x021372a0 .ctor start:0x021375c8 end:0x021375cc - .bss start:0x02143644 end:0x02143680 + .bss start:0x02143630 end:0x02143728 src/026_Train/Actor/ActorUnkTTET.cpp: .text start:0x02125120 end:0x02125880 .init start:0x021372a0 end:0x021372f0 .ctor start:0x021375cc end:0x021375d0 - .bss start:0x02143738 end:0x02143774 + .bss start:0x02143728 end:0x021437a4 src/026_Train/Actor/ActorUnkTRSG.cpp: .text start:0x02125880 end:0x02125d08 .init start:0x021372f0 end:0x02137340 .ctor start:0x021375d0 end:0x021375d4 - .bss start:0x021437b4 end:0x021437f0 + .bss start:0x021437a4 end:0x021437f8 src/026_Train/Actor/ActorUnkBDEM.cpp: .text start:0x02125d08 end:0x0212a28c .init start:0x02137340 end:0x021373b8 .ctor start:0x021375d4 end:0x021375d8 - .bss start:0x02143810 end:0x021438e8 + .bss start:0x021437f8 end:0x021438f4 src/026_Train/Actor/ActorUnkTCOW_WCAS.cpp: .text start:0x0212a28c end:0x0212dbc0 .init start:0x021373b8 end:0x0213746c .ctor start:0x021375d8 end:0x021375dc - .bss start:0x0214390c end:0x02143abc + .bss start:0x021438f4 end:0x02143bb0 src/026_Train/Actor/ActorUnkDKTR.cpp: .text start:0x0212dbc0 end:0x0213077c .init start:0x0213746c end:0x021374bc .ctor start:0x021375dc end:0x021375e0 - .bss start:0x02143bd0 end:0x02143ca8 + .bss start:0x02143bb0 end:0x02143ca8 diff --git a/config/jp/arm9/overlays/ov026/symbols.txt b/config/jp/arm9/overlays/ov026/symbols.txt index 426c3dce..a05c43f7 100644 --- a/config/jp/arm9/overlays/ov026/symbols.txt +++ b/config/jp/arm9/overlays/ov026/symbols.txt @@ -3024,77 +3024,77 @@ data_ov026_0214196c kind:bss addr:0x0214196c data_ov026_02141974 kind:bss addr:0x02141974 data_ov026_02141980 kind:bss addr:0x02141980 data_ov026_02141988 kind:bss addr:0x02141988 -data_ov026_02141994 kind:bss addr:0x02141994 -data_ov026_02141998 kind:bss addr:0x02141998 -sActorProfileUnkDKCL kind:bss addr:0x021419a4 -data_ov026_02141a7c kind:bss addr:0x02141a7c -data_ov026_02141a80 kind:bss addr:0x02141a80 -sMapObjectProfileUnkPLFM kind:bss addr:0x02141a8c -data_ov026_02141b60 kind:bss addr:0x02141b60 -data_ov026_02141b64 kind:bss addr:0x02141b64 -sMapObjectProfileUnkPLFA kind:bss addr:0x02141b70 -data_ov026_02141b90 kind:bss addr:0x02141b90 -data_ov026_02141b94 kind:bss addr:0x02141b94 -sMapObjectProfileUnkTRET kind:bss addr:0x02141ba0 +_ZGVN15ProfileInstanceI19ActorProfileUnkDKCLE8sProfileE kind:bss addr:0x02141994 +@30175 kind:bss addr:0x02141998 +_ZN15ProfileInstanceI19ActorProfileUnkDKCLE8sProfileE kind:bss addr:0x021419a4 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkPLFME8sProfileE kind:bss addr:0x02141a7c +@30170 kind:bss addr:0x02141a80 +_ZN15ProfileInstanceI23MapObjectProfileUnkPLFME8sProfileE kind:bss addr:0x02141a8c +_ZGVN15ProfileInstanceI23MapObjectProfileUnkPLFAE8sProfileE kind:bss addr:0x02141b60 +@30176 kind:bss addr:0x02141b64 +_ZN15ProfileInstanceI23MapObjectProfileUnkPLFAE8sProfileE kind:bss addr:0x02141b70 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRETE8sProfileE kind:bss addr:0x02141b90 +@30182 kind:bss addr:0x02141b94 +_ZN15ProfileInstanceI23MapObjectProfileUnkTRETE8sProfileE kind:bss addr:0x02141ba0 data_ov026_02141c74 kind:bss addr:0x02141c74 -data_ov026_02141c94 kind:bss addr:0x02141c94 -data_ov026_02141c98 kind:bss addr:0x02141c98 -sMapObjectProfileUnkTRRC kind:bss addr:0x02141ca4 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRRCE8sProfileE kind:bss addr:0x02141c94 +@30188 kind:bss addr:0x02141c98 +_ZN15ProfileInstanceI23MapObjectProfileUnkTRRCE8sProfileE kind:bss addr:0x02141ca4 data_ov026_02141d68 kind:bss addr:0x02141d68 ambiguous data_ov026_02141d78 kind:bss addr:0x02141d78 data_ov026_02141d94 kind:bss addr:0x02141d94 ambiguous -data_ov026_02141d98 kind:bss addr:0x02141d98 -data_ov026_02141d9c kind:bss addr:0x02141d9c -sMapObjectProfileUnkTBSF kind:bss addr:0x02141da8 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTBSFE8sProfileE kind:bss addr:0x02141d98 +@30194 kind:bss addr:0x02141d9c +_ZN15ProfileInstanceI23MapObjectProfileUnkTBSFE8sProfileE kind:bss addr:0x02141da8 data_ov026_02141de0 kind:bss addr:0x02141de0 ambiguous data_ov026_02141e7c kind:bss addr:0x02141e7c -data_ov026_02141e9c kind:bss addr:0x02141e9c -data_ov026_02141ea0 kind:bss addr:0x02141ea0 -sMapObjectProfileUnkMTWR kind:bss addr:0x02141eac +_ZGVN15ProfileInstanceI23MapObjectProfileUnkMTWRE8sProfileE kind:bss addr:0x02141e9c +@30200 kind:bss addr:0x02141ea0 +_ZN15ProfileInstanceI23MapObjectProfileUnkMTWRE8sProfileE kind:bss addr:0x02141eac data_ov026_02141ecc kind:bss addr:0x02141ecc -data_ov026_02141f80 kind:bss addr:0x02141f80 -data_ov026_02141f84 kind:bss addr:0x02141f84 -sMapObjectProfileUnkEBRD kind:bss addr:0x02141f90 -data_ov026_02142064 kind:bss addr:0x02142064 -data_ov026_02142068 kind:bss addr:0x02142068 -sMapObjectProfileUnkETNL kind:bss addr:0x02142074 -data_ov026_02142148 kind:bss addr:0x02142148 -data_ov026_0214214c kind:bss addr:0x0214214c -sMapObjectProfileUnkMTGT kind:bss addr:0x02142158 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkEBRDE8sProfileE kind:bss addr:0x02141f80 +@30206 kind:bss addr:0x02141f84 +_ZN15ProfileInstanceI23MapObjectProfileUnkEBRDE8sProfileE kind:bss addr:0x02141f90 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkETNLE8sProfileE kind:bss addr:0x02142064 +@30212 kind:bss addr:0x02142068 +_ZN15ProfileInstanceI23MapObjectProfileUnkETNLE8sProfileE kind:bss addr:0x02142074 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkMTGTE8sProfileE kind:bss addr:0x02142148 +@30218 kind:bss addr:0x0214214c +_ZN15ProfileInstanceI23MapObjectProfileUnkMTGTE8sProfileE kind:bss addr:0x02142158 data_ov026_02142178 kind:bss addr:0x02142178 -data_ov026_0214222c kind:bss addr:0x0214222c -data_ov026_02142230 kind:bss addr:0x02142230 -sMapObjectProfileUnkTRTF kind:bss addr:0x0214223c +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRTFE8sProfileE kind:bss addr:0x0214222c +@30224 kind:bss addr:0x02142230 +_ZN15ProfileInstanceI23MapObjectProfileUnkTRTFE8sProfileE kind:bss addr:0x0214223c data_ov026_02142310 kind:bss addr:0x02142310 -data_ov026_02142330 kind:bss addr:0x02142330 -data_ov026_02142334 kind:bss addr:0x02142334 -sMapObjectProfileUnkTRPT kind:bss addr:0x02142340 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRPTE8sProfileE kind:bss addr:0x02142330 +@30230 kind:bss addr:0x02142334 +_ZN15ProfileInstanceI23MapObjectProfileUnkTRPTE8sProfileE kind:bss addr:0x02142340 data_ov026_02142414 kind:bss addr:0x02142414 -data_ov026_02142434 kind:bss addr:0x02142434 -data_ov026_02142438 kind:bss addr:0x02142438 -sMapObjectProfileUnkEFRS kind:bss addr:0x02142444 -data_ov026_02142518 kind:bss addr:0x02142518 -data_ov026_0214251c kind:bss addr:0x0214251c -sMapObjectProfileUnkETSD kind:bss addr:0x02142528 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkEFRSE8sProfileE kind:bss addr:0x02142434 +@30236 kind:bss addr:0x02142438 +_ZN15ProfileInstanceI23MapObjectProfileUnkEFRSE8sProfileE kind:bss addr:0x02142444 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkETSDE8sProfileE kind:bss addr:0x02142518 +@30242 kind:bss addr:0x0214251c +_ZN15ProfileInstanceI23MapObjectProfileUnkETSDE8sProfileE kind:bss addr:0x02142528 data_ov026_021425fc kind:bss addr:0x021425fc data_ov026_02142600 kind:bss addr:0x02142600 -data_ov026_02142604 kind:bss addr:0x02142604 -data_ov026_02142608 kind:bss addr:0x02142608 -sActorProfileUnkCNBL kind:bss addr:0x02142614 +_ZGVN15ProfileInstanceI19ActorProfileUnkCNBLE8sProfileE kind:bss addr:0x02142604 +@30259 kind:bss addr:0x02142608 +_ZN15ProfileInstanceI19ActorProfileUnkCNBLE8sProfileE kind:bss addr:0x02142614 data_ov026_02142650 kind:bss addr:0x02142650 data_ov026_02142660 kind:bss addr:0x02142660 -data_ov026_02142670 kind:bss addr:0x02142670 -data_ov026_02142674 kind:bss addr:0x02142674 -sActorProfileUnkTRBC kind:bss addr:0x02142680 -data_ov026_02142758 kind:bss addr:0x02142758 -data_ov026_0214275c kind:bss addr:0x0214275c -sActorProfileUnkTRCB kind:bss addr:0x02142768 -data_ov026_021427a4 kind:bss addr:0x021427a4 -data_ov026_021427a8 kind:bss addr:0x021427a8 -sActorProfileUnkTHER kind:bss addr:0x021427b4 -data_ov026_021427f0 kind:bss addr:0x021427f0 -data_ov026_021427f4 kind:bss addr:0x021427f4 -sActorProfileUnkTRUP kind:bss addr:0x02142800 +_ZGVN15ProfileInstanceI19ActorProfileUnkTRBCE8sProfileE kind:bss addr:0x02142670 +@30265 kind:bss addr:0x02142674 +_ZN15ProfileInstanceI19ActorProfileUnkTRBCE8sProfileE kind:bss addr:0x02142680 +_ZGVN15ProfileInstanceI19ActorProfileUnkTRCBE8sProfileE kind:bss addr:0x02142758 +@30271 kind:bss addr:0x0214275c +_ZN15ProfileInstanceI19ActorProfileUnkTRCBE8sProfileE kind:bss addr:0x02142768 +_ZGVN15ProfileInstanceI19ActorProfileUnkTHERE8sProfileE kind:bss addr:0x021427a4 +@30277 kind:bss addr:0x021427a8 +_ZN15ProfileInstanceI19ActorProfileUnkTHERE8sProfileE kind:bss addr:0x021427b4 +_ZGVN15ProfileInstanceI19ActorProfileUnkTRUPE8sProfileE kind:bss addr:0x021427f0 +@30283 kind:bss addr:0x021427f4 +_ZN15ProfileInstanceI19ActorProfileUnkTRUPE8sProfileE kind:bss addr:0x02142800 data_ov026_0214283c kind:bss addr:0x0214283c data_ov026_02142840 kind:bss addr:0x02142840 data_ov026_02142844 kind:bss addr:0x02142844 @@ -3123,71 +3123,71 @@ data_ov026_02142904 kind:bss addr:0x02142904 data_ov026_02142914 kind:bss addr:0x02142914 data_ov026_02142924 kind:bss addr:0x02142924 data_ov026_02142934 kind:bss addr:0x02142934 -data_ov026_02142944 kind:bss addr:0x02142944 -data_ov026_02142954 kind:bss addr:0x02142954 -sActorProfileUnkKLTR kind:bss addr:0x02142964 +_ZGVN15ProfileInstanceI19ActorProfileUnkKLTRE8sProfileE kind:bss addr:0x02142944 +@30289 kind:bss addr:0x02142954 +_ZN15ProfileInstanceI19ActorProfileUnkKLTRE8sProfileE kind:bss addr:0x02142964 data_ov026_02142a3c kind:bss addr:0x02142a3c -data_ov026_02142a44 kind:bss addr:0x02142a44 -data_ov026_02142a50 kind:bss addr:0x02142a50 -sActorProfileUnkTRTT kind:bss addr:0x02142a5c -data_ov026_02142b34 kind:bss addr:0x02142b34 -data_ov026_02142b38 kind:bss addr:0x02142b38 -sActorProfileUnkTFAT kind:bss addr:0x02142b44 +_ZGVN15ProfileInstanceI19ActorProfileUnkTRTTE8sProfileE kind:bss addr:0x02142a44 +@30295 kind:bss addr:0x02142a50 +_ZN15ProfileInstanceI19ActorProfileUnkTRTTE8sProfileE kind:bss addr:0x02142a5c +_ZGVN15ProfileInstanceI19ActorProfileUnkTFATE8sProfileE kind:bss addr:0x02142b34 +@30301 kind:bss addr:0x02142b38 +_ZN15ProfileInstanceI19ActorProfileUnkTFATE8sProfileE kind:bss addr:0x02142b44 data_ov026_02142b80 kind:bss addr:0x02142b80 data_ov026_02142b8c kind:bss addr:0x02142b8c data_ov026_02142b98 kind:bss addr:0x02142b98 data_ov026_02142ba4 kind:bss addr:0x02142ba4 data_ov026_02142bb4 kind:bss addr:0x02142bb4 -data_ov026_02142bc4 kind:bss addr:0x02142bc4 -data_ov026_02142bc8 kind:bss addr:0x02142bc8 -sActorProfileUnkTBRD kind:bss addr:0x02142bdc +_ZGVN15ProfileInstanceI19ActorProfileUnkTBRDE8sProfileE kind:bss addr:0x02142bc4 +@30307 kind:bss addr:0x02142bc8 +_ZN15ProfileInstanceI19ActorProfileUnkTBRDE8sProfileE kind:bss addr:0x02142bdc data_ov026_02142cb4 kind:bss addr:0x02142cb4 data_ov026_02142cc8 kind:bss addr:0x02142cc8 data_ov026_0214313c kind:bss addr:0x0214313c ambiguous -data_ov026_02143180 kind:bss addr:0x02143180 -data_ov026_02143184 kind:bss addr:0x02143184 -sActorProfileUnkSNST kind:bss addr:0x02143190 -data_ov026_02143268 kind:bss addr:0x02143268 -data_ov026_0214326c kind:bss addr:0x0214326c -sActorProfileUnkTRSP kind:bss addr:0x02143278 +_ZGVN15ProfileInstanceI19ActorProfileUnkSNSTE8sProfileE kind:bss addr:0x02143180 +@30313 kind:bss addr:0x02143184 +_ZN15ProfileInstanceI19ActorProfileUnkSNSTE8sProfileE kind:bss addr:0x02143190 +_ZGVN15ProfileInstanceI19ActorProfileUnkTRSPE8sProfileE kind:bss addr:0x02143268 +@30319 kind:bss addr:0x0214326c +_ZN15ProfileInstanceI19ActorProfileUnkTRSPE8sProfileE kind:bss addr:0x02143278 data_ov026_02143350 kind:bss addr:0x02143350 data_ov026_02143354 kind:bss addr:0x02143354 data_ov026_02143360 kind:bss addr:0x02143360 -data_ov026_02143378 kind:bss addr:0x02143378 -data_ov026_0214337c kind:bss addr:0x0214337c -sActorProfileUnkRB1T kind:bss addr:0x02143388 -data_ov026_02143460 kind:bss addr:0x02143460 -data_ov026_02143464 kind:bss addr:0x02143464 -sActorProfileUnkRBRT kind:bss addr:0x02143470 -data_ov026_02143548 kind:bss addr:0x02143548 -data_ov026_0214354c kind:bss addr:0x0214354c -sActorProfileUnkRBNT kind:bss addr:0x02143558 -data_ov026_02143630 kind:bss addr:0x02143630 -data_ov026_02143638 kind:bss addr:0x02143638 -sActorProfileUnkTVLR kind:bss addr:0x02143644 +_ZGVN15ProfileInstanceI19ActorProfileUnkRB1TE8sProfileE kind:bss addr:0x02143378 +@30325 kind:bss addr:0x0214337c +_ZN15ProfileInstanceI19ActorProfileUnkRB1TE8sProfileE kind:bss addr:0x02143388 +_ZGVN15ProfileInstanceI19ActorProfileUnkRBRTE8sProfileE kind:bss addr:0x02143460 +@30331 kind:bss addr:0x02143464 +_ZN15ProfileInstanceI19ActorProfileUnkRBRTE8sProfileE kind:bss addr:0x02143470 +_ZGVN15ProfileInstanceI19ActorProfileUnkRBNTE8sProfileE kind:bss addr:0x02143548 +@30337 kind:bss addr:0x0214354c +_ZN15ProfileInstanceI19ActorProfileUnkRBNTE8sProfileE kind:bss addr:0x02143558 +_ZGVN15ProfileInstanceI19ActorProfileUnkTVLRE8sProfileE kind:bss addr:0x02143630 +@30343 kind:bss addr:0x02143638 +_ZN15ProfileInstanceI19ActorProfileUnkTVLRE8sProfileE kind:bss addr:0x02143644 data_ov026_02143680 kind:bss addr:0x02143680 data_ov026_0214371c kind:bss addr:0x0214371c data_ov026_02143720 kind:bss addr:0x02143720 data_ov026_02143724 kind:bss addr:0x02143724 -data_ov026_02143728 kind:bss addr:0x02143728 -data_ov026_0214372c kind:bss addr:0x0214372c -sActorProfileUnkTTET kind:bss addr:0x02143738 +_ZGVN15ProfileInstanceI19ActorProfileUnkTTETE8sProfileE kind:bss addr:0x02143728 +@30349 kind:bss addr:0x0214372c +_ZN15ProfileInstanceI19ActorProfileUnkTTETE8sProfileE kind:bss addr:0x02143738 data_ov026_02143774 kind:bss addr:0x02143774 data_ov026_02143784 kind:bss addr:0x02143784 data_ov026_02143794 kind:bss addr:0x02143794 -data_ov026_021437a4 kind:bss addr:0x021437a4 -data_ov026_021437a8 kind:bss addr:0x021437a8 -sActorProfileUnkTRSG kind:bss addr:0x021437b4 +_ZGVN15ProfileInstanceI19ActorProfileUnkTRSGE8sProfileE kind:bss addr:0x021437a4 +@30355 kind:bss addr:0x021437a8 +_ZN15ProfileInstanceI19ActorProfileUnkTRSGE8sProfileE kind:bss addr:0x021437b4 data_ov026_021437f0 kind:bss addr:0x021437f0 -data_ov026_021437f8 kind:bss addr:0x021437f8 -data_ov026_02143804 kind:bss addr:0x02143804 -sActorProfileUnkBDEM kind:bss addr:0x02143810 +_ZGVN15ProfileInstanceI19ActorProfileUnkBDEME8sProfileE kind:bss addr:0x021437f8 +@30361 kind:bss addr:0x02143804 +_ZN15ProfileInstanceI19ActorProfileUnkBDEME8sProfileE kind:bss addr:0x02143810 data_ov026_021438e8 kind:bss addr:0x021438e8 -data_ov026_021438f4 kind:bss addr:0x021438f4 -data_ov026_02143900 kind:bss addr:0x02143900 -sActorProfileUnkWCAS kind:bss addr:0x0214390c +_ZGVN15ProfileInstanceI19ActorProfileUnkWCASE8sProfileE kind:bss addr:0x021438f4 +@30367 kind:bss addr:0x02143900 +_ZN15ProfileInstanceI19ActorProfileUnkWCASE8sProfileE kind:bss addr:0x0214390c data_ov026_021439b8 kind:bss addr:0x021439b8 ambiguous -sActorProfileUnkTCOW kind:bss addr:0x021439e4 +_ZN15ProfileInstanceI19ActorProfileUnkTCOWE8sProfileE kind:bss addr:0x021439e4 data_ov026_02143abc kind:bss addr:0x02143abc data_ov026_02143ac0 kind:bss addr:0x02143ac0 data_ov026_02143ac4 kind:bss addr:0x02143ac4 @@ -3214,9 +3214,9 @@ data_ov026_02143b70 kind:bss addr:0x02143b70 data_ov026_02143b80 kind:bss addr:0x02143b80 data_ov026_02143b90 kind:bss addr:0x02143b90 data_ov026_02143ba0 kind:bss addr:0x02143ba0 -data_ov026_02143bb0 kind:bss addr:0x02143bb0 -data_ov026_02143bc0 kind:bss addr:0x02143bc0 -sActorProfileUnkDKTR kind:bss addr:0x02143bd0 +_ZGVN15ProfileInstanceI19ActorProfileUnkDKTRE8sProfileE kind:bss addr:0x02143bb0 +@30373 kind:bss addr:0x02143bc0 +_ZN15ProfileInstanceI19ActorProfileUnkDKTRE8sProfileE kind:bss addr:0x02143bd0 data_ov026_02143ca8 kind:bss addr:0x02143ca8 data_ov026_02143cac kind:bss addr:0x02143cac data_ov026_02143cb8 kind:bss addr:0x02143cb8 diff --git a/config/jp/arm9/overlays/ov027/delinks.txt b/config/jp/arm9/overlays/ov027/delinks.txt index 22419ae1..af7a24b1 100644 --- a/config/jp/arm9/overlays/ov027/delinks.txt +++ b/config/jp/arm9/overlays/ov027/delinks.txt @@ -9,76 +9,76 @@ src/027_TrainForest/MapObject/MapObjectUnkTMFR.cpp: .text start:0x02143d60 end:0x021443a0 .init start:0x0214a2d0 end:0x0214a340 .ctor start:0x0214a71c end:0x0214a720 - .bss start:0x0214b1c0 end:0x0214b294 + .bss start:0x0214b1a8 end:0x0214b294 src/027_TrainForest/MapObject/MapObjectUnkTRFV.cpp: .text start:0x021443a0 end:0x02144798 .init start:0x0214a340 end:0x0214a390 .ctor start:0x0214a720 end:0x0214a724 - .bss start:0x0214b2a4 end:0x0214b378 + .bss start:0x0214b294 end:0x0214b378 src/027_TrainForest/MapObject/MapObjectUnkTRFO.cpp: .text start:0x02144798 end:0x02144a98 .init start:0x0214a390 end:0x0214a3e0 .ctor start:0x0214a724 end:0x0214a728 - .bss start:0x0214b388 end:0x0214b45c + .bss start:0x0214b378 end:0x0214b45c src/027_TrainForest/MapObject/MapObjectUnkTRSH.cpp: .text start:0x02144a98 end:0x02144db4 .init start:0x0214a3e0 end:0x0214a430 .ctor start:0x0214a728 end:0x0214a72c - .bss start:0x0214b46c end:0x0214b540 + .bss start:0x0214b45c end:0x0214b540 src/027_TrainForest/MapObject/MapObjectUnkTRBR.cpp: .text start:0x02144db4 end:0x021450b4 .init start:0x0214a430 end:0x0214a480 .ctor start:0x0214a72c end:0x0214a730 - .bss start:0x0214b550 end:0x0214b624 + .bss start:0x0214b540 end:0x0214b624 src/027_TrainForest/MapObject/MapObjectUnkTRDA.cpp: .text start:0x021450b4 end:0x0214536c .init start:0x0214a480 end:0x0214a4d0 .ctor start:0x0214a730 end:0x0214a734 - .bss start:0x0214b634 end:0x0214b708 + .bss start:0x0214b624 end:0x0214b708 src/027_TrainForest/MapObject/MapObjectUnkETDK.cpp: .text start:0x0214536c end:0x02145c10 .init start:0x0214a4d0 end:0x0214a520 .ctor start:0x0214a734 end:0x0214a738 - .bss start:0x0214b718 end:0x0214b738 + .bss start:0x0214b708 end:0x0214b7ec src/027_TrainForest/MapObject/MapObjectUnkTRRA.cpp: .text start:0x02145c10 end:0x02145f38 .init start:0x0214a520 end:0x0214a570 .ctor start:0x0214a738 end:0x0214a73c - .bss start:0x0214b7fc end:0x0214b8d0 + .bss start:0x0214b7ec end:0x0214b8d0 src/027_TrainForest/MapObject/MapObjectUnkCSTL.cpp: .text start:0x02145f38 end:0x0214625c .init start:0x0214a570 end:0x0214a5c0 .ctor start:0x0214a73c end:0x0214a740 - .bss start:0x0214b8e0 end:0x0214b9b4 + .bss start:0x0214b8d0 end:0x0214b9b4 src/027_TrainForest/MapObject/MapObjectUnkMBRG.cpp: .text start:0x0214625c end:0x021465fc .init start:0x0214a5c0 end:0x0214a610 .ctor start:0x0214a740 end:0x0214a744 - .bss start:0x0214b9c4 end:0x0214ba2c + .bss start:0x0214b9b4 end:0x0214ba2c src/027_TrainForest/MapObject/MapObjectUnkMZFE.cpp: .text start:0x02146618 end:0x02146bb0 .init start:0x0214a610 end:0x0214a67c .ctor start:0x0214a744 end:0x0214a748 - .bss start:0x0214ba3c end:0x0214bb10 + .bss start:0x0214ba2c end:0x0214bb10 src/027_TrainForest/Actor/ActorUnkTRER.cpp: .text start:0x02146bb0 end:0x02147440 .init start:0x0214a67c end:0x0214a6cc .ctor start:0x0214a748 end:0x0214a74c - .bss start:0x0214bb24 end:0x0214bbfc + .bss start:0x0214bb10 end:0x0214bd04 src/027_TrainForest/Actor/ActorUnkFKTR.cpp: .text start:0x02147440 end:0x0214a294 .init start:0x0214a6cc end:0x0214a71c .ctor start:0x0214a74c end:0x0214a750 - .bss start:0x0214bd24 end:0x0214be00 + .bss start:0x0214bd04 end:0x0214be00 diff --git a/config/jp/arm9/overlays/ov027/symbols.txt b/config/jp/arm9/overlays/ov027/symbols.txt index b1eb4921..58879d04 100644 --- a/config/jp/arm9/overlays/ov027/symbols.txt +++ b/config/jp/arm9/overlays/ov027/symbols.txt @@ -331,43 +331,43 @@ data_ov027_0214b094 kind:data(any) addr:0x0214b094 data_ov027_0214b0dc kind:data(any) addr:0x0214b0dc _ZTV19data_ov027_0214b120 kind:data(any) addr:0x0214b120 data_ov027_0214b1a0 kind:bss addr:0x0214b1a0 -data_ov027_0214b1a8 kind:bss addr:0x0214b1a8 -data_ov027_0214b1b4 kind:bss addr:0x0214b1b4 -sMapObjectProfileUnkTMFR kind:bss addr:0x0214b1c0 -data_ov027_0214b294 kind:bss addr:0x0214b294 -data_ov027_0214b298 kind:bss addr:0x0214b298 -sMapObjectProfileUnkTRFV kind:bss addr:0x0214b2a4 -data_ov027_0214b378 kind:bss addr:0x0214b378 -data_ov027_0214b37c kind:bss addr:0x0214b37c -sMapObjectProfileUnkTRFO kind:bss addr:0x0214b388 -data_ov027_0214b45c kind:bss addr:0x0214b45c -data_ov027_0214b460 kind:bss addr:0x0214b460 -sMapObjectProfileUnkTRSH kind:bss addr:0x0214b46c -data_ov027_0214b540 kind:bss addr:0x0214b540 -data_ov027_0214b544 kind:bss addr:0x0214b544 -sMapObjectProfileUnkTRBR kind:bss addr:0x0214b550 -data_ov027_0214b624 kind:bss addr:0x0214b624 -data_ov027_0214b628 kind:bss addr:0x0214b628 -sMapObjectProfileUnkTRDA kind:bss addr:0x0214b634 -data_ov027_0214b708 kind:bss addr:0x0214b708 -data_ov027_0214b70c kind:bss addr:0x0214b70c -sMapObjectProfileUnkETDK kind:bss addr:0x0214b718 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTMFRE8sProfileE kind:bss addr:0x0214b1a8 +@30374 kind:bss addr:0x0214b1b4 +_ZN15ProfileInstanceI23MapObjectProfileUnkTMFRE8sProfileE kind:bss addr:0x0214b1c0 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRFVE8sProfileE kind:bss addr:0x0214b294 +@30380 kind:bss addr:0x0214b298 +_ZN15ProfileInstanceI23MapObjectProfileUnkTRFVE8sProfileE kind:bss addr:0x0214b2a4 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRFOE8sProfileE kind:bss addr:0x0214b378 +@30386 kind:bss addr:0x0214b37c +_ZN15ProfileInstanceI23MapObjectProfileUnkTRFOE8sProfileE kind:bss addr:0x0214b388 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRSHE8sProfileE kind:bss addr:0x0214b45c +@30392 kind:bss addr:0x0214b460 +_ZN15ProfileInstanceI23MapObjectProfileUnkTRSHE8sProfileE kind:bss addr:0x0214b46c +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRBRE8sProfileE kind:bss addr:0x0214b540 +@30398 kind:bss addr:0x0214b544 +_ZN15ProfileInstanceI23MapObjectProfileUnkTRBRE8sProfileE kind:bss addr:0x0214b550 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRDAE8sProfileE kind:bss addr:0x0214b624 +@30404 kind:bss addr:0x0214b628 +_ZN15ProfileInstanceI23MapObjectProfileUnkTRDAE8sProfileE kind:bss addr:0x0214b634 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkETDKE8sProfileE kind:bss addr:0x0214b708 +@30410 kind:bss addr:0x0214b70c +_ZN15ProfileInstanceI23MapObjectProfileUnkETDKE8sProfileE kind:bss addr:0x0214b718 data_ov027_0214b738 kind:bss addr:0x0214b738 -data_ov027_0214b7ec kind:bss addr:0x0214b7ec -data_ov027_0214b7f0 kind:bss addr:0x0214b7f0 -sMapObjectProfileUnkTRRA kind:bss addr:0x0214b7fc -data_ov027_0214b8d0 kind:bss addr:0x0214b8d0 -data_ov027_0214b8d4 kind:bss addr:0x0214b8d4 -sMapObjectProfileUnkCSTL kind:bss addr:0x0214b8e0 -data_ov027_0214b9b4 kind:bss addr:0x0214b9b4 -data_ov027_0214b9b8 kind:bss addr:0x0214b9b8 -sMapObjectProfileUnkMBRG kind:bss addr:0x0214b9c4 -data_ov027_0214ba2c kind:bss addr:0x0214ba2c -data_ov027_0214ba30 kind:bss addr:0x0214ba30 -sMapObjectProfileUnkMZFE kind:bss addr:0x0214ba3c -data_ov027_0214bb10 kind:bss addr:0x0214bb10 -data_ov027_0214bb18 kind:bss addr:0x0214bb18 -sActorProfileUnkTRER kind:bss addr:0x0214bb24 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRRAE8sProfileE kind:bss addr:0x0214b7ec +@30416 kind:bss addr:0x0214b7f0 +_ZN15ProfileInstanceI23MapObjectProfileUnkTRRAE8sProfileE kind:bss addr:0x0214b7fc +_ZGVN15ProfileInstanceI23MapObjectProfileUnkCSTLE8sProfileE kind:bss addr:0x0214b8d0 +@30422 kind:bss addr:0x0214b8d4 +_ZN15ProfileInstanceI23MapObjectProfileUnkCSTLE8sProfileE kind:bss addr:0x0214b8e0 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkMBRGE8sProfileE kind:bss addr:0x0214b9b4 +@30428 kind:bss addr:0x0214b9b8 +_ZN15ProfileInstanceI23MapObjectProfileUnkMBRGE8sProfileE kind:bss addr:0x0214b9c4 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkMZFEE8sProfileE kind:bss addr:0x0214ba2c +@30434 kind:bss addr:0x0214ba30 +_ZN15ProfileInstanceI23MapObjectProfileUnkMZFEE8sProfileE kind:bss addr:0x0214ba3c +_ZGVN15ProfileInstanceI19ActorProfileUnkTRERE8sProfileE kind:bss addr:0x0214bb10 +@30451 kind:bss addr:0x0214bb18 +_ZN15ProfileInstanceI19ActorProfileUnkTRERE8sProfileE kind:bss addr:0x0214bb24 data_ov027_0214bbfc kind:bss addr:0x0214bbfc data_ov027_0214bc00 kind:bss addr:0x0214bc00 data_ov027_0214bc04 kind:bss addr:0x0214bc04 @@ -396,6 +396,6 @@ data_ov027_0214bcc4 kind:bss addr:0x0214bcc4 data_ov027_0214bcd4 kind:bss addr:0x0214bcd4 data_ov027_0214bce4 kind:bss addr:0x0214bce4 data_ov027_0214bcf4 kind:bss addr:0x0214bcf4 -data_ov027_0214bd04 kind:bss addr:0x0214bd04 -data_ov027_0214bd14 kind:bss addr:0x0214bd14 -sActorProfileUnkFKTR kind:bss addr:0x0214bd24 +_ZGVN15ProfileInstanceI19ActorProfileUnkFKTRE8sProfileE kind:bss addr:0x0214bd04 +@30457 kind:bss addr:0x0214bd14 +_ZN15ProfileInstanceI19ActorProfileUnkFKTRE8sProfileE kind:bss addr:0x0214bd24 diff --git a/config/jp/arm9/overlays/ov028/delinks.txt b/config/jp/arm9/overlays/ov028/delinks.txt index b15a547f..44776293 100644 --- a/config/jp/arm9/overlays/ov028/delinks.txt +++ b/config/jp/arm9/overlays/ov028/delinks.txt @@ -9,94 +9,94 @@ src/028_TrainSnow/Actor/ActorUnkSNMA.cpp: .text start:0x02143d60 end:0x021454cc .init start:0x02148dc4 end:0x02148e60 .ctor start:0x02149350 end:0x02149354 - .bss start:0x02149ffc end:0x0214a0d4 + .bss start:0x02149fe4 end:0x0214a0d4 src/028_TrainSnow/Actor/ActorUnkSNMB.cpp: .text start:0x021454cc end:0x02145c18 .init start:0x02148e60 end:0x02148eb0 .ctor start:0x02149354 end:0x02149358 - .bss start:0x0214a0e4 end:0x0214a1bc + .bss start:0x0214a0d4 end:0x0214a1bc src/028_TrainSnow/MapObject/MapObjectUnkTRSS.cpp: .text start:0x02146788 end:0x02146be8 .init start:0x02148ed0 end:0x02148f20 .ctor start:0x0214935c end:0x02149360 - .bss start:0x0214a1cc end:0x0214a2a0 + .bss start:0x0214a1bc end:0x0214a2a0 src/028_TrainSnow/MapObject/MapObjectUnkTRRS.cpp: .text start:0x02146be8 end:0x02146ea0 .init start:0x02148f20 end:0x02148f70 .ctor start:0x02149360 end:0x02149364 - .bss start:0x0214a2b0 end:0x0214a384 + .bss start:0x0214a2a0 end:0x0214a384 src/028_TrainSnow/MapObject/MapObjectUnkTRMA.cpp: .text start:0x02146ea0 end:0x021471a0 .init start:0x02148f70 end:0x02148fc0 .ctor start:0x02149364 end:0x02149368 - .bss start:0x0214a394 end:0x0214a468 + .bss start:0x0214a384 end:0x0214a468 src/028_TrainSnow/MapObject/MapObjectUnkTRBM.cpp: .text start:0x021471a0 end:0x021474a0 .init start:0x02148fc0 end:0x02149010 .ctor start:0x02149368 end:0x0214936c - .bss start:0x0214a478 end:0x0214a54c + .bss start:0x0214a468 end:0x0214a554 src/028_TrainSnow/MapObject/MapObjectUnkTMSN.cpp: .text start:0x021474a0 end:0x02147988 .init start:0x02149010 end:0x02149080 .ctor start:0x0214936c end:0x02149370 - .bss start:0x0214a56c end:0x0214a640 + .bss start:0x0214a554 end:0x0214a640 src/028_TrainSnow/MapObject/MapObjectUnkETNS.cpp: .text start:0x02147988 end:0x02147ad8 .init start:0x02149080 end:0x021490d0 .ctor start:0x02149370 end:0x02149374 - .bss start:0x0214a650 end:0x0214a724 + .bss start:0x0214a640 end:0x0214a724 src/028_TrainSnow/MapObject/MapObjectUnkETSW.cpp: .text start:0x02147ad8 end:0x02147e0c .init start:0x021490d0 end:0x02149120 .ctor start:0x02149374 end:0x02149378 - .bss start:0x0214a734 end:0x0214a808 + .bss start:0x0214a724 end:0x0214a808 src/028_TrainSnow/MapObject/MapObjectUnkEFRF.cpp: .text start:0x02147e0c end:0x02147f80 .init start:0x02149120 end:0x02149170 .ctor start:0x02149378 end:0x0214937c - .bss start:0x0214a818 end:0x0214a830 + .bss start:0x0214a808 end:0x0214a8ec src/028_TrainSnow/MapObject/MapObjectUnkRLPT.cpp: .text start:0x02147f80 end:0x02148128 .init start:0x02149170 end:0x021491c0 .ctor start:0x0214937c end:0x02149380 - .bss start:0x0214a8fc end:0x0214a91c + .bss start:0x0214a8ec end:0x0214a91c src/028_TrainSnow/MapObject/MapObjectUnkTRH0.cpp: .text start:0x02148128 end:0x021483e8 .init start:0x021491c0 end:0x02149210 .ctor start:0x02149380 end:0x02149384 - .bss start:0x0214a92c end:0x0214a95c + .bss start:0x0214a91c end:0x0214aa00 src/028_TrainSnow/MapObject/MapObjectUnkTRTS.cpp: .text start:0x021483e8 end:0x021486dc .init start:0x02149210 end:0x02149260 .ctor start:0x02149384 end:0x02149388 - .bss start:0x0214aa10 end:0x0214aae4 + .bss start:0x0214aa00 end:0x0214ab04 src/028_TrainSnow/MapObject/MapObjectUnkTRSR.cpp: .text start:0x021486dc end:0x021488b4 .init start:0x02149260 end:0x021492b0 .ctor start:0x02149388 end:0x0214938c - .bss start:0x0214ab14 end:0x0214abe8 + .bss start:0x0214ab04 end:0x0214ac08 src/028_TrainSnow/MapObject/MapObjectUnkRBSR.cpp: .text start:0x021488b4 end:0x02148aa8 .init start:0x021492b0 end:0x02149300 .ctor start:0x0214938c end:0x02149390 - .bss start:0x0214ac18 end:0x0214ac5c + .bss start:0x0214ac08 end:0x0214ac5c src/028_TrainSnow/MapObject/MapObjectUnkTRFS.cpp: .text start:0x02148aa8 end:0x02148d38 .init start:0x02149300 end:0x02149350 .ctor start:0x02149390 end:0x02149394 - .bss start:0x0214ac6c end:0x0214ad40 + .bss start:0x0214ac5c end:0x0214ad40 diff --git a/config/jp/arm9/overlays/ov028/symbols.txt b/config/jp/arm9/overlays/ov028/symbols.txt index 49f1e249..4c14067a 100644 --- a/config/jp/arm9/overlays/ov028/symbols.txt +++ b/config/jp/arm9/overlays/ov028/symbols.txt @@ -356,57 +356,57 @@ data_ov028_02149f14 kind:data(any) addr:0x02149f14 data_ov028_02149f74 kind:data(any) addr:0x02149f74 data_ov028_02149f90 kind:data(any) addr:0x02149f90 data_ov028_02149fe0 kind:bss addr:0x02149fe0 -data_ov028_02149fe4 kind:bss addr:0x02149fe4 -data_ov028_02149ff0 kind:bss addr:0x02149ff0 -sActorProfileUnkSNMA kind:bss addr:0x02149ffc -data_ov028_0214a0d4 kind:bss addr:0x0214a0d4 -data_ov028_0214a0d8 kind:bss addr:0x0214a0d8 -sActorProfileUnkSNMB kind:bss addr:0x0214a0e4 -data_ov028_0214a1bc kind:bss addr:0x0214a1bc -data_ov028_0214a1c0 kind:bss addr:0x0214a1c0 -sMapObjectProfileUnkTRSS kind:bss addr:0x0214a1cc -data_ov028_0214a2a0 kind:bss addr:0x0214a2a0 -data_ov028_0214a2a4 kind:bss addr:0x0214a2a4 -sMapObjectProfileUnkTRRS kind:bss addr:0x0214a2b0 -data_ov028_0214a384 kind:bss addr:0x0214a384 -data_ov028_0214a388 kind:bss addr:0x0214a388 -sMapObjectProfileUnkTRMA kind:bss addr:0x0214a394 -data_ov028_0214a468 kind:bss addr:0x0214a468 -data_ov028_0214a46c kind:bss addr:0x0214a46c -sMapObjectProfileUnkTRBM kind:bss addr:0x0214a478 +_ZGVN15ProfileInstanceI19ActorProfileUnkSNMAE8sProfileE kind:bss addr:0x02149fe4 +@30469 kind:bss addr:0x02149ff0 +_ZN15ProfileInstanceI19ActorProfileUnkSNMAE8sProfileE kind:bss addr:0x02149ffc +_ZGVN15ProfileInstanceI19ActorProfileUnkSNMBE8sProfileE kind:bss addr:0x0214a0d4 +@30475 kind:bss addr:0x0214a0d8 +_ZN15ProfileInstanceI19ActorProfileUnkSNMBE8sProfileE kind:bss addr:0x0214a0e4 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRSSE8sProfileE kind:bss addr:0x0214a1bc +@30470 kind:bss addr:0x0214a1c0 +_ZN15ProfileInstanceI23MapObjectProfileUnkTRSSE8sProfileE kind:bss addr:0x0214a1cc +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRRSE8sProfileE kind:bss addr:0x0214a2a0 +@30476 kind:bss addr:0x0214a2a4 +_ZN15ProfileInstanceI23MapObjectProfileUnkTRRSE8sProfileE kind:bss addr:0x0214a2b0 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRMAE8sProfileE kind:bss addr:0x0214a384 +@30482 kind:bss addr:0x0214a388 +_ZN15ProfileInstanceI23MapObjectProfileUnkTRMAE8sProfileE kind:bss addr:0x0214a394 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRBME8sProfileE kind:bss addr:0x0214a468 +@30488 kind:bss addr:0x0214a46c +_ZN15ProfileInstanceI23MapObjectProfileUnkTRBME8sProfileE kind:bss addr:0x0214a478 data_ov028_0214a54c kind:bss addr:0x0214a54c -data_ov028_0214a554 kind:bss addr:0x0214a554 -data_ov028_0214a560 kind:bss addr:0x0214a560 -sMapObjectProfileUnkTMSN kind:bss addr:0x0214a56c -data_ov028_0214a640 kind:bss addr:0x0214a640 -data_ov028_0214a644 kind:bss addr:0x0214a644 -sMapObjectProfileUnkETNS kind:bss addr:0x0214a650 -data_ov028_0214a724 kind:bss addr:0x0214a724 -data_ov028_0214a728 kind:bss addr:0x0214a728 -sMapObjectProfileUnkETSW kind:bss addr:0x0214a734 -data_ov028_0214a808 kind:bss addr:0x0214a808 -data_ov028_0214a80c kind:bss addr:0x0214a80c -sMapObjectProfileUnkEFRF kind:bss addr:0x0214a818 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTMSNE8sProfileE kind:bss addr:0x0214a554 +@30494 kind:bss addr:0x0214a560 +_ZN15ProfileInstanceI23MapObjectProfileUnkTMSNE8sProfileE kind:bss addr:0x0214a56c +_ZGVN15ProfileInstanceI23MapObjectProfileUnkETNSE8sProfileE kind:bss addr:0x0214a640 +@30500 kind:bss addr:0x0214a644 +_ZN15ProfileInstanceI23MapObjectProfileUnkETNSE8sProfileE kind:bss addr:0x0214a650 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkETSWE8sProfileE kind:bss addr:0x0214a724 +@30506 kind:bss addr:0x0214a728 +_ZN15ProfileInstanceI23MapObjectProfileUnkETSWE8sProfileE kind:bss addr:0x0214a734 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkEFRFE8sProfileE kind:bss addr:0x0214a808 +@30512 kind:bss addr:0x0214a80c +_ZN15ProfileInstanceI23MapObjectProfileUnkEFRFE8sProfileE kind:bss addr:0x0214a818 data_ov028_0214a830 kind:bss addr:0x0214a830 ambiguous -data_ov028_0214a8ec kind:bss addr:0x0214a8ec -data_ov028_0214a8f0 kind:bss addr:0x0214a8f0 -sMapObjectProfileUnkRLPT kind:bss addr:0x0214a8fc -data_ov028_0214a91c kind:bss addr:0x0214a91c -data_ov028_0214a920 kind:bss addr:0x0214a920 -sMapObjectProfileUnkTRH0 kind:bss addr:0x0214a92c +_ZGVN15ProfileInstanceI23MapObjectProfileUnkRLPTE8sProfileE kind:bss addr:0x0214a8ec +@30518 kind:bss addr:0x0214a8f0 +_ZN15ProfileInstanceI23MapObjectProfileUnkRLPTE8sProfileE kind:bss addr:0x0214a8fc +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRH0E8sProfileE kind:bss addr:0x0214a91c +@30524 kind:bss addr:0x0214a920 +_ZN15ProfileInstanceI23MapObjectProfileUnkTRH0E8sProfileE kind:bss addr:0x0214a92c data_ov028_0214a95c kind:bss addr:0x0214a95c ambiguous -data_ov028_0214aa00 kind:bss addr:0x0214aa00 -data_ov028_0214aa04 kind:bss addr:0x0214aa04 -sMapObjectProfileUnkTRTS kind:bss addr:0x0214aa10 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRTSE8sProfileE kind:bss addr:0x0214aa00 +@30530 kind:bss addr:0x0214aa04 +_ZN15ProfileInstanceI23MapObjectProfileUnkTRTSE8sProfileE kind:bss addr:0x0214aa10 data_ov028_0214aae4 kind:bss addr:0x0214aae4 -data_ov028_0214ab04 kind:bss addr:0x0214ab04 -data_ov028_0214ab08 kind:bss addr:0x0214ab08 -sMapObjectProfileUnkTRSR kind:bss addr:0x0214ab14 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRSRE8sProfileE kind:bss addr:0x0214ab04 +@30536 kind:bss addr:0x0214ab08 +_ZN15ProfileInstanceI23MapObjectProfileUnkTRSRE8sProfileE kind:bss addr:0x0214ab14 data_ov028_0214abe8 kind:bss addr:0x0214abe8 -data_ov028_0214ac08 kind:bss addr:0x0214ac08 -data_ov028_0214ac0c kind:bss addr:0x0214ac0c -sMapObjectProfileUnkRBSR kind:bss addr:0x0214ac18 -data_ov028_0214ac5c kind:bss addr:0x0214ac5c -data_ov028_0214ac60 kind:bss addr:0x0214ac60 -sMapObjectProfileUnkTRFS kind:bss addr:0x0214ac6c +_ZGVN15ProfileInstanceI23MapObjectProfileUnkRBSRE8sProfileE kind:bss addr:0x0214ac08 +@30542 kind:bss addr:0x0214ac0c +_ZN15ProfileInstanceI23MapObjectProfileUnkRBSRE8sProfileE kind:bss addr:0x0214ac18 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRFSE8sProfileE kind:bss addr:0x0214ac5c +@30548 kind:bss addr:0x0214ac60 +_ZN15ProfileInstanceI23MapObjectProfileUnkTRFSE8sProfileE kind:bss addr:0x0214ac6c data_ov028_0214ad40 kind:bss addr:0x0214ad40 diff --git a/config/jp/arm9/overlays/ov029/delinks.txt b/config/jp/arm9/overlays/ov029/delinks.txt index 7846109a..da6d0267 100644 --- a/config/jp/arm9/overlays/ov029/delinks.txt +++ b/config/jp/arm9/overlays/ov029/delinks.txt @@ -9,112 +9,112 @@ src/029_TrainWater/MapObject/MapObjectUnkTMDE.cpp: .text start:0x02143d60 end:0x02144330 .init start:0x02153310 end:0x02153380 .ctor start:0x02153a20 end:0x02153a24 - .bss start:0x02154b00 end:0x02154b74 + .bss start:0x02154ae8 end:0x02154bd8 src/029_TrainWater/MapObject/MapObjectUnkTMWT.cpp: .text start:0x02144330 end:0x021445e4 .init start:0x02153380 end:0x021533d0 .ctor start:0x02153a24 end:0x02153a28 - .bss start:0x02154be4 end:0x02154ca4 + .bss start:0x02154bd8 end:0x02154cb8 src/029_TrainWater/MapObject/MapObjectUnkTRWA.cpp: .text start:0x021445e4 end:0x021448c0 .init start:0x021533d0 end:0x02153420 .ctor start:0x02153a28 end:0x02153a2c - .bss start:0x02154cc8 end:0x02154d9c + .bss start:0x02154cb8 end:0x02154d9c src/029_TrainWater/MapObject/MapObjectUnkTRRW.cpp: .text start:0x021448c0 end:0x02144b80 .init start:0x02153420 end:0x02153470 .ctor start:0x02153a2c end:0x02153a30 - .bss start:0x02154dac end:0x02154e6c + .bss start:0x02154d9c end:0x02154e80 src/029_TrainWater/MapObject/MapObjectUnkTRSA.cpp: .text start:0x02144b80 end:0x021455d4 .init start:0x02153470 end:0x021534c0 .ctor start:0x02153a30 end:0x02153a34 - .bss start:0x02154e90 end:0x02154eb0 + .bss start:0x02154e80 end:0x02154f64 src/029_TrainWater/MapObject/MapObjectUnkTRRD.cpp: .text start:0x021455d4 end:0x0214588c .init start:0x021534c0 end:0x02153510 .ctor start:0x02153a34 end:0x02153a38 - .bss start:0x02154f74 end:0x02154f88 + .bss start:0x02154f64 end:0x02155048 src/029_TrainWater/MapObject/MapObjectUnkTRPI.cpp: .text start:0x0214588c end:0x02145b4c .init start:0x02153510 end:0x02153560 .ctor start:0x02153a38 end:0x02153a3c - .bss start:0x02155058 end:0x02155064 + .bss start:0x02155048 end:0x0215512c src/029_TrainWater/MapObject/MapObjectUnkSBDE.cpp: .text start:0x02145b4c end:0x021463f8 .init start:0x02153560 end:0x021535b0 .ctor start:0x02153a3c end:0x02153a40 - .bss start:0x0215513c end:0x02155190 + .bss start:0x0215512c end:0x02155210 src/029_TrainWater/MapObject/MapObjectUnkSTDE.cpp: .text start:0x021463f8 end:0x021466ac .init start:0x021535b0 end:0x02153600 .ctor start:0x02153a40 end:0x02153a44 - .bss start:0x02155220 end:0x021552f4 + .bss start:0x02155210 end:0x021552f4 src/029_TrainWater/MapObject/MapObjectUnkTCBT.cpp: .text start:0x021466ac end:0x02147710 .init start:0x02153600 end:0x02153650 .ctor start:0x02153a44 end:0x02153a48 - .bss start:0x02155304 end:0x021553d8 + .bss start:0x021552f4 end:0x021553f8 src/029_TrainWater/MapObject/MapObjectUnkWHSW.cpp: .text start:0x02147710 end:0x02148018 .init start:0x02153650 end:0x021536a0 .ctor start:0x02153a48 end:0x02153a4c - .bss start:0x02155408 end:0x02155428 + .bss start:0x021553f8 end:0x021554fc src/029_TrainWater/MapObject/MapObjectUnkTRH1.cpp: .text start:0x02148018 end:0x02148310 .init start:0x021536a0 end:0x021536f0 .ctor start:0x02153a4c end:0x02153a50 - .bss start:0x0215550c end:0x021555e0 + .bss start:0x021554fc end:0x021555e0 src/029_TrainWater/MapObject/MapObjectUnkTBSS.cpp: .text start:0x02148310 end:0x021485a4 .init start:0x021536f0 end:0x02153740 .ctor start:0x02153a50 end:0x02153a54 - .bss start:0x021555f0 end:0x021556c4 + .bss start:0x021555e0 end:0x021556e4 src/029_TrainWater/MapObject/MapObjectUnkTRBL.cpp: .text start:0x021485a4 end:0x02148c9c .init start:0x02153740 end:0x02153790 .ctor start:0x02153a54 end:0x02153a58 - .bss start:0x021556f4 end:0x021557c8 + .bss start:0x021556e4 end:0x021557e8 src/029_TrainWater/MapObject/MapObjectUnkRBBL.cpp: .text start:0x02148c9c end:0x02148eac .init start:0x02153790 end:0x021537e0 .ctor start:0x02153a58 end:0x02153a5c - .bss start:0x021557f8 end:0x0215583c + .bss start:0x021557e8 end:0x0215589c src/029_TrainWater/Actor/ActorUnkDLPN.cpp: .text start:0x02148eac end:0x0214c074 .init start:0x021537e0 end:0x02153870 .ctor start:0x02153a5c end:0x02153a60 - .bss start:0x021558c4 end:0x02155990 + .bss start:0x0215589c end:0x0215599c src/029_TrainWater/Actor/ActorUnkBLJF.cpp: .text start:0x0214c074 end:0x0214d324 .init start:0x02153870 end:0x021538cc .ctor start:0x02153a60 end:0x02153a64 - .bss start:0x021559b8 end:0x02155a90 + .bss start:0x0215599c end:0x02155aa0 src/029_TrainWater/Actor/ActorUnkMDYG.cpp: .text start:0x0214d324 end:0x0214fc50 .init start:0x021538cc end:0x0215399c .ctor start:0x02153a64 end:0x02153a68 - .bss start:0x02155ad0 end:0x02155ba8 + .bss start:0x02155aa0 end:0x02155bb4 src/029_TrainWater/Actor/ActorUnkPRSP.cpp: .text start:0x0214fc50 end:0x0215321c .init start:0x0215399c end:0x02153a20 .ctor start:0x02153a68 end:0x02153a6c - .bss start:0x02155bc4 end:0x02155c90 + .bss start:0x02155bb4 end:0x02155c90 diff --git a/config/jp/arm9/overlays/ov029/symbols.txt b/config/jp/arm9/overlays/ov029/symbols.txt index 11e78d4c..eee9c634 100644 --- a/config/jp/arm9/overlays/ov029/symbols.txt +++ b/config/jp/arm9/overlays/ov029/symbols.txt @@ -554,68 +554,68 @@ _ZTV19data_ov029_021549ac kind:data(any) addr:0x021549ac data_ov029_02154a10 kind:data(any) addr:0x02154a10 data_ov029_02154a78 kind:data(any) addr:0x02154a78 data_ov029_02154ae0 kind:bss addr:0x02154ae0 -data_ov029_02154ae8 kind:bss addr:0x02154ae8 -data_ov029_02154af4 kind:bss addr:0x02154af4 -sMapObjectProfileUnkTMDE kind:bss addr:0x02154b00 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTMDEE8sProfileE kind:bss addr:0x02154ae8 +@30560 kind:bss addr:0x02154af4 +_ZN15ProfileInstanceI23MapObjectProfileUnkTMDEE8sProfileE kind:bss addr:0x02154b00 data_ov029_02154b74 kind:bss addr:0x02154b74 ambiguous data_ov029_02154bd4 kind:bss addr:0x02154bd4 -data_ov029_02154bd8 kind:bss addr:0x02154bd8 -data_ov029_02154be0 kind:bss addr:0x02154be0 ambiguous -sMapObjectProfileUnkTMWT kind:bss addr:0x02154be4 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTMWTE8sProfileE kind:bss addr:0x02154bd8 +@30566 kind:bss addr:0x02154be0 ambiguous +_ZN15ProfileInstanceI23MapObjectProfileUnkTMWTE8sProfileE kind:bss addr:0x02154be4 data_ov029_02154ca4 kind:bss addr:0x02154ca4 ambiguous -data_ov029_02154cb8 kind:bss addr:0x02154cb8 -data_ov029_02154cbc kind:bss addr:0x02154cbc -sMapObjectProfileUnkTRWA kind:bss addr:0x02154cc8 -data_ov029_02154d9c kind:bss addr:0x02154d9c -data_ov029_02154da0 kind:bss addr:0x02154da0 -sMapObjectProfileUnkTRRW kind:bss addr:0x02154dac +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRWAE8sProfileE kind:bss addr:0x02154cb8 +@30572 kind:bss addr:0x02154cbc +_ZN15ProfileInstanceI23MapObjectProfileUnkTRWAE8sProfileE kind:bss addr:0x02154cc8 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRRWE8sProfileE kind:bss addr:0x02154d9c +@30578 kind:bss addr:0x02154da0 +_ZN15ProfileInstanceI23MapObjectProfileUnkTRRWE8sProfileE kind:bss addr:0x02154dac data_ov029_02154e6c kind:bss addr:0x02154e6c ambiguous -data_ov029_02154e80 kind:bss addr:0x02154e80 -data_ov029_02154e84 kind:bss addr:0x02154e84 -sMapObjectProfileUnkTRSA kind:bss addr:0x02154e90 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRSAE8sProfileE kind:bss addr:0x02154e80 +@30584 kind:bss addr:0x02154e84 +_ZN15ProfileInstanceI23MapObjectProfileUnkTRSAE8sProfileE kind:bss addr:0x02154e90 data_ov029_02154eb0 kind:bss addr:0x02154eb0 data_ov029_02154ec0 kind:bss addr:0x02154ec0 ambiguous data_ov029_02154f28 kind:bss addr:0x02154f28 ambiguous -data_ov029_02154f64 kind:bss addr:0x02154f64 -data_ov029_02154f68 kind:bss addr:0x02154f68 -sMapObjectProfileUnkTRRD kind:bss addr:0x02154f74 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRRDE8sProfileE kind:bss addr:0x02154f64 +@30590 kind:bss addr:0x02154f68 +_ZN15ProfileInstanceI23MapObjectProfileUnkTRRDE8sProfileE kind:bss addr:0x02154f74 data_ov029_02154f88 kind:bss addr:0x02154f88 ambiguous -data_ov029_02155048 kind:bss addr:0x02155048 -data_ov029_0215504c kind:bss addr:0x0215504c -sMapObjectProfileUnkTRPI kind:bss addr:0x02155058 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRPIE8sProfileE kind:bss addr:0x02155048 +@30596 kind:bss addr:0x0215504c +_ZN15ProfileInstanceI23MapObjectProfileUnkTRPIE8sProfileE kind:bss addr:0x02155058 data_ov029_02155064 kind:bss addr:0x02155064 ambiguous data_ov029_02155070 kind:bss addr:0x02155070 ambiguous -data_ov029_0215512c kind:bss addr:0x0215512c -data_ov029_02155130 kind:bss addr:0x02155130 -sMapObjectProfileUnkSBDE kind:bss addr:0x0215513c +_ZGVN15ProfileInstanceI23MapObjectProfileUnkSBDEE8sProfileE kind:bss addr:0x0215512c +@30602 kind:bss addr:0x02155130 +_ZN15ProfileInstanceI23MapObjectProfileUnkSBDEE8sProfileE kind:bss addr:0x0215513c data_ov029_02155190 kind:bss addr:0x02155190 ambiguous data_ov029_02155200 kind:bss addr:0x02155200 ambiguous -data_ov029_02155210 kind:bss addr:0x02155210 -data_ov029_02155214 kind:bss addr:0x02155214 -sMapObjectProfileUnkSTDE kind:bss addr:0x02155220 -data_ov029_021552f4 kind:bss addr:0x021552f4 -data_ov029_021552f8 kind:bss addr:0x021552f8 -sMapObjectProfileUnkTCBT kind:bss addr:0x02155304 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkSTDEE8sProfileE kind:bss addr:0x02155210 +@30608 kind:bss addr:0x02155214 +_ZN15ProfileInstanceI23MapObjectProfileUnkSTDEE8sProfileE kind:bss addr:0x02155220 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTCBTE8sProfileE kind:bss addr:0x021552f4 +@30614 kind:bss addr:0x021552f8 +_ZN15ProfileInstanceI23MapObjectProfileUnkTCBTE8sProfileE kind:bss addr:0x02155304 data_ov029_021553d8 kind:bss addr:0x021553d8 -data_ov029_021553f8 kind:bss addr:0x021553f8 -data_ov029_021553fc kind:bss addr:0x021553fc -sMapObjectProfileUnkWHSW kind:bss addr:0x02155408 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkWHSWE8sProfileE kind:bss addr:0x021553f8 +@30620 kind:bss addr:0x021553fc +_ZN15ProfileInstanceI23MapObjectProfileUnkWHSWE8sProfileE kind:bss addr:0x02155408 data_ov029_02155428 kind:bss addr:0x02155428 data_ov029_021554dc kind:bss addr:0x021554dc -data_ov029_021554fc kind:bss addr:0x021554fc -data_ov029_02155500 kind:bss addr:0x02155500 -sMapObjectProfileUnkTRH1 kind:bss addr:0x0215550c -data_ov029_021555e0 kind:bss addr:0x021555e0 -data_ov029_021555e4 kind:bss addr:0x021555e4 -sMapObjectProfileUnkTBSS kind:bss addr:0x021555f0 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRH1E8sProfileE kind:bss addr:0x021554fc +@30626 kind:bss addr:0x02155500 +_ZN15ProfileInstanceI23MapObjectProfileUnkTRH1E8sProfileE kind:bss addr:0x0215550c +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTBSSE8sProfileE kind:bss addr:0x021555e0 +@30632 kind:bss addr:0x021555e4 +_ZN15ProfileInstanceI23MapObjectProfileUnkTBSSE8sProfileE kind:bss addr:0x021555f0 data_ov029_021556c4 kind:bss addr:0x021556c4 -data_ov029_021556e4 kind:bss addr:0x021556e4 -data_ov029_021556e8 kind:bss addr:0x021556e8 -sMapObjectProfileUnkTRBL kind:bss addr:0x021556f4 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRBLE8sProfileE kind:bss addr:0x021556e4 +@30638 kind:bss addr:0x021556e8 +_ZN15ProfileInstanceI23MapObjectProfileUnkTRBLE8sProfileE kind:bss addr:0x021556f4 data_ov029_021557c8 kind:bss addr:0x021557c8 -data_ov029_021557e8 kind:bss addr:0x021557e8 -data_ov029_021557ec kind:bss addr:0x021557ec -sMapObjectProfileUnkRBBL kind:bss addr:0x021557f8 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkRBBLE8sProfileE kind:bss addr:0x021557e8 +@30644 kind:bss addr:0x021557ec +_ZN15ProfileInstanceI23MapObjectProfileUnkRBBLE8sProfileE kind:bss addr:0x021557f8 data_ov029_0215583c kind:bss addr:0x0215583c data_ov029_02155844 kind:bss addr:0x02155844 data_ov029_02155850 kind:bss addr:0x02155850 @@ -624,21 +624,21 @@ data_ov029_02155868 kind:bss addr:0x02155868 data_ov029_02155874 kind:bss addr:0x02155874 data_ov029_02155880 kind:bss addr:0x02155880 data_ov029_02155890 kind:bss addr:0x02155890 -data_ov029_0215589c kind:bss addr:0x0215589c -data_ov029_021558b4 kind:bss addr:0x021558b4 -sActorProfileUnkDLPN kind:bss addr:0x021558c4 +_ZGVN15ProfileInstanceI19ActorProfileUnkDLPNE8sProfileE kind:bss addr:0x0215589c +@30661 kind:bss addr:0x021558b4 +_ZN15ProfileInstanceI19ActorProfileUnkDLPNE8sProfileE kind:bss addr:0x021558c4 data_ov029_02155990 kind:bss addr:0x02155990 ambiguous -data_ov029_0215599c kind:bss addr:0x0215599c -data_ov029_021559a0 kind:bss addr:0x021559a0 -sActorProfileUnkBLJF kind:bss addr:0x021559b8 +_ZGVN15ProfileInstanceI19ActorProfileUnkBLJFE8sProfileE kind:bss addr:0x0215599c +@30667 kind:bss addr:0x021559a0 +_ZN15ProfileInstanceI19ActorProfileUnkBLJFE8sProfileE kind:bss addr:0x021559b8 data_ov029_02155a90 kind:bss addr:0x02155a90 data_ov029_02155a94 kind:bss addr:0x02155a94 -data_ov029_02155aa0 kind:bss addr:0x02155aa0 -data_ov029_02155aac kind:bss addr:0x02155aac -sActorProfileUnkMDYG kind:bss addr:0x02155ad0 +_ZGVN15ProfileInstanceI19ActorProfileUnkMDYGE8sProfileE kind:bss addr:0x02155aa0 +@30673 kind:bss addr:0x02155aac +_ZN15ProfileInstanceI19ActorProfileUnkMDYGE8sProfileE kind:bss addr:0x02155ad0 data_ov029_02155ba8 kind:bss addr:0x02155ba8 data_ov029_02155bac kind:bss addr:0x02155bac -data_ov029_02155bb4 kind:bss addr:0x02155bb4 ambiguous -data_ov029_02155bb8 kind:bss addr:0x02155bb8 -sActorProfileUnkPRSP kind:bss addr:0x02155bc4 +_ZGVN15ProfileInstanceI19ActorProfileUnkPRSPE8sProfileE kind:bss addr:0x02155bb4 ambiguous +@30679 kind:bss addr:0x02155bb8 +_ZN15ProfileInstanceI19ActorProfileUnkPRSPE8sProfileE kind:bss addr:0x02155bc4 data_ov029_02155c90 kind:bss addr:0x02155c90 ambiguous diff --git a/config/jp/arm9/overlays/ov030/delinks.txt b/config/jp/arm9/overlays/ov030/delinks.txt index ab58c8e7..a3d08334 100644 --- a/config/jp/arm9/overlays/ov030/delinks.txt +++ b/config/jp/arm9/overlays/ov030/delinks.txt @@ -9,76 +9,76 @@ src/030_TrainFlame/MapObject/MapObjectUnkETTV.cpp: .text start:0x021441e4 end:0x02144d6c .init start:0x02152d3c end:0x02152d8c .ctor start:0x02153324 end:0x02153328 - .bss start:0x02154130 end:0x02154150 + .bss start:0x02154120 end:0x02154204 src/030_TrainFlame/MapObject/MapObjectUnkTRFI.cpp: .text start:0x02144d6c end:0x021451b8 .init start:0x02152d8c end:0x02152ddc .ctor start:0x02153328 end:0x0215332c - .bss start:0x02154214 end:0x021542e8 + .bss start:0x02154204 end:0x021542e8 src/030_TrainFlame/MapObject/MapObjectUnkTRGM.cpp: .text start:0x021451b8 end:0x02145510 .init start:0x02152ddc end:0x02152e2c .ctor start:0x0215332c end:0x02153330 - .bss start:0x021542f8 end:0x021543cc + .bss start:0x021542e8 end:0x021543cc src/030_TrainFlame/MapObject/MapObjectUnkTRH2.cpp: .text start:0x02145510 end:0x02145818 .init start:0x02152e2c end:0x02152e7c .ctor start:0x02153330 end:0x02153334 - .bss start:0x021543dc end:0x021544b0 + .bss start:0x021543cc end:0x021544b0 src/030_TrainFlame/MapObject/MapObjectUnkTRH3.cpp: .text start:0x02145818 end:0x02145b20 .init start:0x02152e7c end:0x02152ecc .ctor start:0x02153334 end:0x02153338 - .bss start:0x021544c0 end:0x02154594 + .bss start:0x021544b0 end:0x02154594 src/030_TrainFlame/MapObject/MapObjectUnkTRST.cpp: .text start:0x02145b20 end:0x02145e3c .init start:0x02152ecc end:0x02152f1c .ctor start:0x02153338 end:0x0215333c - .bss start:0x021545a4 end:0x02154678 + .bss start:0x02154594 end:0x02154678 src/030_TrainFlame/Actor/ActorUnkHELA.cpp: .text start:0x02145e3c end:0x0214d474 .init start:0x02152f1c end:0x02153058 .ctor start:0x0215333c end:0x02153340 - .bss start:0x021546e0 end:0x021546e4 + .bss start:0x02154678 end:0x02154c84 src/030_TrainFlame/Actor/ActorUnkHLMG.cpp: .text start:0x0214d474 end:0x0214e6ec .init start:0x02153058 end:0x02153140 .ctor start:0x02153340 end:0x02153344 - .bss start:0x02154c94 end:0x02154ca4 + .bss start:0x02154c84 end:0x02154cd0 src/030_TrainFlame/Actor/ActorUnkFDKY.cpp: .text start:0x0214e6ec end:0x0214f1e4 .init start:0x02153140 end:0x021531b0 .ctor start:0x02153344 end:0x02153348 - .bss start:0x02154ce0 end:0x02154db8 + .bss start:0x02154cd0 end:0x02154db8 src/030_TrainFlame/Actor/ActorUnkGOVT.cpp: .text start:0x0214f1e4 end:0x0214fa00 .init start:0x021531b0 end:0x02153234 .ctor start:0x02153348 end:0x0215334c - .bss start:0x02154dc8 end:0x02154e04 + .bss start:0x02154db8 end:0x02154e04 src/030_TrainFlame/Actor/ActorUnkTTFT.cpp: .text start:0x0214fa00 end:0x0214fb78 .init start:0x02153234 end:0x02153284 .ctor start:0x0215334c end:0x02153350 - .bss start:0x02154e14 end:0x02154e50 + .bss start:0x02154e04 end:0x02154e50 src/030_TrainFlame/Actor/ActorUnkSGMG.cpp: .text start:0x0214fb78 end:0x02150060 .init start:0x02153284 end:0x021532d4 .ctor start:0x02153350 end:0x02153354 - .bss start:0x02154e60 end:0x02154e6c + .bss start:0x02154e50 end:0x02154fa4 src/030_TrainFlame/Actor/ActorUnkWKTR.cpp: .text start:0x02150060 end:0x02152968 .init start:0x021532d4 end:0x02153324 .ctor start:0x02153354 end:0x02153358 - .bss start:0x02154fc4 end:0x021550a0 + .bss start:0x02154fa4 end:0x021550a0 diff --git a/config/jp/arm9/overlays/ov030/symbols.txt b/config/jp/arm9/overlays/ov030/symbols.txt index 9928041e..d8eea57a 100644 --- a/config/jp/arm9/overlays/ov030/symbols.txt +++ b/config/jp/arm9/overlays/ov030/symbols.txt @@ -502,33 +502,33 @@ data_ov030_02154094 kind:data(any) addr:0x02154094 ambiguous _ZTV19data_ov030_02154094 kind:data(any) addr:0x02154094 data_ov030_02154100 kind:data(any) addr:0x02154100 _ZTV19data_ov030_02154100 kind:data(any) addr:0x02154100 ambiguous -data_ov030_02154120 kind:bss addr:0x02154120 -data_ov030_02154124 kind:bss addr:0x02154124 -sMapObjectProfileUnkETTV kind:bss addr:0x02154130 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkETTVE8sProfileE kind:bss addr:0x02154120 +@30680 kind:bss addr:0x02154124 +_ZN15ProfileInstanceI23MapObjectProfileUnkETTVE8sProfileE kind:bss addr:0x02154130 data_ov030_02154150 kind:bss addr:0x02154150 -data_ov030_02154204 kind:bss addr:0x02154204 -data_ov030_02154208 kind:bss addr:0x02154208 -sMapObjectProfileUnkTRFI kind:bss addr:0x02154214 -data_ov030_021542e8 kind:bss addr:0x021542e8 -data_ov030_021542ec kind:bss addr:0x021542ec -sMapObjectProfileUnkTRGM kind:bss addr:0x021542f8 -data_ov030_021543cc kind:bss addr:0x021543cc -data_ov030_021543d0 kind:bss addr:0x021543d0 -sMapObjectProfileUnkTRH2 kind:bss addr:0x021543dc -data_ov030_021544b0 kind:bss addr:0x021544b0 -data_ov030_021544b4 kind:bss addr:0x021544b4 -sMapObjectProfileUnkTRH3 kind:bss addr:0x021544c0 -data_ov030_02154594 kind:bss addr:0x02154594 -data_ov030_02154598 kind:bss addr:0x02154598 -sMapObjectProfileUnkTRST kind:bss addr:0x021545a4 -data_ov030_02154678 kind:bss addr:0x02154678 -data_ov030_02154680 kind:bss addr:0x02154680 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRFIE8sProfileE kind:bss addr:0x02154204 +@30686 kind:bss addr:0x02154208 +_ZN15ProfileInstanceI23MapObjectProfileUnkTRFIE8sProfileE kind:bss addr:0x02154214 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRGME8sProfileE kind:bss addr:0x021542e8 +@30692 kind:bss addr:0x021542ec +_ZN15ProfileInstanceI23MapObjectProfileUnkTRGME8sProfileE kind:bss addr:0x021542f8 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRH2E8sProfileE kind:bss addr:0x021543cc +@30698 kind:bss addr:0x021543d0 +_ZN15ProfileInstanceI23MapObjectProfileUnkTRH2E8sProfileE kind:bss addr:0x021543dc +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRH3E8sProfileE kind:bss addr:0x021544b0 +@30704 kind:bss addr:0x021544b4 +_ZN15ProfileInstanceI23MapObjectProfileUnkTRH3E8sProfileE kind:bss addr:0x021544c0 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRSTE8sProfileE kind:bss addr:0x02154594 +@30710 kind:bss addr:0x02154598 +_ZN15ProfileInstanceI23MapObjectProfileUnkTRSTE8sProfileE kind:bss addr:0x021545a4 +_ZGVN15ProfileInstanceI19ActorProfileUnkHELAE8sProfileE kind:bss addr:0x02154678 +@30727 kind:bss addr:0x02154680 data_ov030_0215468c kind:bss addr:0x0215468c data_ov030_02154698 kind:bss addr:0x02154698 data_ov030_0215469c kind:bss addr:0x0215469c data_ov030_021546aa kind:bss addr:0x021546aa data_ov030_021546ac kind:bss addr:0x021546ac -sActorProfileUnkHELA kind:bss addr:0x021546e0 +_ZN15ProfileInstanceI19ActorProfileUnkHELAE8sProfileE kind:bss addr:0x021546e0 data_ov030_021546e4 kind:bss addr:0x021546e4 data_ov030_02154700 kind:bss addr:0x02154700 ambiguous data_ov030_02154761 kind:bss addr:0x02154761 ambiguous @@ -536,22 +536,22 @@ data_ov030_021547b8 kind:bss addr:0x021547b8 data_ov030_021547cc kind:bss addr:0x021547cc data_ov030_02154b74 kind:bss addr:0x02154b74 ambiguous data_ov030_02154be0 kind:bss addr:0x02154be0 ambiguous -data_ov030_02154c84 kind:bss addr:0x02154c84 -data_ov030_02154c88 kind:bss addr:0x02154c88 -sActorProfileUnkHLMG kind:bss addr:0x02154c94 +_ZGVN15ProfileInstanceI19ActorProfileUnkHLMGE8sProfileE kind:bss addr:0x02154c84 +@30733 kind:bss addr:0x02154c88 +_ZN15ProfileInstanceI19ActorProfileUnkHLMGE8sProfileE kind:bss addr:0x02154c94 data_ov030_02154ca4 kind:bss addr:0x02154ca4 ambiguous -data_ov030_02154cd0 kind:bss addr:0x02154cd0 -data_ov030_02154cd4 kind:bss addr:0x02154cd4 -sActorProfileUnkFDKY kind:bss addr:0x02154ce0 -data_ov030_02154db8 kind:bss addr:0x02154db8 -data_ov030_02154dbc kind:bss addr:0x02154dbc -sActorProfileUnkGOVT kind:bss addr:0x02154dc8 -data_ov030_02154e04 kind:bss addr:0x02154e04 -data_ov030_02154e08 kind:bss addr:0x02154e08 -sActorProfileUnkTTFT kind:bss addr:0x02154e14 -data_ov030_02154e50 kind:bss addr:0x02154e50 -data_ov030_02154e54 kind:bss addr:0x02154e54 -sActorProfileUnkSGMG kind:bss addr:0x02154e60 +_ZGVN15ProfileInstanceI19ActorProfileUnkFDKYE8sProfileE kind:bss addr:0x02154cd0 +@30739 kind:bss addr:0x02154cd4 +_ZN15ProfileInstanceI19ActorProfileUnkFDKYE8sProfileE kind:bss addr:0x02154ce0 +_ZGVN15ProfileInstanceI19ActorProfileUnkGOVTE8sProfileE kind:bss addr:0x02154db8 +@30745 kind:bss addr:0x02154dbc +_ZN15ProfileInstanceI19ActorProfileUnkGOVTE8sProfileE kind:bss addr:0x02154dc8 +_ZGVN15ProfileInstanceI19ActorProfileUnkTTFTE8sProfileE kind:bss addr:0x02154e04 +@30751 kind:bss addr:0x02154e08 +_ZN15ProfileInstanceI19ActorProfileUnkTTFTE8sProfileE kind:bss addr:0x02154e14 +_ZGVN15ProfileInstanceI19ActorProfileUnkSGMGE8sProfileE kind:bss addr:0x02154e50 +@30757 kind:bss addr:0x02154e54 +_ZN15ProfileInstanceI19ActorProfileUnkSGMGE8sProfileE kind:bss addr:0x02154e60 data_ov030_02154e6c kind:bss addr:0x02154e6c ambiguous data_ov030_02154e9c kind:bss addr:0x02154e9c data_ov030_02154ea0 kind:bss addr:0x02154ea0 @@ -583,6 +583,6 @@ data_ov030_02154f74 kind:bss addr:0x02154f74 data_ov030_02154f84 kind:bss addr:0x02154f84 data_ov030_02154f88 kind:bss addr:0x02154f88 ambiguous data_ov030_02154f94 kind:bss addr:0x02154f94 -data_ov030_02154fa4 kind:bss addr:0x02154fa4 -data_ov030_02154fb4 kind:bss addr:0x02154fb4 -sActorProfileUnkWKTR kind:bss addr:0x02154fc4 +_ZGVN15ProfileInstanceI19ActorProfileUnkWKTRE8sProfileE kind:bss addr:0x02154fa4 +@30763 kind:bss addr:0x02154fb4 +_ZN15ProfileInstanceI19ActorProfileUnkWKTRE8sProfileE kind:bss addr:0x02154fc4 diff --git a/config/jp/arm9/overlays/ov031/delinks.txt b/config/jp/arm9/overlays/ov031/delinks.txt index d4e6eaf2..55eeb668 100644 --- a/config/jp/arm9/overlays/ov031/delinks.txt +++ b/config/jp/arm9/overlays/ov031/delinks.txt @@ -9,353 +9,353 @@ src/031_Land/Actor/ActorUnkBOMB.cpp: .text start:0x020e2e94 end:0x020e4ea0 .init start:0x02112d68 end:0x02112db8 .ctor start:0x02114528 end:0x0211452c - .bss start:0x021181b4 end:0x021181f0 + .bss start:0x021181a4 end:0x021181f0 src/031_Land/Actor/ActorUnkBLST.cpp: .text start:0x020e4ea0 end:0x020e5690 .init start:0x02112db8 end:0x02112e08 .ctor start:0x0211452c end:0x02114530 - .bss start:0x02118200 end:0x0211823c + .bss start:0x021181f0 end:0x0211823c src/031_Land/Actor/ActorUnkTLKT.cpp: .text start:0x020e5ac4 end:0x020e5f70 .init start:0x02112e08 end:0x02112e58 .ctor start:0x02114530 end:0x02114534 - .bss start:0x0211824c end:0x02118288 + .bss start:0x0211823c end:0x02118288 src/031_Land/Actor/ActorUnkITBM.cpp: .text start:0x020e5f90 end:0x020e7148 .init start:0x02112e58 end:0x02112ea8 .ctor start:0x02114534 end:0x02114538 - .bss start:0x02118298 end:0x021182d4 + .bss start:0x02118288 end:0x021182d4 src/031_Land/Actor/ActorUnkITTD.cpp: .text start:0x020e72b4 end:0x020e7ec4 .init start:0x02112ea8 end:0x02112f1c .ctor start:0x02114538 end:0x0211453c - .bss start:0x021182e4 end:0x02118320 + .bss start:0x021182d4 end:0x02118320 src/031_Land/Actor/ActorUnkSWBM.cpp: .text start:0x020e8520 end:0x020e8d64 .init start:0x02112f1c end:0x02112f90 .ctor start:0x0211453c end:0x02114540 - .bss start:0x02118330 end:0x0211836c + .bss start:0x02118320 end:0x0211836c src/031_Land/Actor/ActorUnkROCK.cpp: .text start:0x020ea210 end:0x020ea6a4 .init start:0x02112f90 end:0x02112fe0 .ctor start:0x02114540 end:0x02114544 - .bss start:0x02118380 end:0x02118458 + .bss start:0x02118370 end:0x02118458 src/031_Land/Actor/ActorRupee.cpp: .text start:0x020ea6a4 end:0x020eba18 .init start:0x02112fe0 end:0x02113078 .ctor start:0x02114544 end:0x02114548 .data start:0x02115228 end:0x021152c0 - .bss start:0x02118488 end:0x021184c4 + .bss start:0x02118488 end:0x021184cc src/031_Land/Actor/ActorUnkZLSL_ZSRS.cpp: .text start:0x020eba18 end:0x020f02b8 .init start:0x02113078 end:0x0211310c .ctor start:0x02114548 end:0x0211454c - .bss start:0x021184e4 end:0x021185f8 + .bss start:0x021184cc end:0x021185f8 src/031_Land/Actor/ActorUnkHERT.cpp: .text start:0x020f06e0 end:0x020f1218 .init start:0x0211310c end:0x02113178 .ctor start:0x0211454c end:0x02114550 - .bss start:0x02118608 end:0x02118644 + .bss start:0x021185f8 end:0x02118644 src/031_Land/Actor/ActorUnkRMTG.cpp: .text start:0x020f1218 end:0x020f1408 .init start:0x02113178 end:0x021131c8 .ctor start:0x02114550 end:0x02114554 - .bss start:0x02118654 end:0x0211872c + .bss start:0x02118644 end:0x0211872c src/031_Land/Actor/ActorUnkSCCN.cpp: .text start:0x020f1408 end:0x020f16d0 .init start:0x021131c8 end:0x02113218 .ctor start:0x02114554 end:0x02114558 - .bss start:0x0211873c end:0x02118778 + .bss start:0x0211872c end:0x02118778 src/031_Land/Actor/ActorUnkNTUB.cpp: .text start:0x020f25fc end:0x020f29c8 .init start:0x02113218 end:0x02113268 .ctor start:0x02114558 end:0x0211455c - .bss start:0x02118788 end:0x021187c4 + .bss start:0x02118778 end:0x021187c4 src/031_Land/Actor/ActorUnkNITF.cpp: .text start:0x020f29c8 end:0x020f2d8c .init start:0x02113268 end:0x021132b8 .ctor start:0x0211455c end:0x02114560 - .bss start:0x021187d4 end:0x02118810 + .bss start:0x021187c4 end:0x02118810 src/031_Land/Actor/ActorUnkAROW.cpp: .text start:0x020f2d8c end:0x020f5820 .init start:0x021132b8 end:0x02113308 .ctor start:0x02114560 end:0x02114564 - .bss start:0x02118820 end:0x02118848 + .bss start:0x02118810 end:0x0211885c src/031_Land/Actor/ActorUnkATTG.cpp: .text start:0x020f5820 end:0x020f5b40 .init start:0x02113308 end:0x02113358 .ctor start:0x02114564 end:0x02114568 - .bss start:0x0211886c end:0x021188a8 + .bss start:0x0211885c end:0x021188a8 src/031_Land/Actor/ActorUnkNTTZ.cpp: .text start:0x020f7ba8 end:0x020f7d24 .init start:0x02113358 end:0x021133a8 .ctor start:0x02114568 end:0x0211456c - .bss start:0x021188b8 end:0x021188f4 + .bss start:0x021188a8 end:0x02118904 src/031_Land/Actor/ActorUnkTGTZ.cpp: .text start:0x020f82d4 end:0x020f8ea4 .init start:0x021133cc end:0x0211344c .ctor start:0x02114570 end:0x02114574 - .bss start:0x0211891c end:0x021189f4 + .bss start:0x02118904 end:0x021189f4 src/031_Land/Actor/ActorUnkSWCH.cpp: .text start:0x020f94c8 end:0x020f9620 .init start:0x0211344c end:0x0211349c .ctor start:0x02114574 end:0x02114578 - .bss start:0x02118a04 end:0x02118a1c + .bss start:0x021189f4 end:0x02118a40 src/031_Land/Actor/ActorUnkSWON.cpp: .text start:0x020f9800 end:0x020f9958 .init start:0x0211349c end:0x021134ec .ctor start:0x02114578 end:0x0211457c - .bss start:0x02118a50 end:0x02118a8c + .bss start:0x02118a40 end:0x02118a8c src/031_Land/Actor/ActorUnkNORE.cpp: .text start:0x020f9958 end:0x020f9a68 .init start:0x021134ec end:0x0211353c .ctor start:0x0211457c end:0x02114580 - .bss start:0x02118a9c end:0x02118ad8 + .bss start:0x02118a8c end:0x02118ad8 src/031_Land/Actor/ActorUnkFLEN.cpp: .text start:0x020f9a68 end:0x020f9d24 .init start:0x0211353c end:0x0211358c .ctor start:0x02114580 end:0x02114584 - .bss start:0x02118ae8 end:0x02118b24 + .bss start:0x02118ad8 end:0x02118b24 src/031_Land/Actor/ActorUnkRLST.cpp: .text start:0x020f9d24 end:0x020fb810 .init start:0x0211358c end:0x021135dc .ctor start:0x02114584 end:0x02114588 - .bss start:0x02118b34 end:0x02118c0c + .bss start:0x02118b24 end:0x02118c34 src/031_Land/Actor/ActorUnkSPAR_SPBM_SPDR_SPTR.cpp: .text start:0x020fb810 end:0x020fc5b4 .init start:0x021135dc end:0x02113714 .ctor start:0x02114588 end:0x0211458c - .bss start:0x02118c4c end:0x02118d3c + .bss start:0x02118c34 end:0x02118d3c src/031_Land/Actor/ActorUnkMLCK.cpp: .text start:0x020fc5b4 end:0x020fcd04 .init start:0x02113714 end:0x02113788 .ctor start:0x0211458c end:0x02114590 - .bss start:0x02118d4c end:0x02118d88 + .bss start:0x02118d3c end:0x02118d88 src/031_Land/Actor/ActorUnkCLLT.cpp: .text start:0x020fcd64 end:0x020fcf04 .init start:0x02113788 end:0x021137d8 .ctor start:0x02114590 end:0x02114594 - .bss start:0x02118d98 end:0x02118dd4 + .bss start:0x02118d88 end:0x02118dd4 src/031_Land/Actor/ActorUnkEFSB.cpp: .text start:0x020fcf04 end:0x020fd264 .init start:0x021137d8 end:0x02113828 .ctor start:0x02114594 end:0x02114598 - .bss start:0x02118de4 end:0x02118ebc + .bss start:0x02118dd4 end:0x02118ebc src/031_Land/Actor/ActorUnkNFSP.cpp: .text start:0x020fd264 end:0x020fd7b4 .init start:0x02113828 end:0x02113878 .ctor start:0x02114598 end:0x0211459c - .bss start:0x02118ecc end:0x02118fa4 + .bss start:0x02118ebc end:0x0211901c src/031_Land/MapObject/MapObjectUnkDRDS.cpp: .text start:0x020feb40 end:0x021001bc .init start:0x021138b4 end:0x02113918 .ctor start:0x021145a0 end:0x021145a4 - .bss start:0x0211902c end:0x02119100 + .bss start:0x0211901c end:0x02119100 src/031_Land/MapObject/MapObjectUnkDRKY.cpp: .text start:0x021001dc end:0x02100914 .init start:0x02113918 end:0x0211397c .ctor start:0x021145a4 end:0x021145a8 - .bss start:0x02119110 end:0x021191e4 + .bss start:0x02119100 end:0x021191e4 src/031_Land/MapObject/MapObjectUnkDRSW.cpp: .text start:0x02100914 end:0x02101260 .init start:0x0211397c end:0x021139e0 .ctor start:0x021145a8 end:0x021145ac - .bss start:0x021191f4 end:0x021192c8 + .bss start:0x021191e4 end:0x021192c8 src/031_Land/MapObject/MapObjectUnkDRCK.cpp: .text start:0x02101260 end:0x02101f78 .init start:0x021139e0 end:0x02113a44 .ctor start:0x021145ac end:0x021145b0 - .bss start:0x021192d8 end:0x021192f8 + .bss start:0x021192c8 end:0x02119340 src/031_Land/MapObject/MapObjectUnkDRTC.cpp: .text start:0x02101f94 end:0x02102204 .init start:0x02113a44 end:0x02113a94 .ctor start:0x021145b0 end:0x021145b4 - .bss start:0x02119350 end:0x02119370 + .bss start:0x02119340 end:0x021193b8 src/031_Land/MapObject/MapObjectUnkEXIT.cpp: .text start:0x02102220 end:0x021024fc .init start:0x02113a94 end:0x02113ae4 .ctor start:0x021145b4 end:0x021145b8 - .bss start:0x021193c8 end:0x0211949c + .bss start:0x021193b8 end:0x0211949c src/031_Land/MapObject/MapObjectUnkGATE.cpp: .text start:0x021024fc end:0x02102808 .init start:0x02113ae4 end:0x02113b34 .ctor start:0x021145b8 end:0x021145bc - .bss start:0x021194ac end:0x021194cc + .bss start:0x0211949c end:0x02119514 src/031_Land/MapObject/MapObjectUnkSTIR.cpp: .text start:0x02102824 end:0x02102d54 .init start:0x02113b34 end:0x02113b84 .ctor start:0x021145bc end:0x021145c0 - .bss start:0x02119524 end:0x021195f8 + .bss start:0x02119514 end:0x02119608 src/031_Land/MapObject/MapObjectUnkGRSS.cpp: .text start:0x02102d54 end:0x02103724 .init start:0x02113b84 end:0x02113c14 .ctor start:0x021145c0 end:0x021145c4 - .bss start:0x02119664 end:0x02119738 + .bss start:0x02119608 end:0x02119758 src/031_Land/MapObject/MapObjectUnkSWHT.cpp: .text start:0x0210375c end:0x02104194 .init start:0x02113c14 end:0x02113c84 .ctor start:0x021145c4 end:0x021145c8 - .bss start:0x02119768 end:0x02119788 + .bss start:0x02119758 end:0x0211985c src/031_Land/MapObject/MapObjectUnkBMFL.cpp: .text start:0x02104194 end:0x0210491c .init start:0x02113c84 end:0x02113cd4 .ctor start:0x021145c8 end:0x021145cc - .bss start:0x0211986c end:0x02119940 + .bss start:0x0211985c end:0x02119940 src/031_Land/MapObject/MapObjectUnkTRES.cpp: .text start:0x02104bcc end:0x02104d44 .init start:0x02113cd4 end:0x02113d40 .ctor start:0x021145cc end:0x021145d0 - .bss start:0x02119950 end:0x02119a24 + .bss start:0x02119940 end:0x02119a9c src/031_Land/MapObject/MapObjectUnkTRED.cpp: .text start:0x02105d78 end:0x02105f14 .init start:0x02113d70 end:0x02113ddc .ctor start:0x021145d4 end:0x021145d8 - .bss start:0x02119aac end:0x02119ad0 + .bss start:0x02119a9c end:0x02119ad0 src/031_Land/MapObject/MapObjectUnkTREW.cpp: .text start:0x02105f14 end:0x021060d4 .init start:0x02113ddc end:0x02113e48 .ctor start:0x021145d8 end:0x021145dc - .bss start:0x02119ae0 end:0x02119b04 + .bss start:0x02119ad0 end:0x02119b04 src/031_Land/MapObject/MapObjectUnkTREN.cpp: .text start:0x021060d4 end:0x0210621c .init start:0x02113e48 end:0x02113eb4 .ctor start:0x021145dc end:0x021145e0 - .bss start:0x02119b14 end:0x02119be8 + .bss start:0x02119b04 end:0x02119be8 src/031_Land/MapObject/MapObjectUnkTRWS.cpp: .text start:0x0210621c end:0x02106c5c .init start:0x02113eb4 end:0x02113f04 .ctor start:0x021145e0 end:0x021145e4 - .bss start:0x02119bf8 end:0x02119ccc + .bss start:0x02119be8 end:0x02119ccc src/031_Land/MapObject/MapObjectUnkTSUB.cpp: .text start:0x02106c8c end:0x021071f8 .init start:0x02113f04 end:0x02113f54 .ctor start:0x021145e4 end:0x021145e8 - .bss start:0x02119cdc end:0x02119db0 + .bss start:0x02119ccc end:0x02119dd0 src/031_Land/MapObject/MapObjectUnkSKBN.cpp: .text start:0x021071f8 end:0x0210759c .init start:0x02113f54 end:0x02113fc8 .ctor start:0x021145e8 end:0x021145ec - .bss start:0x02119de0 end:0x02119eb4 + .bss start:0x02119dd0 end:0x02119ed8 src/031_Land/MapObject/MapObjectUnkITFL.cpp: .text start:0x0210759c end:0x02107d5c .init start:0x02113fc8 end:0x02114018 .ctor start:0x021145ec end:0x021145f0 - .bss start:0x02119ee8 end:0x02119fbc + .bss start:0x02119ed8 end:0x02119fbc src/031_Land/MapObject/MapObjectUnkSKDI.cpp: .text start:0x02107d5c end:0x02108abc .init start:0x02114018 end:0x02114068 .ctor start:0x021145f0 end:0x021145f4 - .bss start:0x02119fcc end:0x0211a0a0 + .bss start:0x02119fbc end:0x0211a0a0 src/031_Land/Actor/ActorUnkSKDO.cpp: .text start:0x02108abc end:0x02108c74 .init start:0x02114068 end:0x021140b8 .ctor start:0x021145f4 end:0x021145f8 - .bss start:0x0211a0b0 end:0x0211a0ec + .bss start:0x0211a0a0 end:0x0211a0ec src/031_Land/MapObject/MapObjectUnkCRWL.cpp: .text start:0x02108c74 end:0x0210929c .init start:0x021140b8 end:0x02114128 .ctor start:0x021145f8 end:0x021145fc - .bss start:0x0211a0fc end:0x0211a11c + .bss start:0x0211a0ec end:0x0211a174 src/031_Land/MapObject/MapObjectUnkBREX.cpp: .text start:0x021092b8 end:0x0210a6b8 .init start:0x02114128 end:0x0211418c .ctor start:0x021145fc end:0x02114600 - .bss start:0x0211a18c end:0x0211a260 + .bss start:0x0211a174 end:0x0211a270 src/031_Land/MapObject/MapObjectUnkTATZ.cpp: .text start:0x0210a6b8 end:0x0210b3c4 .init start:0x0211418c end:0x021141f0 .ctor start:0x02114600 end:0x02114604 - .bss start:0x0211a288 end:0x0211a380 + .bss start:0x0211a270 end:0x0211a380 src/031_Land/MapObject/MapObjectUnkSTSP.cpp: .text start:0x0210b3c4 end:0x0210b754 .init start:0x021141f0 end:0x02114240 .ctor start:0x02114604 end:0x02114608 - .bss start:0x0211a390 end:0x0211a464 + .bss start:0x0211a380 end:0x0211a468 src/031_Land/MapObject/MapObjectUnkBLCC.cpp: .text start:0x0210b754 end:0x0210bc88 .init start:0x02114240 end:0x0211429c .ctor start:0x02114608 end:0x0211460c - .bss start:0x0211a480 end:0x0211a554 + .bss start:0x0211a468 end:0x0211a578 src/031_Land/MapObject/MapObjectUnkRLSG.cpp: .text start:0x0210bc88 end:0x0210c874 .init start:0x0211429c end:0x0211430c .ctor start:0x0211460c end:0x02114610 - .bss start:0x0211a588 end:0x0211a65c + .bss start:0x0211a578 end:0x0211a6a0 src/031_Land/MapObject/MapObjectUnkSAND.cpp: .text start:0x0210c874 end:0x0210d0f0 .init start:0x0211430c end:0x021143ec .ctor start:0x02114610 end:0x02114614 - .bss start:0x0211a770 end:0x0211a844 + .bss start:0x0211a6a0 end:0x0211aa30 src/031_Land/MapObject/MapObjectUnkSPTB.cpp: .text start:0x0210d0f0 end:0x0210d7cc .init start:0x021143ec end:0x02114460 .ctor start:0x02114614 end:0x02114618 - .bss start:0x0211aa44 end:0x0211ab18 + .bss start:0x0211aa30 end:0x0211ab38 src/031_Land/MapObject/MapObjectUnkGSST.cpp: .text start:0x0210d81c end:0x0210ec24 .init start:0x02114460 end:0x021144b0 .ctor start:0x02114618 end:0x0211461c - .bss start:0x0211ab48 end:0x0211ab68 + .bss start:0x0211ab38 end:0x0211ac3c src/031_Land/MapObject/MapObjectUnkSWFS.cpp: .text start:0x0210ec54 end:0x0210f71c .init start:0x021144b0 end:0x02114520 .ctor start:0x0211461c end:0x02114620 - .bss start:0x0211ac4c end:0x0211ac6c + .bss start:0x0211ac3c end:0x0211ac6c diff --git a/config/jp/arm9/overlays/ov031/symbols.txt b/config/jp/arm9/overlays/ov031/symbols.txt index f85123d7..bd4ec040 100644 --- a/config/jp/arm9/overlays/ov031/symbols.txt +++ b/config/jp/arm9/overlays/ov031/symbols.txt @@ -2522,230 +2522,229 @@ data_ov031_021180cc kind:data(any) addr:0x021180cc data_ov031_021180e0 kind:data(any) addr:0x021180e0 ambiguous data_ov031_021180f8 kind:data(any) addr:0x021180f8 data_ov031_02118120 kind:bss addr:0x02118120 -data_ov031_021181a4 kind:bss addr:0x021181a4 -data_ov031_021181a8 kind:bss addr:0x021181a8 -sActorProfileUnkBOMB kind:bss addr:0x021181b4 -data_ov031_021181f0 kind:bss addr:0x021181f0 -data_ov031_021181f4 kind:bss addr:0x021181f4 -sActorProfileUnkBLST kind:bss addr:0x02118200 -data_ov031_0211823c kind:bss addr:0x0211823c -data_ov031_02118240 kind:bss addr:0x02118240 -sActorProfileUnkTLKT kind:bss addr:0x0211824c -data_ov031_02118288 kind:bss addr:0x02118288 -data_ov031_0211828c kind:bss addr:0x0211828c -sActorProfileUnkITBM kind:bss addr:0x02118298 -data_ov031_021182d4 kind:bss addr:0x021182d4 -data_ov031_021182d8 kind:bss addr:0x021182d8 -sActorProfileUnkITTD kind:bss addr:0x021182e4 -data_ov031_02118320 kind:bss addr:0x02118320 -data_ov031_02118324 kind:bss addr:0x02118324 -sActorProfileUnkSWBM kind:bss addr:0x02118330 +_ZGVN15ProfileInstanceI19ActorProfileUnkBOMBE8sProfileE kind:bss addr:0x021181a4 +@30775 kind:bss addr:0x021181a8 +_ZN15ProfileInstanceI19ActorProfileUnkBOMBE8sProfileE kind:bss addr:0x021181b4 +_ZGVN15ProfileInstanceI19ActorProfileUnkBLSTE8sProfileE kind:bss addr:0x021181f0 +@30781 kind:bss addr:0x021181f4 +_ZN15ProfileInstanceI19ActorProfileUnkBLSTE8sProfileE kind:bss addr:0x02118200 +_ZGVN15ProfileInstanceI19ActorProfileUnkTLKTE8sProfileE kind:bss addr:0x0211823c +@30787 kind:bss addr:0x02118240 +_ZN15ProfileInstanceI19ActorProfileUnkTLKTE8sProfileE kind:bss addr:0x0211824c +_ZGVN15ProfileInstanceI19ActorProfileUnkITBME8sProfileE kind:bss addr:0x02118288 +@30793 kind:bss addr:0x0211828c +_ZN15ProfileInstanceI19ActorProfileUnkITBME8sProfileE kind:bss addr:0x02118298 +_ZGVN15ProfileInstanceI19ActorProfileUnkITTDE8sProfileE kind:bss addr:0x021182d4 +@30799 kind:bss addr:0x021182d8 +_ZN15ProfileInstanceI19ActorProfileUnkITTDE8sProfileE kind:bss addr:0x021182e4 +_ZGVN15ProfileInstanceI19ActorProfileUnkSWBME8sProfileE kind:bss addr:0x02118320 +@30805 kind:bss addr:0x02118324 +_ZN15ProfileInstanceI19ActorProfileUnkSWBME8sProfileE kind:bss addr:0x02118330 data_ov031_0211836c kind:bss addr:0x0211836c -data_ov031_02118370 kind:bss addr:0x02118370 -data_ov031_02118374 kind:bss addr:0x02118374 -sActorProfileUnkROCK kind:bss addr:0x02118380 +_ZGVN15ProfileInstanceI19ActorProfileUnkROCKE8sProfileE kind:bss addr:0x02118370 +@30811 kind:bss addr:0x02118374 +_ZN15ProfileInstanceI19ActorProfileUnkROCKE8sProfileE kind:bss addr:0x02118380 data_ov031_02118458 kind:bss addr:0x02118458 data_ov031_02118478 kind:bss addr:0x02118478 data_ov031_0211847c kind:bss addr:0x0211847c -sActorProfileRupee kind:bss addr:0x02118488 +_ZN15ProfileInstanceI17ActorProfileRupeeE8sProfileE kind:bss addr:0x02118488 data_ov031_021184c4 kind:bss addr:0x021184c4 -data_ov031_021184cc kind:bss addr:0x021184cc -data_ov031_021184d8 kind:bss addr:0x021184d8 -sActorProfileUnkZLSL kind:bss addr:0x021184e4 -sActorProfileUnkZSRS kind:bss addr:0x02118520 -data_ov031_021185f8 kind:bss addr:0x021185f8 -data_ov031_021185fc kind:bss addr:0x021185fc -sActorProfileUnkHERT kind:bss addr:0x02118608 -data_ov031_02118644 kind:bss addr:0x02118644 -data_ov031_02118648 kind:bss addr:0x02118648 -sActorProfileUnkRMTG kind:bss addr:0x02118654 -data_ov031_0211872c kind:bss addr:0x0211872c -data_ov031_02118730 kind:bss addr:0x02118730 -sActorProfileUnkSCCN kind:bss addr:0x0211873c -data_ov031_02118778 kind:bss addr:0x02118778 -data_ov031_0211877c kind:bss addr:0x0211877c -sActorProfileUnkNTUB kind:bss addr:0x02118788 -data_ov031_021187c4 kind:bss addr:0x021187c4 -data_ov031_021187c8 kind:bss addr:0x021187c8 -sActorProfileUnkNITF kind:bss addr:0x021187d4 -data_ov031_02118810 kind:bss addr:0x02118810 -data_ov031_02118814 kind:bss addr:0x02118814 -sActorProfileUnkAROW kind:bss addr:0x02118820 -data_ov031_02118848 kind:bss addr:0x02118848 ambiguous -data_ov031_0211885c kind:bss addr:0x0211885c -data_ov031_02118860 kind:bss addr:0x02118860 -sActorProfileUnkATTG kind:bss addr:0x0211886c -data_ov031_021188a8 kind:bss addr:0x021188a8 -data_ov031_021188ac kind:bss addr:0x021188ac -sActorProfileUnkNTTZ kind:bss addr:0x021188b8 +_ZGVN15ProfileInstanceI19ActorProfileUnkZLSLE8sProfileE kind:bss addr:0x021184cc +@30824 kind:bss addr:0x021184d8 +_ZN15ProfileInstanceI19ActorProfileUnkZLSLE8sProfileE kind:bss addr:0x021184e4 +_ZN15ProfileInstanceI19ActorProfileUnkZSRSE8sProfileE kind:bss addr:0x02118520 +_ZGVN15ProfileInstanceI19ActorProfileUnkHERTE8sProfileE kind:bss addr:0x021185f8 +@30830 kind:bss addr:0x021185fc +_ZN15ProfileInstanceI19ActorProfileUnkHERTE8sProfileE kind:bss addr:0x02118608 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMTGE8sProfileE kind:bss addr:0x02118644 +@30836 kind:bss addr:0x02118648 +_ZN15ProfileInstanceI19ActorProfileUnkRMTGE8sProfileE kind:bss addr:0x02118654 +_ZGVN15ProfileInstanceI19ActorProfileUnkSCCNE8sProfileE kind:bss addr:0x0211872c +@30842 kind:bss addr:0x02118730 +_ZN15ProfileInstanceI19ActorProfileUnkSCCNE8sProfileE kind:bss addr:0x0211873c +_ZGVN15ProfileInstanceI19ActorProfileUnkNTUBE8sProfileE kind:bss addr:0x02118778 +@30848 kind:bss addr:0x0211877c +_ZN15ProfileInstanceI19ActorProfileUnkNTUBE8sProfileE kind:bss addr:0x02118788 +_ZGVN15ProfileInstanceI19ActorProfileUnkNITFE8sProfileE kind:bss addr:0x021187c4 +@30854 kind:bss addr:0x021187c8 +_ZN15ProfileInstanceI19ActorProfileUnkNITFE8sProfileE kind:bss addr:0x021187d4 +_ZGVN15ProfileInstanceI19ActorProfileUnkAROWE8sProfileE kind:bss addr:0x02118810 +@30860 kind:bss addr:0x02118814 +_ZN15ProfileInstanceI19ActorProfileUnkAROWE8sProfileE kind:bss addr:0x02118820 +_ZGVN15ProfileInstanceI19ActorProfileUnkATTGE8sProfileE kind:bss addr:0x0211885c +@30866 kind:bss addr:0x02118860 +_ZN15ProfileInstanceI19ActorProfileUnkATTGE8sProfileE kind:bss addr:0x0211886c +_ZGVN15ProfileInstanceI19ActorProfileUnkNTTZE8sProfileE kind:bss addr:0x021188a8 +@30872 kind:bss addr:0x021188ac +_ZN15ProfileInstanceI19ActorProfileUnkNTTZE8sProfileE kind:bss addr:0x021188b8 data_ov031_021188f4 kind:bss addr:0x021188f4 data_ov031_021188f8 kind:bss addr:0x021188f8 -data_ov031_02118904 kind:bss addr:0x02118904 -data_ov031_02118910 kind:bss addr:0x02118910 -sActorProfileUnkTGTZ kind:bss addr:0x0211891c -data_ov031_021189f4 kind:bss addr:0x021189f4 -data_ov031_021189f8 kind:bss addr:0x021189f8 -sActorProfileUnkSWCH kind:bss addr:0x02118a04 +_ZGVN15ProfileInstanceI19ActorProfileUnkTGTZE8sProfileE kind:bss addr:0x02118904 +@30878 kind:bss addr:0x02118910 +_ZN15ProfileInstanceI19ActorProfileUnkTGTZE8sProfileE kind:bss addr:0x0211891c +_ZGVN15ProfileInstanceI19ActorProfileUnkSWCHE8sProfileE kind:bss addr:0x021189f4 +@30884 kind:bss addr:0x021189f8 +_ZN15ProfileInstanceI19ActorProfileUnkSWCHE8sProfileE kind:bss addr:0x02118a04 data_ov031_02118a1c kind:bss addr:0x02118a1c ambiguous -data_ov031_02118a40 kind:bss addr:0x02118a40 -data_ov031_02118a44 kind:bss addr:0x02118a44 -sActorProfileUnkSWON kind:bss addr:0x02118a50 -data_ov031_02118a8c kind:bss addr:0x02118a8c -data_ov031_02118a90 kind:bss addr:0x02118a90 -sActorProfileUnkNORE kind:bss addr:0x02118a9c -data_ov031_02118ad8 kind:bss addr:0x02118ad8 -data_ov031_02118adc kind:bss addr:0x02118adc -sActorProfileUnkFLEN kind:bss addr:0x02118ae8 -data_ov031_02118b24 kind:bss addr:0x02118b24 -data_ov031_02118b28 kind:bss addr:0x02118b28 -sActorProfileUnkRLST kind:bss addr:0x02118b34 +_ZGVN15ProfileInstanceI19ActorProfileUnkSWONE8sProfileE kind:bss addr:0x02118a40 +@30890 kind:bss addr:0x02118a44 +_ZN15ProfileInstanceI19ActorProfileUnkSWONE8sProfileE kind:bss addr:0x02118a50 +_ZGVN15ProfileInstanceI19ActorProfileUnkNOREE8sProfileE kind:bss addr:0x02118a8c +@30896 kind:bss addr:0x02118a90 +_ZN15ProfileInstanceI19ActorProfileUnkNOREE8sProfileE kind:bss addr:0x02118a9c +_ZGVN15ProfileInstanceI19ActorProfileUnkFLENE8sProfileE kind:bss addr:0x02118ad8 +@30902 kind:bss addr:0x02118adc +_ZN15ProfileInstanceI19ActorProfileUnkFLENE8sProfileE kind:bss addr:0x02118ae8 +_ZGVN15ProfileInstanceI19ActorProfileUnkRLSTE8sProfileE kind:bss addr:0x02118b24 +@30908 kind:bss addr:0x02118b28 +_ZN15ProfileInstanceI19ActorProfileUnkRLSTE8sProfileE kind:bss addr:0x02118b34 data_ov031_02118c0c kind:bss addr:0x02118c0c data_ov031_02118c1c kind:bss addr:0x02118c1c data_ov031_02118c28 kind:bss addr:0x02118c28 -data_ov031_02118c34 kind:bss addr:0x02118c34 -data_ov031_02118c40 kind:bss addr:0x02118c40 -sActorProfileUnkSPDR kind:bss addr:0x02118c4c -sActorProfileUnkSPTR kind:bss addr:0x02118c88 -sActorProfileUnkSPAR kind:bss addr:0x02118cc4 -sActorProfileUnkSPBM kind:bss addr:0x02118d00 -data_ov031_02118d3c kind:bss addr:0x02118d3c -data_ov031_02118d40 kind:bss addr:0x02118d40 -sActorProfileUnkMLCK kind:bss addr:0x02118d4c -data_ov031_02118d88 kind:bss addr:0x02118d88 -data_ov031_02118d8c kind:bss addr:0x02118d8c -sActorProfileUnkCLLT kind:bss addr:0x02118d98 -data_ov031_02118dd4 kind:bss addr:0x02118dd4 -data_ov031_02118dd8 kind:bss addr:0x02118dd8 -sActorProfileUnkEFSB kind:bss addr:0x02118de4 -data_ov031_02118ebc kind:bss addr:0x02118ebc -data_ov031_02118ec0 kind:bss addr:0x02118ec0 -sActorProfileUnkNFSP kind:bss addr:0x02118ecc +_ZGVN15ProfileInstanceI19ActorProfileUnkSPDRE8sProfileE kind:bss addr:0x02118c34 +@30914 kind:bss addr:0x02118c40 +_ZN15ProfileInstanceI19ActorProfileUnkSPDRE8sProfileE kind:bss addr:0x02118c4c +_ZN15ProfileInstanceI19ActorProfileUnkSPTRE8sProfileE kind:bss addr:0x02118c88 +_ZN15ProfileInstanceI19ActorProfileUnkSPARE8sProfileE kind:bss addr:0x02118cc4 +_ZN15ProfileInstanceI19ActorProfileUnkSPBME8sProfileE kind:bss addr:0x02118d00 +_ZGVN15ProfileInstanceI19ActorProfileUnkMLCKE8sProfileE kind:bss addr:0x02118d3c +@30920 kind:bss addr:0x02118d40 +_ZN15ProfileInstanceI19ActorProfileUnkMLCKE8sProfileE kind:bss addr:0x02118d4c +_ZGVN15ProfileInstanceI19ActorProfileUnkCLLTE8sProfileE kind:bss addr:0x02118d88 +@30926 kind:bss addr:0x02118d8c +_ZN15ProfileInstanceI19ActorProfileUnkCLLTE8sProfileE kind:bss addr:0x02118d98 +_ZGVN15ProfileInstanceI19ActorProfileUnkEFSBE8sProfileE kind:bss addr:0x02118dd4 +@30932 kind:bss addr:0x02118dd8 +_ZN15ProfileInstanceI19ActorProfileUnkEFSBE8sProfileE kind:bss addr:0x02118de4 +_ZGVN15ProfileInstanceI19ActorProfileUnkNFSPE8sProfileE kind:bss addr:0x02118ebc +@30938 kind:bss addr:0x02118ec0 +_ZN15ProfileInstanceI19ActorProfileUnkNFSPE8sProfileE kind:bss addr:0x02118ecc data_ov031_02118fa4 kind:bss addr:0x02118fa4 data_ov031_02118fb0 kind:bss addr:0x02118fb0 data_ov031_02118fd4 kind:bss addr:0x02118fd4 data_ov031_02118ff8 kind:bss addr:0x02118ff8 -data_ov031_0211901c kind:bss addr:0x0211901c -data_ov031_02119020 kind:bss addr:0x02119020 -sMapObjectProfileUnkDRDS kind:bss addr:0x0211902c -data_ov031_02119100 kind:bss addr:0x02119100 -data_ov031_02119104 kind:bss addr:0x02119104 -sMapObjectProfileUnkDRKY kind:bss addr:0x02119110 -data_ov031_021191e4 kind:bss addr:0x021191e4 -data_ov031_021191e8 kind:bss addr:0x021191e8 -sMapObjectProfileUnkDRSW kind:bss addr:0x021191f4 -data_ov031_021192c8 kind:bss addr:0x021192c8 -data_ov031_021192cc kind:bss addr:0x021192cc -sMapObjectProfileUnkDRCK kind:bss addr:0x021192d8 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkDRDSE8sProfileE kind:bss addr:0x0211901c +@30933 kind:bss addr:0x02119020 +_ZN15ProfileInstanceI23MapObjectProfileUnkDRDSE8sProfileE kind:bss addr:0x0211902c +_ZGVN15ProfileInstanceI23MapObjectProfileUnkDRKYE8sProfileE kind:bss addr:0x02119100 +@30939 kind:bss addr:0x02119104 +_ZN15ProfileInstanceI23MapObjectProfileUnkDRKYE8sProfileE kind:bss addr:0x02119110 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkDRSWE8sProfileE kind:bss addr:0x021191e4 +@30945 kind:bss addr:0x021191e8 +_ZN15ProfileInstanceI23MapObjectProfileUnkDRSWE8sProfileE kind:bss addr:0x021191f4 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkDRCKE8sProfileE kind:bss addr:0x021192c8 +@30951 kind:bss addr:0x021192cc +_ZN15ProfileInstanceI23MapObjectProfileUnkDRCKE8sProfileE kind:bss addr:0x021192d8 data_ov031_021192f8 kind:bss addr:0x021192f8 -data_ov031_02119340 kind:bss addr:0x02119340 -data_ov031_02119344 kind:bss addr:0x02119344 -sMapObjectProfileUnkDRTC kind:bss addr:0x02119350 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkDRTCE8sProfileE kind:bss addr:0x02119340 +@30957 kind:bss addr:0x02119344 +_ZN15ProfileInstanceI23MapObjectProfileUnkDRTCE8sProfileE kind:bss addr:0x02119350 data_ov031_02119370 kind:bss addr:0x02119370 -data_ov031_021193b8 kind:bss addr:0x021193b8 -data_ov031_021193bc kind:bss addr:0x021193bc -sMapObjectProfileUnkEXIT kind:bss addr:0x021193c8 -data_ov031_0211949c kind:bss addr:0x0211949c -data_ov031_021194a0 kind:bss addr:0x021194a0 -sMapObjectProfileUnkGATE kind:bss addr:0x021194ac +_ZGVN15ProfileInstanceI23MapObjectProfileUnkEXITE8sProfileE kind:bss addr:0x021193b8 +@30963 kind:bss addr:0x021193bc +_ZN15ProfileInstanceI23MapObjectProfileUnkEXITE8sProfileE kind:bss addr:0x021193c8 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkGATEE8sProfileE kind:bss addr:0x0211949c +@30969 kind:bss addr:0x021194a0 +_ZN15ProfileInstanceI23MapObjectProfileUnkGATEE8sProfileE kind:bss addr:0x021194ac data_ov031_021194cc kind:bss addr:0x021194cc -data_ov031_02119514 kind:bss addr:0x02119514 -data_ov031_02119518 kind:bss addr:0x02119518 -sMapObjectProfileUnkSTIR kind:bss addr:0x02119524 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkSTIRE8sProfileE kind:bss addr:0x02119514 +@30975 kind:bss addr:0x02119518 +_ZN15ProfileInstanceI23MapObjectProfileUnkSTIRE8sProfileE kind:bss addr:0x02119524 data_ov031_021195f8 kind:bss addr:0x021195f8 data_ov031_021195fc kind:bss addr:0x021195fc -data_ov031_02119608 kind:bss addr:0x02119608 -data_ov031_02119614 kind:bss addr:0x02119614 -sMapObjectProfileUnkGRSS kind:bss addr:0x02119664 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkGRSSE8sProfileE kind:bss addr:0x02119608 +@30981 kind:bss addr:0x02119614 +_ZN15ProfileInstanceI23MapObjectProfileUnkGRSSE8sProfileE kind:bss addr:0x02119664 data_ov031_02119738 kind:bss addr:0x02119738 -data_ov031_02119758 kind:bss addr:0x02119758 -data_ov031_0211975c kind:bss addr:0x0211975c -sMapObjectProfileUnkSWHT kind:bss addr:0x02119768 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkSWHTE8sProfileE kind:bss addr:0x02119758 +@30987 kind:bss addr:0x0211975c +_ZN15ProfileInstanceI23MapObjectProfileUnkSWHTE8sProfileE kind:bss addr:0x02119768 data_ov031_02119788 kind:bss addr:0x02119788 data_ov031_0211983c kind:bss addr:0x0211983c -data_ov031_0211985c kind:bss addr:0x0211985c -data_ov031_02119860 kind:bss addr:0x02119860 -sMapObjectProfileUnkBMFL kind:bss addr:0x0211986c -data_ov031_02119940 kind:bss addr:0x02119940 -data_ov031_02119944 kind:bss addr:0x02119944 -sMapObjectProfileUnkTRES kind:bss addr:0x02119950 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkBMFLE8sProfileE kind:bss addr:0x0211985c +@30993 kind:bss addr:0x02119860 +_ZN15ProfileInstanceI23MapObjectProfileUnkBMFLE8sProfileE kind:bss addr:0x0211986c +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRESE8sProfileE kind:bss addr:0x02119940 +@30999 kind:bss addr:0x02119944 +_ZN15ProfileInstanceI23MapObjectProfileUnkTRESE8sProfileE kind:bss addr:0x02119950 data_ov031_02119a24 kind:bss addr:0x02119a24 -data_ov031_02119a9c kind:bss addr:0x02119a9c -data_ov031_02119aa0 kind:bss addr:0x02119aa0 -sMapObjectProfileUnkTRED kind:bss addr:0x02119aac -data_ov031_02119ad0 kind:bss addr:0x02119ad0 -data_ov031_02119ad4 kind:bss addr:0x02119ad4 -sMapObjectProfileUnkTREW kind:bss addr:0x02119ae0 -data_ov031_02119b04 kind:bss addr:0x02119b04 -data_ov031_02119b08 kind:bss addr:0x02119b08 -sMapObjectProfileUnkTREN kind:bss addr:0x02119b14 -data_ov031_02119be8 kind:bss addr:0x02119be8 -data_ov031_02119bec kind:bss addr:0x02119bec -sMapObjectProfileUnkTRWS kind:bss addr:0x02119bf8 -data_ov031_02119ccc kind:bss addr:0x02119ccc -data_ov031_02119cd0 kind:bss addr:0x02119cd0 -sMapObjectProfileUnkTSUB kind:bss addr:0x02119cdc +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTREDE8sProfileE kind:bss addr:0x02119a9c +@31005 kind:bss addr:0x02119aa0 +_ZN15ProfileInstanceI23MapObjectProfileUnkTREDE8sProfileE kind:bss addr:0x02119aac +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTREWE8sProfileE kind:bss addr:0x02119ad0 +@31011 kind:bss addr:0x02119ad4 +_ZN15ProfileInstanceI23MapObjectProfileUnkTREWE8sProfileE kind:bss addr:0x02119ae0 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRENE8sProfileE kind:bss addr:0x02119b04 +@31017 kind:bss addr:0x02119b08 +_ZN15ProfileInstanceI23MapObjectProfileUnkTRENE8sProfileE kind:bss addr:0x02119b14 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRWSE8sProfileE kind:bss addr:0x02119be8 +@31023 kind:bss addr:0x02119bec +_ZN15ProfileInstanceI23MapObjectProfileUnkTRWSE8sProfileE kind:bss addr:0x02119bf8 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTSUBE8sProfileE kind:bss addr:0x02119ccc +@31029 kind:bss addr:0x02119cd0 +_ZN15ProfileInstanceI23MapObjectProfileUnkTSUBE8sProfileE kind:bss addr:0x02119cdc data_ov031_02119db0 kind:bss addr:0x02119db0 -data_ov031_02119dd0 kind:bss addr:0x02119dd0 -data_ov031_02119dd4 kind:bss addr:0x02119dd4 -sMapObjectProfileUnkSKBN kind:bss addr:0x02119de0 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkSKBNE8sProfileE kind:bss addr:0x02119dd0 +@31035 kind:bss addr:0x02119dd4 +_ZN15ProfileInstanceI23MapObjectProfileUnkSKBNE8sProfileE kind:bss addr:0x02119de0 data_ov031_02119eb4 kind:bss addr:0x02119eb4 -data_ov031_02119ed8 kind:bss addr:0x02119ed8 -data_ov031_02119edc kind:bss addr:0x02119edc -sMapObjectProfileUnkITFL kind:bss addr:0x02119ee8 -data_ov031_02119fbc kind:bss addr:0x02119fbc -data_ov031_02119fc0 kind:bss addr:0x02119fc0 -sMapObjectProfileUnkSKDI kind:bss addr:0x02119fcc -data_ov031_0211a0a0 kind:bss addr:0x0211a0a0 -data_ov031_0211a0a4 kind:bss addr:0x0211a0a4 -sActorProfileUnkSKDO kind:bss addr:0x0211a0b0 -data_ov031_0211a0ec kind:bss addr:0x0211a0ec -data_ov031_0211a0f0 kind:bss addr:0x0211a0f0 -sMapObjectProfileUnkCRWL kind:bss addr:0x0211a0fc +_ZGVN15ProfileInstanceI23MapObjectProfileUnkITFLE8sProfileE kind:bss addr:0x02119ed8 +@31041 kind:bss addr:0x02119edc +_ZN15ProfileInstanceI23MapObjectProfileUnkITFLE8sProfileE kind:bss addr:0x02119ee8 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkSKDIE8sProfileE kind:bss addr:0x02119fbc +@31047 kind:bss addr:0x02119fc0 +_ZN15ProfileInstanceI23MapObjectProfileUnkSKDIE8sProfileE kind:bss addr:0x02119fcc +_ZGVN15ProfileInstanceI19ActorProfileUnkSKDOE8sProfileE kind:bss addr:0x0211a0a0 +@31064 kind:bss addr:0x0211a0a4 +_ZN15ProfileInstanceI19ActorProfileUnkSKDOE8sProfileE kind:bss addr:0x0211a0b0 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkCRWLE8sProfileE kind:bss addr:0x0211a0ec +@31059 kind:bss addr:0x0211a0f0 +_ZN15ProfileInstanceI23MapObjectProfileUnkCRWLE8sProfileE kind:bss addr:0x0211a0fc data_ov031_0211a11c kind:bss addr:0x0211a11c data_ov031_0211a164 kind:bss addr:0x0211a164 data_ov031_0211a168 kind:bss addr:0x0211a168 -data_ov031_0211a174 kind:bss addr:0x0211a174 -data_ov031_0211a180 kind:bss addr:0x0211a180 -sMapObjectProfileUnkBREX kind:bss addr:0x0211a18c +_ZGVN15ProfileInstanceI23MapObjectProfileUnkBREXE8sProfileE kind:bss addr:0x0211a174 +@31065 kind:bss addr:0x0211a180 +_ZN15ProfileInstanceI23MapObjectProfileUnkBREXE8sProfileE kind:bss addr:0x0211a18c data_ov031_0211a260 kind:bss addr:0x0211a260 data_ov031_0211a264 kind:bss addr:0x0211a264 -data_ov031_0211a270 kind:bss addr:0x0211a270 -data_ov031_0211a27c kind:bss addr:0x0211a27c -sMapObjectProfileUnkTATZ kind:bss addr:0x0211a288 -data_ov031_0211a380 kind:bss addr:0x0211a380 -data_ov031_0211a384 kind:bss addr:0x0211a384 -sMapObjectProfileUnkSTSP kind:bss addr:0x0211a390 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTATZE8sProfileE kind:bss addr:0x0211a270 +@31071 kind:bss addr:0x0211a27c +_ZN15ProfileInstanceI23MapObjectProfileUnkTATZE8sProfileE kind:bss addr:0x0211a288 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkSTSPE8sProfileE kind:bss addr:0x0211a380 +@31077 kind:bss addr:0x0211a384 +_ZN15ProfileInstanceI23MapObjectProfileUnkSTSPE8sProfileE kind:bss addr:0x0211a390 data_ov031_0211a464 kind:bss addr:0x0211a464 -data_ov031_0211a468 kind:bss addr:0x0211a468 -data_ov031_0211a474 kind:bss addr:0x0211a474 -sMapObjectProfileUnkBLCC kind:bss addr:0x0211a480 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkBLCCE8sProfileE kind:bss addr:0x0211a468 +@31083 kind:bss addr:0x0211a474 +_ZN15ProfileInstanceI23MapObjectProfileUnkBLCCE8sProfileE kind:bss addr:0x0211a480 data_ov031_0211a554 kind:bss addr:0x0211a554 -data_ov031_0211a578 kind:bss addr:0x0211a578 -data_ov031_0211a57c kind:bss addr:0x0211a57c -sMapObjectProfileUnkRLSG kind:bss addr:0x0211a588 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkRLSGE8sProfileE kind:bss addr:0x0211a578 +@31089 kind:bss addr:0x0211a57c +_ZN15ProfileInstanceI23MapObjectProfileUnkRLSGE8sProfileE kind:bss addr:0x0211a588 data_ov031_0211a65c kind:bss addr:0x0211a65c data_ov031_0211a680 kind:bss addr:0x0211a680 data_ov031_0211a688 kind:bss addr:0x0211a688 data_ov031_0211a694 kind:bss addr:0x0211a694 -data_ov031_0211a6a0 kind:bss addr:0x0211a6a0 -data_ov031_0211a6b8 kind:bss addr:0x0211a6b8 -sMapObjectProfileUnkSAND kind:bss addr:0x0211a770 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkSANDE8sProfileE kind:bss addr:0x0211a6a0 +@31095 kind:bss addr:0x0211a6b8 +_ZN15ProfileInstanceI23MapObjectProfileUnkSANDE8sProfileE kind:bss addr:0x0211a770 data_ov031_0211a844 kind:bss addr:0x0211a844 data_ov031_0211a868 kind:bss addr:0x0211a868 data_ov031_0211a88c kind:bss addr:0x0211a88c data_ov031_0211a8b0 kind:bss addr:0x0211a8b0 -data_ov031_0211aa30 kind:bss addr:0x0211aa30 -data_ov031_0211aa38 kind:bss addr:0x0211aa38 -sMapObjectProfileUnkSPTB kind:bss addr:0x0211aa44 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkSPTBE8sProfileE kind:bss addr:0x0211aa30 +@31101 kind:bss addr:0x0211aa38 +_ZN15ProfileInstanceI23MapObjectProfileUnkSPTBE8sProfileE kind:bss addr:0x0211aa44 data_ov031_0211ab18 kind:bss addr:0x0211ab18 -data_ov031_0211ab38 kind:bss addr:0x0211ab38 -data_ov031_0211ab3c kind:bss addr:0x0211ab3c -sMapObjectProfileUnkGSST kind:bss addr:0x0211ab48 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkGSSTE8sProfileE kind:bss addr:0x0211ab38 +@31107 kind:bss addr:0x0211ab3c +_ZN15ProfileInstanceI23MapObjectProfileUnkGSSTE8sProfileE kind:bss addr:0x0211ab48 data_ov031_0211ab68 kind:bss addr:0x0211ab68 data_ov031_0211ac1c kind:bss addr:0x0211ac1c -data_ov031_0211ac3c kind:bss addr:0x0211ac3c -data_ov031_0211ac40 kind:bss addr:0x0211ac40 -sMapObjectProfileUnkSWFS kind:bss addr:0x0211ac4c +_ZGVN15ProfileInstanceI23MapObjectProfileUnkSWFSE8sProfileE kind:bss addr:0x0211ac3c +@31113 kind:bss addr:0x0211ac40 +_ZN15ProfileInstanceI23MapObjectProfileUnkSWFSE8sProfileE kind:bss addr:0x0211ac4c data_ov031_0211ac6c kind:bss addr:0x0211ac6c data_ov031_0211ad20 kind:bss addr:0x0211ad20 data_ov031_0211ad44 kind:bss addr:0x0211ad44 diff --git a/config/jp/arm9/overlays/ov032/delinks.txt b/config/jp/arm9/overlays/ov032/delinks.txt index cad3d03e..d1b9fa6b 100644 --- a/config/jp/arm9/overlays/ov032/delinks.txt +++ b/config/jp/arm9/overlays/ov032/delinks.txt @@ -9,28 +9,28 @@ src/032_MapA1/Actor/ActorUnkKURI.cpp: .text start:0x0211ad60 end:0x0211d46c .init start:0x02123f0c end:0x02123f78 .ctor start:0x02124104 end:0x02124108 - .bss start:0x02124810 end:0x021248e8 + .bss start:0x02124800 end:0x021248f8 src/032_MapA1/Actor/ActorUnkMKUR.cpp: .text start:0x0211d46c end:0x0211f8e0 .init start:0x02123f78 end:0x02123ff8 .ctor start:0x02124108 end:0x0212410c - .bss start:0x02124910 end:0x02124954 + .bss start:0x021248f8 end:0x02124954 src/032_MapA1/Actor/ActorUnkKETH.cpp: .text start:0x0211f8e0 end:0x02121b20 .init start:0x02123ff8 end:0x02124064 .ctor start:0x0212410c end:0x02124110 - .bss start:0x02124964 end:0x02124a3c + .bss start:0x02124954 end:0x02124a3c src/032_MapA1/Actor/ActorUnkNSSW.cpp: .text start:0x02121b20 end:0x02122e68 .init start:0x02124064 end:0x021240b4 .ctor start:0x02124110 end:0x02124114 - .bss start:0x02124a4c end:0x02124a88 + .bss start:0x02124a3c end:0x02124a88 src/032_MapA1/MapObject/MapObjectUnkSWSW.cpp: .text start:0x02122e68 end:0x02123ea8 .init start:0x021240b4 end:0x02124104 .ctor start:0x02124114 end:0x02124118 - .bss start:0x02124a98 end:0x02124ab8 + .bss start:0x02124a88 end:0x02124ab8 diff --git a/config/jp/arm9/overlays/ov032/symbols.txt b/config/jp/arm9/overlays/ov032/symbols.txt index c228c399..3c4b3b57 100644 --- a/config/jp/arm9/overlays/ov032/symbols.txt +++ b/config/jp/arm9/overlays/ov032/symbols.txt @@ -278,22 +278,22 @@ data_ov032_02124744 kind:data(any) addr:0x02124744 data_ov032_02124760 kind:data(any) addr:0x02124760 data_ov032_02124788 kind:data(any) addr:0x02124788 data_ov032_021247b4 kind:data(any) addr:0x021247b4 -data_ov032_02124800 kind:bss addr:0x02124800 -data_ov032_02124804 kind:bss addr:0x02124804 -sActorProfileUnkKURI kind:bss addr:0x02124810 +_ZGVN15ProfileInstanceI19ActorProfileUnkKURIE8sProfileE kind:bss addr:0x02124800 +@31136 kind:bss addr:0x02124804 +_ZN15ProfileInstanceI19ActorProfileUnkKURIE8sProfileE kind:bss addr:0x02124810 data_ov032_021248e8 kind:bss addr:0x021248e8 data_ov032_021248ec kind:bss addr:0x021248ec -data_ov032_021248f8 kind:bss addr:0x021248f8 -data_ov032_02124904 kind:bss addr:0x02124904 -sActorProfileUnkMKUR kind:bss addr:0x02124910 -data_ov032_02124954 kind:bss addr:0x02124954 -data_ov032_02124958 kind:bss addr:0x02124958 -sActorProfileUnkKETH kind:bss addr:0x02124964 -data_ov032_02124a3c kind:bss addr:0x02124a3c -data_ov032_02124a40 kind:bss addr:0x02124a40 -sActorProfileUnkNSSW kind:bss addr:0x02124a4c -data_ov032_02124a88 kind:bss addr:0x02124a88 -data_ov032_02124a8c kind:bss addr:0x02124a8c -sMapObjectProfileUnkSWSW kind:bss addr:0x02124a98 +_ZGVN15ProfileInstanceI19ActorProfileUnkMKURE8sProfileE kind:bss addr:0x021248f8 +@31142 kind:bss addr:0x02124904 +_ZN15ProfileInstanceI19ActorProfileUnkMKURE8sProfileE kind:bss addr:0x02124910 +_ZGVN15ProfileInstanceI19ActorProfileUnkKETHE8sProfileE kind:bss addr:0x02124954 +@31148 kind:bss addr:0x02124958 +_ZN15ProfileInstanceI19ActorProfileUnkKETHE8sProfileE kind:bss addr:0x02124964 +_ZGVN15ProfileInstanceI19ActorProfileUnkNSSWE8sProfileE kind:bss addr:0x02124a3c +@31154 kind:bss addr:0x02124a40 +_ZN15ProfileInstanceI19ActorProfileUnkNSSWE8sProfileE kind:bss addr:0x02124a4c +_ZGVN15ProfileInstanceI23MapObjectProfileUnkSWSWE8sProfileE kind:bss addr:0x02124a88 +@31149 kind:bss addr:0x02124a8c +_ZN15ProfileInstanceI23MapObjectProfileUnkSWSWE8sProfileE kind:bss addr:0x02124a98 data_ov032_02124ab8 kind:bss addr:0x02124ab8 data_ov032_02124b6c kind:bss addr:0x02124b6c diff --git a/config/jp/arm9/overlays/ov033/delinks.txt b/config/jp/arm9/overlays/ov033/delinks.txt index a67a571f..82e1bff7 100644 --- a/config/jp/arm9/overlays/ov033/delinks.txt +++ b/config/jp/arm9/overlays/ov033/delinks.txt @@ -9,16 +9,16 @@ src/033_MapA2/Actor/ActorUnkRCFO.cpp: .text start:0x0211b0e8 end:0x0211bb20 .init start:0x02122e08 end:0x02122e58 .ctor start:0x02122f18 end:0x02122f1c - .bss start:0x02123a54 end:0x02123a90 + .bss start:0x02123a44 end:0x02123a94 src/033_MapA2/MapObject/MapObjectUnkDOPA.cpp: .text start:0x0211bb20 end:0x0211d4c4 .init start:0x02122e58 end:0x02122ec8 .ctor start:0x02122f1c end:0x02122f20 - .bss start:0x02123aac end:0x02123b80 + .bss start:0x02123a94 end:0x02124420 src/033_MapA2/MapObject/MapObjectUnkRCFL.cpp: .text start:0x0211d524 end:0x0211dc2c .init start:0x02122ec8 end:0x02122f18 .ctor start:0x02122f20 end:0x02122f24 - .bss start:0x02124430 end:0x02124504 + .bss start:0x02124420 end:0x02124504 diff --git a/config/jp/arm9/overlays/ov033/symbols.txt b/config/jp/arm9/overlays/ov033/symbols.txt index 88691a26..23c98311 100644 --- a/config/jp/arm9/overlays/ov033/symbols.txt +++ b/config/jp/arm9/overlays/ov033/symbols.txt @@ -316,21 +316,21 @@ data_ov033_0212362c kind:data(any) addr:0x0212362c data_ov033_02123648 kind:data(any) addr:0x02123648 data_ov033_021236a0 kind:bss addr:0x021236a0 data_ov033_021236a4 kind:bss addr:0x021236a4 -data_ov033_02123a44 kind:bss addr:0x02123a44 -data_ov033_02123a48 kind:bss addr:0x02123a48 -sActorProfileUnkRCFO kind:bss addr:0x02123a54 +_ZGVN15ProfileInstanceI19ActorProfileUnkRCFOE8sProfileE kind:bss addr:0x02123a44 +@31172 kind:bss addr:0x02123a48 +_ZN15ProfileInstanceI19ActorProfileUnkRCFOE8sProfileE kind:bss addr:0x02123a54 data_ov033_02123a90 kind:bss addr:0x02123a90 -data_ov033_02123a94 kind:bss addr:0x02123a94 -data_ov033_02123aa0 kind:bss addr:0x02123aa0 -sMapObjectProfileUnkDOPA kind:bss addr:0x02123aac +_ZGVN15ProfileInstanceI23MapObjectProfileUnkDOPAE8sProfileE kind:bss addr:0x02123a94 +@31167 kind:bss addr:0x02123aa0 +_ZN15ProfileInstanceI23MapObjectProfileUnkDOPAE8sProfileE kind:bss addr:0x02123aac data_ov033_02123b80 kind:bss addr:0x02123b80 data_ov033_02123ba4 kind:bss addr:0x02123ba4 data_ov033_02123c90 kind:bss addr:0x02123c90 ambiguous data_ov033_021241ad kind:bss addr:0x021241ad ambiguous data_ov033_02124348 kind:bss addr:0x02124348 ambiguous data_ov033_02124360 kind:bss addr:0x02124360 ambiguous -data_ov033_02124420 kind:bss addr:0x02124420 -data_ov033_02124424 kind:bss addr:0x02124424 -sMapObjectProfileUnkRCFL kind:bss addr:0x02124430 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkRCFLE8sProfileE kind:bss addr:0x02124420 +@31173 kind:bss addr:0x02124424 +_ZN15ProfileInstanceI23MapObjectProfileUnkRCFLE8sProfileE kind:bss addr:0x02124430 data_ov033_02124504 kind:bss addr:0x02124504 data_ov033_02124528 kind:bss addr:0x02124528 diff --git a/config/jp/arm9/overlays/ov034/delinks.txt b/config/jp/arm9/overlays/ov034/delinks.txt index 0ff96767..ef6fc24f 100644 --- a/config/jp/arm9/overlays/ov034/delinks.txt +++ b/config/jp/arm9/overlays/ov034/delinks.txt @@ -9,46 +9,46 @@ src/034_MapA3/Actor/ActorUnkRMM1.cpp: .text start:0x0211ad60 end:0x0211b0c4 .init start:0x021242a8 end:0x021242f8 .ctor start:0x02124588 end:0x0212458c - .bss start:0x02124c30 end:0x02124d08 + .bss start:0x02124c20 end:0x02124d08 src/034_MapA3/Actor/ActorUnkBSFC.cpp: .text start:0x0211b0c4 end:0x0211bc60 .init start:0x021242f8 end:0x02124348 .ctor start:0x0212458c end:0x02124590 - .bss start:0x02124d18 end:0x02124df0 + .bss start:0x02124d08 end:0x02124df0 src/034_MapA3/Actor/ActorUnkFCHL.cpp: .text start:0x0211bc60 end:0x0211c090 .init start:0x02124348 end:0x02124398 .ctor start:0x02124590 end:0x02124594 - .bss start:0x02124e00 end:0x02124ed8 + .bss start:0x02124df0 end:0x02124ed8 src/034_MapA3/Actor/ActorUnkTRLY.cpp: .text start:0x0211c0d8 end:0x021200bc .init start:0x02124398 end:0x02124408 .ctor start:0x02124594 end:0x02124598 - .bss start:0x02124ee8 end:0x02124fc0 + .bss start:0x02124ed8 end:0x02124fc0 src/034_MapA3/Actor/ActorUnkTRRL.cpp: .text start:0x021200bc end:0x02122b3c .init start:0x02124408 end:0x02124458 .ctor start:0x02124598 end:0x0212459c - .bss start:0x02124fd4 end:0x021250c8 + .bss start:0x02124fc0 end:0x021250c8 src/034_MapA3/MapObject/MapObjectUnkTRSW.cpp: .text start:0x02122b3c end:0x02123458 .init start:0x02124458 end:0x021244a8 .ctor start:0x0212459c end:0x021245a0 - .bss start:0x021250d8 end:0x021250f8 + .bss start:0x021250c8 end:0x021251d0 src/034_MapA3/MapObject/MapObjectUnkWPHL.cpp: .text start:0x021234d8 end:0x02123c90 .init start:0x021244a8 end:0x02124504 .ctor start:0x021245a0 end:0x021245a4 - .bss start:0x021251e8 end:0x021251f8 + .bss start:0x021251d0 end:0x02125208 src/034_MapA3/MapObject/MapObjectUnkGELG.cpp: .text start:0x02123c90 end:0x02124190 .init start:0x02124504 end:0x02124588 .ctor start:0x021245a4 end:0x021245a8 - .bss start:0x02125218 end:0x02125238 + .bss start:0x02125208 end:0x02125238 diff --git a/config/jp/arm9/overlays/ov034/symbols.txt b/config/jp/arm9/overlays/ov034/symbols.txt index 1dc5a77d..e480750c 100644 --- a/config/jp/arm9/overlays/ov034/symbols.txt +++ b/config/jp/arm9/overlays/ov034/symbols.txt @@ -288,34 +288,34 @@ data_ov034_02124b4c kind:data(any) addr:0x02124b4c data_ov034_02124b84 kind:data(any) addr:0x02124b84 data_ov034_02124ba0 kind:data(any) addr:0x02124ba0 data_ov034_02124bc8 kind:data(any) addr:0x02124bc8 -data_ov034_02124c20 kind:bss addr:0x02124c20 -data_ov034_02124c24 kind:bss addr:0x02124c24 -sActorProfileUnkRMM1 kind:bss addr:0x02124c30 -data_ov034_02124d08 kind:bss addr:0x02124d08 -data_ov034_02124d0c kind:bss addr:0x02124d0c -sActorProfileUnkBSFC kind:bss addr:0x02124d18 -data_ov034_02124df0 kind:bss addr:0x02124df0 -data_ov034_02124df4 kind:bss addr:0x02124df4 -sActorProfileUnkFCHL kind:bss addr:0x02124e00 -data_ov034_02124ed8 kind:bss addr:0x02124ed8 -data_ov034_02124edc kind:bss addr:0x02124edc -sActorProfileUnkTRLY kind:bss addr:0x02124ee8 -data_ov034_02124fc0 kind:bss addr:0x02124fc0 -data_ov034_02124fc8 kind:bss addr:0x02124fc8 -sActorProfileUnkTRRL kind:bss addr:0x02124fd4 -data_ov034_021250c8 kind:bss addr:0x021250c8 -data_ov034_021250cc kind:bss addr:0x021250cc -sMapObjectProfileUnkTRSW kind:bss addr:0x021250d8 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMM1E8sProfileE kind:bss addr:0x02124c20 +@31196 kind:bss addr:0x02124c24 +_ZN15ProfileInstanceI19ActorProfileUnkRMM1E8sProfileE kind:bss addr:0x02124c30 +_ZGVN15ProfileInstanceI19ActorProfileUnkBSFCE8sProfileE kind:bss addr:0x02124d08 +@31202 kind:bss addr:0x02124d0c +_ZN15ProfileInstanceI19ActorProfileUnkBSFCE8sProfileE kind:bss addr:0x02124d18 +_ZGVN15ProfileInstanceI19ActorProfileUnkFCHLE8sProfileE kind:bss addr:0x02124df0 +@31208 kind:bss addr:0x02124df4 +_ZN15ProfileInstanceI19ActorProfileUnkFCHLE8sProfileE kind:bss addr:0x02124e00 +_ZGVN15ProfileInstanceI19ActorProfileUnkTRLYE8sProfileE kind:bss addr:0x02124ed8 +@31214 kind:bss addr:0x02124edc +_ZN15ProfileInstanceI19ActorProfileUnkTRLYE8sProfileE kind:bss addr:0x02124ee8 +_ZGVN15ProfileInstanceI19ActorProfileUnkTRRLE8sProfileE kind:bss addr:0x02124fc0 +@31220 kind:bss addr:0x02124fc8 +_ZN15ProfileInstanceI19ActorProfileUnkTRRLE8sProfileE kind:bss addr:0x02124fd4 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRSWE8sProfileE kind:bss addr:0x021250c8 +@31215 kind:bss addr:0x021250cc +_ZN15ProfileInstanceI23MapObjectProfileUnkTRSWE8sProfileE kind:bss addr:0x021250d8 data_ov034_021250f8 kind:bss addr:0x021250f8 data_ov034_02125120 kind:bss addr:0x02125120 ambiguous data_ov034_021251ac kind:bss addr:0x021251ac data_ov034_021251cc kind:bss addr:0x021251cc -data_ov034_021251d0 kind:bss addr:0x021251d0 -data_ov034_021251dc kind:bss addr:0x021251dc -sMapObjectProfileUnkWPHL kind:bss addr:0x021251e8 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkWPHLE8sProfileE kind:bss addr:0x021251d0 +@31221 kind:bss addr:0x021251dc +_ZN15ProfileInstanceI23MapObjectProfileUnkWPHLE8sProfileE kind:bss addr:0x021251e8 data_ov034_021251f8 kind:bss addr:0x021251f8 ambiguous -data_ov034_02125208 kind:bss addr:0x02125208 -data_ov034_0212520c kind:bss addr:0x0212520c -sMapObjectProfileUnkGELG kind:bss addr:0x02125218 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkGELGE8sProfileE kind:bss addr:0x02125208 +@31227 kind:bss addr:0x0212520c +_ZN15ProfileInstanceI23MapObjectProfileUnkGELGE8sProfileE kind:bss addr:0x02125218 data_ov034_02125238 kind:bss addr:0x02125238 data_ov034_0212525c kind:bss addr:0x0212525c ambiguous diff --git a/config/jp/arm9/overlays/ov035/delinks.txt b/config/jp/arm9/overlays/ov035/delinks.txt index 20a862ca..fca31d06 100644 --- a/config/jp/arm9/overlays/ov035/delinks.txt +++ b/config/jp/arm9/overlays/ov035/delinks.txt @@ -9,22 +9,22 @@ src/035_MapA4/Actor/ActorUnkFIMA.cpp: .text start:0x0211ad60 end:0x0211c808 .init start:0x02122d34 end:0x02122d84 .ctor start:0x02122f18 end:0x02122f1c - .bss start:0x021238b0 end:0x02123988 + .bss start:0x021238a0 end:0x02123990 src/035_MapA4/Actor/ActorUnkFMAS_FMLS.cpp: .text start:0x0211c808 end:0x0211d8c8 .init start:0x02122d84 end:0x02122e60 .ctor start:0x02122f1c end:0x02122f20 - .bss start:0x021239a8 end:0x02123b58 + .bss start:0x02123990 end:0x02123b64 src/035_MapA4/Actor/ActorUnkFIML.cpp: .text start:0x0211d954 end:0x0212023c .init start:0x02122e60 end:0x02122ec8 .ctor start:0x02122f20 end:0x02122f24 - .bss start:0x02123b7c end:0x02123c54 + .bss start:0x02123b64 end:0x02123c54 src/035_MapA4/Actor/ActorUnkFIFI.cpp: .text start:0x0212023c end:0x021206a8 .init start:0x02122ec8 end:0x02122f18 .ctor start:0x02122f24 end:0x02122f28 - .bss start:0x02123c64 end:0x02123ca0 + .bss start:0x02123c54 end:0x02123ca0 diff --git a/config/jp/arm9/overlays/ov035/symbols.txt b/config/jp/arm9/overlays/ov035/symbols.txt index cf6f37ec..2ee4b2bc 100644 --- a/config/jp/arm9/overlays/ov035/symbols.txt +++ b/config/jp/arm9/overlays/ov035/symbols.txt @@ -257,19 +257,19 @@ data_ov035_02123820 kind:data(any) addr:0x02123820 data_ov035_02123850 kind:data(any) addr:0x02123850 data_ov035_02123868 kind:data(any) addr:0x02123868 data_ov035_02123880 kind:data(any) addr:0x02123880 -data_ov035_021238a0 kind:bss addr:0x021238a0 -data_ov035_021238a4 kind:bss addr:0x021238a4 -sActorProfileUnkFIMA kind:bss addr:0x021238b0 +_ZGVN15ProfileInstanceI19ActorProfileUnkFIMAE8sProfileE kind:bss addr:0x021238a0 +@31250 kind:bss addr:0x021238a4 +_ZN15ProfileInstanceI19ActorProfileUnkFIMAE8sProfileE kind:bss addr:0x021238b0 data_ov035_02123988 kind:bss addr:0x02123988 -data_ov035_02123990 kind:bss addr:0x02123990 -data_ov035_0212399c kind:bss addr:0x0212399c -sActorProfileUnkFMAS kind:bss addr:0x021239a8 -sActorProfileUnkFMLS kind:bss addr:0x02123a80 +_ZGVN15ProfileInstanceI19ActorProfileUnkFMASE8sProfileE kind:bss addr:0x02123990 +@31256 kind:bss addr:0x0212399c +_ZN15ProfileInstanceI19ActorProfileUnkFMASE8sProfileE kind:bss addr:0x021239a8 +_ZN15ProfileInstanceI19ActorProfileUnkFMLSE8sProfileE kind:bss addr:0x02123a80 data_ov035_02123b58 kind:bss addr:0x02123b58 data_ov035_02123b5c kind:bss addr:0x02123b5c -data_ov035_02123b64 kind:bss addr:0x02123b64 -data_ov035_02123b70 kind:bss addr:0x02123b70 -sActorProfileUnkFIML kind:bss addr:0x02123b7c -data_ov035_02123c54 kind:bss addr:0x02123c54 -data_ov035_02123c58 kind:bss addr:0x02123c58 -sActorProfileUnkFIFI kind:bss addr:0x02123c64 +_ZGVN15ProfileInstanceI19ActorProfileUnkFIMLE8sProfileE kind:bss addr:0x02123b64 +@31262 kind:bss addr:0x02123b70 +_ZN15ProfileInstanceI19ActorProfileUnkFIMLE8sProfileE kind:bss addr:0x02123b7c +_ZGVN15ProfileInstanceI19ActorProfileUnkFIFIE8sProfileE kind:bss addr:0x02123c54 +@31268 kind:bss addr:0x02123c58 +_ZN15ProfileInstanceI19ActorProfileUnkFIFIE8sProfileE kind:bss addr:0x02123c64 diff --git a/config/jp/arm9/overlays/ov036/delinks.txt b/config/jp/arm9/overlays/ov036/delinks.txt index b84f9cc4..61fb2f4a 100644 --- a/config/jp/arm9/overlays/ov036/delinks.txt +++ b/config/jp/arm9/overlays/ov036/delinks.txt @@ -9,49 +9,49 @@ src/036_MapA5/Actor/ActorUnkCAMY.cpp: .text start:0x0211cd20 end:0x0211cfcc .init start:0x02122c14 end:0x02122c64 .ctor start:0x02122ee4 end:0x02122ee8 - .bss start:0x02124514 end:0x021245d0 + .bss start:0x02124504 end:0x021245ec src/036_MapA5/Actor/ActorUnkFOMY.cpp: .text start:0x0211cfec end:0x0211d2a4 .init start:0x02122c64 end:0x02122cb4 .ctor start:0x02122ee8 end:0x02122eec - .bss start:0x021245fc end:0x021246d4 + .bss start:0x021245ec end:0x021246d4 src/036_MapA5/Actor/ActorUnkYUKY.cpp: .text start:0x0211d2c4 end:0x0211d590 .init start:0x02122cb4 end:0x02122d04 .ctor start:0x02122eec end:0x02122ef0 - .bss start:0x021246e4 end:0x021247bc + .bss start:0x021246d4 end:0x021247bc src/036_MapA5/Actor/ActorUnkWAWY.cpp: .text start:0x0211d5b0 end:0x0211d858 .init start:0x02122d04 end:0x02122d54 .ctor start:0x02122ef0 end:0x02122ef4 - .bss start:0x021247cc end:0x021248a4 + .bss start:0x021247bc end:0x021248a4 src/036_MapA5/Actor/ActorUnkGORY.cpp: .text start:0x0211d878 end:0x0211db64 .init start:0x02122d54 end:0x02122da4 .ctor start:0x02122ef4 end:0x02122ef8 - .bss start:0x021248b4 end:0x0212498c + .bss start:0x021248a4 end:0x0212498c src/036_MapA5/Actor/ActorUnkTERY.cpp: .text start:0x0211db84 end:0x0211df28 .init start:0x02122da4 end:0x02122df4 .ctor start:0x02122ef8 end:0x02122efc - .bss start:0x0212499c end:0x02124a74 + .bss start:0x0212498c end:0x02124a74 src/036_MapA5/Actor/ActorUnkSHIT.cpp: .text start:0x0211df48 end:0x0211f554 .init start:0x02122df4 end:0x02122e44 .ctor start:0x02122efc end:0x02122f00 - .bss start:0x02124a84 end:0x02124b5c + .bss start:0x02124a74 end:0x02124b5c src/036_MapA5/Actor/ActorUnkTEHT.cpp: .text start:0x0211f5f4 end:0x0211fb2c .init start:0x02122e44 end:0x02122e94 .ctor start:0x02122f00 end:0x02122f04 - .bss start:0x02124b78 end:0x02124bb4 + .bss start:0x02124b5c end:0x02124bb4 src/036_MapA5/Actor/ActorUnkRMST.cpp: .text start:0x0211fbcc end:0x0211fcf0 diff --git a/config/jp/arm9/overlays/ov036/symbols.txt b/config/jp/arm9/overlays/ov036/symbols.txt index 130cec30..c8b9429c 100644 --- a/config/jp/arm9/overlays/ov036/symbols.txt +++ b/config/jp/arm9/overlays/ov036/symbols.txt @@ -442,31 +442,31 @@ data_ov036_021244dc kind:data(any) addr:0x021244dc data_ov036_021244e8 kind:data(any) addr:0x021244e8 data_ov036_021244f4 kind:data(any) addr:0x021244f4 data_ov036_02124500 kind:bss addr:0x02124500 -data_ov036_02124504 kind:bss addr:0x02124504 -data_ov036_02124508 kind:bss addr:0x02124508 -sActorProfileUnkCAMY kind:bss addr:0x02124514 +_ZGVN15ProfileInstanceI19ActorProfileUnkCAMYE8sProfileE kind:bss addr:0x02124504 +@31280 kind:bss addr:0x02124508 +_ZN15ProfileInstanceI19ActorProfileUnkCAMYE8sProfileE kind:bss addr:0x02124514 data_ov036_021245d0 kind:bss addr:0x021245d0 ambiguous -data_ov036_021245ec kind:bss addr:0x021245ec -data_ov036_021245f0 kind:bss addr:0x021245f0 -sActorProfileUnkFOMY kind:bss addr:0x021245fc -data_ov036_021246d4 kind:bss addr:0x021246d4 -data_ov036_021246d8 kind:bss addr:0x021246d8 -sActorProfileUnkYUKY kind:bss addr:0x021246e4 -data_ov036_021247bc kind:bss addr:0x021247bc -data_ov036_021247c0 kind:bss addr:0x021247c0 -sActorProfileUnkWAWY kind:bss addr:0x021247cc -data_ov036_021248a4 kind:bss addr:0x021248a4 -data_ov036_021248a8 kind:bss addr:0x021248a8 -sActorProfileUnkGORY kind:bss addr:0x021248b4 -data_ov036_0212498c kind:bss addr:0x0212498c -data_ov036_02124990 kind:bss addr:0x02124990 -sActorProfileUnkTERY kind:bss addr:0x0212499c -data_ov036_02124a74 kind:bss addr:0x02124a74 -data_ov036_02124a78 kind:bss addr:0x02124a78 -sActorProfileUnkSHIT kind:bss addr:0x02124a84 -data_ov036_02124b5c kind:bss addr:0x02124b5c -data_ov036_02124b6c kind:bss addr:0x02124b6c -sActorProfileUnkTEHT kind:bss addr:0x02124b78 +_ZGVN15ProfileInstanceI19ActorProfileUnkFOMYE8sProfileE kind:bss addr:0x021245ec +@31286 kind:bss addr:0x021245f0 +_ZN15ProfileInstanceI19ActorProfileUnkFOMYE8sProfileE kind:bss addr:0x021245fc +_ZGVN15ProfileInstanceI19ActorProfileUnkYUKYE8sProfileE kind:bss addr:0x021246d4 +@31292 kind:bss addr:0x021246d8 +_ZN15ProfileInstanceI19ActorProfileUnkYUKYE8sProfileE kind:bss addr:0x021246e4 +_ZGVN15ProfileInstanceI19ActorProfileUnkWAWYE8sProfileE kind:bss addr:0x021247bc +@31298 kind:bss addr:0x021247c0 +_ZN15ProfileInstanceI19ActorProfileUnkWAWYE8sProfileE kind:bss addr:0x021247cc +_ZGVN15ProfileInstanceI19ActorProfileUnkGORYE8sProfileE kind:bss addr:0x021248a4 +@31304 kind:bss addr:0x021248a8 +_ZN15ProfileInstanceI19ActorProfileUnkGORYE8sProfileE kind:bss addr:0x021248b4 +_ZGVN15ProfileInstanceI19ActorProfileUnkTERYE8sProfileE kind:bss addr:0x0212498c +@31310 kind:bss addr:0x02124990 +_ZN15ProfileInstanceI19ActorProfileUnkTERYE8sProfileE kind:bss addr:0x0212499c +_ZGVN15ProfileInstanceI19ActorProfileUnkSHITE8sProfileE kind:bss addr:0x02124a74 +@31316 kind:bss addr:0x02124a78 +_ZN15ProfileInstanceI19ActorProfileUnkSHITE8sProfileE kind:bss addr:0x02124a84 +_ZGVN15ProfileInstanceI19ActorProfileUnkTEHTE8sProfileE kind:bss addr:0x02124b5c +@31322 kind:bss addr:0x02124b6c +_ZN15ProfileInstanceI19ActorProfileUnkTEHTE8sProfileE kind:bss addr:0x02124b78 data_ov036_02124bb4 kind:bss addr:0x02124bb4 data_ov036_02124bb8 kind:bss addr:0x02124bb8 -sActorProfileUnkRMST kind:bss addr:0x02124bc4 +_ZN15ProfileInstanceI19ActorProfileUnkRMSTE8sProfileE kind:bss addr:0x02124bc4 diff --git a/config/jp/arm9/overlays/ov037/delinks.txt b/config/jp/arm9/overlays/ov037/delinks.txt index 40abaf9a..c6a4c489 100644 --- a/config/jp/arm9/overlays/ov037/delinks.txt +++ b/config/jp/arm9/overlays/ov037/delinks.txt @@ -9,13 +9,13 @@ src/037_MapA6/Actor/ActorUnkSOLF.cpp: .text start:0x0211d1a4 end:0x021206ec .init start:0x02123a58 end:0x02123aa8 .ctor start:0x02123b98 end:0x02123b9c - .bss start:0x02124738 end:0x0212477c + .bss start:0x02124728 end:0x0212477c src/037_MapA6/Actor/ActorUnkSOLT.cpp: .text start:0x021206ec end:0x02122764 .init start:0x02123aa8 end:0x02123af8 .ctor start:0x02123b9c end:0x02123ba0 - .bss start:0x0212478c end:0x02124864 + .bss start:0x0212477c end:0x02124864 src/037_MapA6/Actor/ActorUnkTUTO.cpp: .text start:0x02122764 end:0x02123964 diff --git a/config/jp/arm9/overlays/ov037/symbols.txt b/config/jp/arm9/overlays/ov037/symbols.txt index 15d2f925..3dc7c166 100644 --- a/config/jp/arm9/overlays/ov037/symbols.txt +++ b/config/jp/arm9/overlays/ov037/symbols.txt @@ -287,12 +287,12 @@ _ZTV19data_ov037_0212454c kind:data(any) addr:0x0212454c data_ov037_021245c0 kind:bss addr:0x021245c0 data_ov037_021245c4 kind:bss addr:0x021245c4 data_ov037_021245d0 kind:bss addr:0x021245d0 -data_ov037_02124728 kind:bss addr:0x02124728 -data_ov037_0212472c kind:bss addr:0x0212472c -sActorProfileUnkSOLF kind:bss addr:0x02124738 -data_ov037_0212477c kind:bss addr:0x0212477c -data_ov037_02124780 kind:bss addr:0x02124780 -sActorProfileUnkSOLT kind:bss addr:0x0212478c +_ZGVN15ProfileInstanceI19ActorProfileUnkSOLFE8sProfileE kind:bss addr:0x02124728 +@31339 kind:bss addr:0x0212472c +_ZN15ProfileInstanceI19ActorProfileUnkSOLFE8sProfileE kind:bss addr:0x02124738 +_ZGVN15ProfileInstanceI19ActorProfileUnkSOLTE8sProfileE kind:bss addr:0x0212477c +@31345 kind:bss addr:0x02124780 +_ZN15ProfileInstanceI19ActorProfileUnkSOLTE8sProfileE kind:bss addr:0x0212478c data_ov037_02124864 kind:bss addr:0x02124864 data_ov037_02124868 kind:bss addr:0x02124868 -sActorProfileUnkTUTO kind:bss addr:0x02124874 +_ZN15ProfileInstanceI19ActorProfileUnkTUTOE8sProfileE kind:bss addr:0x02124874 diff --git a/config/jp/arm9/overlays/ov038/delinks.txt b/config/jp/arm9/overlays/ov038/delinks.txt index 4b39827d..c9c8b91b 100644 --- a/config/jp/arm9/overlays/ov038/delinks.txt +++ b/config/jp/arm9/overlays/ov038/delinks.txt @@ -9,46 +9,46 @@ src/038_MapA7/Actor/ActorUnkWWFS.cpp: .text start:0x0211ae70 end:0x0211eb38 .init start:0x02122814 end:0x021228a4 .ctor start:0x02122ad4 end:0x02122ad8 - .bss start:0x0212323c end:0x02123240 + .bss start:0x02123228 end:0x02123314 src/038_MapA7/Actor/ActorUnkBLBR.cpp: .text start:0x0211eb38 end:0x021201d0 .init start:0x021228a4 end:0x021228f4 .ctor start:0x02122ad8 end:0x02122adc - .bss start:0x02123324 end:0x021233fc + .bss start:0x02123314 end:0x021233fc src/038_MapA7/MapObject/MapObjectUnkBLSR.cpp: .text start:0x021201d0 end:0x02120510 .init start:0x021228f4 end:0x02122944 .ctor start:0x02122adc end:0x02122ae0 - .bss start:0x0212340c end:0x0212345c + .bss start:0x021233fc end:0x02123500 src/038_MapA7/MapObject/MapObjectUnkSWBR.cpp: .text start:0x02120510 end:0x021207e8 .init start:0x02122944 end:0x02122994 .ctor start:0x02122ae0 end:0x02122ae4 - .bss start:0x02123510 end:0x021235e4 + .bss start:0x02123500 end:0x021235e4 src/038_MapA7/Actor/ActorUnkBLBL.cpp: .text start:0x021207e8 end:0x02120a04 .init start:0x02122994 end:0x021229e4 .ctor start:0x02122ae4 end:0x02122ae8 - .bss start:0x021235f4 end:0x021236cc + .bss start:0x021235e4 end:0x021236cc src/038_MapA7/Actor/ActorUnkGRCF.cpp: .text start:0x02120a04 end:0x02120c18 .init start:0x021229e4 end:0x02122a34 .ctor start:0x02122ae8 end:0x02122aec - .bss start:0x021236dc end:0x02123718 + .bss start:0x021236cc end:0x02123718 src/038_MapA7/MapObject/MapObjectUnkFSSN.cpp: .text start:0x02120c18 end:0x02120e40 .init start:0x02122a34 end:0x02122a84 .ctor start:0x02122aec end:0x02122af0 - .bss start:0x02123728 end:0x021237fc + .bss start:0x02123718 end:0x021237fc src/038_MapA7/Actor/ActorUnkPLSR.cpp: .text start:0x02120e40 end:0x02122720 .init start:0x02122a84 end:0x02122ad4 .ctor start:0x02122af0 end:0x02122af4 - .bss start:0x0212380c end:0x021238e4 + .bss start:0x021237fc end:0x021238e4 diff --git a/config/jp/arm9/overlays/ov038/symbols.txt b/config/jp/arm9/overlays/ov038/symbols.txt index 17a2bd28..a01b7cfd 100644 --- a/config/jp/arm9/overlays/ov038/symbols.txt +++ b/config/jp/arm9/overlays/ov038/symbols.txt @@ -240,33 +240,33 @@ data_ov038_0212319c kind:data(any) addr:0x0212319c _ZTV19data_ov038_021231b8 kind:data(any) addr:0x021231b8 data_ov038_02123220 kind:bss addr:0x02123220 data_ov038_02123224 kind:bss addr:0x02123224 -data_ov038_02123228 kind:bss addr:0x02123228 -data_ov038_02123230 kind:bss addr:0x02123230 -sActorProfileUnkWWFS kind:bss addr:0x0212323c +_ZGVN15ProfileInstanceI19ActorProfileUnkWWFSE8sProfileE kind:bss addr:0x02123228 +@31362 kind:bss addr:0x02123230 +_ZN15ProfileInstanceI19ActorProfileUnkWWFSE8sProfileE kind:bss addr:0x0212323c data_ov038_02123240 kind:bss addr:0x02123240 -data_ov038_02123314 kind:bss addr:0x02123314 -data_ov038_02123318 kind:bss addr:0x02123318 -sActorProfileUnkBLBR kind:bss addr:0x02123324 -data_ov038_021233fc kind:bss addr:0x021233fc -data_ov038_02123400 kind:bss addr:0x02123400 -sMapObjectProfileUnkBLSR kind:bss addr:0x0212340c +_ZGVN15ProfileInstanceI19ActorProfileUnkBLBRE8sProfileE kind:bss addr:0x02123314 +@31368 kind:bss addr:0x02123318 +_ZN15ProfileInstanceI19ActorProfileUnkBLBRE8sProfileE kind:bss addr:0x02123324 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkBLSRE8sProfileE kind:bss addr:0x021233fc +@31251 kind:bss addr:0x02123400 +_ZN15ProfileInstanceI23MapObjectProfileUnkBLSRE8sProfileE kind:bss addr:0x0212340c data_ov038_0212345c kind:bss addr:0x0212345c ambiguous data_ov038_021234d8 kind:bss addr:0x021234d8 ambiguous data_ov038_021234e0 kind:bss addr:0x021234e0 -data_ov038_02123500 kind:bss addr:0x02123500 -data_ov038_02123504 kind:bss addr:0x02123504 -sMapObjectProfileUnkSWBR kind:bss addr:0x02123510 -data_ov038_021235e4 kind:bss addr:0x021235e4 -data_ov038_021235e8 kind:bss addr:0x021235e8 -sActorProfileUnkBLBL kind:bss addr:0x021235f4 -data_ov038_021236cc kind:bss addr:0x021236cc -data_ov038_021236d0 kind:bss addr:0x021236d0 -sActorProfileUnkGRCF kind:bss addr:0x021236dc -data_ov038_02123718 kind:bss addr:0x02123718 -data_ov038_0212371c kind:bss addr:0x0212371c -sMapObjectProfileUnkFSSN kind:bss addr:0x02123728 -data_ov038_021237fc kind:bss addr:0x021237fc -data_ov038_02123800 kind:bss addr:0x02123800 -sActorProfileUnkPLSR kind:bss addr:0x0212380c +_ZGVN15ProfileInstanceI23MapObjectProfileUnkSWBRE8sProfileE kind:bss addr:0x02123500 +@31257 kind:bss addr:0x02123504 +_ZN15ProfileInstanceI23MapObjectProfileUnkSWBRE8sProfileE kind:bss addr:0x02123510 +_ZGVN15ProfileInstanceI19ActorProfileUnkBLBLE8sProfileE kind:bss addr:0x021235e4 +@31386 kind:bss addr:0x021235e8 +_ZN15ProfileInstanceI19ActorProfileUnkBLBLE8sProfileE kind:bss addr:0x021235f4 +_ZGVN15ProfileInstanceI19ActorProfileUnkGRCFE8sProfileE kind:bss addr:0x021236cc +@31392 kind:bss addr:0x021236d0 +_ZN15ProfileInstanceI19ActorProfileUnkGRCFE8sProfileE kind:bss addr:0x021236dc +_ZGVN15ProfileInstanceI23MapObjectProfileUnkFSSNE8sProfileE kind:bss addr:0x02123718 +@31275 kind:bss addr:0x0212371c +_ZN15ProfileInstanceI23MapObjectProfileUnkFSSNE8sProfileE kind:bss addr:0x02123728 +_ZGVN15ProfileInstanceI19ActorProfileUnkPLSRE8sProfileE kind:bss addr:0x021237fc +@31404 kind:bss addr:0x02123800 +_ZN15ProfileInstanceI19ActorProfileUnkPLSRE8sProfileE kind:bss addr:0x0212380c data_ov038_021238e4 kind:bss addr:0x021238e4 data_ov038_021238f8 kind:bss addr:0x021238f8 diff --git a/config/jp/arm9/overlays/ov039/delinks.txt b/config/jp/arm9/overlays/ov039/delinks.txt index 63115f2f..89a0d27a 100644 --- a/config/jp/arm9/overlays/ov039/delinks.txt +++ b/config/jp/arm9/overlays/ov039/delinks.txt @@ -9,25 +9,25 @@ src/039_MapA8/Actor/ActorUnkZELD.cpp: .text start:0x0211ad8c end:0x0211bbfc .init start:0x0211e920 end:0x0211e970 .ctor start:0x0211eba8 end:0x0211ebac - .bss start:0x0211fb30 end:0x0211fbcc + .bss start:0x0211fb20 end:0x0211fc30 src/039_MapA8/Actor/ActorUnkSIRO_SIRS_SRNM_SRSL.cpp: .text start:0x0211bbfc end:0x0211c7c8 .init start:0x0211e970 end:0x0211eab8 .ctor start:0x0211ebac end:0x0211ebb0 - .bss start:0x0211fc48 end:0x0211fe48 + .bss start:0x0211fc30 end:0x0211ff14 src/039_MapA8/Actor/ActorUnkRMM4.cpp: .text start:0x0211c8c8 end:0x0211d2a8 .init start:0x0211eab8 end:0x0211eb08 .ctor start:0x0211ebb0 end:0x0211ebb4 - .bss start:0x0211ff24 end:0x0211fffc + .bss start:0x0211ff14 end:0x0211fffc src/039_MapA8/Actor/ActorUnkZLSS.cpp: .text start:0x0211d2a8 end:0x0211e4a4 .init start:0x0211eb08 end:0x0211eb58 .ctor start:0x0211ebb4 end:0x0211ebb8 - .bss start:0x0212000c end:0x02120050 + .bss start:0x0211fffc end:0x02120050 src/039_MapA8/MapObject/MapObjectUnkGTAT.cpp: .text start:0x0211e4a4 end:0x0211e74c diff --git a/config/jp/arm9/overlays/ov039/symbols.txt b/config/jp/arm9/overlays/ov039/symbols.txt index 95a89d64..2c7c33c9 100644 --- a/config/jp/arm9/overlays/ov039/symbols.txt +++ b/config/jp/arm9/overlays/ov039/symbols.txt @@ -216,32 +216,32 @@ data_ov039_0211fa68 kind:data(any) addr:0x0211fa68 data_ov039_0211fa88 kind:data(any) addr:0x0211fa88 data_ov039_0211faa4 kind:data(any) addr:0x0211faa4 data_ov039_0211facc kind:data(any) addr:0x0211facc -data_ov039_0211fb20 kind:bss addr:0x0211fb20 -data_ov039_0211fb24 kind:bss addr:0x0211fb24 -sActorProfileUnkZELD kind:bss addr:0x0211fb30 +_ZGVN15ProfileInstanceI19ActorProfileUnkZELDE8sProfileE kind:bss addr:0x0211fb20 +@31416 kind:bss addr:0x0211fb24 +_ZN15ProfileInstanceI19ActorProfileUnkZELDE8sProfileE kind:bss addr:0x0211fb30 data_ov039_0211fbcc kind:bss addr:0x0211fbcc ambiguous data_ov039_0211fc08 kind:bss addr:0x0211fc08 data_ov039_0211fc18 kind:bss addr:0x0211fc18 data_ov039_0211fc24 kind:bss addr:0x0211fc24 -data_ov039_0211fc30 kind:bss addr:0x0211fc30 -data_ov039_0211fc3c kind:bss addr:0x0211fc3c -sActorProfileUnkSIRS kind:bss addr:0x0211fc48 -sActorProfileUnkSRNM kind:bss addr:0x0211fc8c +_ZGVN15ProfileInstanceI19ActorProfileUnkSIRSE8sProfileE kind:bss addr:0x0211fc30 +@31422 kind:bss addr:0x0211fc3c +_ZN15ProfileInstanceI19ActorProfileUnkSIRSE8sProfileE kind:bss addr:0x0211fc48 +_ZN15ProfileInstanceI19ActorProfileUnkSRNME8sProfileE kind:bss addr:0x0211fc8c data_ov039_0211fd08 kind:bss addr:0x0211fd08 ambiguous data_ov039_0211fd40 kind:bss addr:0x0211fd40 ambiguous -sActorProfileUnkSRSL kind:bss addr:0x0211fd64 +_ZN15ProfileInstanceI19ActorProfileUnkSRSLE8sProfileE kind:bss addr:0x0211fd64 data_ov039_0211fd6c kind:bss addr:0x0211fd6c ambiguous data_ov039_0211fd70 kind:bss addr:0x0211fd70 ambiguous data_ov039_0211fdd4 kind:bss addr:0x0211fdd4 ambiguous data_ov039_0211fe14 kind:bss addr:0x0211fe14 ambiguous -sActorProfileUnkSIRO kind:bss addr:0x0211fe3c +_ZN15ProfileInstanceI19ActorProfileUnkSIROE8sProfileE kind:bss addr:0x0211fe3c data_ov039_0211fe48 kind:bss addr:0x0211fe48 ambiguous -data_ov039_0211ff14 kind:bss addr:0x0211ff14 -data_ov039_0211ff18 kind:bss addr:0x0211ff18 -sActorProfileUnkRMM4 kind:bss addr:0x0211ff24 -data_ov039_0211fffc kind:bss addr:0x0211fffc -data_ov039_02120000 kind:bss addr:0x02120000 -sActorProfileUnkZLSS kind:bss addr:0x0212000c +_ZGVN15ProfileInstanceI19ActorProfileUnkRMM4E8sProfileE kind:bss addr:0x0211ff14 +@31428 kind:bss addr:0x0211ff18 +_ZN15ProfileInstanceI19ActorProfileUnkRMM4E8sProfileE kind:bss addr:0x0211ff24 +_ZGVN15ProfileInstanceI19ActorProfileUnkZLSSE8sProfileE kind:bss addr:0x0211fffc +@31434 kind:bss addr:0x02120000 +_ZN15ProfileInstanceI19ActorProfileUnkZLSSE8sProfileE kind:bss addr:0x0212000c data_ov039_02120050 kind:bss addr:0x02120050 data_ov039_02120054 kind:bss addr:0x02120054 -sMapObjectProfileUnkGTAT kind:bss addr:0x02120060 +_ZN15ProfileInstanceI23MapObjectProfileUnkGTATE8sProfileE kind:bss addr:0x02120060 diff --git a/config/jp/arm9/overlays/ov040/delinks.txt b/config/jp/arm9/overlays/ov040/delinks.txt index 0e06a8fb..cdda4247 100644 --- a/config/jp/arm9/overlays/ov040/delinks.txt +++ b/config/jp/arm9/overlays/ov040/delinks.txt @@ -9,43 +9,43 @@ src/040_MapB1/Actor/ActorUnkFTRN.cpp: .text start:0x021252b4 end:0x021290f8 .init start:0x0212f7d8 end:0x0212f8f8 .ctor start:0x0212feb0 end:0x0212feb4 - .bss start:0x02130ddc end:0x02130e18 + .bss start:0x02130dc4 end:0x02130e18 src/040_MapB1/Actor/ActorUnkZSTG.cpp: .text start:0x0212c76c end:0x0212cad4 .init start:0x0212f8f8 end:0x0212f948 .ctor start:0x0212feb4 end:0x0212feb8 - .bss start:0x02130e28 end:0x02130e64 + .bss start:0x02130e18 end:0x02130e64 src/040_MapB1/Actor/ActorUnkCAWB_CRFP_FOMA_FOMB_FOMC_FOMR_FOMS_FOPD_GOCP_GORP_NCCA_NCCS_WAMA.cpp: .text start:0x0212cb68 end:0x0212e254 .init start:0x0212f948 end:0x0212fc98 .ctor start:0x0212feb8 end:0x0212febc - .bss start:0x02130f34 end:0x02131a3c + .bss start:0x02130e64 end:0x02131a54 src/040_MapB1/Actor/ActorUnkYKAP_YKCP_YKEP.cpp: .text start:0x0212e254 end:0x0212e7ec .init start:0x0212fc98 end:0x0212fd70 .ctor start:0x0212febc end:0x0212fec0 - .bss start:0x02131a6c end:0x02131bcc + .bss start:0x02131a54 end:0x02131bcc src/040_MapB1/Actor/ActorUnkOLDS.cpp: .text start:0x0212e7ec end:0x0212eb88 .init start:0x0212fd70 end:0x0212fdc0 .ctor start:0x0212fec0 end:0x0212fec4 - .bss start:0x02131bdc end:0x02131cb4 + .bss start:0x02131bcc end:0x02131cb4 src/040_MapB1/Actor/ActorUnkTMNP.cpp: .text start:0x0212eb88 end:0x0212ed6c .init start:0x0212fdc0 end:0x0212fe10 .ctor start:0x0212fec4 end:0x0212fec8 - .bss start:0x02131cc4 end:0x02131d9c + .bss start:0x02131cb4 end:0x02131d9c src/040_MapB1/MapObject/MapObjectUnkFSTA.cpp: .text start:0x0212ed6c end:0x0212f130 .init start:0x0212fe10 end:0x0212fe60 .ctor start:0x0212fec8 end:0x0212fecc - .bss start:0x02131dac end:0x02131dcc + .bss start:0x02131d9c end:0x02131dcc src/040_MapB1/MapObject/MapObjectUnkFRAI.cpp: .text start:0x0212f17c end:0x0212f5b4 diff --git a/config/jp/arm9/overlays/ov040/symbols.txt b/config/jp/arm9/overlays/ov040/symbols.txt index d7bd757c..760769fb 100644 --- a/config/jp/arm9/overlays/ov040/symbols.txt +++ b/config/jp/arm9/overlays/ov040/symbols.txt @@ -394,56 +394,68 @@ data_ov040_02130d10 kind:data(any) addr:0x02130d10 data_ov040_02130d50 kind:data(any) addr:0x02130d50 data_ov040_02130d78 kind:data(any) addr:0x02130d78 data_ov040_02130dc0 kind:bss addr:0x02130dc0 -data_ov040_02130dc4 kind:bss addr:0x02130dc4 -data_ov040_02130dd0 kind:bss addr:0x02130dd0 -sActorProfileUnkFTRN kind:bss addr:0x02130ddc -data_ov040_02130e18 kind:bss addr:0x02130e18 -data_ov040_02130e1c kind:bss addr:0x02130e1c -sActorProfileUnkZSTG kind:bss addr:0x02130e28 -data_ov040_02130e64 kind:bss addr:0x02130e64 -data_ov040_02130e98 kind:bss addr:0x02130e98 -data_ov040_02130ea4 kind:bss addr:0x02130ea4 -data_ov040_02130eb0 kind:bss addr:0x02130eb0 -data_ov040_02130ebc kind:bss addr:0x02130ebc -data_ov040_02130ec8 kind:bss addr:0x02130ec8 -data_ov040_02130ed4 kind:bss addr:0x02130ed4 -data_ov040_02130ee0 kind:bss addr:0x02130ee0 -data_ov040_02130eec kind:bss addr:0x02130eec -data_ov040_02130ef8 kind:bss addr:0x02130ef8 -data_ov040_02130f04 kind:bss addr:0x02130f04 -data_ov040_02130f10 kind:bss addr:0x02130f10 -data_ov040_02130f1c kind:bss addr:0x02130f1c +_ZGVN15ProfileInstanceI19ActorProfileUnkFTRNE8sProfileE kind:bss addr:0x02130dc4 +@31451 kind:bss addr:0x02130dd0 +_ZN15ProfileInstanceI19ActorProfileUnkFTRNE8sProfileE kind:bss addr:0x02130ddc +_ZGVN15ProfileInstanceI19ActorProfileUnkZSTGE8sProfileE kind:bss addr:0x02130e18 +@31457 kind:bss addr:0x02130e1c +_ZN15ProfileInstanceI19ActorProfileUnkZSTGE8sProfileE kind:bss addr:0x02130e28 +_ZGVN15ProfileInstanceI19ActorProfileUnkFOMCE8sProfileE kind:bss addr:0x02130e64 +_ZGVN15ProfileInstanceI19ActorProfileUnkNCCSE8sProfileE kind:bss addr:0x02130e68 +_ZGVN15ProfileInstanceI19ActorProfileUnkFOMBE8sProfileE kind:bss addr:0x02130e6c +_ZGVN15ProfileInstanceI19ActorProfileUnkWAMAE8sProfileE kind:bss addr:0x02130e70 +_ZGVN15ProfileInstanceI19ActorProfileUnkFOMSE8sProfileE kind:bss addr:0x02130e74 +_ZGVN15ProfileInstanceI19ActorProfileUnkGOCPE8sProfileE kind:bss addr:0x02130e78 +_ZGVN15ProfileInstanceI19ActorProfileUnkNCCAE8sProfileE kind:bss addr:0x02130e7c +_ZGVN15ProfileInstanceI19ActorProfileUnkCRFPE8sProfileE kind:bss addr:0x02130e80 +_ZGVN15ProfileInstanceI19ActorProfileUnkFOPDE8sProfileE kind:bss addr:0x02130e84 +_ZGVN15ProfileInstanceI19ActorProfileUnkGORPE8sProfileE kind:bss addr:0x02130e88 +_ZGVN15ProfileInstanceI19ActorProfileUnkFOMAE8sProfileE kind:bss addr:0x02130e8c +_ZGVN15ProfileInstanceI19ActorProfileUnkFOMRE8sProfileE kind:bss addr:0x02130e90 +_ZGVN15ProfileInstanceI19ActorProfileUnkCAWBE8sProfileE kind:bss addr:0x02130e94 +@456 kind:bss addr:0x02130e98 +@460 kind:bss addr:0x02130ea4 +@464 kind:bss addr:0x02130eb0 +@468 kind:bss addr:0x02130ebc +@472 kind:bss addr:0x02130ec8 +@476 kind:bss addr:0x02130ed4 +@480 kind:bss addr:0x02130ee0 +@484 kind:bss addr:0x02130eec +@488 kind:bss addr:0x02130ef8 +@448 kind:bss addr:0x02130f04 +@440 kind:bss addr:0x02130f10 +@444 kind:bss addr:0x02130f1c data_ov040_02130f28 kind:bss addr:0x02130f28 -sActorProfileUnkFOMS kind:bss addr:0x02130f34 -sActorProfileUnkNCCA kind:bss addr:0x0213100c -sActorProfileUnkWAMA kind:bss addr:0x021310e4 -sActorProfileUnkCAWB kind:bss addr:0x021311bc -sActorProfileUnkFOPD kind:bss addr:0x02131294 -sActorProfileUnkFOMA kind:bss addr:0x0213136c -sActorProfileUnkFOMB kind:bss addr:0x02131444 -sActorProfileUnkFOMC kind:bss addr:0x0213151c -sActorProfileUnkFOMR kind:bss addr:0x021315f4 -sActorProfileUnkCRFP kind:bss addr:0x021316cc -sActorProfileUnkNCCS kind:bss addr:0x021317a4 -sActorProfileUnkGORP kind:bss addr:0x0213187c -sActorProfileUnkGOCP kind:bss addr:0x0213195c +_ZN15ProfileInstanceI19ActorProfileUnkFOMSE8sProfileE kind:bss addr:0x02130f34 +_ZN15ProfileInstanceI19ActorProfileUnkNCCAE8sProfileE kind:bss addr:0x0213100c +_ZN15ProfileInstanceI19ActorProfileUnkWAMAE8sProfileE kind:bss addr:0x021310e4 +_ZN15ProfileInstanceI19ActorProfileUnkCAWBE8sProfileE kind:bss addr:0x021311bc +_ZN15ProfileInstanceI19ActorProfileUnkFOPDE8sProfileE kind:bss addr:0x02131294 +_ZN15ProfileInstanceI19ActorProfileUnkFOMAE8sProfileE kind:bss addr:0x0213136c +_ZN15ProfileInstanceI19ActorProfileUnkFOMBE8sProfileE kind:bss addr:0x02131444 +_ZN15ProfileInstanceI19ActorProfileUnkFOMCE8sProfileE kind:bss addr:0x0213151c +_ZN15ProfileInstanceI19ActorProfileUnkFOMRE8sProfileE kind:bss addr:0x021315f4 +_ZN15ProfileInstanceI19ActorProfileUnkCRFPE8sProfileE kind:bss addr:0x021316cc +_ZN15ProfileInstanceI19ActorProfileUnkNCCSE8sProfileE kind:bss addr:0x021317a4 +_ZN15ProfileInstanceI19ActorProfileUnkGORPE8sProfileE kind:bss addr:0x0213187c +_ZN15ProfileInstanceI19ActorProfileUnkGOCPE8sProfileE kind:bss addr:0x0213195c data_ov040_02131a3c kind:bss addr:0x02131a3c data_ov040_02131a48 kind:bss addr:0x02131a48 -data_ov040_02131a54 kind:bss addr:0x02131a54 -data_ov040_02131a60 kind:bss addr:0x02131a60 -sActorProfileUnkYKCP kind:bss addr:0x02131a6c -sActorProfileUnkYKEP kind:bss addr:0x02131ab0 -sActorProfileUnkYKAP kind:bss addr:0x02131af4 -data_ov040_02131bcc kind:bss addr:0x02131bcc -data_ov040_02131bd0 kind:bss addr:0x02131bd0 -sActorProfileUnkOLDS kind:bss addr:0x02131bdc -data_ov040_02131cb4 kind:bss addr:0x02131cb4 -data_ov040_02131cb8 kind:bss addr:0x02131cb8 -sActorProfileUnkTMNP kind:bss addr:0x02131cc4 -data_ov040_02131d9c kind:bss addr:0x02131d9c -data_ov040_02131da0 kind:bss addr:0x02131da0 -sMapObjectProfileUnkFSTA kind:bss addr:0x02131dac +_ZGVN15ProfileInstanceI19ActorProfileUnkYKCPE8sProfileE kind:bss addr:0x02131a54 +@31469 kind:bss addr:0x02131a60 +_ZN15ProfileInstanceI19ActorProfileUnkYKCPE8sProfileE kind:bss addr:0x02131a6c +_ZN15ProfileInstanceI19ActorProfileUnkYKEPE8sProfileE kind:bss addr:0x02131ab0 +_ZN15ProfileInstanceI19ActorProfileUnkYKAPE8sProfileE kind:bss addr:0x02131af4 +_ZGVN15ProfileInstanceI19ActorProfileUnkOLDSE8sProfileE kind:bss addr:0x02131bcc +@31475 kind:bss addr:0x02131bd0 +_ZN15ProfileInstanceI19ActorProfileUnkOLDSE8sProfileE kind:bss addr:0x02131bdc +_ZGVN15ProfileInstanceI19ActorProfileUnkTMNPE8sProfileE kind:bss addr:0x02131cb4 +@31481 kind:bss addr:0x02131cb8 +_ZN15ProfileInstanceI19ActorProfileUnkTMNPE8sProfileE kind:bss addr:0x02131cc4 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkFSTAE8sProfileE kind:bss addr:0x02131d9c +@31364 kind:bss addr:0x02131da0 +_ZN15ProfileInstanceI23MapObjectProfileUnkFSTAE8sProfileE kind:bss addr:0x02131dac data_ov040_02131dcc kind:bss addr:0x02131dcc data_ov040_02131e34 kind:bss addr:0x02131e34 data_ov040_02131e38 kind:bss addr:0x02131e38 -sMapObjectProfileUnkFRAI kind:bss addr:0x02131e44 +_ZN15ProfileInstanceI23MapObjectProfileUnkFRAIE8sProfileE kind:bss addr:0x02131e44 diff --git a/config/jp/arm9/overlays/ov041/delinks.txt b/config/jp/arm9/overlays/ov041/delinks.txt index ed32314e..de161d59 100644 --- a/config/jp/arm9/overlays/ov041/delinks.txt +++ b/config/jp/arm9/overlays/ov041/delinks.txt @@ -9,43 +9,43 @@ src/041_MapB2/Actor/ActorUnkKEYB.cpp: .text start:0x02125280 end:0x02125460 .init start:0x0212f320 end:0x0212f370 .ctor start:0x0212f68c end:0x0212f690 - .bss start:0x02130070 end:0x02130148 + .bss start:0x02130060 end:0x02130148 src/041_MapB2/Actor/ActorUnkKGDB.cpp: .text start:0x02125460 end:0x02125930 .init start:0x0212f370 end:0x0212f3dc .ctor start:0x0212f690 end:0x0212f694 - .bss start:0x02130158 end:0x02130230 + .bss start:0x02130148 end:0x02130230 src/041_MapB2/Actor/ActorUnkKEYT.cpp: .text start:0x02125930 end:0x02125f4c .init start:0x0212f3dc end:0x0212f438 .ctor start:0x0212f694 end:0x0212f698 - .bss start:0x0213024c end:0x02130290 + .bss start:0x02130230 end:0x02130290 src/041_MapB2/Actor/ActorUnkKGDN.cpp: .text start:0x02125f4c end:0x021269c8 .init start:0x0212f438 end:0x0212f488 .ctor start:0x0212f698 end:0x0212f69c - .bss start:0x021302a0 end:0x021302e4 + .bss start:0x02130290 end:0x02130300 src/041_MapB2/Actor/ActorUnkRPMT.cpp: .text start:0x0212c648 end:0x0212d848 .init start:0x0212f4d4 end:0x0212f524 .ctor start:0x0212f6a4 end:0x0212f6a8 - .bss start:0x02130310 end:0x0213034c + .bss start:0x02130300 end:0x02130350 src/041_MapB2/MapObject/MapObjectUnkDRBK.cpp: .text start:0x0212d848 end:0x0212e680 .init start:0x0212f524 end:0x0212f5a4 .ctor start:0x0212f6a8 end:0x0212f6ac - .bss start:0x02130368 end:0x0213043c + .bss start:0x02130350 end:0x02130460 src/041_MapB2/MapObject/MapObjectUnkDRTK.cpp: .text start:0x0212e680 end:0x0212ee68 .init start:0x0212f5a4 end:0x0212f618 .ctor start:0x0212f6ac end:0x0212f6b0 - .bss start:0x02130470 end:0x02130544 + .bss start:0x02130460 end:0x02130544 src/041_MapB2/MapObject/MapObjectUnkDRMC.cpp: .text start:0x0212ee68 end:0x0212f188 diff --git a/config/jp/arm9/overlays/ov041/symbols.txt b/config/jp/arm9/overlays/ov041/symbols.txt index 406ca2d2..5dad3a83 100644 --- a/config/jp/arm9/overlays/ov041/symbols.txt +++ b/config/jp/arm9/overlays/ov041/symbols.txt @@ -308,33 +308,33 @@ data_ov041_0212ff94 kind:data(any) addr:0x0212ff94 data_ov041_0212ffd8 kind:data(any) addr:0x0212ffd8 data_ov041_0212ffec kind:data(any) addr:0x0212ffec data_ov041_02130008 kind:data(any) addr:0x02130008 -data_ov041_02130060 kind:bss addr:0x02130060 -data_ov041_02130064 kind:bss addr:0x02130064 -sActorProfileUnkKEYB kind:bss addr:0x02130070 -data_ov041_02130148 kind:bss addr:0x02130148 -data_ov041_0213014c kind:bss addr:0x0213014c -sActorProfileUnkKGDB kind:bss addr:0x02130158 -data_ov041_02130230 kind:bss addr:0x02130230 -data_ov041_02130234 kind:bss addr:0x02130234 -sActorProfileUnkKEYT kind:bss addr:0x0213024c -data_ov041_02130290 kind:bss addr:0x02130290 -data_ov041_02130294 kind:bss addr:0x02130294 -sActorProfileUnkKGDN kind:bss addr:0x021302a0 +_ZGVN15ProfileInstanceI19ActorProfileUnkKEYBE8sProfileE kind:bss addr:0x02130060 +@31504 kind:bss addr:0x02130064 +_ZN15ProfileInstanceI19ActorProfileUnkKEYBE8sProfileE kind:bss addr:0x02130070 +_ZGVN15ProfileInstanceI19ActorProfileUnkKGDBE8sProfileE kind:bss addr:0x02130148 +@31510 kind:bss addr:0x0213014c +_ZN15ProfileInstanceI19ActorProfileUnkKGDBE8sProfileE kind:bss addr:0x02130158 +_ZGVN15ProfileInstanceI19ActorProfileUnkKEYTE8sProfileE kind:bss addr:0x02130230 +@31516 kind:bss addr:0x02130234 +_ZN15ProfileInstanceI19ActorProfileUnkKEYTE8sProfileE kind:bss addr:0x0213024c +_ZGVN15ProfileInstanceI19ActorProfileUnkKGDNE8sProfileE kind:bss addr:0x02130290 +@31522 kind:bss addr:0x02130294 +_ZN15ProfileInstanceI19ActorProfileUnkKGDNE8sProfileE kind:bss addr:0x021302a0 data_ov041_021302e4 kind:bss addr:0x021302e4 data_ov041_021302e8 kind:bss addr:0x021302e8 data_ov041_021302f4 kind:bss addr:0x021302f4 -data_ov041_02130300 kind:bss addr:0x02130300 -data_ov041_02130304 kind:bss addr:0x02130304 -sActorProfileUnkRPMT kind:bss addr:0x02130310 +_ZGVN15ProfileInstanceI19ActorProfileUnkRPMTE8sProfileE kind:bss addr:0x02130300 +@31528 kind:bss addr:0x02130304 +_ZN15ProfileInstanceI19ActorProfileUnkRPMTE8sProfileE kind:bss addr:0x02130310 data_ov041_0213034c kind:bss addr:0x0213034c -data_ov041_02130350 kind:bss addr:0x02130350 -data_ov041_0213035c kind:bss addr:0x0213035c -sMapObjectProfileUnkDRBK kind:bss addr:0x02130368 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkDRBKE8sProfileE kind:bss addr:0x02130350 +@31411 kind:bss addr:0x0213035c +_ZN15ProfileInstanceI23MapObjectProfileUnkDRBKE8sProfileE kind:bss addr:0x02130368 data_ov041_0213043c kind:bss addr:0x0213043c -data_ov041_02130460 kind:bss addr:0x02130460 -data_ov041_02130464 kind:bss addr:0x02130464 -sMapObjectProfileUnkDRTK kind:bss addr:0x02130470 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkDRTKE8sProfileE kind:bss addr:0x02130460 +@31417 kind:bss addr:0x02130464 +_ZN15ProfileInstanceI23MapObjectProfileUnkDRTKE8sProfileE kind:bss addr:0x02130470 data_ov041_02130544 kind:bss addr:0x02130544 data_ov041_02130568 kind:bss addr:0x02130568 data_ov041_0213056c kind:bss addr:0x0213056c -sMapObjectProfileUnkDRMC kind:bss addr:0x02130578 +_ZN15ProfileInstanceI23MapObjectProfileUnkDRMCE8sProfileE kind:bss addr:0x02130578 diff --git a/config/jp/arm9/overlays/ov042/delinks.txt b/config/jp/arm9/overlays/ov042/delinks.txt index 96ea6d98..56867f6f 100644 --- a/config/jp/arm9/overlays/ov042/delinks.txt +++ b/config/jp/arm9/overlays/ov042/delinks.txt @@ -9,34 +9,34 @@ src/042_MapB3/Actor/ActorUnkOCTS.cpp: .text start:0x02125280 end:0x02125a0c .init start:0x0212eac8 end:0x0212eb18 .ctor start:0x0212ecf8 end:0x0212ecfc - .bss start:0x0212f7f0 end:0x0212f8c8 + .bss start:0x0212f7e0 end:0x0212f8c8 src/042_MapB3/Actor/ActorUnkOCTA.cpp: .text start:0x02125a0c end:0x02126f68 .init start:0x0212eb18 end:0x0212eb84 .ctor start:0x0212ecfc end:0x0212ed00 - .bss start:0x0212f8d8 end:0x0212f9b0 + .bss start:0x0212f8c8 end:0x0212f9b0 src/042_MapB3/Actor/ActorUnkMIFR.cpp: .text start:0x02126f68 end:0x0212878c .init start:0x0212eb84 end:0x0212ebd4 .ctor start:0x0212ed00 end:0x0212ed04 - .bss start:0x0212f9c0 end:0x0212fa98 + .bss start:0x0212f9b0 end:0x0212faa4 src/042_MapB3/Actor/ActorUnkPHEY.cpp: .text start:0x0212a770 end:0x0212d7f8 .init start:0x0212ebec end:0x0212ec58 .ctor start:0x0212ed08 end:0x0212ed0c - .bss start:0x0212fab4 end:0x0212fb8c + .bss start:0x0212faa4 end:0x0212fb8c src/042_MapB3/Actor/ActorUnkPMTT.cpp: .text start:0x0212d7f8 end:0x0212e580 .init start:0x0212ec58 end:0x0212eca8 .ctor start:0x0212ed0c end:0x0212ed10 - .bss start:0x0212fba0 end:0x0212fc78 + .bss start:0x0212fb8c end:0x0212fc78 src/042_MapB3/MapObject/MapObjectUnkSWRA.cpp: .text start:0x0212e580 end:0x0212ea40 .init start:0x0212eca8 end:0x0212ecf8 .ctor start:0x0212ed10 end:0x0212ed14 - .bss start:0x0212fc88 end:0x0212fca8 + .bss start:0x0212fc78 end:0x0212fca8 diff --git a/config/jp/arm9/overlays/ov042/symbols.txt b/config/jp/arm9/overlays/ov042/symbols.txt index 01b80dba..26749774 100644 --- a/config/jp/arm9/overlays/ov042/symbols.txt +++ b/config/jp/arm9/overlays/ov042/symbols.txt @@ -291,24 +291,24 @@ data_ov042_0212f744 kind:data(any) addr:0x0212f744 data_ov042_0212f760 kind:data(any) addr:0x0212f760 data_ov042_0212f77c kind:data(any) addr:0x0212f77c data_ov042_0212f7a4 kind:data(any) addr:0x0212f7a4 -data_ov042_0212f7e0 kind:bss addr:0x0212f7e0 -data_ov042_0212f7e4 kind:bss addr:0x0212f7e4 -sActorProfileUnkOCTS kind:bss addr:0x0212f7f0 -data_ov042_0212f8c8 kind:bss addr:0x0212f8c8 -data_ov042_0212f8cc kind:bss addr:0x0212f8cc -sActorProfileUnkOCTA kind:bss addr:0x0212f8d8 -data_ov042_0212f9b0 kind:bss addr:0x0212f9b0 -data_ov042_0212f9b4 kind:bss addr:0x0212f9b4 -sActorProfileUnkMIFR kind:bss addr:0x0212f9c0 +_ZGVN15ProfileInstanceI19ActorProfileUnkOCTSE8sProfileE kind:bss addr:0x0212f7e0 +@31557 kind:bss addr:0x0212f7e4 +_ZN15ProfileInstanceI19ActorProfileUnkOCTSE8sProfileE kind:bss addr:0x0212f7f0 +_ZGVN15ProfileInstanceI19ActorProfileUnkOCTAE8sProfileE kind:bss addr:0x0212f8c8 +@31563 kind:bss addr:0x0212f8cc +_ZN15ProfileInstanceI19ActorProfileUnkOCTAE8sProfileE kind:bss addr:0x0212f8d8 +_ZGVN15ProfileInstanceI19ActorProfileUnkMIFRE8sProfileE kind:bss addr:0x0212f9b0 +@31569 kind:bss addr:0x0212f9b4 +_ZN15ProfileInstanceI19ActorProfileUnkMIFRE8sProfileE kind:bss addr:0x0212f9c0 data_ov042_0212fa98 kind:bss addr:0x0212fa98 -data_ov042_0212faa4 kind:bss addr:0x0212faa4 -data_ov042_0212faa8 kind:bss addr:0x0212faa8 -sActorProfileUnkPHEY kind:bss addr:0x0212fab4 -data_ov042_0212fb8c kind:bss addr:0x0212fb8c -data_ov042_0212fb94 kind:bss addr:0x0212fb94 -sActorProfileUnkPMTT kind:bss addr:0x0212fba0 -data_ov042_0212fc78 kind:bss addr:0x0212fc78 -data_ov042_0212fc7c kind:bss addr:0x0212fc7c -sMapObjectProfileUnkSWRA kind:bss addr:0x0212fc88 +_ZGVN15ProfileInstanceI19ActorProfileUnkPHEYE8sProfileE kind:bss addr:0x0212faa4 +@31575 kind:bss addr:0x0212faa8 +_ZN15ProfileInstanceI19ActorProfileUnkPHEYE8sProfileE kind:bss addr:0x0212fab4 +_ZGVN15ProfileInstanceI19ActorProfileUnkPMTTE8sProfileE kind:bss addr:0x0212fb8c +@31581 kind:bss addr:0x0212fb94 +_ZN15ProfileInstanceI19ActorProfileUnkPMTTE8sProfileE kind:bss addr:0x0212fba0 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkSWRAE8sProfileE kind:bss addr:0x0212fc78 +@31464 kind:bss addr:0x0212fc7c +_ZN15ProfileInstanceI23MapObjectProfileUnkSWRAE8sProfileE kind:bss addr:0x0212fc88 data_ov042_0212fca8 kind:bss addr:0x0212fca8 data_ov042_0212fd5c kind:bss addr:0x0212fd5c diff --git a/config/jp/arm9/overlays/ov043/delinks.txt b/config/jp/arm9/overlays/ov043/delinks.txt index 243f0cfe..353de46f 100644 --- a/config/jp/arm9/overlays/ov043/delinks.txt +++ b/config/jp/arm9/overlays/ov043/delinks.txt @@ -9,22 +9,22 @@ src/043_MapB4/Actor/ActorUnkSTLF.cpp: .text start:0x02125280 end:0x021284d8 .init start:0x0212e938 end:0x0212ea38 .ctor start:0x0212ebe0 end:0x0212ebe4 - .bss start:0x0212f998 end:0x0212fa70 + .bss start:0x0212f980 end:0x0212fa70 src/043_MapB4/Actor/ActorUnkSTFH.cpp: .text start:0x021284d8 end:0x0212a108 .init start:0x0212ea38 end:0x0212eb18 .ctor start:0x0212ebe4 end:0x0212ebe8 - .bss start:0x0212fa80 end:0x0212fb58 + .bss start:0x0212fa70 end:0x0212fb58 src/043_MapB4/Actor/ActorUnkSTFB.cpp: .text start:0x0212a108 end:0x0212a814 .init start:0x0212eb18 end:0x0212eb68 .ctor start:0x0212ebe8 end:0x0212ebec - .bss start:0x0212fb68 end:0x0212fbac + .bss start:0x0212fb58 end:0x0212fbac src/043_MapB4/Actor/ActorUnkSHDL.cpp: .text start:0x0212a898 end:0x0212e7f4 .init start:0x0212eb68 end:0x0212ebe0 .ctor start:0x0212ebec end:0x0212ebf0 - .bss start:0x0212fbc0 end:0x0212fc00 + .bss start:0x0212fbac end:0x0212fc00 diff --git a/config/jp/arm9/overlays/ov043/symbols.txt b/config/jp/arm9/overlays/ov043/symbols.txt index cb094f54..f26fdb4b 100644 --- a/config/jp/arm9/overlays/ov043/symbols.txt +++ b/config/jp/arm9/overlays/ov043/symbols.txt @@ -303,17 +303,17 @@ data_ov043_0212f5c0 kind:data(any) addr:0x0212f5c0 data_ov043_0212f5c4 kind:data(any) addr:0x0212f5c4 data_ov043_0212f5c8 kind:data(any) addr:0x0212f5c8 data_ov043_0212f5cc kind:data(any) addr:0x0212f5cc -data_ov043_0212f980 kind:bss addr:0x0212f980 -data_ov043_0212f98c kind:bss addr:0x0212f98c -sActorProfileUnkSTLF kind:bss addr:0x0212f998 -data_ov043_0212fa70 kind:bss addr:0x0212fa70 -data_ov043_0212fa74 kind:bss addr:0x0212fa74 -sActorProfileUnkSTFH kind:bss addr:0x0212fa80 -data_ov043_0212fb58 kind:bss addr:0x0212fb58 -data_ov043_0212fb5c kind:bss addr:0x0212fb5c -sActorProfileUnkSTFB kind:bss addr:0x0212fb68 -data_ov043_0212fbac kind:bss addr:0x0212fbac -data_ov043_0212fbb4 kind:bss addr:0x0212fbb4 -sActorProfileUnkSHDL kind:bss addr:0x0212fbc0 +_ZGVN15ProfileInstanceI19ActorProfileUnkSTLFE8sProfileE kind:bss addr:0x0212f980 +@31599 kind:bss addr:0x0212f98c +_ZN15ProfileInstanceI19ActorProfileUnkSTLFE8sProfileE kind:bss addr:0x0212f998 +_ZGVN15ProfileInstanceI19ActorProfileUnkSTFHE8sProfileE kind:bss addr:0x0212fa70 +@31605 kind:bss addr:0x0212fa74 +_ZN15ProfileInstanceI19ActorProfileUnkSTFHE8sProfileE kind:bss addr:0x0212fa80 +_ZGVN15ProfileInstanceI19ActorProfileUnkSTFBE8sProfileE kind:bss addr:0x0212fb58 +@31611 kind:bss addr:0x0212fb5c +_ZN15ProfileInstanceI19ActorProfileUnkSTFBE8sProfileE kind:bss addr:0x0212fb68 +_ZGVN15ProfileInstanceI19ActorProfileUnkSHDLE8sProfileE kind:bss addr:0x0212fbac +@31617 kind:bss addr:0x0212fbb4 +_ZN15ProfileInstanceI19ActorProfileUnkSHDLE8sProfileE kind:bss addr:0x0212fbc0 data_ov043_0212fc00 kind:bss addr:0x0212fc00 data_ov043_0212fc40 kind:bss addr:0x0212fc40 diff --git a/config/jp/arm9/overlays/ov044/delinks.txt b/config/jp/arm9/overlays/ov044/delinks.txt index 2b220abc..7340336d 100644 --- a/config/jp/arm9/overlays/ov044/delinks.txt +++ b/config/jp/arm9/overlays/ov044/delinks.txt @@ -9,37 +9,37 @@ src/044_MapB5/Actor/ActorUnkICBB.cpp: .text start:0x02127c8c end:0x0212c24c .init start:0x0212e91c end:0x0212e980 .ctor start:0x0212eb8c end:0x0212eb90 - .bss start:0x0212f4e0 end:0x0212f5b8 + .bss start:0x0212f4c8 end:0x0212f5b8 src/044_MapB5/Actor/ActorUnkIBBA.cpp: .text start:0x0212c24c end:0x0212d510 .init start:0x0212e980 end:0x0212e9f4 .ctor start:0x0212eb90 end:0x0212eb94 - .bss start:0x0212f5c8 end:0x0212f604 + .bss start:0x0212f5b8 end:0x0212f624 src/044_MapB5/Actor/ActorUnkIBSP.cpp: .text start:0x0212d510 end:0x0212d9d0 .init start:0x0212e9f4 end:0x0212ea44 .ctor start:0x0212eb94 end:0x0212eb98 - .bss start:0x0212f634 end:0x0212f670 + .bss start:0x0212f624 end:0x0212f670 src/044_MapB5/Actor/ActorUnkRBL2.cpp: .text start:0x0212db48 end:0x0212dfa8 .init start:0x0212ea44 end:0x0212ea94 .ctor start:0x0212eb98 end:0x0212eb9c - .bss start:0x0212f680 end:0x0212f758 + .bss start:0x0212f670 end:0x0212f768 src/044_MapB5/Actor/ActorUnkL2V1.cpp: .text start:0x0212dfa8 end:0x0212e444 .init start:0x0212ea94 end:0x0212eae4 .ctor start:0x0212eb9c end:0x0212eba0 - .bss start:0x0212f838 end:0x0212f910 + .bss start:0x0212f768 end:0x0212f910 src/044_MapB5/Actor/ActorUnkL2V2.cpp: .text start:0x0212e444 end:0x0212e688 .init start:0x0212eae4 end:0x0212eb34 .ctor start:0x0212eba0 end:0x0212eba4 - .bss start:0x0212f920 end:0x0212f9f8 + .bss start:0x0212f910 end:0x0212f9f8 src/044_MapB5/Actor/ActorUnkL2MT.cpp: .text start:0x0212e688 end:0x0212e7f4 diff --git a/config/jp/arm9/overlays/ov044/symbols.txt b/config/jp/arm9/overlays/ov044/symbols.txt index 96ad57c8..867814c8 100644 --- a/config/jp/arm9/overlays/ov044/symbols.txt +++ b/config/jp/arm9/overlays/ov044/symbols.txt @@ -295,27 +295,27 @@ data_ov044_0212f3e8 kind:bss addr:0x0212f3e8 data_ov044_0212f450 kind:bss addr:0x0212f450 data_ov044_0212f4b8 kind:bss addr:0x0212f4b8 data_ov044_0212f4bc kind:bss addr:0x0212f4bc -data_ov044_0212f4c8 kind:bss addr:0x0212f4c8 -data_ov044_0212f4d4 kind:bss addr:0x0212f4d4 -sActorProfileUnkICBB kind:bss addr:0x0212f4e0 -data_ov044_0212f5b8 kind:bss addr:0x0212f5b8 -data_ov044_0212f5bc kind:bss addr:0x0212f5bc -sActorProfileUnkIBBA kind:bss addr:0x0212f5c8 +_ZGVN15ProfileInstanceI19ActorProfileUnkICBBE8sProfileE kind:bss addr:0x0212f4c8 +@31629 kind:bss addr:0x0212f4d4 +_ZN15ProfileInstanceI19ActorProfileUnkICBBE8sProfileE kind:bss addr:0x0212f4e0 +_ZGVN15ProfileInstanceI19ActorProfileUnkIBBAE8sProfileE kind:bss addr:0x0212f5b8 +@31635 kind:bss addr:0x0212f5bc +_ZN15ProfileInstanceI19ActorProfileUnkIBBAE8sProfileE kind:bss addr:0x0212f5c8 data_ov044_0212f604 kind:bss addr:0x0212f604 -data_ov044_0212f624 kind:bss addr:0x0212f624 -data_ov044_0212f628 kind:bss addr:0x0212f628 -sActorProfileUnkIBSP kind:bss addr:0x0212f634 -data_ov044_0212f670 kind:bss addr:0x0212f670 -data_ov044_0212f674 kind:bss addr:0x0212f674 -sActorProfileUnkRBL2 kind:bss addr:0x0212f680 +_ZGVN15ProfileInstanceI19ActorProfileUnkIBSPE8sProfileE kind:bss addr:0x0212f624 +@31641 kind:bss addr:0x0212f628 +_ZN15ProfileInstanceI19ActorProfileUnkIBSPE8sProfileE kind:bss addr:0x0212f634 +_ZGVN15ProfileInstanceI19ActorProfileUnkRBL2E8sProfileE kind:bss addr:0x0212f670 +@31647 kind:bss addr:0x0212f674 +_ZN15ProfileInstanceI19ActorProfileUnkRBL2E8sProfileE kind:bss addr:0x0212f680 data_ov044_0212f758 kind:bss addr:0x0212f758 data_ov044_0212f75c kind:bss addr:0x0212f75c -data_ov044_0212f768 kind:bss addr:0x0212f768 -data_ov044_0212f7d0 kind:bss addr:0x0212f7d0 -sActorProfileUnkL2V1 kind:bss addr:0x0212f838 -data_ov044_0212f910 kind:bss addr:0x0212f910 -data_ov044_0212f914 kind:bss addr:0x0212f914 -sActorProfileUnkL2V2 kind:bss addr:0x0212f920 +_ZGVN15ProfileInstanceI19ActorProfileUnkL2V1E8sProfileE kind:bss addr:0x0212f768 +@31653 kind:bss addr:0x0212f7d0 +_ZN15ProfileInstanceI19ActorProfileUnkL2V1E8sProfileE kind:bss addr:0x0212f838 +_ZGVN15ProfileInstanceI19ActorProfileUnkL2V2E8sProfileE kind:bss addr:0x0212f910 +@31659 kind:bss addr:0x0212f914 +_ZN15ProfileInstanceI19ActorProfileUnkL2V2E8sProfileE kind:bss addr:0x0212f920 data_ov044_0212f9f8 kind:bss addr:0x0212f9f8 data_ov044_0212f9fc kind:bss addr:0x0212f9fc -sActorProfileUnkL2MT kind:bss addr:0x0212fa08 +_ZN15ProfileInstanceI19ActorProfileUnkL2MTE8sProfileE kind:bss addr:0x0212fa08 diff --git a/config/jp/arm9/overlays/ov045/delinks.txt b/config/jp/arm9/overlays/ov045/delinks.txt index 53e3c453..82c6dc12 100644 --- a/config/jp/arm9/overlays/ov045/delinks.txt +++ b/config/jp/arm9/overlays/ov045/delinks.txt @@ -9,31 +9,31 @@ src/045_MapB6/Actor/ActorUnkRMBD.cpp: .text start:0x02125280 end:0x02125f48 .init start:0x0212b3e0 end:0x0212b624 .ctor start:0x0212b894 end:0x0212b898 - .bss start:0x0212c010 end:0x0212c0e8 + .bss start:0x0212c000 end:0x0212c0fc src/045_MapB6/Actor/ActorUnkBDGA.cpp: .text start:0x02125f48 end:0x02129678 .init start:0x0212b624 end:0x0212b754 .ctor start:0x0212b898 end:0x0212b89c - .bss start:0x0212c10c end:0x0212c1e4 + .bss start:0x0212c0fc end:0x0212c1e4 src/045_MapB6/Actor/ActorUnkBDBA.cpp: .text start:0x02129678 end:0x0212a0c0 .init start:0x0212b754 end:0x0212b7a4 .ctor start:0x0212b89c end:0x0212b8a0 - .bss start:0x0212c1f4 end:0x0212c24c + .bss start:0x0212c1e4 end:0x0212c2cc src/045_MapB6/Actor/ActorUnkBDLB.cpp: .text start:0x0212a0c0 end:0x0212ac7c .init start:0x0212b7a4 end:0x0212b7f4 .ctor start:0x0212b8a0 end:0x0212b8a4 - .bss start:0x0212c2dc end:0x0212c3b4 + .bss start:0x0212c2cc end:0x0212c3b4 src/045_MapB6/Actor/ActorUnkWPCL.cpp: .text start:0x0212ac7c end:0x0212ae08 .init start:0x0212b7f4 end:0x0212b844 .ctor start:0x0212b8a4 end:0x0212b8a8 - .bss start:0x0212c3c4 end:0x0212c400 + .bss start:0x0212c3b4 end:0x0212c400 src/045_MapB6/MapObject/MapObjectUnkRDSD.cpp: .text start:0x0212ae08 end:0x0212b15c diff --git a/config/jp/arm9/overlays/ov045/symbols.txt b/config/jp/arm9/overlays/ov045/symbols.txt index 4ff48bc7..99e532bc 100644 --- a/config/jp/arm9/overlays/ov045/symbols.txt +++ b/config/jp/arm9/overlays/ov045/symbols.txt @@ -235,23 +235,23 @@ _ZTV19data_ov045_0212bef0 kind:data(any) addr:0x0212bef0 data_ov045_0212bf54 kind:data(any) addr:0x0212bf54 data_ov045_0212bf7c kind:data(any) addr:0x0212bf7c data_ov045_0212bfec kind:data(any) addr:0x0212bfec -data_ov045_0212c000 kind:bss addr:0x0212c000 -data_ov045_0212c004 kind:bss addr:0x0212c004 -sActorProfileUnkRMBD kind:bss addr:0x0212c010 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMBDE8sProfileE kind:bss addr:0x0212c000 +@31676 kind:bss addr:0x0212c004 +_ZN15ProfileInstanceI19ActorProfileUnkRMBDE8sProfileE kind:bss addr:0x0212c010 data_ov045_0212c0e8 kind:bss addr:0x0212c0e8 -data_ov045_0212c0fc kind:bss addr:0x0212c0fc -data_ov045_0212c100 kind:bss addr:0x0212c100 -sActorProfileUnkBDGA kind:bss addr:0x0212c10c -data_ov045_0212c1e4 kind:bss addr:0x0212c1e4 -data_ov045_0212c1e8 kind:bss addr:0x0212c1e8 -sActorProfileUnkBDBA kind:bss addr:0x0212c1f4 +_ZGVN15ProfileInstanceI19ActorProfileUnkBDGAE8sProfileE kind:bss addr:0x0212c0fc +@31682 kind:bss addr:0x0212c100 +_ZN15ProfileInstanceI19ActorProfileUnkBDGAE8sProfileE kind:bss addr:0x0212c10c +_ZGVN15ProfileInstanceI19ActorProfileUnkBDBAE8sProfileE kind:bss addr:0x0212c1e4 +@31688 kind:bss addr:0x0212c1e8 +_ZN15ProfileInstanceI19ActorProfileUnkBDBAE8sProfileE kind:bss addr:0x0212c1f4 data_ov045_0212c24c kind:bss addr:0x0212c24c ambiguous -data_ov045_0212c2cc kind:bss addr:0x0212c2cc -data_ov045_0212c2d0 kind:bss addr:0x0212c2d0 -sActorProfileUnkBDLB kind:bss addr:0x0212c2dc -data_ov045_0212c3b4 kind:bss addr:0x0212c3b4 -data_ov045_0212c3b8 kind:bss addr:0x0212c3b8 -sActorProfileUnkWPCL kind:bss addr:0x0212c3c4 +_ZGVN15ProfileInstanceI19ActorProfileUnkBDLBE8sProfileE kind:bss addr:0x0212c2cc +@31694 kind:bss addr:0x0212c2d0 +_ZN15ProfileInstanceI19ActorProfileUnkBDLBE8sProfileE kind:bss addr:0x0212c2dc +_ZGVN15ProfileInstanceI19ActorProfileUnkWPCLE8sProfileE kind:bss addr:0x0212c3b4 +@31700 kind:bss addr:0x0212c3b8 +_ZN15ProfileInstanceI19ActorProfileUnkWPCLE8sProfileE kind:bss addr:0x0212c3c4 data_ov045_0212c400 kind:bss addr:0x0212c400 data_ov045_0212c404 kind:bss addr:0x0212c404 -sMapObjectProfileUnkRDSD kind:bss addr:0x0212c410 +_ZN15ProfileInstanceI23MapObjectProfileUnkRDSDE8sProfileE kind:bss addr:0x0212c410 diff --git a/config/jp/arm9/overlays/ov046/delinks.txt b/config/jp/arm9/overlays/ov046/delinks.txt index 931f5a87..2493766c 100644 --- a/config/jp/arm9/overlays/ov046/delinks.txt +++ b/config/jp/arm9/overlays/ov046/delinks.txt @@ -9,28 +9,28 @@ src/046_MapB7/Actor/ActorUnkWTTH.cpp: .text start:0x02125280 end:0x02126bd8 .init start:0x0212bae0 end:0x0212bb68 .ctor start:0x0212bd70 end:0x0212bd74 - .bss start:0x0212c530 end:0x0212c608 + .bss start:0x0212c520 end:0x0212c608 src/046_MapB7/Actor/ActorUnkWTH2.cpp: .text start:0x02126bd8 end:0x02128314 .init start:0x0212bb68 end:0x0212bc20 .ctor start:0x0212bd74 end:0x0212bd78 - .bss start:0x0212c618 end:0x0212c648 + .bss start:0x0212c608 end:0x0212c6f0 src/046_MapB7/Actor/ActorUnkWTH3.cpp: .text start:0x02128314 end:0x02129650 .init start:0x0212bc20 end:0x0212bcd0 .ctor start:0x0212bd78 end:0x0212bd7c - .bss start:0x0212c700 end:0x0212c76c + .bss start:0x0212c6f0 end:0x0212c7d8 src/046_MapB7/Actor/ActorUnkWBTN.cpp: .text start:0x02129650 end:0x0212a6a0 .init start:0x0212bcd0 end:0x0212bd20 .ctor start:0x0212bd7c end:0x0212bd80 - .bss start:0x0212c7e8 end:0x0212c7ec + .bss start:0x0212c7d8 end:0x0212c8c0 src/046_MapB7/Actor/ActorUnkWBN2.cpp: .text start:0x0212a6a0 end:0x0212b408 .init start:0x0212bd20 end:0x0212bd70 .ctor start:0x0212bd80 end:0x0212bd84 - .bss start:0x0212c8d0 end:0x0212c8d4 + .bss start:0x0212c8c0 end:0x0212c8d4 diff --git a/config/jp/arm9/overlays/ov046/symbols.txt b/config/jp/arm9/overlays/ov046/symbols.txt index 0471fdce..02819947 100644 --- a/config/jp/arm9/overlays/ov046/symbols.txt +++ b/config/jp/arm9/overlays/ov046/symbols.txt @@ -256,22 +256,22 @@ data_ov046_0212c428 kind:data(any) addr:0x0212c428 _ZTV19data_ov046_0212c43c kind:data(any) addr:0x0212c43c data_ov046_0212c460 kind:data(any) addr:0x0212c460 _ZTV19data_ov046_0212c4b0 kind:data(any) addr:0x0212c4b0 -data_ov046_0212c520 kind:bss addr:0x0212c520 -data_ov046_0212c524 kind:bss addr:0x0212c524 -sActorProfileUnkWTTH kind:bss addr:0x0212c530 -data_ov046_0212c608 kind:bss addr:0x0212c608 -data_ov046_0212c60c kind:bss addr:0x0212c60c -sActorProfileUnkWTH2 kind:bss addr:0x0212c618 +_ZGVN15ProfileInstanceI19ActorProfileUnkWTTHE8sProfileE kind:bss addr:0x0212c520 +@31717 kind:bss addr:0x0212c524 +_ZN15ProfileInstanceI19ActorProfileUnkWTTHE8sProfileE kind:bss addr:0x0212c530 +_ZGVN15ProfileInstanceI19ActorProfileUnkWTH2E8sProfileE kind:bss addr:0x0212c608 +@31723 kind:bss addr:0x0212c60c +_ZN15ProfileInstanceI19ActorProfileUnkWTH2E8sProfileE kind:bss addr:0x0212c618 data_ov046_0212c648 kind:bss addr:0x0212c648 ambiguous -data_ov046_0212c6f0 kind:bss addr:0x0212c6f0 -data_ov046_0212c6f4 kind:bss addr:0x0212c6f4 -sActorProfileUnkWTH3 kind:bss addr:0x0212c700 +_ZGVN15ProfileInstanceI19ActorProfileUnkWTH3E8sProfileE kind:bss addr:0x0212c6f0 +@31729 kind:bss addr:0x0212c6f4 +_ZN15ProfileInstanceI19ActorProfileUnkWTH3E8sProfileE kind:bss addr:0x0212c700 data_ov046_0212c76c kind:bss addr:0x0212c76c ambiguous -data_ov046_0212c7d8 kind:bss addr:0x0212c7d8 -data_ov046_0212c7dc kind:bss addr:0x0212c7dc -sActorProfileUnkWBTN kind:bss addr:0x0212c7e8 +_ZGVN15ProfileInstanceI19ActorProfileUnkWBTNE8sProfileE kind:bss addr:0x0212c7d8 +@31735 kind:bss addr:0x0212c7dc +_ZN15ProfileInstanceI19ActorProfileUnkWBTNE8sProfileE kind:bss addr:0x0212c7e8 data_ov046_0212c7ec kind:bss addr:0x0212c7ec -data_ov046_0212c8c0 kind:bss addr:0x0212c8c0 -data_ov046_0212c8c4 kind:bss addr:0x0212c8c4 -sActorProfileUnkWBN2 kind:bss addr:0x0212c8d0 +_ZGVN15ProfileInstanceI19ActorProfileUnkWBN2E8sProfileE kind:bss addr:0x0212c8c0 +@31741 kind:bss addr:0x0212c8c4 +_ZN15ProfileInstanceI19ActorProfileUnkWBN2E8sProfileE kind:bss addr:0x0212c8d0 data_ov046_0212c8d4 kind:bss addr:0x0212c8d4 diff --git a/config/jp/arm9/overlays/ov047/delinks.txt b/config/jp/arm9/overlays/ov047/delinks.txt index 5f5f818b..47ca968f 100644 --- a/config/jp/arm9/overlays/ov047/delinks.txt +++ b/config/jp/arm9/overlays/ov047/delinks.txt @@ -9,19 +9,19 @@ src/047_MapC1/Actor/ActorUnkGHOS.cpp: .text start:0x02132e98 end:0x02136bcc .init start:0x021377ec end:0x0213783c .ctor start:0x02137930 end:0x02137934 - .bss start:0x02137e10 end:0x02137e2c + .bss start:0x02137e00 end:0x02137ee8 src/047_MapC1/Actor/ActorUnkEVCH.cpp: .text start:0x02136bcc end:0x02136eb0 .init start:0x0213783c end:0x0213788c .ctor start:0x02137934 end:0x02137938 - .bss start:0x02137ef8 end:0x02137f34 + .bss start:0x02137ee8 end:0x02137f34 src/047_MapC1/Actor/ActorUnkFLDK.cpp: .text start:0x02136eb0 end:0x021370f8 .init start:0x0213788c end:0x021378dc .ctor start:0x02137938 end:0x0213793c - .bss start:0x02137f44 end:0x02137f80 + .bss start:0x02137f34 end:0x02137f80 src/047_MapC1/Actor/ActorUnkDLTG.cpp: .text start:0x02137188 end:0x02137550 diff --git a/config/jp/arm9/overlays/ov047/symbols.txt b/config/jp/arm9/overlays/ov047/symbols.txt index 61c0e73c..66a10c40 100644 --- a/config/jp/arm9/overlays/ov047/symbols.txt +++ b/config/jp/arm9/overlays/ov047/symbols.txt @@ -167,17 +167,17 @@ _ZTV19data_ov047_02137cf0 kind:data(any) addr:0x02137cf0 _ZTV19data_ov047_02137d14 kind:data(any) addr:0x02137d14 _ZTV19data_ov047_02137d70 kind:data(any) addr:0x02137d70 _ZTV19data_ov047_02137d94 kind:data(any) addr:0x02137d94 -data_ov047_02137e00 kind:bss addr:0x02137e00 -data_ov047_02137e04 kind:bss addr:0x02137e04 -sActorProfileUnkGHOS kind:bss addr:0x02137e10 +_ZGVN15ProfileInstanceI19ActorProfileUnkGHOSE8sProfileE kind:bss addr:0x02137e00 +@31753 kind:bss addr:0x02137e04 +_ZN15ProfileInstanceI19ActorProfileUnkGHOSE8sProfileE kind:bss addr:0x02137e10 data_ov047_02137e2c kind:bss addr:0x02137e2c ambiguous data_ov047_02137e74 kind:bss addr:0x02137e74 ambiguous -data_ov047_02137ee8 kind:bss addr:0x02137ee8 -data_ov047_02137eec kind:bss addr:0x02137eec -sActorProfileUnkEVCH kind:bss addr:0x02137ef8 -data_ov047_02137f34 kind:bss addr:0x02137f34 -data_ov047_02137f38 kind:bss addr:0x02137f38 -sActorProfileUnkFLDK kind:bss addr:0x02137f44 +_ZGVN15ProfileInstanceI19ActorProfileUnkEVCHE8sProfileE kind:bss addr:0x02137ee8 +@31759 kind:bss addr:0x02137eec +_ZN15ProfileInstanceI19ActorProfileUnkEVCHE8sProfileE kind:bss addr:0x02137ef8 +_ZGVN15ProfileInstanceI19ActorProfileUnkFLDKE8sProfileE kind:bss addr:0x02137f34 +@31765 kind:bss addr:0x02137f38 +_ZN15ProfileInstanceI19ActorProfileUnkFLDKE8sProfileE kind:bss addr:0x02137f44 data_ov047_02137f80 kind:bss addr:0x02137f80 data_ov047_02137f84 kind:bss addr:0x02137f84 -sActorProfileUnkDLTG kind:bss addr:0x02137f90 +_ZN15ProfileInstanceI19ActorProfileUnkDLTGE8sProfileE kind:bss addr:0x02137f90 diff --git a/config/jp/arm9/overlays/ov048/delinks.txt b/config/jp/arm9/overlays/ov048/delinks.txt index 00f4fc25..0aaf50ea 100644 --- a/config/jp/arm9/overlays/ov048/delinks.txt +++ b/config/jp/arm9/overlays/ov048/delinks.txt @@ -9,16 +9,16 @@ src/048_MapC2/Actor/ActorUnkPSBK.cpp: .text start:0x02132600 end:0x02133b4c .init start:0x02138f28 end:0x02138fa0 .ctor start:0x02139050 end:0x02139054 - .bss start:0x02139544 end:0x0213961c + .bss start:0x02139520 end:0x021396f8 src/048_MapC2/Actor/ActorUnkPBK2.cpp: .text start:0x02133b4c end:0x0213565c .init start:0x02138fa0 end:0x02138ff0 .ctor start:0x02139054 end:0x02139058 - .bss start:0x02139710 end:0x021397e8 + .bss start:0x021396f8 end:0x021397ec src/048_MapC2/MapObject/MapObjectUnkDRTW.cpp: .text start:0x0213565c end:0x021363fc .init start:0x02138ff0 end:0x0213904c .ctor start:0x02139058 end:0x0213905c - .bss start:0x02139804 end:0x02139824 + .bss start:0x021397ec end:0x02139824 diff --git a/config/jp/arm9/overlays/ov048/symbols.txt b/config/jp/arm9/overlays/ov048/symbols.txt index ab16365c..efa3525d 100644 --- a/config/jp/arm9/overlays/ov048/symbols.txt +++ b/config/jp/arm9/overlays/ov048/symbols.txt @@ -205,16 +205,16 @@ data_ov048_021394cc kind:data(any) addr:0x021394cc data_ov048_02139500 kind:bss addr:0x02139500 data_ov048_0213950c kind:bss addr:0x0213950c data_ov048_02139514 kind:bss addr:0x02139514 -data_ov048_02139520 kind:bss addr:0x02139520 -data_ov048_0213952c kind:bss addr:0x0213952c -sActorProfileUnkPSBK kind:bss addr:0x02139544 +_ZGVN15ProfileInstanceI19ActorProfileUnkPSBKE8sProfileE kind:bss addr:0x02139520 +@31782 kind:bss addr:0x0213952c +_ZN15ProfileInstanceI19ActorProfileUnkPSBKE8sProfileE kind:bss addr:0x02139544 data_ov048_0213961c kind:bss addr:0x0213961c -data_ov048_021396f8 kind:bss addr:0x021396f8 -data_ov048_02139704 kind:bss addr:0x02139704 -sActorProfileUnkPBK2 kind:bss addr:0x02139710 +_ZGVN15ProfileInstanceI19ActorProfileUnkPBK2E8sProfileE kind:bss addr:0x021396f8 +@31788 kind:bss addr:0x02139704 +_ZN15ProfileInstanceI19ActorProfileUnkPBK2E8sProfileE kind:bss addr:0x02139710 data_ov048_021397e8 kind:bss addr:0x021397e8 -data_ov048_021397ec kind:bss addr:0x021397ec -data_ov048_021397f8 kind:bss addr:0x021397f8 -sMapObjectProfileUnkDRTW kind:bss addr:0x02139804 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkDRTWE8sProfileE kind:bss addr:0x021397ec +@31529 kind:bss addr:0x021397f8 +_ZN15ProfileInstanceI23MapObjectProfileUnkDRTWE8sProfileE kind:bss addr:0x02139804 data_ov048_02139824 kind:bss addr:0x02139824 data_ov048_021398d8 kind:bss addr:0x021398d8 diff --git a/config/jp/arm9/overlays/ov049/delinks.txt b/config/jp/arm9/overlays/ov049/delinks.txt index c8b188dd..7850307e 100644 --- a/config/jp/arm9/overlays/ov049/delinks.txt +++ b/config/jp/arm9/overlays/ov049/delinks.txt @@ -9,31 +9,31 @@ src/049_MapC3/Actor/ActorUnkBEEE.cpp: .text start:0x02131ec0 end:0x02132e98 .init start:0x021385bc end:0x0213860c .ctor start:0x02138d14 end:0x02138d18 - .bss start:0x02139a50 end:0x02139b28 + .bss start:0x02139a40 end:0x02139b28 src/049_MapC3/Actor/ActorUnkBEEH.cpp: .text start:0x02132e98 end:0x02133b0c .init start:0x0213860c end:0x0213865c .ctor start:0x02138d18 end:0x02138d1c - .bss start:0x02139b38 end:0x02139c10 + .bss start:0x02139b28 end:0x02139c10 src/049_MapC3/Actor/ActorUnkCROW.cpp: .text start:0x02133b0c end:0x02135b84 .init start:0x0213865c end:0x021386ac .ctor start:0x02138d1c end:0x02138d20 - .bss start:0x02139c20 end:0x02139cf8 + .bss start:0x02139c10 end:0x02139cf8 src/049_MapC3/Actor/ActorUnkCRCH.cpp: .text start:0x02135b84 end:0x02135e9c .init start:0x021386ac end:0x021386fc .ctor start:0x02138d20 end:0x02138d24 - .bss start:0x02139d08 end:0x02139d44 + .bss start:0x02139cf8 end:0x02139d44 src/049_MapC3/Actor/ActorUnkPOST.cpp: .text start:0x0213620c end:0x02136c74 .init start:0x021386fc end:0x02138a08 .ctor start:0x02138d24 end:0x02138d28 - .bss start:0x02139d54 end:0x02139e2c + .bss start:0x02139d44 end:0x02139e2c src/049_MapC3/Actor/ActorUnkPTMN.cpp: .text start:0x02136f94 end:0x0213858c diff --git a/config/jp/arm9/overlays/ov049/symbols.txt b/config/jp/arm9/overlays/ov049/symbols.txt index a1eab102..f346d051 100644 --- a/config/jp/arm9/overlays/ov049/symbols.txt +++ b/config/jp/arm9/overlays/ov049/symbols.txt @@ -328,21 +328,21 @@ data_ov049_02139a00 kind:data(any) addr:0x02139a00 data_ov049_02139a10 kind:data(any) addr:0x02139a10 data_ov049_02139a20 kind:data(any) addr:0x02139a20 data_ov049_02139a30 kind:data(any) addr:0x02139a30 -data_ov049_02139a40 kind:bss addr:0x02139a40 -data_ov049_02139a44 kind:bss addr:0x02139a44 -sActorProfileUnkBEEE kind:bss addr:0x02139a50 -data_ov049_02139b28 kind:bss addr:0x02139b28 -data_ov049_02139b2c kind:bss addr:0x02139b2c -sActorProfileUnkBEEH kind:bss addr:0x02139b38 -data_ov049_02139c10 kind:bss addr:0x02139c10 -data_ov049_02139c14 kind:bss addr:0x02139c14 -sActorProfileUnkCROW kind:bss addr:0x02139c20 -data_ov049_02139cf8 kind:bss addr:0x02139cf8 -data_ov049_02139cfc kind:bss addr:0x02139cfc -sActorProfileUnkCRCH kind:bss addr:0x02139d08 -data_ov049_02139d44 kind:bss addr:0x02139d44 -data_ov049_02139d48 kind:bss addr:0x02139d48 -sActorProfileUnkPOST kind:bss addr:0x02139d54 +_ZGVN15ProfileInstanceI19ActorProfileUnkBEEEE8sProfileE kind:bss addr:0x02139a40 +@31806 kind:bss addr:0x02139a44 +_ZN15ProfileInstanceI19ActorProfileUnkBEEEE8sProfileE kind:bss addr:0x02139a50 +_ZGVN15ProfileInstanceI19ActorProfileUnkBEEHE8sProfileE kind:bss addr:0x02139b28 +@31812 kind:bss addr:0x02139b2c +_ZN15ProfileInstanceI19ActorProfileUnkBEEHE8sProfileE kind:bss addr:0x02139b38 +_ZGVN15ProfileInstanceI19ActorProfileUnkCROWE8sProfileE kind:bss addr:0x02139c10 +@31818 kind:bss addr:0x02139c14 +_ZN15ProfileInstanceI19ActorProfileUnkCROWE8sProfileE kind:bss addr:0x02139c20 +_ZGVN15ProfileInstanceI19ActorProfileUnkCRCHE8sProfileE kind:bss addr:0x02139cf8 +@31824 kind:bss addr:0x02139cfc +_ZN15ProfileInstanceI19ActorProfileUnkCRCHE8sProfileE kind:bss addr:0x02139d08 +_ZGVN15ProfileInstanceI19ActorProfileUnkPOSTE8sProfileE kind:bss addr:0x02139d44 +@31830 kind:bss addr:0x02139d48 +_ZN15ProfileInstanceI19ActorProfileUnkPOSTE8sProfileE kind:bss addr:0x02139d54 data_ov049_02139e2c kind:bss addr:0x02139e2c data_ov049_02139e30 kind:bss addr:0x02139e30 -sActorProfileUnkPTMN kind:bss addr:0x02139e3c +_ZN15ProfileInstanceI19ActorProfileUnkPTMNE8sProfileE kind:bss addr:0x02139e3c diff --git a/config/jp/arm9/overlays/ov050/delinks.txt b/config/jp/arm9/overlays/ov050/delinks.txt index 7604a283..9d8c55e2 100644 --- a/config/jp/arm9/overlays/ov050/delinks.txt +++ b/config/jp/arm9/overlays/ov050/delinks.txt @@ -9,19 +9,19 @@ src/050_MapC4/Actor/ActorUnkKMOS.cpp: .text start:0x02131ec0 end:0x021348e0 .init start:0x0213842c end:0x02138488 .ctor start:0x021385a0 end:0x021385a4 - .bss start:0x02138cbc end:0x02138d94 + .bss start:0x02138ca4 end:0x02138d94 src/050_MapC4/Actor/ActorUnkKMOH.cpp: .text start:0x021348e0 end:0x02136d34 .init start:0x02138488 end:0x021384f0 .ctor start:0x021385a4 end:0x021385a8 - .bss start:0x02138da4 end:0x02138e7c + .bss start:0x02138d94 end:0x02138e7c src/050_MapC4/Actor/ActorUnkFRTN.cpp: .text start:0x02136d34 end:0x02137e74 .init start:0x021384f0 end:0x02138550 .ctor start:0x021385a8 end:0x021385ac - .bss start:0x02138e98 end:0x02138f70 + .bss start:0x02138e7c end:0x02138f70 src/050_MapC4/MapObject/MapObjectUnkGTTN.cpp: .text start:0x02137e74 end:0x0213840c diff --git a/config/jp/arm9/overlays/ov050/symbols.txt b/config/jp/arm9/overlays/ov050/symbols.txt index 4b4cda00..461c530a 100644 --- a/config/jp/arm9/overlays/ov050/symbols.txt +++ b/config/jp/arm9/overlays/ov050/symbols.txt @@ -223,15 +223,15 @@ data_ov050_02138bf8 kind:data(any) addr:0x02138bf8 data_ov050_02138c20 kind:data(any) addr:0x02138c20 data_ov050_02138c4c kind:data(any) addr:0x02138c4c data_ov050_02138ca0 kind:bss addr:0x02138ca0 -data_ov050_02138ca4 kind:bss addr:0x02138ca4 -data_ov050_02138cb0 kind:bss addr:0x02138cb0 -sActorProfileUnkKMOS kind:bss addr:0x02138cbc -data_ov050_02138d94 kind:bss addr:0x02138d94 -data_ov050_02138d98 kind:bss addr:0x02138d98 -sActorProfileUnkKMOH kind:bss addr:0x02138da4 -data_ov050_02138e7c kind:bss addr:0x02138e7c -data_ov050_02138e80 kind:bss addr:0x02138e80 -sActorProfileUnkFRTN kind:bss addr:0x02138e98 +_ZGVN15ProfileInstanceI19ActorProfileUnkKMOSE8sProfileE kind:bss addr:0x02138ca4 +@31847 kind:bss addr:0x02138cb0 +_ZN15ProfileInstanceI19ActorProfileUnkKMOSE8sProfileE kind:bss addr:0x02138cbc +_ZGVN15ProfileInstanceI19ActorProfileUnkKMOHE8sProfileE kind:bss addr:0x02138d94 +@31853 kind:bss addr:0x02138d98 +_ZN15ProfileInstanceI19ActorProfileUnkKMOHE8sProfileE kind:bss addr:0x02138da4 +_ZGVN15ProfileInstanceI19ActorProfileUnkFRTNE8sProfileE kind:bss addr:0x02138e7c +@31859 kind:bss addr:0x02138e80 +_ZN15ProfileInstanceI19ActorProfileUnkFRTNE8sProfileE kind:bss addr:0x02138e98 data_ov050_02138f70 kind:bss addr:0x02138f70 data_ov050_02138f74 kind:bss addr:0x02138f74 -sMapObjectProfileUnkGTTN kind:bss addr:0x02138f80 +_ZN15ProfileInstanceI23MapObjectProfileUnkGTTNE8sProfileE kind:bss addr:0x02138f80 diff --git a/config/jp/arm9/overlays/ov051/symbols.txt b/config/jp/arm9/overlays/ov051/symbols.txt index d2a360f4..60772641 100644 --- a/config/jp/arm9/overlays/ov051/symbols.txt +++ b/config/jp/arm9/overlays/ov051/symbols.txt @@ -131,4 +131,4 @@ data_ov051_02138b90 kind:data(any) addr:0x02138b90 data_ov051_02138ba8 kind:data(any) addr:0x02138ba8 data_ov051_02138bc0 kind:bss addr:0x02138bc0 data_ov051_02138bc4 kind:bss addr:0x02138bc4 -sActorProfileUnkGYAM kind:bss addr:0x02138bd0 +_ZN15ProfileInstanceI19ActorProfileUnkGYAME8sProfileE kind:bss addr:0x02138bd0 diff --git a/config/jp/arm9/overlays/ov052/delinks.txt b/config/jp/arm9/overlays/ov052/delinks.txt index 93cfd7a6..8a7cd30b 100644 --- a/config/jp/arm9/overlays/ov052/delinks.txt +++ b/config/jp/arm9/overlays/ov052/delinks.txt @@ -9,19 +9,19 @@ src/052_MapC6/Actor/ActorUnkSTLW.cpp: .text start:0x02131ec0 end:0x02134b84 .init start:0x021377e4 end:0x021378c4 .ctor start:0x02137a8c end:0x02137a90 - .bss start:0x02138458 end:0x02138530 + .bss start:0x02138440 end:0x02138530 src/052_MapC6/Actor/ActorUnkSTWH.cpp: .text start:0x02134b84 end:0x021367a4 .init start:0x021378c4 end:0x021379ac .ctor start:0x02137a90 end:0x02137a94 - .bss start:0x02138540 end:0x02138618 + .bss start:0x02138530 end:0x02138618 src/052_MapC6/Actor/ActorUnkNAVI.cpp: .text start:0x021367a4 end:0x021375a4 .init start:0x021379ac end:0x02137a3c .ctor start:0x02137a94 end:0x02137a98 - .bss start:0x02138628 end:0x02138700 + .bss start:0x02138618 end:0x02138700 src/052_MapC6/Actor/ActorUnkPTSW.cpp: .text start:0x021375a4 end:0x021377bc diff --git a/config/jp/arm9/overlays/ov052/symbols.txt b/config/jp/arm9/overlays/ov052/symbols.txt index 68dd6af9..7f08ce4b 100644 --- a/config/jp/arm9/overlays/ov052/symbols.txt +++ b/config/jp/arm9/overlays/ov052/symbols.txt @@ -217,15 +217,15 @@ _ZTV19data_ov052_02138188 kind:data(any) addr:0x02138188 _ZTV19data_ov052_021382a4 kind:data(any) addr:0x021382a4 _ZTV19data_ov052_021383c0 kind:data(any) addr:0x021383c0 _ZTV19data_ov052_021383e4 kind:data(any) addr:0x021383e4 -data_ov052_02138440 kind:bss addr:0x02138440 -data_ov052_0213844c kind:bss addr:0x0213844c -sActorProfileUnkSTLW kind:bss addr:0x02138458 -data_ov052_02138530 kind:bss addr:0x02138530 -data_ov052_02138534 kind:bss addr:0x02138534 -sActorProfileUnkSTWH kind:bss addr:0x02138540 -data_ov052_02138618 kind:bss addr:0x02138618 -data_ov052_0213861c kind:bss addr:0x0213861c -sActorProfileUnkNAVI kind:bss addr:0x02138628 +_ZGVN15ProfileInstanceI19ActorProfileUnkSTLWE8sProfileE kind:bss addr:0x02138440 +@31887 kind:bss addr:0x0213844c +_ZN15ProfileInstanceI19ActorProfileUnkSTLWE8sProfileE kind:bss addr:0x02138458 +_ZGVN15ProfileInstanceI19ActorProfileUnkSTWHE8sProfileE kind:bss addr:0x02138530 +@31893 kind:bss addr:0x02138534 +_ZN15ProfileInstanceI19ActorProfileUnkSTWHE8sProfileE kind:bss addr:0x02138540 +_ZGVN15ProfileInstanceI19ActorProfileUnkNAVIE8sProfileE kind:bss addr:0x02138618 +@31899 kind:bss addr:0x0213861c +_ZN15ProfileInstanceI19ActorProfileUnkNAVIE8sProfileE kind:bss addr:0x02138628 data_ov052_02138700 kind:bss addr:0x02138700 data_ov052_02138704 kind:bss addr:0x02138704 -sActorProfileUnkPTSW kind:bss addr:0x02138710 +_ZN15ProfileInstanceI19ActorProfileUnkPTSWE8sProfileE kind:bss addr:0x02138710 diff --git a/config/jp/arm9/overlays/ov053/delinks.txt b/config/jp/arm9/overlays/ov053/delinks.txt index e79010be..c902c33e 100644 --- a/config/jp/arm9/overlays/ov053/delinks.txt +++ b/config/jp/arm9/overlays/ov053/delinks.txt @@ -9,7 +9,7 @@ src/053_MapD1/Actor/ActorUnkLIKE.cpp: .text start:0x02139fdc end:0x0213ccdc .init start:0x0213e790 end:0x0213e7e0 .ctor start:0x0213e8a8 end:0x0213e8ac - .bss start:0x0213edf0 end:0x0213eec8 + .bss start:0x0213ede0 end:0x0213eec8 src/053_MapD1/Actor/ActorUnkRAT0.cpp: .text start:0x0213ccdc end:0x0213e524 diff --git a/config/jp/arm9/overlays/ov053/symbols.txt b/config/jp/arm9/overlays/ov053/symbols.txt index fb5e8be5..b412971c 100644 --- a/config/jp/arm9/overlays/ov053/symbols.txt +++ b/config/jp/arm9/overlays/ov053/symbols.txt @@ -149,9 +149,9 @@ _ZTV19data_ov053_0213eca0 kind:data(any) addr:0x0213eca0 data_ov053_0213ed00 kind:data(any) addr:0x0213ed00 data_ov053_0213ed10 kind:data(any) addr:0x0213ed10 data_ov053_0213edd8 kind:data(any) addr:0x0213edd8 -data_ov053_0213ede0 kind:bss addr:0x0213ede0 -data_ov053_0213ede4 kind:bss addr:0x0213ede4 -sActorProfileUnkLIKE kind:bss addr:0x0213edf0 +_ZGVN15ProfileInstanceI19ActorProfileUnkLIKEE8sProfileE kind:bss addr:0x0213ede0 +@31916 kind:bss addr:0x0213ede4 +_ZN15ProfileInstanceI19ActorProfileUnkLIKEE8sProfileE kind:bss addr:0x0213edf0 data_ov053_0213eec8 kind:bss addr:0x0213eec8 data_ov053_0213eed0 kind:bss addr:0x0213eed0 -sActorProfileUnkRAT0 kind:bss addr:0x0213eedc +_ZN15ProfileInstanceI19ActorProfileUnkRAT0E8sProfileE kind:bss addr:0x0213eedc diff --git a/config/jp/arm9/overlays/ov054/delinks.txt b/config/jp/arm9/overlays/ov054/delinks.txt index 960d9038..da99a7ae 100644 --- a/config/jp/arm9/overlays/ov054/delinks.txt +++ b/config/jp/arm9/overlays/ov054/delinks.txt @@ -8,13 +8,13 @@ src/054_MapD2/Actor/ActorUnkFBBH.cpp: .text start:0x02139fa4 end:0x0213dc5c .init start:0x0213f458 end:0x0213f588 .ctor start:0x0213f6b0 end:0x0213f6b4 - .bss start:0x0213ff70 end:0x02140048 + .bss start:0x0213ff60 end:0x02140048 src/054_MapD2/Actor/ActorUnkFIBB.cpp: .text start:0x0213dc5c end:0x0213f040 .init start:0x0213f588 end:0x0213f660 .ctor start:0x0213f6b4 end:0x0213f6b8 - .bss start:0x02140058 end:0x02140130 + .bss start:0x02140048 end:0x02140130 src/054_MapD2/Actor/ActorUnkFBBF.cpp: .text start:0x0213f040 end:0x0213f458 diff --git a/config/jp/arm9/overlays/ov054/symbols.txt b/config/jp/arm9/overlays/ov054/symbols.txt index b5e08e6c..6170702b 100644 --- a/config/jp/arm9/overlays/ov054/symbols.txt +++ b/config/jp/arm9/overlays/ov054/symbols.txt @@ -191,12 +191,12 @@ data_ov054_0213fe98 kind:data(any) addr:0x0213fe98 data_ov054_0213feb0 kind:data(any) addr:0x0213feb0 _ZTV19data_ov054_0213fec8 kind:data(any) addr:0x0213fec8 _ZTV19data_ov054_0213feec kind:data(any) addr:0x0213feec -data_ov054_0213ff60 kind:bss addr:0x0213ff60 -data_ov054_0213ff64 kind:bss addr:0x0213ff64 -sActorProfileUnkFBBH kind:bss addr:0x0213ff70 -data_ov054_02140048 kind:bss addr:0x02140048 -data_ov054_0214004c kind:bss addr:0x0214004c -sActorProfileUnkFIBB kind:bss addr:0x02140058 +_ZGVN15ProfileInstanceI19ActorProfileUnkFBBHE8sProfileE kind:bss addr:0x0213ff60 +@31932 kind:bss addr:0x0213ff64 +_ZN15ProfileInstanceI19ActorProfileUnkFBBHE8sProfileE kind:bss addr:0x0213ff70 +_ZGVN15ProfileInstanceI19ActorProfileUnkFIBBE8sProfileE kind:bss addr:0x02140048 +@31938 kind:bss addr:0x0214004c +_ZN15ProfileInstanceI19ActorProfileUnkFIBBE8sProfileE kind:bss addr:0x02140058 data_ov054_02140130 kind:bss addr:0x02140130 data_ov054_02140134 kind:bss addr:0x02140134 -sActorProfileUnkFBBF kind:bss addr:0x02140140 +_ZN15ProfileInstanceI19ActorProfileUnkFBBFE8sProfileE kind:bss addr:0x02140140 diff --git a/config/jp/arm9/overlays/ov055/delinks.txt b/config/jp/arm9/overlays/ov055/delinks.txt index 96644c3f..0cf8ce90 100644 --- a/config/jp/arm9/overlays/ov055/delinks.txt +++ b/config/jp/arm9/overlays/ov055/delinks.txt @@ -9,13 +9,13 @@ src/055_MapD3/Actor/ActorUnkCHUC.cpp: .text start:0x0213b248 end:0x0213cce8 .init start:0x0213ecc0 end:0x0213ed2c .ctor start:0x0213ee2c end:0x0213ee30 - .bss start:0x0213f610 end:0x0213f6e8 + .bss start:0x0213f600 end:0x0213f6e8 src/055_MapD3/Actor/ActorUnkRCHU.cpp: .text start:0x0213cce8 end:0x0213d8bc .init start:0x0213ed2c end:0x0213ed98 .ctor start:0x0213ee30 end:0x0213ee34 - .bss start:0x0213f6f8 end:0x0213f73c + .bss start:0x0213f6e8 end:0x0213f73c src/055_MapD3/Actor/ActorUnkRCMS.cpp: .text start:0x0213d8bc end:0x0213ec90 diff --git a/config/jp/arm9/overlays/ov055/symbols.txt b/config/jp/arm9/overlays/ov055/symbols.txt index e2e9585b..40f065c7 100644 --- a/config/jp/arm9/overlays/ov055/symbols.txt +++ b/config/jp/arm9/overlays/ov055/symbols.txt @@ -229,12 +229,12 @@ data_ov055_0213f510 kind:data(any) addr:0x0213f510 _ZTV19data_ov055_0213f524 kind:data(any) addr:0x0213f524 data_ov055_0213f550 kind:data(any) addr:0x0213f550 _ZTV19data_ov055_0213f594 kind:data(any) addr:0x0213f594 -data_ov055_0213f600 kind:bss addr:0x0213f600 -data_ov055_0213f604 kind:bss addr:0x0213f604 -sActorProfileUnkCHUC kind:bss addr:0x0213f610 -data_ov055_0213f6e8 kind:bss addr:0x0213f6e8 -data_ov055_0213f6ec kind:bss addr:0x0213f6ec -sActorProfileUnkRCHU kind:bss addr:0x0213f6f8 +_ZGVN15ProfileInstanceI19ActorProfileUnkCHUCE8sProfileE kind:bss addr:0x0213f600 +@31955 kind:bss addr:0x0213f604 +_ZN15ProfileInstanceI19ActorProfileUnkCHUCE8sProfileE kind:bss addr:0x0213f610 +_ZGVN15ProfileInstanceI19ActorProfileUnkRCHUE8sProfileE kind:bss addr:0x0213f6e8 +@31961 kind:bss addr:0x0213f6ec +_ZN15ProfileInstanceI19ActorProfileUnkRCHUE8sProfileE kind:bss addr:0x0213f6f8 data_ov055_0213f73c kind:bss addr:0x0213f73c data_ov055_0213f740 kind:bss addr:0x0213f740 -sActorProfileUnkRCMS kind:bss addr:0x0213f74c +_ZN15ProfileInstanceI19ActorProfileUnkRCMSE8sProfileE kind:bss addr:0x0213f74c diff --git a/config/jp/arm9/overlays/ov056/delinks.txt b/config/jp/arm9/overlays/ov056/delinks.txt index 118942f7..17bc9048 100644 --- a/config/jp/arm9/overlays/ov056/delinks.txt +++ b/config/jp/arm9/overlays/ov056/delinks.txt @@ -9,16 +9,16 @@ src/056_MapD4/Actor/ActorUnkPASS.cpp: .text start:0x0213a1c8 end:0x0213c500 .init start:0x0213ffac end:0x0213fffc .ctor start:0x0214009c end:0x021400a0 - .bss start:0x02140a10 end:0x02140a60 + .bss start:0x02140a00 end:0x02140a60 src/056_MapD4/MapObject/MapObjectUnkFSVC.cpp: .text start:0x0213c5d0 end:0x0213c708 .init start:0x0213fffc end:0x0214004c .ctor start:0x021400a0 end:0x021400a4 - .bss start:0x02140a70 end:0x02140b44 + .bss start:0x02140a60 end:0x02140b44 src/056_MapD4/Actor/ActorUnkFSIR.cpp: .text start:0x0213c708 end:0x0213cdd4 .init start:0x0214004c end:0x0214009c .ctor start:0x021400a4 end:0x021400a8 - .bss start:0x02140b54 end:0x02140b98 + .bss start:0x02140b44 end:0x02140b98 diff --git a/config/jp/arm9/overlays/ov056/symbols.txt b/config/jp/arm9/overlays/ov056/symbols.txt index b06c0657..352194c2 100644 --- a/config/jp/arm9/overlays/ov056/symbols.txt +++ b/config/jp/arm9/overlays/ov056/symbols.txt @@ -268,13 +268,13 @@ data_ov056_021409b8 kind:data(any) addr:0x021409b8 data_ov056_021409c8 kind:data(any) addr:0x021409c8 data_ov056_021409d4 kind:data(any) addr:0x021409d4 data_ov056_021409ec kind:data(any) addr:0x021409ec -data_ov056_02140a00 kind:bss addr:0x02140a00 -data_ov056_02140a04 kind:bss addr:0x02140a04 -sActorProfileUnkPASS kind:bss addr:0x02140a10 -data_ov056_02140a60 kind:bss addr:0x02140a60 -data_ov056_02140a64 kind:bss addr:0x02140a64 -sMapObjectProfileUnkFSVC kind:bss addr:0x02140a70 -data_ov056_02140b44 kind:bss addr:0x02140b44 -data_ov056_02140b48 kind:bss addr:0x02140b48 -sActorProfileUnkFSIR kind:bss addr:0x02140b54 +_ZGVN15ProfileInstanceI19ActorProfileUnkPASSE8sProfileE kind:bss addr:0x02140a00 +@31978 kind:bss addr:0x02140a04 +_ZN15ProfileInstanceI19ActorProfileUnkPASSE8sProfileE kind:bss addr:0x02140a10 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkFSVCE8sProfileE kind:bss addr:0x02140a60 +@31576 kind:bss addr:0x02140a64 +_ZN15ProfileInstanceI23MapObjectProfileUnkFSVCE8sProfileE kind:bss addr:0x02140a70 +_ZGVN15ProfileInstanceI19ActorProfileUnkFSIRE8sProfileE kind:bss addr:0x02140b44 +@31990 kind:bss addr:0x02140b48 +_ZN15ProfileInstanceI19ActorProfileUnkFSIRE8sProfileE kind:bss addr:0x02140b54 data_ov056_02140b98 kind:bss addr:0x02140b98 diff --git a/config/jp/arm9/overlays/ov057/delinks.txt b/config/jp/arm9/overlays/ov057/delinks.txt index 7e222ccc..cd996e5a 100644 --- a/config/jp/arm9/overlays/ov057/delinks.txt +++ b/config/jp/arm9/overlays/ov057/delinks.txt @@ -9,37 +9,37 @@ src/057_MapD5/Actor/ActorUnkFSST.cpp: .text start:0x02139f20 end:0x0213b8a0 .init start:0x0213d3c0 end:0x0213d420 .ctor start:0x0213d7c4 end:0x0213d7c8 - .bss start:0x0213dd3c end:0x0213de14 + .bss start:0x0213dd24 end:0x0213de14 src/057_MapD5/Actor/ActorUnkFSSF.cpp: .text start:0x0213b8a0 end:0x0213bbbc .init start:0x0213d420 end:0x0213d470 .ctor start:0x0213d7c8 end:0x0213d7cc - .bss start:0x0213de24 end:0x0213de60 + .bss start:0x0213de14 end:0x0213de60 src/057_MapD5/Actor/ActorUnkRMFK.cpp: .text start:0x0213bbbc end:0x0213c238 .init start:0x0213d470 end:0x0213d668 .ctor start:0x0213d7cc end:0x0213d7d0 - .bss start:0x0213de70 end:0x0213df48 + .bss start:0x0213de60 end:0x0213df48 src/057_MapD5/Actor/ActorUnkGTTG.cpp: .text start:0x0213c238 end:0x0213c43c .init start:0x0213d668 end:0x0213d6b8 .ctor start:0x0213d7d0 end:0x0213d7d4 - .bss start:0x0213df58 end:0x0213df94 + .bss start:0x0213df48 end:0x0213df94 src/057_MapD5/Actor/ActorUnkHYSW.cpp: .text start:0x0213c43c end:0x0213c630 .init start:0x0213d6b8 end:0x0213d708 .ctor start:0x0213d7d4 end:0x0213d7d8 - .bss start:0x0213dfa4 end:0x0213dfe0 + .bss start:0x0213df94 end:0x0213dfe0 src/057_MapD5/Actor/ActorUnkELVT.cpp: .text start:0x0213c630 end:0x0213d1c8 .init start:0x0213d708 end:0x0213d758 .ctor start:0x0213d7d8 end:0x0213d7dc - .bss start:0x0213dff0 end:0x0213e0c8 + .bss start:0x0213dfe0 end:0x0213e0c8 src/057_MapD5/MapObject/MapObjectUnkTRLN.cpp: .text start:0x0213d1c8 end:0x0213d33c diff --git a/config/jp/arm9/overlays/ov057/symbols.txt b/config/jp/arm9/overlays/ov057/symbols.txt index dc92613e..74ca3bbc 100644 --- a/config/jp/arm9/overlays/ov057/symbols.txt +++ b/config/jp/arm9/overlays/ov057/symbols.txt @@ -175,24 +175,24 @@ data_ov057_0213dc8c kind:data(any) addr:0x0213dc8c data_ov057_0213dc9c kind:data(any) addr:0x0213dc9c data_ov057_0213dcb8 kind:data(any) addr:0x0213dcb8 data_ov057_0213dd20 kind:bss addr:0x0213dd20 -data_ov057_0213dd24 kind:bss addr:0x0213dd24 -data_ov057_0213dd30 kind:bss addr:0x0213dd30 -sActorProfileUnkFSST kind:bss addr:0x0213dd3c -data_ov057_0213de14 kind:bss addr:0x0213de14 -data_ov057_0213de18 kind:bss addr:0x0213de18 -sActorProfileUnkFSSF kind:bss addr:0x0213de24 -data_ov057_0213de60 kind:bss addr:0x0213de60 -data_ov057_0213de64 kind:bss addr:0x0213de64 -sActorProfileUnkRMFK kind:bss addr:0x0213de70 -data_ov057_0213df48 kind:bss addr:0x0213df48 -data_ov057_0213df4c kind:bss addr:0x0213df4c -sActorProfileUnkGTTG kind:bss addr:0x0213df58 -data_ov057_0213df94 kind:bss addr:0x0213df94 -data_ov057_0213df98 kind:bss addr:0x0213df98 -sActorProfileUnkHYSW kind:bss addr:0x0213dfa4 -data_ov057_0213dfe0 kind:bss addr:0x0213dfe0 -data_ov057_0213dfe4 kind:bss addr:0x0213dfe4 -sActorProfileUnkELVT kind:bss addr:0x0213dff0 +_ZGVN15ProfileInstanceI19ActorProfileUnkFSSTE8sProfileE kind:bss addr:0x0213dd24 +@32002 kind:bss addr:0x0213dd30 +_ZN15ProfileInstanceI19ActorProfileUnkFSSTE8sProfileE kind:bss addr:0x0213dd3c +_ZGVN15ProfileInstanceI19ActorProfileUnkFSSFE8sProfileE kind:bss addr:0x0213de14 +@32008 kind:bss addr:0x0213de18 +_ZN15ProfileInstanceI19ActorProfileUnkFSSFE8sProfileE kind:bss addr:0x0213de24 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMFKE8sProfileE kind:bss addr:0x0213de60 +@32014 kind:bss addr:0x0213de64 +_ZN15ProfileInstanceI19ActorProfileUnkRMFKE8sProfileE kind:bss addr:0x0213de70 +_ZGVN15ProfileInstanceI19ActorProfileUnkGTTGE8sProfileE kind:bss addr:0x0213df48 +@32020 kind:bss addr:0x0213df4c +_ZN15ProfileInstanceI19ActorProfileUnkGTTGE8sProfileE kind:bss addr:0x0213df58 +_ZGVN15ProfileInstanceI19ActorProfileUnkHYSWE8sProfileE kind:bss addr:0x0213df94 +@32026 kind:bss addr:0x0213df98 +_ZN15ProfileInstanceI19ActorProfileUnkHYSWE8sProfileE kind:bss addr:0x0213dfa4 +_ZGVN15ProfileInstanceI19ActorProfileUnkELVTE8sProfileE kind:bss addr:0x0213dfe0 +@32032 kind:bss addr:0x0213dfe4 +_ZN15ProfileInstanceI19ActorProfileUnkELVTE8sProfileE kind:bss addr:0x0213dff0 data_ov057_0213e0c8 kind:bss addr:0x0213e0c8 data_ov057_0213e0cc kind:bss addr:0x0213e0cc -sMapObjectProfileUnkTRLN kind:bss addr:0x0213e0d8 +_ZN15ProfileInstanceI23MapObjectProfileUnkTRLNE8sProfileE kind:bss addr:0x0213e0d8 diff --git a/config/jp/arm9/overlays/ov058/delinks.txt b/config/jp/arm9/overlays/ov058/delinks.txt index d983b8b2..52019f9a 100644 --- a/config/jp/arm9/overlays/ov058/delinks.txt +++ b/config/jp/arm9/overlays/ov058/delinks.txt @@ -9,148 +9,148 @@ src/058_Field/Actor/ActorUnkKOKO.cpp: .text start:0x02140e34 end:0x021439b8 .init start:0x021551d8 end:0x02155228 .ctor start:0x02155e60 end:0x02155e64 - .bss start:0x02157bf0 end:0x02157c44 + .bss start:0x02157be0 end:0x02157cd4 src/058_Field/Actor/ActorUnkKOAT.cpp: .text start:0x021439b8 end:0x02143f5c .init start:0x02155228 end:0x02155278 .ctor start:0x02155e64 end:0x02155e68 - .bss start:0x02157ce0 end:0x02157d24 + .bss start:0x02157cd4 end:0x02157d24 src/058_Field/Actor/ActorUnkKOCH.cpp: .text start:0x02143f5c end:0x0214458c .init start:0x02155278 end:0x021552c8 .ctor start:0x02155e68 end:0x02155e6c - .bss start:0x02157d34 end:0x02157d70 + .bss start:0x02157d24 end:0x02157d70 src/058_Field/Actor/ActorUnkNSTN.cpp: .text start:0x021445ac end:0x02144970 .init start:0x021552c8 end:0x02155318 .ctor start:0x02155e6c end:0x02155e70 - .bss start:0x02157d80 end:0x02157da4 + .bss start:0x02157d70 end:0x02157ee0 src/058_Field/Actor/ActorUnkSYDE_SYDL_SYDS_SYFI_SYFO_SYIL_SYIS_SYOL_SYOS_SYSL_SYSN_SYSS_SYWA_SYWL_SYWS.cpp: .text start:0x02144970 end:0x02149b34 .init start:0x02155318 end:0x021556e8 .ctor start:0x02155e70 end:0x02155e74 - .bss start:0x02157f60 end:0x02158ba8 + .bss start:0x02157ee0 end:0x02158c08 src/058_Field/Actor/ActorUnkCRFT.cpp: .text start:0x02149b34 end:0x0214a830 .init start:0x021556e8 end:0x02155738 .ctor start:0x02155e74 end:0x02155e78 - .bss start:0x02158c18 end:0x02158cf0 + .bss start:0x02158c08 end:0x02158d04 src/058_Field/Actor/ActorUnkFBRD.cpp: .text start:0x0214a830 end:0x0214c5cc .init start:0x02155738 end:0x021557b4 .ctor start:0x02155e78 end:0x02155e7c - .bss start:0x02158d2c end:0x02158e04 + .bss start:0x02158d04 end:0x02158e04 src/058_Field/Actor/ActorUnkFBSC.cpp: .text start:0x0214c5cc end:0x0214c7e4 .init start:0x021557b4 end:0x02155804 .ctor start:0x02155e7c end:0x02155e80 - .bss start:0x02158e14 end:0x02158e3c + .bss start:0x02158e04 end:0x02158e50 src/058_Field/Actor/ActorUnkWPBD.cpp: .text start:0x0214c804 end:0x0214f0ac .init start:0x02155804 end:0x02155884 .ctor start:0x02155e80 end:0x02155e84 - .bss start:0x02158e64 end:0x02158ebc + .bss start:0x02158e50 end:0x02158f3c src/058_Field/Actor/ActorUnkWPCH.cpp: .text start:0x0214f0ac end:0x0214f340 .init start:0x02155884 end:0x021558d4 .ctor start:0x02155e84 end:0x02155e88 - .bss start:0x02158f4c end:0x02158f88 + .bss start:0x02158f3c end:0x02158f88 src/058_Field/Actor/ActorUnkBSTG.cpp: .text start:0x0214f360 end:0x0214f458 .init start:0x021558d4 end:0x02155924 .ctor start:0x02155e88 end:0x02155e8c - .bss start:0x02158f98 end:0x02158f9c + .bss start:0x02158f88 end:0x02158fe4 src/058_Field/Actor/ActorUnkTMNA.cpp: .text start:0x0214f458 end:0x0214fa0c .init start:0x02155924 end:0x0215599c .ctor start:0x02155e8c end:0x02155e90 - .bss start:0x0215903c end:0x021590fc + .bss start:0x02158fe4 end:0x02159114 src/058_Field/Actor/ActorUnkTMNC.cpp: .text start:0x0214fa0c end:0x0214fc98 .init start:0x0215599c end:0x021559ec .ctor start:0x02155e90 end:0x02155e94 - .bss start:0x02159124 end:0x0215916c + .bss start:0x02159114 end:0x0215920c src/058_Field/MapObject/MapObjectUnkTREE.cpp: .text start:0x0214fc98 end:0x021501f8 .init start:0x021559ec end:0x02155a68 .ctor start:0x02155e94 end:0x02155e98 - .bss start:0x0215922c end:0x02159294 + .bss start:0x0215920c end:0x021592b4 src/058_Field/MapObject/MapObjectUnkLEVS.cpp: .text start:0x02150244 end:0x021507ac .init start:0x02155a68 end:0x02155ab8 .ctor start:0x02155e98 end:0x02155e9c - .bss start:0x021592c4 end:0x02159398 + .bss start:0x021592b4 end:0x021593b8 src/058_Field/MapObject/MapObjectUnkSTNE.cpp: .text start:0x021507ac end:0x02150da0 .init start:0x02155ab8 end:0x02155b08 .ctor start:0x02155e9c end:0x02155ea0 - .bss start:0x021593c8 end:0x0215949c + .bss start:0x021593b8 end:0x021594bc src/058_Field/MapObject/MapObjectUnkHOUS.cpp: .text start:0x02150da0 end:0x02151334 .init start:0x02155b08 end:0x02155b58 .ctor start:0x02155ea0 end:0x02155ea4 - .bss start:0x021594d4 end:0x021594f4 + .bss start:0x021594bc end:0x0215953c src/058_Field/MapObject/MapObjectUnkHOST.cpp: .text start:0x021514dc end:0x02151628 .init start:0x02155b58 end:0x02155ba8 .ctor start:0x02155ea4 end:0x02155ea8 - .bss start:0x0215954c end:0x021595e0 + .bss start:0x0215953c end:0x02159620 src/058_Field/MapObject/MapObjectUnkDRHS.cpp: .text start:0x02151628 end:0x02151a54 .init start:0x02155ba8 end:0x02155bf8 .ctor start:0x02155ea8 end:0x02155eac - .bss start:0x02159630 end:0x021596ac + .bss start:0x02159620 end:0x02159704 src/058_Field/MapObject/MapObjectUnkEXHS.cpp: .text start:0x02151a54 end:0x02151c0c .init start:0x02155bf8 end:0x02155c48 .ctor start:0x02155eac end:0x02155eb0 - .bss start:0x02159714 end:0x02159734 + .bss start:0x02159704 end:0x02159734 src/058_Field/MapObject/MapObjectUnkBBFL.cpp: .text start:0x02151c0c end:0x021526e0 .init start:0x02155c48 end:0x02155c98 .ctor start:0x02155eb0 end:0x02155eb4 - .bss start:0x02159744 end:0x02159818 + .bss start:0x02159734 end:0x02159818 src/058_Field/MapObject/MapObjectUnkKNBN.cpp: .text start:0x021526e0 end:0x02152ed8 .init start:0x02155c98 end:0x02155d0c .ctor start:0x02155eb4 end:0x02155eb8 - .bss start:0x02159828 end:0x02159868 + .bss start:0x02159818 end:0x02159920 src/058_Field/MapObject/MapObjectUnkMSCL.cpp: .text start:0x02152ed8 end:0x021531bc .init start:0x02155d0c end:0x02155d80 .ctor start:0x02155eb8 end:0x02155ebc - .bss start:0x02159930 end:0x02159950 + .bss start:0x02159920 end:0x02159990 src/058_Field/MapObject/MapObjectUnkGRSV.cpp: .text start:0x021531bc end:0x021536a4 .init start:0x02155d80 end:0x02155e10 .ctor start:0x02155ebc end:0x02155ec0 - .bss start:0x021599e0 end:0x02159a24 + .bss start:0x02159990 end:0x02159ad4 src/058_Field/MapObject/MapObjectUnkSWCB.cpp: .text start:0x021536dc end:0x021546a4 .init start:0x02155e10 end:0x02155e60 .ctor start:0x02155ec0 end:0x02155ec4 - .bss start:0x02159ae4 end:0x02159af4 + .bss start:0x02159ad4 end:0x02159af4 diff --git a/config/jp/arm9/overlays/ov058/symbols.txt b/config/jp/arm9/overlays/ov058/symbols.txt index 025c21dd..4c082664 100644 --- a/config/jp/arm9/overlays/ov058/symbols.txt +++ b/config/jp/arm9/overlays/ov058/symbols.txt @@ -910,21 +910,21 @@ data_ov058_02157b78 kind:data(any) addr:0x02157b78 _ZTV19data_ov058_02157b88 kind:data(any) addr:0x02157b88 _ZTV19data_ov058_02157ba4 kind:data(any) addr:0x02157ba4 data_ov058_02157bcc kind:data(any) addr:0x02157bcc ambiguous -data_ov058_02157be0 kind:bss addr:0x02157be0 -data_ov058_02157be4 kind:bss addr:0x02157be4 -sActorProfileUnkKOKO kind:bss addr:0x02157bf0 +_ZGVN15ProfileInstanceI19ActorProfileUnkKOKOE8sProfileE kind:bss addr:0x02157be0 +@32049 kind:bss addr:0x02157be4 +_ZN15ProfileInstanceI19ActorProfileUnkKOKOE8sProfileE kind:bss addr:0x02157bf0 data_ov058_02157c44 kind:bss addr:0x02157c44 ambiguous data_ov058_02157cc8 kind:bss addr:0x02157cc8 data_ov058_02157ccc kind:bss addr:0x02157ccc -data_ov058_02157cd4 kind:bss addr:0x02157cd4 -data_ov058_02157cdc kind:bss addr:0x02157cdc ambiguous -sActorProfileUnkKOAT kind:bss addr:0x02157ce0 -data_ov058_02157d24 kind:bss addr:0x02157d24 -data_ov058_02157d28 kind:bss addr:0x02157d28 -sActorProfileUnkKOCH kind:bss addr:0x02157d34 -data_ov058_02157d70 kind:bss addr:0x02157d70 -data_ov058_02157d74 kind:bss addr:0x02157d74 -sActorProfileUnkNSTN kind:bss addr:0x02157d80 +_ZGVN15ProfileInstanceI19ActorProfileUnkKOATE8sProfileE kind:bss addr:0x02157cd4 +@32055 kind:bss addr:0x02157cdc ambiguous +_ZN15ProfileInstanceI19ActorProfileUnkKOATE8sProfileE kind:bss addr:0x02157ce0 +_ZGVN15ProfileInstanceI19ActorProfileUnkKOCHE8sProfileE kind:bss addr:0x02157d24 +@32061 kind:bss addr:0x02157d28 +_ZN15ProfileInstanceI19ActorProfileUnkKOCHE8sProfileE kind:bss addr:0x02157d34 +_ZGVN15ProfileInstanceI19ActorProfileUnkNSTNE8sProfileE kind:bss addr:0x02157d70 +@32067 kind:bss addr:0x02157d74 +_ZN15ProfileInstanceI19ActorProfileUnkNSTNE8sProfileE kind:bss addr:0x02157d80 data_ov058_02157da4 kind:bss addr:0x02157da4 ambiguous data_ov058_02157dbc kind:bss addr:0x02157dbc data_ov058_02157df8 kind:bss addr:0x02157df8 @@ -957,120 +957,120 @@ data_ov058_02157ed0 kind:bss addr:0x02157ed0 data_ov058_02157ed4 kind:bss addr:0x02157ed4 data_ov058_02157ed8 kind:bss addr:0x02157ed8 data_ov058_02157edc kind:bss addr:0x02157edc -data_ov058_02157ee0 kind:bss addr:0x02157ee0 -data_ov058_02157ee4 kind:bss addr:0x02157ee4 -sActorProfileUnkSYDL kind:bss addr:0x02157f60 -sActorProfileUnkSYFO kind:bss addr:0x02158038 -sActorProfileUnkSYSN kind:bss addr:0x02158110 +_ZGVN15ProfileInstanceI19ActorProfileUnkSYDLE8sProfileE kind:bss addr:0x02157ee0 +@32073 kind:bss addr:0x02157ee4 +_ZN15ProfileInstanceI19ActorProfileUnkSYDLE8sProfileE kind:bss addr:0x02157f60 +_ZN15ProfileInstanceI19ActorProfileUnkSYFOE8sProfileE kind:bss addr:0x02158038 +_ZN15ProfileInstanceI19ActorProfileUnkSYSNE8sProfileE kind:bss addr:0x02158110 data_ov058_02158134 kind:bss addr:0x02158134 ambiguous -sActorProfileUnkSYWA kind:bss addr:0x021581e8 -sActorProfileUnkSYFI kind:bss addr:0x021582c0 -sActorProfileUnkSYDE kind:bss addr:0x02158398 -sActorProfileUnkSYOS kind:bss addr:0x02158470 +_ZN15ProfileInstanceI19ActorProfileUnkSYWAE8sProfileE kind:bss addr:0x021581e8 +_ZN15ProfileInstanceI19ActorProfileUnkSYFIE8sProfileE kind:bss addr:0x021582c0 +_ZN15ProfileInstanceI19ActorProfileUnkSYDEE8sProfileE kind:bss addr:0x02158398 +_ZN15ProfileInstanceI19ActorProfileUnkSYOSE8sProfileE kind:bss addr:0x02158470 data_ov058_02158480 kind:bss addr:0x02158480 ambiguous data_ov058_02158520 kind:bss addr:0x02158520 ambiguous -sActorProfileUnkSYSS kind:bss addr:0x02158548 +_ZN15ProfileInstanceI19ActorProfileUnkSYSSE8sProfileE kind:bss addr:0x02158548 data_ov058_021585f8 kind:bss addr:0x021585f8 ambiguous -sActorProfileUnkSYWS kind:bss addr:0x02158620 -sActorProfileUnkSYIS kind:bss addr:0x021586f8 -sActorProfileUnkSYDS kind:bss addr:0x021587d0 -sActorProfileUnkSYOL kind:bss addr:0x021588a8 +_ZN15ProfileInstanceI19ActorProfileUnkSYWSE8sProfileE kind:bss addr:0x02158620 +_ZN15ProfileInstanceI19ActorProfileUnkSYISE8sProfileE kind:bss addr:0x021586f8 +_ZN15ProfileInstanceI19ActorProfileUnkSYDSE8sProfileE kind:bss addr:0x021587d0 +_ZN15ProfileInstanceI19ActorProfileUnkSYOLE8sProfileE kind:bss addr:0x021588a8 data_ov058_021588f8 kind:bss addr:0x021588f8 ambiguous -sActorProfileUnkSYSL kind:bss addr:0x02158980 +_ZN15ProfileInstanceI19ActorProfileUnkSYSLE8sProfileE kind:bss addr:0x02158980 data_ov058_021589c0 kind:bss addr:0x021589c0 ambiguous data_ov058_02158a54 kind:bss addr:0x02158a54 ambiguous -sActorProfileUnkSYWL kind:bss addr:0x02158a58 -sActorProfileUnkSYIL kind:bss addr:0x02158b30 +_ZN15ProfileInstanceI19ActorProfileUnkSYWLE8sProfileE kind:bss addr:0x02158a58 +_ZN15ProfileInstanceI19ActorProfileUnkSYILE8sProfileE kind:bss addr:0x02158b30 data_ov058_02158ba8 kind:bss addr:0x02158ba8 ambiguous -data_ov058_02158c08 kind:bss addr:0x02158c08 -data_ov058_02158c0c kind:bss addr:0x02158c0c -sActorProfileUnkCRFT kind:bss addr:0x02158c18 +_ZGVN15ProfileInstanceI19ActorProfileUnkCRFTE8sProfileE kind:bss addr:0x02158c08 +@32079 kind:bss addr:0x02158c0c +_ZN15ProfileInstanceI19ActorProfileUnkCRFTE8sProfileE kind:bss addr:0x02158c18 data_ov058_02158cf0 kind:bss addr:0x02158cf0 data_ov058_02158cf8 kind:bss addr:0x02158cf8 -data_ov058_02158d04 kind:bss addr:0x02158d04 -data_ov058_02158d20 kind:bss addr:0x02158d20 ambiguous -sActorProfileUnkFBRD kind:bss addr:0x02158d2c -data_ov058_02158e04 kind:bss addr:0x02158e04 -data_ov058_02158e08 kind:bss addr:0x02158e08 -sActorProfileUnkFBSC kind:bss addr:0x02158e14 +_ZGVN15ProfileInstanceI19ActorProfileUnkFBRDE8sProfileE kind:bss addr:0x02158d04 +@32085 kind:bss addr:0x02158d20 ambiguous +_ZN15ProfileInstanceI19ActorProfileUnkFBRDE8sProfileE kind:bss addr:0x02158d2c +_ZGVN15ProfileInstanceI19ActorProfileUnkFBSCE8sProfileE kind:bss addr:0x02158e04 +@32091 kind:bss addr:0x02158e08 +_ZN15ProfileInstanceI19ActorProfileUnkFBSCE8sProfileE kind:bss addr:0x02158e14 data_ov058_02158e3c kind:bss addr:0x02158e3c ambiguous -data_ov058_02158e50 kind:bss addr:0x02158e50 -data_ov058_02158e58 kind:bss addr:0x02158e58 -sActorProfileUnkWPBD kind:bss addr:0x02158e64 +_ZGVN15ProfileInstanceI19ActorProfileUnkWPBDE8sProfileE kind:bss addr:0x02158e50 +@32097 kind:bss addr:0x02158e58 +_ZN15ProfileInstanceI19ActorProfileUnkWPBDE8sProfileE kind:bss addr:0x02158e64 data_ov058_02158ebc kind:bss addr:0x02158ebc ambiguous -data_ov058_02158f3c kind:bss addr:0x02158f3c -data_ov058_02158f40 kind:bss addr:0x02158f40 -sActorProfileUnkWPCH kind:bss addr:0x02158f4c -data_ov058_02158f88 kind:bss addr:0x02158f88 -data_ov058_02158f8c kind:bss addr:0x02158f8c -sActorProfileUnkBSTG kind:bss addr:0x02158f98 +_ZGVN15ProfileInstanceI19ActorProfileUnkWPCHE8sProfileE kind:bss addr:0x02158f3c +@32103 kind:bss addr:0x02158f40 +_ZN15ProfileInstanceI19ActorProfileUnkWPCHE8sProfileE kind:bss addr:0x02158f4c +_ZGVN15ProfileInstanceI19ActorProfileUnkBSTGE8sProfileE kind:bss addr:0x02158f88 +@32109 kind:bss addr:0x02158f8c +_ZN15ProfileInstanceI19ActorProfileUnkBSTGE8sProfileE kind:bss addr:0x02158f98 data_ov058_02158f9c kind:bss addr:0x02158f9c ambiguous data_ov058_02158fd4 kind:bss addr:0x02158fd4 data_ov058_02158fd8 kind:bss addr:0x02158fd8 data_ov058_02158fdc kind:bss addr:0x02158fdc ambiguous -data_ov058_02158fe4 kind:bss addr:0x02158fe4 -data_ov058_02158ff0 kind:bss addr:0x02158ff0 -sActorProfileUnkTMNA kind:bss addr:0x0215903c +_ZGVN15ProfileInstanceI19ActorProfileUnkTMNAE8sProfileE kind:bss addr:0x02158fe4 +@32115 kind:bss addr:0x02158ff0 +_ZN15ProfileInstanceI19ActorProfileUnkTMNAE8sProfileE kind:bss addr:0x0215903c data_ov058_021590fc kind:bss addr:0x021590fc ambiguous -data_ov058_02159114 kind:bss addr:0x02159114 -data_ov058_02159118 kind:bss addr:0x02159118 -sActorProfileUnkTMNC kind:bss addr:0x02159124 +_ZGVN15ProfileInstanceI19ActorProfileUnkTMNCE8sProfileE kind:bss addr:0x02159114 +@32121 kind:bss addr:0x02159118 +_ZN15ProfileInstanceI19ActorProfileUnkTMNCE8sProfileE kind:bss addr:0x02159124 data_ov058_0215916c kind:bss addr:0x0215916c ambiguous data_ov058_021591b0 kind:bss addr:0x021591b0 ambiguous data_ov058_021591fc kind:bss addr:0x021591fc data_ov058_02159200 kind:bss addr:0x02159200 -data_ov058_0215920c kind:bss addr:0x0215920c -data_ov058_02159228 kind:bss addr:0x02159228 ambiguous -sMapObjectProfileUnkTREE kind:bss addr:0x0215922c +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTREEE8sProfileE kind:bss addr:0x0215920c +@31719 kind:bss addr:0x02159228 ambiguous +_ZN15ProfileInstanceI23MapObjectProfileUnkTREEE8sProfileE kind:bss addr:0x0215922c data_ov058_02159294 kind:bss addr:0x02159294 -data_ov058_021592b4 kind:bss addr:0x021592b4 -data_ov058_021592b8 kind:bss addr:0x021592b8 -sMapObjectProfileUnkLEVS kind:bss addr:0x021592c4 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkLEVSE8sProfileE kind:bss addr:0x021592b4 +@31725 kind:bss addr:0x021592b8 +_ZN15ProfileInstanceI23MapObjectProfileUnkLEVSE8sProfileE kind:bss addr:0x021592c4 data_ov058_02159398 kind:bss addr:0x02159398 -data_ov058_021593b8 kind:bss addr:0x021593b8 -data_ov058_021593bc kind:bss addr:0x021593bc -sMapObjectProfileUnkSTNE kind:bss addr:0x021593c8 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkSTNEE8sProfileE kind:bss addr:0x021593b8 +@31731 kind:bss addr:0x021593bc +_ZN15ProfileInstanceI23MapObjectProfileUnkSTNEE8sProfileE kind:bss addr:0x021593c8 data_ov058_0215949c kind:bss addr:0x0215949c -data_ov058_021594bc kind:bss addr:0x021594bc -data_ov058_021594c8 kind:bss addr:0x021594c8 -sMapObjectProfileUnkHOUS kind:bss addr:0x021594d4 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkHOUSE8sProfileE kind:bss addr:0x021594bc +@31737 kind:bss addr:0x021594c8 +_ZN15ProfileInstanceI23MapObjectProfileUnkHOUSE8sProfileE kind:bss addr:0x021594d4 data_ov058_021594f4 kind:bss addr:0x021594f4 -data_ov058_0215953c kind:bss addr:0x0215953c -data_ov058_02159540 kind:bss addr:0x02159540 -sMapObjectProfileUnkHOST kind:bss addr:0x0215954c +_ZGVN15ProfileInstanceI23MapObjectProfileUnkHOSTE8sProfileE kind:bss addr:0x0215953c +@31743 kind:bss addr:0x02159540 +_ZN15ProfileInstanceI23MapObjectProfileUnkHOSTE8sProfileE kind:bss addr:0x0215954c data_ov058_021595e0 kind:bss addr:0x021595e0 ambiguous data_ov058_0215961c kind:bss addr:0x0215961c ambiguous -data_ov058_02159620 kind:bss addr:0x02159620 -data_ov058_02159624 kind:bss addr:0x02159624 -sMapObjectProfileUnkDRHS kind:bss addr:0x02159630 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkDRHSE8sProfileE kind:bss addr:0x02159620 +@31749 kind:bss addr:0x02159624 +_ZN15ProfileInstanceI23MapObjectProfileUnkDRHSE8sProfileE kind:bss addr:0x02159630 data_ov058_021596ac kind:bss addr:0x021596ac ambiguous -data_ov058_02159704 kind:bss addr:0x02159704 -data_ov058_02159708 kind:bss addr:0x02159708 -sMapObjectProfileUnkEXHS kind:bss addr:0x02159714 -data_ov058_02159734 kind:bss addr:0x02159734 -data_ov058_02159738 kind:bss addr:0x02159738 -sMapObjectProfileUnkBBFL kind:bss addr:0x02159744 -data_ov058_02159818 kind:bss addr:0x02159818 -data_ov058_0215981c kind:bss addr:0x0215981c -sMapObjectProfileUnkKNBN kind:bss addr:0x02159828 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkEXHSE8sProfileE kind:bss addr:0x02159704 +@31755 kind:bss addr:0x02159708 +_ZN15ProfileInstanceI23MapObjectProfileUnkEXHSE8sProfileE kind:bss addr:0x02159714 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkBBFLE8sProfileE kind:bss addr:0x02159734 +@31761 kind:bss addr:0x02159738 +_ZN15ProfileInstanceI23MapObjectProfileUnkBBFLE8sProfileE kind:bss addr:0x02159744 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkKNBNE8sProfileE kind:bss addr:0x02159818 +@31767 kind:bss addr:0x0215981c +_ZN15ProfileInstanceI23MapObjectProfileUnkKNBNE8sProfileE kind:bss addr:0x02159828 data_ov058_02159868 kind:bss addr:0x02159868 ambiguous data_ov058_021598d4 kind:bss addr:0x021598d4 ambiguous data_ov058_021598fc kind:bss addr:0x021598fc -data_ov058_02159920 kind:bss addr:0x02159920 -data_ov058_02159924 kind:bss addr:0x02159924 -sMapObjectProfileUnkMSCL kind:bss addr:0x02159930 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkMSCLE8sProfileE kind:bss addr:0x02159920 +@31773 kind:bss addr:0x02159924 +_ZN15ProfileInstanceI23MapObjectProfileUnkMSCLE8sProfileE kind:bss addr:0x02159930 data_ov058_02159950 kind:bss addr:0x02159950 data_ov058_02159974 kind:bss addr:0x02159974 data_ov058_02159978 kind:bss addr:0x02159978 data_ov058_02159984 kind:bss addr:0x02159984 -data_ov058_02159990 kind:bss addr:0x02159990 -data_ov058_021599b0 kind:bss addr:0x021599b0 ambiguous -sMapObjectProfileUnkGRSV kind:bss addr:0x021599e0 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkGRSVE8sProfileE kind:bss addr:0x02159990 +@31779 kind:bss addr:0x021599b0 ambiguous +_ZN15ProfileInstanceI23MapObjectProfileUnkGRSVE8sProfileE kind:bss addr:0x021599e0 data_ov058_02159a24 kind:bss addr:0x02159a24 ambiguous data_ov058_02159ab4 kind:bss addr:0x02159ab4 -data_ov058_02159ad4 kind:bss addr:0x02159ad4 -data_ov058_02159ad8 kind:bss addr:0x02159ad8 -sMapObjectProfileUnkSWCB kind:bss addr:0x02159ae4 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkSWCBE8sProfileE kind:bss addr:0x02159ad4 +@31785 kind:bss addr:0x02159ad8 +_ZN15ProfileInstanceI23MapObjectProfileUnkSWCBE8sProfileE kind:bss addr:0x02159ae4 data_ov058_02159af4 kind:bss addr:0x02159af4 ambiguous data_ov058_02159b04 kind:bss addr:0x02159b04 data_ov058_02159bb8 kind:bss addr:0x02159bb8 diff --git a/config/jp/arm9/overlays/ov059/delinks.txt b/config/jp/arm9/overlays/ov059/delinks.txt index 17ef8ebd..c481de35 100644 --- a/config/jp/arm9/overlays/ov059/delinks.txt +++ b/config/jp/arm9/overlays/ov059/delinks.txt @@ -9,79 +9,79 @@ src/059_InTrain/Actor/ActorUnkPBSP.cpp: .text start:0x02159be0 end:0x0215a890 .init start:0x02164c18 end:0x02164c68 .ctor start:0x02165100 end:0x02165104 - .bss start:0x021660b0 end:0x021660ec + .bss start:0x021660a0 end:0x021660f0 src/059_InTrain/Actor/ActorUnkPSEM.cpp: .text start:0x0215a890 end:0x0215e178 .init start:0x02164c68 end:0x02164cf4 .ctor start:0x02165104 end:0x02165108 - .bss start:0x02166108 end:0x0216611c + .bss start:0x021660f0 end:0x021661e4 src/059_InTrain/Actor/ActorUnkPSBS.cpp: .text start:0x0215e178 end:0x021621c8 .init start:0x02164cf4 end:0x02164d6c .ctor start:0x02165108 end:0x0216510c - .bss start:0x021661fc end:0x021662d4 + .bss start:0x021661e4 end:0x021662d8 src/059_InTrain/Actor/ActorUnkPSNP.cpp: .text start:0x021621c8 end:0x02162b7c .init start:0x02164d6c end:0x02164dc8 .ctor start:0x0216510c end:0x02165110 - .bss start:0x021662f0 end:0x021663a4 + .bss start:0x021662d8 end:0x021663c8 src/059_InTrain/Actor/ActorUnkCAGE.cpp: .text start:0x02162b7c end:0x02163248 .init start:0x02164dc8 end:0x02164e18 .ctor start:0x02165110 end:0x02165114 - .bss start:0x021663d8 end:0x021664b0 + .bss start:0x021663c8 end:0x021664b0 src/059_InTrain/Actor/ActorUnkRMVT.cpp: .text start:0x021632a8 end:0x02163868 .init start:0x02164e18 end:0x02164e80 .ctor start:0x02165114 end:0x02165118 - .bss start:0x021664c0 end:0x02166598 + .bss start:0x021664b0 end:0x02166598 src/059_InTrain/Actor/ActorUnkRMVF.cpp: .text start:0x02163938 end:0x02163c5c .init start:0x02164e80 end:0x02164ed0 .ctor start:0x02165118 end:0x0216511c - .bss start:0x021665a8 end:0x02166680 + .bss start:0x02166598 end:0x02166680 src/059_InTrain/Actor/ActorUnkRMVS.cpp: .text start:0x02163c5c end:0x02163f14 .init start:0x02164ed0 end:0x02164f20 .ctor start:0x0216511c end:0x02165120 - .bss start:0x02166690 end:0x02166768 + .bss start:0x02166680 end:0x02166768 src/059_InTrain/Actor/ActorUnkRMVW.cpp: .text start:0x02163f14 end:0x021641cc .init start:0x02164f20 end:0x02164f70 .ctor start:0x02165120 end:0x02165124 - .bss start:0x02166778 end:0x02166850 + .bss start:0x02166768 end:0x02166850 src/059_InTrain/Actor/ActorUnkRMVV.cpp: .text start:0x021641cc end:0x02164484 .init start:0x02164f70 end:0x02164fc0 .ctor start:0x02165124 end:0x02165128 - .bss start:0x02166860 end:0x021668f0 + .bss start:0x02166850 end:0x02166938 src/059_InTrain/Actor/ActorUnkRMVD.cpp: .text start:0x02164484 end:0x0216473c .init start:0x02164fc0 end:0x02165010 .ctor start:0x02165128 end:0x0216512c - .bss start:0x02166948 end:0x02166a20 + .bss start:0x02166938 end:0x02166a20 src/059_InTrain/Actor/ActorUnkRMTR.cpp: .text start:0x0216473c end:0x021648e4 .init start:0x02165010 end:0x02165060 .ctor start:0x0216512c end:0x02165130 - .bss start:0x02166a30 end:0x02166b08 + .bss start:0x02166a20 end:0x02166b08 src/059_InTrain/Actor/ActorUnkRMTB.cpp: .text start:0x021648e4 end:0x02164a08 .init start:0x02165060 end:0x021650b0 .ctor start:0x02165130 end:0x02165134 - .bss start:0x02166b18 end:0x02166bf0 + .bss start:0x02166b08 end:0x02166bf0 src/059_InTrain/MapObject/MapObjectUnkEXTR.cpp: .text start:0x02164a08 end:0x02164bb4 diff --git a/config/jp/arm9/overlays/ov059/symbols.txt b/config/jp/arm9/overlays/ov059/symbols.txt index 21588968..63f68067 100644 --- a/config/jp/arm9/overlays/ov059/symbols.txt +++ b/config/jp/arm9/overlays/ov059/symbols.txt @@ -435,51 +435,51 @@ data_ov059_02166028 kind:data(any) addr:0x02166028 data_ov059_02166040 kind:data(any) addr:0x02166040 ambiguous data_ov059_02166050 kind:data(any) addr:0x02166050 data_ov059_02166054 kind:data(any) addr:0x02166054 ambiguous -data_ov059_021660a0 kind:bss addr:0x021660a0 -data_ov059_021660a4 kind:bss addr:0x021660a4 -sActorProfileUnkPBSP kind:bss addr:0x021660b0 +_ZGVN15ProfileInstanceI19ActorProfileUnkPBSPE8sProfileE kind:bss addr:0x021660a0 +@32205 kind:bss addr:0x021660a4 +_ZN15ProfileInstanceI19ActorProfileUnkPBSPE8sProfileE kind:bss addr:0x021660b0 data_ov059_021660ec kind:bss addr:0x021660ec -data_ov059_021660f0 kind:bss addr:0x021660f0 -data_ov059_021660fc kind:bss addr:0x021660fc -sActorProfileUnkPSEM kind:bss addr:0x02166108 +_ZGVN15ProfileInstanceI19ActorProfileUnkPSEME8sProfileE kind:bss addr:0x021660f0 +@32211 kind:bss addr:0x021660fc +_ZN15ProfileInstanceI19ActorProfileUnkPSEME8sProfileE kind:bss addr:0x02166108 data_ov059_0216611c kind:bss addr:0x0216611c ambiguous data_ov059_021661e0 kind:bss addr:0x021661e0 -data_ov059_021661e4 kind:bss addr:0x021661e4 -data_ov059_021661f0 kind:bss addr:0x021661f0 -sActorProfileUnkPSBS kind:bss addr:0x021661fc +_ZGVN15ProfileInstanceI19ActorProfileUnkPSBSE8sProfileE kind:bss addr:0x021661e4 +@32217 kind:bss addr:0x021661f0 +_ZN15ProfileInstanceI19ActorProfileUnkPSBSE8sProfileE kind:bss addr:0x021661fc data_ov059_021662d4 kind:bss addr:0x021662d4 -data_ov059_021662d8 kind:bss addr:0x021662d8 -data_ov059_021662e4 kind:bss addr:0x021662e4 -sActorProfileUnkPSNP kind:bss addr:0x021662f0 +_ZGVN15ProfileInstanceI19ActorProfileUnkPSNPE8sProfileE kind:bss addr:0x021662d8 +@32223 kind:bss addr:0x021662e4 +_ZN15ProfileInstanceI19ActorProfileUnkPSNPE8sProfileE kind:bss addr:0x021662f0 data_ov059_021663a4 kind:bss addr:0x021663a4 ambiguous -data_ov059_021663c8 kind:bss addr:0x021663c8 -data_ov059_021663cc kind:bss addr:0x021663cc -sActorProfileUnkCAGE kind:bss addr:0x021663d8 -data_ov059_021664b0 kind:bss addr:0x021664b0 -data_ov059_021664b4 kind:bss addr:0x021664b4 -sActorProfileUnkRMVT kind:bss addr:0x021664c0 -data_ov059_02166598 kind:bss addr:0x02166598 -data_ov059_0216659c kind:bss addr:0x0216659c -sActorProfileUnkRMVF kind:bss addr:0x021665a8 -data_ov059_02166680 kind:bss addr:0x02166680 -data_ov059_02166684 kind:bss addr:0x02166684 -sActorProfileUnkRMVS kind:bss addr:0x02166690 -data_ov059_02166768 kind:bss addr:0x02166768 -data_ov059_0216676c kind:bss addr:0x0216676c -sActorProfileUnkRMVW kind:bss addr:0x02166778 -data_ov059_02166850 kind:bss addr:0x02166850 -data_ov059_02166854 kind:bss addr:0x02166854 -sActorProfileUnkRMVV kind:bss addr:0x02166860 +_ZGVN15ProfileInstanceI19ActorProfileUnkCAGEE8sProfileE kind:bss addr:0x021663c8 +@32229 kind:bss addr:0x021663cc +_ZN15ProfileInstanceI19ActorProfileUnkCAGEE8sProfileE kind:bss addr:0x021663d8 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMVTE8sProfileE kind:bss addr:0x021664b0 +@32235 kind:bss addr:0x021664b4 +_ZN15ProfileInstanceI19ActorProfileUnkRMVTE8sProfileE kind:bss addr:0x021664c0 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMVFE8sProfileE kind:bss addr:0x02166598 +@32241 kind:bss addr:0x0216659c +_ZN15ProfileInstanceI19ActorProfileUnkRMVFE8sProfileE kind:bss addr:0x021665a8 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMVSE8sProfileE kind:bss addr:0x02166680 +@32247 kind:bss addr:0x02166684 +_ZN15ProfileInstanceI19ActorProfileUnkRMVSE8sProfileE kind:bss addr:0x02166690 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMVWE8sProfileE kind:bss addr:0x02166768 +@32253 kind:bss addr:0x0216676c +_ZN15ProfileInstanceI19ActorProfileUnkRMVWE8sProfileE kind:bss addr:0x02166778 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMVVE8sProfileE kind:bss addr:0x02166850 +@32259 kind:bss addr:0x02166854 +_ZN15ProfileInstanceI19ActorProfileUnkRMVVE8sProfileE kind:bss addr:0x02166860 data_ov059_021668f0 kind:bss addr:0x021668f0 ambiguous -data_ov059_02166938 kind:bss addr:0x02166938 -data_ov059_0216693c kind:bss addr:0x0216693c -sActorProfileUnkRMVD kind:bss addr:0x02166948 -data_ov059_02166a20 kind:bss addr:0x02166a20 -data_ov059_02166a24 kind:bss addr:0x02166a24 -sActorProfileUnkRMTR kind:bss addr:0x02166a30 -data_ov059_02166b08 kind:bss addr:0x02166b08 -data_ov059_02166b0c kind:bss addr:0x02166b0c -sActorProfileUnkRMTB kind:bss addr:0x02166b18 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMVDE8sProfileE kind:bss addr:0x02166938 +@32265 kind:bss addr:0x0216693c +_ZN15ProfileInstanceI19ActorProfileUnkRMVDE8sProfileE kind:bss addr:0x02166948 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMTRE8sProfileE kind:bss addr:0x02166a20 +@32271 kind:bss addr:0x02166a24 +_ZN15ProfileInstanceI19ActorProfileUnkRMTRE8sProfileE kind:bss addr:0x02166a30 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMTBE8sProfileE kind:bss addr:0x02166b08 +@32277 kind:bss addr:0x02166b0c +_ZN15ProfileInstanceI19ActorProfileUnkRMTBE8sProfileE kind:bss addr:0x02166b18 data_ov059_02166bf0 kind:bss addr:0x02166bf0 data_ov059_02166bf4 kind:bss addr:0x02166bf4 -sMapObjectProfileUnkEXTR kind:bss addr:0x02166c00 +_ZN15ProfileInstanceI23MapObjectProfileUnkEXTRE8sProfileE kind:bss addr:0x02166c00 diff --git a/config/jp/arm9/overlays/ov060/delinks.txt b/config/jp/arm9/overlays/ov060/delinks.txt index 9f750162..ab3cba52 100644 --- a/config/jp/arm9/overlays/ov060/delinks.txt +++ b/config/jp/arm9/overlays/ov060/delinks.txt @@ -9,103 +9,103 @@ src/060_Castle/Actor/ActorUnkSOLB_SOLC_SOLD.cpp: .text start:0x02159be0 end:0x0215afe4 .init start:0x02162a1c end:0x02162af4 .ctor start:0x0216312c end:0x02163130 - .bss start:0x02164c70 end:0x02164ef8 + .bss start:0x02164c58 end:0x02164f28 src/060_Castle/Actor/ActorUnkSOGB_SOGC_SOLG.cpp: .text start:0x0215afe4 end:0x0215e41c .init start:0x02162af4 end:0x02162c0c .ctor start:0x02163130 end:0x02163134 - .bss start:0x02164f40 end:0x0216500c + .bss start:0x02164f28 end:0x0216500c src/060_Castle/Actor/ActorUnkCOMM.cpp: .text start:0x0215e41c end:0x0215ec18 .init start:0x02162c0c end:0x02162c7c .ctor start:0x02163134 end:0x02163138 - .bss start:0x0216501c end:0x02165020 + .bss start:0x0216500c end:0x021650f4 src/060_Castle/Actor/ActorUnkOLDM.cpp: .text start:0x0215ec18 end:0x0215f214 .init start:0x02162c7c end:0x02162ccc .ctor start:0x02163138 end:0x0216313c - .bss start:0x02165104 end:0x02165194 + .bss start:0x021650f4 end:0x021651dc src/060_Castle/Actor/ActorUnkRMC0.cpp: .text start:0x0215f214 end:0x0215f5c8 .init start:0x02162ccc end:0x02162d1c .ctor start:0x0216313c end:0x02163140 - .bss start:0x021651ec end:0x02165248 + .bss start:0x021651dc end:0x021652c4 src/060_Castle/Actor/ActorUnkRMC1.cpp: .text start:0x0215f5c8 end:0x0215f71c .init start:0x02162d1c end:0x02162d6c .ctor start:0x02163140 end:0x02163144 - .bss start:0x021652d4 end:0x021653ac + .bss start:0x021652c4 end:0x021653ac src/060_Castle/Actor/ActorUnkRMC2.cpp: .text start:0x0215f71c end:0x0215fdcc .init start:0x02162d6c end:0x02162dbc .ctor start:0x02163144 end:0x02163148 - .bss start:0x021653bc end:0x02165494 + .bss start:0x021653ac end:0x021654f8 src/060_Castle/Actor/ActorUnkRMC6.cpp: .text start:0x0215fdcc end:0x0215fef4 .init start:0x02162dbc end:0x02162e0c .ctor start:0x02163148 end:0x0216314c - .bss start:0x02165508 end:0x02165518 + .bss start:0x021654f8 end:0x021655e0 src/060_Castle/Actor/ActorUnkRMC3.cpp: .text start:0x0215fef4 end:0x02160348 .init start:0x02162e0c end:0x02162e5c .ctor start:0x0216314c end:0x02163150 - .bss start:0x021655f0 end:0x021656c8 + .bss start:0x021655e0 end:0x021656c8 src/060_Castle/Actor/ActorUnkRMC4.cpp: .text start:0x02160348 end:0x02160470 .init start:0x02162e5c end:0x02162eac .ctor start:0x02163150 end:0x02163154 - .bss start:0x021656d8 end:0x021657b0 + .bss start:0x021656c8 end:0x021657b0 src/060_Castle/Actor/ActorUnkRMC5.cpp: .text start:0x02160470 end:0x021606b4 .init start:0x02162eac end:0x02162efc .ctor start:0x02163154 end:0x02163158 - .bss start:0x021657c0 end:0x02165898 + .bss start:0x021657b0 end:0x02165898 src/060_Castle/Actor/ActorUnkCASL.cpp: .text start:0x021606b4 end:0x021608f0 .init start:0x02162efc end:0x02162f4c .ctor start:0x02163158 end:0x0216315c - .bss start:0x021658a8 end:0x02165980 + .bss start:0x02165898 end:0x02165980 src/060_Castle/Actor/ActorUnkCAST.cpp: .text start:0x021608f0 end:0x02160a78 .init start:0x02162f4c end:0x02162f9c .ctor start:0x0216315c end:0x02163160 - .bss start:0x02165990 end:0x02165a68 + .bss start:0x02165980 end:0x02165a68 src/060_Castle/Actor/ActorUnkZLSN.cpp: .text start:0x02160aa4 end:0x02161e74 .init start:0x02162f9c end:0x02162fec .ctor start:0x02163160 end:0x02163164 - .bss start:0x02165a78 end:0x02165b50 + .bss start:0x02165a68 end:0x02165b50 src/060_Castle/Actor/ActorUnkKIMA.cpp: .text start:0x02161e74 end:0x021620a4 .init start:0x02162fec end:0x0216303c .ctor start:0x02163164 end:0x02163168 - .bss start:0x02165b60 end:0x02165c38 + .bss start:0x02165b50 end:0x02165c38 src/060_Castle/MapObject/MapObjectUnkPLCT.cpp: .text start:0x021620a4 end:0x02162274 .init start:0x0216303c end:0x0216308c .ctor start:0x02163168 end:0x0216316c - .bss start:0x02165c48 end:0x02165d1c + .bss start:0x02165c38 end:0x02165d3c src/060_Castle/MapObject/MapObjectUnkDFNC.cpp: .text start:0x02162274 end:0x0216271c .init start:0x0216308c end:0x021630dc .ctor start:0x0216316c end:0x02163170 - .bss start:0x02165d4c end:0x02165e20 + .bss start:0x02165d3c end:0x02165e20 src/060_Castle/MapObject/MapObjectUnkEXCT.cpp: .text start:0x0216271c end:0x021628d4 diff --git a/config/jp/arm9/overlays/ov060/symbols.txt b/config/jp/arm9/overlays/ov060/symbols.txt index 9919c4eb..d190633a 100644 --- a/config/jp/arm9/overlays/ov060/symbols.txt +++ b/config/jp/arm9/overlays/ov060/symbols.txt @@ -510,72 +510,72 @@ data_ov060_02164bd0 kind:data(any) addr:0x02164bd0 data_ov060_02164bec kind:data(any) addr:0x02164bec data_ov060_02164c40 kind:bss addr:0x02164c40 data_ov060_02164c4c kind:bss addr:0x02164c4c -data_ov060_02164c58 kind:bss addr:0x02164c58 -data_ov060_02164c64 kind:bss addr:0x02164c64 -sActorProfileUnkSOLD kind:bss addr:0x02164c70 -sActorProfileUnkSOLB kind:bss addr:0x02164d48 -sActorProfileUnkSOLC kind:bss addr:0x02164e20 +_ZGVN15ProfileInstanceI19ActorProfileUnkSOLDE8sProfileE kind:bss addr:0x02164c58 +@32294 kind:bss addr:0x02164c64 +_ZN15ProfileInstanceI19ActorProfileUnkSOLDE8sProfileE kind:bss addr:0x02164c70 +_ZN15ProfileInstanceI19ActorProfileUnkSOLBE8sProfileE kind:bss addr:0x02164d48 +_ZN15ProfileInstanceI19ActorProfileUnkSOLCE8sProfileE kind:bss addr:0x02164e20 data_ov060_02164ef8 kind:bss addr:0x02164ef8 data_ov060_02164f04 kind:bss addr:0x02164f04 data_ov060_02164f10 kind:bss addr:0x02164f10 data_ov060_02164f1c kind:bss addr:0x02164f1c -data_ov060_02164f28 kind:bss addr:0x02164f28 -data_ov060_02164f34 kind:bss addr:0x02164f34 -sActorProfileUnkSOLG kind:bss addr:0x02164f40 -sActorProfileUnkSOGB kind:bss addr:0x02164f84 -sActorProfileUnkSOGC kind:bss addr:0x02164fc8 -data_ov060_0216500c kind:bss addr:0x0216500c -data_ov060_02165010 kind:bss addr:0x02165010 -sActorProfileUnkCOMM kind:bss addr:0x0216501c +_ZGVN15ProfileInstanceI19ActorProfileUnkSOLGE8sProfileE kind:bss addr:0x02164f28 +@32300 kind:bss addr:0x02164f34 +_ZN15ProfileInstanceI19ActorProfileUnkSOLGE8sProfileE kind:bss addr:0x02164f40 +_ZN15ProfileInstanceI19ActorProfileUnkSOGBE8sProfileE kind:bss addr:0x02164f84 +_ZN15ProfileInstanceI19ActorProfileUnkSOGCE8sProfileE kind:bss addr:0x02164fc8 +_ZGVN15ProfileInstanceI19ActorProfileUnkCOMME8sProfileE kind:bss addr:0x0216500c +@32306 kind:bss addr:0x02165010 +_ZN15ProfileInstanceI19ActorProfileUnkCOMME8sProfileE kind:bss addr:0x0216501c data_ov060_02165020 kind:bss addr:0x02165020 -data_ov060_021650f4 kind:bss addr:0x021650f4 -data_ov060_021650f8 kind:bss addr:0x021650f8 -sActorProfileUnkOLDM kind:bss addr:0x02165104 +_ZGVN15ProfileInstanceI19ActorProfileUnkOLDME8sProfileE kind:bss addr:0x021650f4 +@32312 kind:bss addr:0x021650f8 +_ZN15ProfileInstanceI19ActorProfileUnkOLDME8sProfileE kind:bss addr:0x02165104 data_ov060_02165194 kind:bss addr:0x02165194 ambiguous -data_ov060_021651dc kind:bss addr:0x021651dc -data_ov060_021651e0 kind:bss addr:0x021651e0 -sActorProfileUnkRMC0 kind:bss addr:0x021651ec +_ZGVN15ProfileInstanceI19ActorProfileUnkRMC0E8sProfileE kind:bss addr:0x021651dc +@32318 kind:bss addr:0x021651e0 +_ZN15ProfileInstanceI19ActorProfileUnkRMC0E8sProfileE kind:bss addr:0x021651ec data_ov060_02165248 kind:bss addr:0x02165248 ambiguous -data_ov060_021652c4 kind:bss addr:0x021652c4 -data_ov060_021652c8 kind:bss addr:0x021652c8 -sActorProfileUnkRMC1 kind:bss addr:0x021652d4 -data_ov060_021653ac kind:bss addr:0x021653ac -data_ov060_021653b0 kind:bss addr:0x021653b0 -sActorProfileUnkRMC2 kind:bss addr:0x021653bc +_ZGVN15ProfileInstanceI19ActorProfileUnkRMC1E8sProfileE kind:bss addr:0x021652c4 +@32324 kind:bss addr:0x021652c8 +_ZN15ProfileInstanceI19ActorProfileUnkRMC1E8sProfileE kind:bss addr:0x021652d4 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMC2E8sProfileE kind:bss addr:0x021653ac +@32330 kind:bss addr:0x021653b0 +_ZN15ProfileInstanceI19ActorProfileUnkRMC2E8sProfileE kind:bss addr:0x021653bc data_ov060_02165494 kind:bss addr:0x02165494 -data_ov060_021654f8 kind:bss addr:0x021654f8 -data_ov060_021654fc kind:bss addr:0x021654fc -sActorProfileUnkRMC6 kind:bss addr:0x02165508 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMC6E8sProfileE kind:bss addr:0x021654f8 +@32336 kind:bss addr:0x021654fc +_ZN15ProfileInstanceI19ActorProfileUnkRMC6E8sProfileE kind:bss addr:0x02165508 data_ov060_02165518 kind:bss addr:0x02165518 ambiguous -data_ov060_021655e0 kind:bss addr:0x021655e0 -data_ov060_021655e4 kind:bss addr:0x021655e4 -sActorProfileUnkRMC3 kind:bss addr:0x021655f0 -data_ov060_021656c8 kind:bss addr:0x021656c8 -data_ov060_021656cc kind:bss addr:0x021656cc -sActorProfileUnkRMC4 kind:bss addr:0x021656d8 -data_ov060_021657b0 kind:bss addr:0x021657b0 -data_ov060_021657b4 kind:bss addr:0x021657b4 -sActorProfileUnkRMC5 kind:bss addr:0x021657c0 -data_ov060_02165898 kind:bss addr:0x02165898 -data_ov060_0216589c kind:bss addr:0x0216589c -sActorProfileUnkCASL kind:bss addr:0x021658a8 -data_ov060_02165980 kind:bss addr:0x02165980 -data_ov060_02165984 kind:bss addr:0x02165984 -sActorProfileUnkCAST kind:bss addr:0x02165990 -data_ov060_02165a68 kind:bss addr:0x02165a68 -data_ov060_02165a6c kind:bss addr:0x02165a6c -sActorProfileUnkZLSN kind:bss addr:0x02165a78 -data_ov060_02165b50 kind:bss addr:0x02165b50 -data_ov060_02165b54 kind:bss addr:0x02165b54 -sActorProfileUnkKIMA kind:bss addr:0x02165b60 -data_ov060_02165c38 kind:bss addr:0x02165c38 -data_ov060_02165c3c kind:bss addr:0x02165c3c -sMapObjectProfileUnkPLCT kind:bss addr:0x02165c48 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMC3E8sProfileE kind:bss addr:0x021655e0 +@32342 kind:bss addr:0x021655e4 +_ZN15ProfileInstanceI19ActorProfileUnkRMC3E8sProfileE kind:bss addr:0x021655f0 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMC4E8sProfileE kind:bss addr:0x021656c8 +@32348 kind:bss addr:0x021656cc +_ZN15ProfileInstanceI19ActorProfileUnkRMC4E8sProfileE kind:bss addr:0x021656d8 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMC5E8sProfileE kind:bss addr:0x021657b0 +@32354 kind:bss addr:0x021657b4 +_ZN15ProfileInstanceI19ActorProfileUnkRMC5E8sProfileE kind:bss addr:0x021657c0 +_ZGVN15ProfileInstanceI19ActorProfileUnkCASLE8sProfileE kind:bss addr:0x02165898 +@32360 kind:bss addr:0x0216589c +_ZN15ProfileInstanceI19ActorProfileUnkCASLE8sProfileE kind:bss addr:0x021658a8 +_ZGVN15ProfileInstanceI19ActorProfileUnkCASTE8sProfileE kind:bss addr:0x02165980 +@32366 kind:bss addr:0x02165984 +_ZN15ProfileInstanceI19ActorProfileUnkCASTE8sProfileE kind:bss addr:0x02165990 +_ZGVN15ProfileInstanceI19ActorProfileUnkZLSNE8sProfileE kind:bss addr:0x02165a68 +@32372 kind:bss addr:0x02165a6c +_ZN15ProfileInstanceI19ActorProfileUnkZLSNE8sProfileE kind:bss addr:0x02165a78 +_ZGVN15ProfileInstanceI19ActorProfileUnkKIMAE8sProfileE kind:bss addr:0x02165b50 +@32378 kind:bss addr:0x02165b54 +_ZN15ProfileInstanceI19ActorProfileUnkKIMAE8sProfileE kind:bss addr:0x02165b60 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkPLCTE8sProfileE kind:bss addr:0x02165c38 +@31976 kind:bss addr:0x02165c3c +_ZN15ProfileInstanceI23MapObjectProfileUnkPLCTE8sProfileE kind:bss addr:0x02165c48 data_ov060_02165d1c kind:bss addr:0x02165d1c -data_ov060_02165d3c kind:bss addr:0x02165d3c -data_ov060_02165d40 kind:bss addr:0x02165d40 -sMapObjectProfileUnkDFNC kind:bss addr:0x02165d4c +_ZGVN15ProfileInstanceI23MapObjectProfileUnkDFNCE8sProfileE kind:bss addr:0x02165d3c +@31982 kind:bss addr:0x02165d40 +_ZN15ProfileInstanceI23MapObjectProfileUnkDFNCE8sProfileE kind:bss addr:0x02165d4c data_ov060_02165e20 kind:bss addr:0x02165e20 data_ov060_02165e44 kind:bss addr:0x02165e44 data_ov060_02165e48 kind:bss addr:0x02165e48 -sMapObjectProfileUnkEXCT kind:bss addr:0x02165e54 +_ZN15ProfileInstanceI23MapObjectProfileUnkEXCTE8sProfileE kind:bss addr:0x02165e54 diff --git a/config/jp/arm9/overlays/ov061/delinks.txt b/config/jp/arm9/overlays/ov061/delinks.txt index a9fd873f..88418242 100644 --- a/config/jp/arm9/overlays/ov061/delinks.txt +++ b/config/jp/arm9/overlays/ov061/delinks.txt @@ -9,64 +9,64 @@ src/061_CastleTown/Actor/ActorUnkRMT0.cpp: .text start:0x02159be0 end:0x02159d04 .init start:0x0215bbd8 end:0x0215bc28 .ctor start:0x0215c018 end:0x0215c01c - .bss start:0x0215ccd0 end:0x0215cda8 + .bss start:0x0215ccc0 end:0x0215cda8 src/061_CastleTown/Actor/ActorUnkRMT1.cpp: .text start:0x02159d04 end:0x02159f74 .init start:0x0215bc28 end:0x0215bc78 .ctor start:0x0215c01c end:0x0215c020 - .bss start:0x0215cdb8 end:0x0215cdbc + .bss start:0x0215cda8 end:0x0215ce90 src/061_CastleTown/Actor/ActorUnkRMT2.cpp: .text start:0x02159f74 end:0x0215a098 .init start:0x0215bc78 end:0x0215bcc8 .ctor start:0x0215c020 end:0x0215c024 - .bss start:0x0215cea0 end:0x0215cf78 + .bss start:0x0215ce90 end:0x0215cf78 src/061_CastleTown/Actor/ActorUnkRMT3.cpp: .text start:0x0215a098 end:0x0215a1bc .init start:0x0215bcc8 end:0x0215bd18 .ctor start:0x0215c024 end:0x0215c028 - .bss start:0x0215cf88 end:0x0215cff0 + .bss start:0x0215cf78 end:0x0215d060 src/061_CastleTown/Actor/ActorUnkRMT4.cpp: .text start:0x0215a1bc end:0x0215a2e0 .init start:0x0215bd18 end:0x0215bd68 .ctor start:0x0215c028 end:0x0215c02c - .bss start:0x0215d070 end:0x0215d0e0 + .bss start:0x0215d060 end:0x0215d160 src/061_CastleTown/Actor/ActorUnkCAMA_CAMB_CAMS.cpp: .text start:0x0215a2e0 end:0x0215a838 .init start:0x0215bd68 end:0x0215be40 .ctor start:0x0215c02c end:0x0215c030 - .bss start:0x0215d178 end:0x0215d400 + .bss start:0x0215d160 end:0x0215d400 src/061_CastleTown/Actor/ActorUnkCAWA.cpp: .text start:0x0215a838 end:0x0215abec .init start:0x0215be40 end:0x0215be90 .ctor start:0x0215c030 end:0x0215c034 - .bss start:0x0215d410 end:0x0215d4e8 + .bss start:0x0215d400 end:0x0215d4e8 src/061_CastleTown/Actor/ActorUnkJOLN.cpp: .text start:0x0215abec end:0x0215aee0 .init start:0x0215be90 end:0x0215bee0 .ctor start:0x0215c034 end:0x0215c038 - .bss start:0x0215d4f8 end:0x0215d590 + .bss start:0x0215d4e8 end:0x0215d5d0 src/061_CastleTown/Actor/ActorUnkFLCT.cpp: .text start:0x0215aee0 end:0x0215b18c .init start:0x0215bee0 end:0x0215bf54 .ctor start:0x0215c038 end:0x0215c03c - .bss start:0x0215d5e0 end:0x0215d644 + .bss start:0x0215d5d0 end:0x0215d6b8 src/061_CastleTown/MapObject/MapObjectUnkFSCT.cpp: .text start:0x0215b18c end:0x0215b2c4 .init start:0x0215bf54 end:0x0215bfa4 .ctor start:0x0215c03c end:0x0215c040 - .bss start:0x0215d6c8 end:0x0215d6e4 + .bss start:0x0215d6b8 end:0x0215d79c src/061_CastleTown/MapObject/MapObjectUnkDRTY.cpp: .text start:0x0215b2c4 end:0x0215bb3c .init start:0x0215bfa4 end:0x0215c018 .ctor start:0x0215c040 end:0x0215c044 - .bss start:0x0215d7ac end:0x0215d880 + .bss start:0x0215d79c end:0x0215d880 diff --git a/config/jp/arm9/overlays/ov061/symbols.txt b/config/jp/arm9/overlays/ov061/symbols.txt index 20bda54a..0822fc23 100644 --- a/config/jp/arm9/overlays/ov061/symbols.txt +++ b/config/jp/arm9/overlays/ov061/symbols.txt @@ -221,54 +221,54 @@ data_ov061_0215cbcc kind:data(any) addr:0x0215cbcc data_ov061_0215cbf4 kind:data(any) addr:0x0215cbf4 data_ov061_0215cc3c kind:data(any) addr:0x0215cc3c ambiguous data_ov061_0215cc8c kind:data(any) addr:0x0215cc8c -data_ov061_0215ccc0 kind:bss addr:0x0215ccc0 -data_ov061_0215ccc4 kind:bss addr:0x0215ccc4 -sActorProfileUnkRMT0 kind:bss addr:0x0215ccd0 -data_ov061_0215cda8 kind:bss addr:0x0215cda8 -data_ov061_0215cdac kind:bss addr:0x0215cdac -sActorProfileUnkRMT1 kind:bss addr:0x0215cdb8 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMT0E8sProfileE kind:bss addr:0x0215ccc0 +@32407 kind:bss addr:0x0215ccc4 +_ZN15ProfileInstanceI19ActorProfileUnkRMT0E8sProfileE kind:bss addr:0x0215ccd0 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMT1E8sProfileE kind:bss addr:0x0215cda8 +@32413 kind:bss addr:0x0215cdac +_ZN15ProfileInstanceI19ActorProfileUnkRMT1E8sProfileE kind:bss addr:0x0215cdb8 data_ov061_0215cdbc kind:bss addr:0x0215cdbc ambiguous data_ov061_0215ce70 kind:bss addr:0x0215ce70 ambiguous -data_ov061_0215ce90 kind:bss addr:0x0215ce90 -data_ov061_0215ce94 kind:bss addr:0x0215ce94 -sActorProfileUnkRMT2 kind:bss addr:0x0215cea0 -data_ov061_0215cf78 kind:bss addr:0x0215cf78 -data_ov061_0215cf7c kind:bss addr:0x0215cf7c -sActorProfileUnkRMT3 kind:bss addr:0x0215cf88 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMT2E8sProfileE kind:bss addr:0x0215ce90 +@32419 kind:bss addr:0x0215ce94 +_ZN15ProfileInstanceI19ActorProfileUnkRMT2E8sProfileE kind:bss addr:0x0215cea0 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMT3E8sProfileE kind:bss addr:0x0215cf78 +@32425 kind:bss addr:0x0215cf7c +_ZN15ProfileInstanceI19ActorProfileUnkRMT3E8sProfileE kind:bss addr:0x0215cf88 data_ov061_0215cff0 kind:bss addr:0x0215cff0 ambiguous data_ov061_0215d004 kind:bss addr:0x0215d004 ambiguous -data_ov061_0215d060 kind:bss addr:0x0215d060 -data_ov061_0215d064 kind:bss addr:0x0215d064 -sActorProfileUnkRMT4 kind:bss addr:0x0215d070 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMT4E8sProfileE kind:bss addr:0x0215d060 +@32431 kind:bss addr:0x0215d064 +_ZN15ProfileInstanceI19ActorProfileUnkRMT4E8sProfileE kind:bss addr:0x0215d070 data_ov061_0215d0e0 kind:bss addr:0x0215d0e0 ambiguous data_ov061_0215d114 kind:bss addr:0x0215d114 ambiguous data_ov061_0215d148 kind:bss addr:0x0215d148 data_ov061_0215d154 kind:bss addr:0x0215d154 -data_ov061_0215d160 kind:bss addr:0x0215d160 -data_ov061_0215d16c kind:bss addr:0x0215d16c -sActorProfileUnkCAMB kind:bss addr:0x0215d178 +_ZGVN15ProfileInstanceI19ActorProfileUnkCAMBE8sProfileE kind:bss addr:0x0215d160 +@32437 kind:bss addr:0x0215d16c +_ZN15ProfileInstanceI19ActorProfileUnkCAMBE8sProfileE kind:bss addr:0x0215d178 data_ov061_0215d1ec kind:bss addr:0x0215d1ec ambiguous data_ov061_0215d204 kind:bss addr:0x0215d204 ambiguous data_ov061_0215d208 kind:bss addr:0x0215d208 ambiguous data_ov061_0215d24c kind:bss addr:0x0215d24c ambiguous -sActorProfileUnkCAMS kind:bss addr:0x0215d250 -sActorProfileUnkCAMA kind:bss addr:0x0215d328 -data_ov061_0215d400 kind:bss addr:0x0215d400 -data_ov061_0215d404 kind:bss addr:0x0215d404 -sActorProfileUnkCAWA kind:bss addr:0x0215d410 -data_ov061_0215d4e8 kind:bss addr:0x0215d4e8 -data_ov061_0215d4ec kind:bss addr:0x0215d4ec -sActorProfileUnkJOLN kind:bss addr:0x0215d4f8 +_ZN15ProfileInstanceI19ActorProfileUnkCAMSE8sProfileE kind:bss addr:0x0215d250 +_ZN15ProfileInstanceI19ActorProfileUnkCAMAE8sProfileE kind:bss addr:0x0215d328 +_ZGVN15ProfileInstanceI19ActorProfileUnkCAWAE8sProfileE kind:bss addr:0x0215d400 +@32443 kind:bss addr:0x0215d404 +_ZN15ProfileInstanceI19ActorProfileUnkCAWAE8sProfileE kind:bss addr:0x0215d410 +_ZGVN15ProfileInstanceI19ActorProfileUnkJOLNE8sProfileE kind:bss addr:0x0215d4e8 +@32449 kind:bss addr:0x0215d4ec +_ZN15ProfileInstanceI19ActorProfileUnkJOLNE8sProfileE kind:bss addr:0x0215d4f8 data_ov061_0215d590 kind:bss addr:0x0215d590 ambiguous -data_ov061_0215d5d0 kind:bss addr:0x0215d5d0 -data_ov061_0215d5d4 kind:bss addr:0x0215d5d4 -sActorProfileUnkFLCT kind:bss addr:0x0215d5e0 +_ZGVN15ProfileInstanceI19ActorProfileUnkFLCTE8sProfileE kind:bss addr:0x0215d5d0 +@32455 kind:bss addr:0x0215d5d4 +_ZN15ProfileInstanceI19ActorProfileUnkFLCTE8sProfileE kind:bss addr:0x0215d5e0 data_ov061_0215d644 kind:bss addr:0x0215d644 ambiguous -data_ov061_0215d6b8 kind:bss addr:0x0215d6b8 -data_ov061_0215d6bc kind:bss addr:0x0215d6bc -sMapObjectProfileUnkFSCT kind:bss addr:0x0215d6c8 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkFSCTE8sProfileE kind:bss addr:0x0215d6b8 +@32053 kind:bss addr:0x0215d6bc +_ZN15ProfileInstanceI23MapObjectProfileUnkFSCTE8sProfileE kind:bss addr:0x0215d6c8 data_ov061_0215d6e4 kind:bss addr:0x0215d6e4 ambiguous data_ov061_0215d798 kind:bss addr:0x0215d798 ambiguous -data_ov061_0215d79c kind:bss addr:0x0215d79c -data_ov061_0215d7a0 kind:bss addr:0x0215d7a0 -sMapObjectProfileUnkDRTY kind:bss addr:0x0215d7ac +_ZGVN15ProfileInstanceI23MapObjectProfileUnkDRTYE8sProfileE kind:bss addr:0x0215d79c +@32059 kind:bss addr:0x0215d7a0 +_ZN15ProfileInstanceI23MapObjectProfileUnkDRTYE8sProfileE kind:bss addr:0x0215d7ac diff --git a/config/jp/arm9/overlays/ov062/delinks.txt b/config/jp/arm9/overlays/ov062/delinks.txt index b4459d39..3a34b5ea 100644 --- a/config/jp/arm9/overlays/ov062/delinks.txt +++ b/config/jp/arm9/overlays/ov062/delinks.txt @@ -9,124 +9,124 @@ src/062_Village/Actor/ActorUnkRML0.cpp: .text start:0x02159be0 end:0x02159d34 .init start:0x0216060c end:0x0216065c .ctor start:0x02160cf4 end:0x02160cf8 - .bss start:0x021626d0 end:0x021626dc + .bss start:0x021626c0 end:0x021627a8 src/062_Village/Actor/ActorUnkRML1.cpp: .text start:0x02159d34 end:0x02159e58 .init start:0x0216065c end:0x021606ac .ctor start:0x02160cf8 end:0x02160cfc - .bss start:0x021627b8 end:0x02162808 + .bss start:0x021627a8 end:0x02162890 src/062_Village/Actor/ActorUnkRML2.cpp: .text start:0x02159e58 end:0x02159f7c .init start:0x021606ac end:0x021606fc .ctor start:0x02160cfc end:0x02160d00 - .bss start:0x021628a0 end:0x021628e8 + .bss start:0x02162890 end:0x02162978 src/062_Village/Actor/ActorUnkRML3.cpp: .text start:0x02159f7c end:0x0215a0a0 .init start:0x021606fc end:0x0216074c .ctor start:0x02160d00 end:0x02160d04 - .bss start:0x02162988 end:0x02162a2c + .bss start:0x02162978 end:0x02162a60 src/062_Village/Actor/ActorUnkNICO.cpp: .text start:0x0215a0a0 end:0x0215a474 .init start:0x0216074c end:0x0216079c .ctor start:0x02160d04 end:0x02160d08 - .bss start:0x02162a70 end:0x02162b48 + .bss start:0x02162a60 end:0x02162b48 src/062_Village/Actor/ActorUnkFBCH.cpp: .text start:0x0215a474 end:0x0215a91c .init start:0x0216079c end:0x021607ec .ctor start:0x02160d08 end:0x02160d0c - .bss start:0x02162b58 end:0x02162b7c + .bss start:0x02162b48 end:0x02162c34 src/062_Village/Actor/ActorUnkNSHD.cpp: .text start:0x0215a91c end:0x0215ace4 .init start:0x021607ec end:0x02160850 .ctor start:0x02160d0c end:0x02160d10 - .bss start:0x02162c50 end:0x02162c8c + .bss start:0x02162c34 end:0x02162c8c src/062_Village/Actor/ActorUnkLBCK.cpp: .text start:0x0215ace4 end:0x0215b734 .init start:0x02160850 end:0x021608a0 .ctor start:0x02160d10 end:0x02160d14 - .bss start:0x02162c9c end:0x02162cb0 + .bss start:0x02162c8c end:0x02162d74 src/062_Village/Actor/ActorUnkRMLF.cpp: .text start:0x0215b734 end:0x0215b858 .init start:0x021608a0 end:0x021608f0 .ctor start:0x02160d14 end:0x02160d18 - .bss start:0x02162d84 end:0x02162df8 + .bss start:0x02162d74 end:0x02162e64 src/062_Village/Actor/ActorUnkNCCB_NCMB.cpp: .text start:0x0215b858 end:0x0215bd34 .init start:0x021608f0 end:0x02160984 .ctor start:0x02160d18 end:0x02160d1c - .bss start:0x02162e7c end:0x0216302c + .bss start:0x02162e64 end:0x0216302c src/062_Village/Actor/ActorUnkNCWA.cpp: .text start:0x0215bd34 end:0x0215c12c .init start:0x02160984 end:0x021609d4 .ctor start:0x02160d1c end:0x02160d20 - .bss start:0x0216303c end:0x021630d4 + .bss start:0x0216302c end:0x02163114 src/062_Village/Actor/ActorUnkRMBC.cpp: .text start:0x0215c12c end:0x0215c250 .init start:0x021609d4 end:0x02160a24 .ctor start:0x02160d20 end:0x02160d24 - .bss start:0x02163124 end:0x021631d8 + .bss start:0x02163114 end:0x021631fc src/062_Village/Actor/ActorUnkMOCT.cpp: .text start:0x0215c250 end:0x0215c470 .init start:0x02160a24 end:0x02160a74 .ctor start:0x02160d24 end:0x02160d28 - .bss start:0x0216320c end:0x02163248 + .bss start:0x021631fc end:0x02163248 src/062_Village/Actor/ActorUnkTSLB.cpp: .text start:0x0215c470 end:0x0215d114 .init start:0x02160a74 end:0x02160ac4 .ctor start:0x02160d28 end:0x02160d2c - .bss start:0x02163258 end:0x021632a4 + .bss start:0x02163248 end:0x02163330 src/062_Village/MapObject/MapObjectUnkFSFS.cpp: .text start:0x0215d114 end:0x0215d24c .init start:0x02160ac4 end:0x02160b14 .ctor start:0x02160d2c end:0x02160d30 - .bss start:0x02163340 end:0x02163408 + .bss start:0x02163330 end:0x02163414 src/062_Village/MapObject/MapObjectUnkHOL2.cpp: .text start:0x0215d24c end:0x0215d590 .init start:0x02160b14 end:0x02160b64 .ctor start:0x02160d30 end:0x02160d34 - .bss start:0x02163424 end:0x02163428 + .bss start:0x02163414 end:0x0216351c src/062_Village/MapObject/MapObjectUnkHOL0.cpp: .text start:0x0215d590 end:0x0215d6e4 .init start:0x02160b64 end:0x02160bb4 .ctor start:0x02160d34 end:0x02160d38 - .bss start:0x0216352c end:0x02163584 + .bss start:0x0216351c end:0x02163600 src/062_Village/MapObject/MapObjectUnkHOL1.cpp: .text start:0x0215d6e4 end:0x0215d838 .init start:0x02160bb4 end:0x02160c04 .ctor start:0x02160d38 end:0x02160d3c - .bss start:0x02163610 end:0x021636e4 + .bss start:0x02163600 end:0x021636e4 src/062_Village/MapObject/MapObjectUnkHOLB.cpp: .text start:0x0215d838 end:0x0215d98c .init start:0x02160c04 end:0x02160c54 .ctor start:0x02160d3c end:0x02160d40 - .bss start:0x021636f4 end:0x021637c8 + .bss start:0x021636e4 end:0x021637c8 src/062_Village/MapObject/MapObjectUnkHOSB.cpp: .text start:0x0215d98c end:0x0215dae0 .init start:0x02160c54 end:0x02160ca4 .ctor start:0x02160d40 end:0x02160d44 - .bss start:0x021637d8 end:0x02163884 + .bss start:0x021637c8 end:0x021638ac src/062_Village/MapObject/MapObjectUnkGBDR.cpp: .text start:0x0215dae0 end:0x0215dd94 .init start:0x02160ca4 end:0x02160cf4 .ctor start:0x02160d44 end:0x02160d48 - .bss start:0x021638bc end:0x02163918 + .bss start:0x021638ac end:0x02163918 diff --git a/config/jp/arm9/overlays/ov062/symbols.txt b/config/jp/arm9/overlays/ov062/symbols.txt index f393cd17..5e008a70 100644 --- a/config/jp/arm9/overlays/ov062/symbols.txt +++ b/config/jp/arm9/overlays/ov062/symbols.txt @@ -497,93 +497,93 @@ data_ov062_02162684 kind:data(any) addr:0x02162684 data_ov062_02162690 kind:data(any) addr:0x02162690 data_ov062_0216269c kind:data(any) addr:0x0216269c data_ov062_021626a8 kind:data(any) addr:0x021626a8 -data_ov062_021626c0 kind:bss addr:0x021626c0 -data_ov062_021626c4 kind:bss addr:0x021626c4 -sActorProfileUnkRML0 kind:bss addr:0x021626d0 +_ZGVN15ProfileInstanceI19ActorProfileUnkRML0E8sProfileE kind:bss addr:0x021626c0 +@32479 kind:bss addr:0x021626c4 +_ZN15ProfileInstanceI19ActorProfileUnkRML0E8sProfileE kind:bss addr:0x021626d0 data_ov062_021626dc kind:bss addr:0x021626dc ambiguous data_ov062_0216271c kind:bss addr:0x0216271c ambiguous -data_ov062_021627a8 kind:bss addr:0x021627a8 -data_ov062_021627ac kind:bss addr:0x021627ac -sActorProfileUnkRML1 kind:bss addr:0x021627b8 +_ZGVN15ProfileInstanceI19ActorProfileUnkRML1E8sProfileE kind:bss addr:0x021627a8 +@32485 kind:bss addr:0x021627ac +_ZN15ProfileInstanceI19ActorProfileUnkRML1E8sProfileE kind:bss addr:0x021627b8 data_ov062_02162808 kind:bss addr:0x02162808 ambiguous data_ov062_0216282c kind:bss addr:0x0216282c ambiguous -data_ov062_02162890 kind:bss addr:0x02162890 -data_ov062_02162894 kind:bss addr:0x02162894 -sActorProfileUnkRML2 kind:bss addr:0x021628a0 +_ZGVN15ProfileInstanceI19ActorProfileUnkRML2E8sProfileE kind:bss addr:0x02162890 +@32491 kind:bss addr:0x02162894 +_ZN15ProfileInstanceI19ActorProfileUnkRML2E8sProfileE kind:bss addr:0x021628a0 data_ov062_021628e8 kind:bss addr:0x021628e8 ambiguous -data_ov062_02162978 kind:bss addr:0x02162978 -data_ov062_0216297c kind:bss addr:0x0216297c -sActorProfileUnkRML3 kind:bss addr:0x02162988 +_ZGVN15ProfileInstanceI19ActorProfileUnkRML3E8sProfileE kind:bss addr:0x02162978 +@32497 kind:bss addr:0x0216297c +_ZN15ProfileInstanceI19ActorProfileUnkRML3E8sProfileE kind:bss addr:0x02162988 data_ov062_02162a2c kind:bss addr:0x02162a2c ambiguous -data_ov062_02162a60 kind:bss addr:0x02162a60 -data_ov062_02162a64 kind:bss addr:0x02162a64 -sActorProfileUnkNICO kind:bss addr:0x02162a70 -data_ov062_02162b48 kind:bss addr:0x02162b48 -data_ov062_02162b4c kind:bss addr:0x02162b4c -sActorProfileUnkFBCH kind:bss addr:0x02162b58 +_ZGVN15ProfileInstanceI19ActorProfileUnkNICOE8sProfileE kind:bss addr:0x02162a60 +@32503 kind:bss addr:0x02162a64 +_ZN15ProfileInstanceI19ActorProfileUnkNICOE8sProfileE kind:bss addr:0x02162a70 +_ZGVN15ProfileInstanceI19ActorProfileUnkFBCHE8sProfileE kind:bss addr:0x02162b48 +@32509 kind:bss addr:0x02162b4c +_ZN15ProfileInstanceI19ActorProfileUnkFBCHE8sProfileE kind:bss addr:0x02162b58 data_ov062_02162b7c kind:bss addr:0x02162b7c ambiguous data_ov062_02162bbc kind:bss addr:0x02162bbc ambiguous data_ov062_02162bd4 kind:bss addr:0x02162bd4 ambiguous data_ov062_02162c30 kind:bss addr:0x02162c30 -data_ov062_02162c34 kind:bss addr:0x02162c34 -data_ov062_02162c40 kind:bss addr:0x02162c40 -sActorProfileUnkNSHD kind:bss addr:0x02162c50 -data_ov062_02162c8c kind:bss addr:0x02162c8c -data_ov062_02162c90 kind:bss addr:0x02162c90 -sActorProfileUnkLBCK kind:bss addr:0x02162c9c +_ZGVN15ProfileInstanceI19ActorProfileUnkNSHDE8sProfileE kind:bss addr:0x02162c34 +@32515 kind:bss addr:0x02162c40 +_ZN15ProfileInstanceI19ActorProfileUnkNSHDE8sProfileE kind:bss addr:0x02162c50 +_ZGVN15ProfileInstanceI19ActorProfileUnkLBCKE8sProfileE kind:bss addr:0x02162c8c +@32521 kind:bss addr:0x02162c90 +_ZN15ProfileInstanceI19ActorProfileUnkLBCKE8sProfileE kind:bss addr:0x02162c9c data_ov062_02162cb0 kind:bss addr:0x02162cb0 ambiguous -data_ov062_02162d74 kind:bss addr:0x02162d74 -data_ov062_02162d78 kind:bss addr:0x02162d78 -sActorProfileUnkRMLF kind:bss addr:0x02162d84 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMLFE8sProfileE kind:bss addr:0x02162d74 +@32527 kind:bss addr:0x02162d78 +_ZN15ProfileInstanceI19ActorProfileUnkRMLFE8sProfileE kind:bss addr:0x02162d84 data_ov062_02162df8 kind:bss addr:0x02162df8 ambiguous data_ov062_02162e5c kind:bss addr:0x02162e5c -data_ov062_02162e64 kind:bss addr:0x02162e64 -data_ov062_02162e70 kind:bss addr:0x02162e70 -sActorProfileUnkNCMB kind:bss addr:0x02162e7c -sActorProfileUnkNCCB kind:bss addr:0x02162f54 -data_ov062_0216302c kind:bss addr:0x0216302c -data_ov062_02163030 kind:bss addr:0x02163030 -sActorProfileUnkNCWA kind:bss addr:0x0216303c +_ZGVN15ProfileInstanceI19ActorProfileUnkNCMBE8sProfileE kind:bss addr:0x02162e64 +@32533 kind:bss addr:0x02162e70 +_ZN15ProfileInstanceI19ActorProfileUnkNCMBE8sProfileE kind:bss addr:0x02162e7c +_ZN15ProfileInstanceI19ActorProfileUnkNCCBE8sProfileE kind:bss addr:0x02162f54 +_ZGVN15ProfileInstanceI19ActorProfileUnkNCWAE8sProfileE kind:bss addr:0x0216302c +@32539 kind:bss addr:0x02163030 +_ZN15ProfileInstanceI19ActorProfileUnkNCWAE8sProfileE kind:bss addr:0x0216303c data_ov062_021630d4 kind:bss addr:0x021630d4 ambiguous -data_ov062_02163114 kind:bss addr:0x02163114 -data_ov062_02163118 kind:bss addr:0x02163118 -sActorProfileUnkRMBC kind:bss addr:0x02163124 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMBCE8sProfileE kind:bss addr:0x02163114 +@32545 kind:bss addr:0x02163118 +_ZN15ProfileInstanceI19ActorProfileUnkRMBCE8sProfileE kind:bss addr:0x02163124 data_ov062_021631d8 kind:bss addr:0x021631d8 ambiguous -data_ov062_021631fc kind:bss addr:0x021631fc -data_ov062_02163200 kind:bss addr:0x02163200 -sActorProfileUnkMOCT kind:bss addr:0x0216320c -data_ov062_02163248 kind:bss addr:0x02163248 -data_ov062_0216324c kind:bss addr:0x0216324c -sActorProfileUnkTSLB kind:bss addr:0x02163258 +_ZGVN15ProfileInstanceI19ActorProfileUnkMOCTE8sProfileE kind:bss addr:0x021631fc +@32551 kind:bss addr:0x02163200 +_ZN15ProfileInstanceI19ActorProfileUnkMOCTE8sProfileE kind:bss addr:0x0216320c +_ZGVN15ProfileInstanceI19ActorProfileUnkTSLBE8sProfileE kind:bss addr:0x02163248 +@32557 kind:bss addr:0x0216324c +_ZN15ProfileInstanceI19ActorProfileUnkTSLBE8sProfileE kind:bss addr:0x02163258 data_ov062_021632a4 kind:bss addr:0x021632a4 ambiguous data_ov062_021632a8 kind:bss addr:0x021632a8 ambiguous -data_ov062_02163330 kind:bss addr:0x02163330 -data_ov062_02163334 kind:bss addr:0x02163334 -sMapObjectProfileUnkFSFS kind:bss addr:0x02163340 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkFSFSE8sProfileE kind:bss addr:0x02163330 +@32155 kind:bss addr:0x02163334 +_ZN15ProfileInstanceI23MapObjectProfileUnkFSFSE8sProfileE kind:bss addr:0x02163340 data_ov062_02163408 kind:bss addr:0x02163408 ambiguous -data_ov062_02163414 kind:bss addr:0x02163414 -data_ov062_02163418 kind:bss addr:0x02163418 -sMapObjectProfileUnkHOL2 kind:bss addr:0x02163424 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkHOL2E8sProfileE kind:bss addr:0x02163414 +@32161 kind:bss addr:0x02163418 +_ZN15ProfileInstanceI23MapObjectProfileUnkHOL2E8sProfileE kind:bss addr:0x02163424 data_ov062_02163428 kind:bss addr:0x02163428 ambiguous data_ov062_02163444 kind:bss addr:0x02163444 data_ov062_021634c4 kind:bss addr:0x021634c4 ambiguous -data_ov062_0216351c kind:bss addr:0x0216351c -data_ov062_02163520 kind:bss addr:0x02163520 -sMapObjectProfileUnkHOL0 kind:bss addr:0x0216352c +_ZGVN15ProfileInstanceI23MapObjectProfileUnkHOL0E8sProfileE kind:bss addr:0x0216351c +@32167 kind:bss addr:0x02163520 +_ZN15ProfileInstanceI23MapObjectProfileUnkHOL0E8sProfileE kind:bss addr:0x0216352c data_ov062_02163584 kind:bss addr:0x02163584 ambiguous -data_ov062_02163600 kind:bss addr:0x02163600 -data_ov062_02163604 kind:bss addr:0x02163604 -sMapObjectProfileUnkHOL1 kind:bss addr:0x02163610 -data_ov062_021636e4 kind:bss addr:0x021636e4 -data_ov062_021636e8 kind:bss addr:0x021636e8 -sMapObjectProfileUnkHOLB kind:bss addr:0x021636f4 -data_ov062_021637c8 kind:bss addr:0x021637c8 -data_ov062_021637cc kind:bss addr:0x021637cc -sMapObjectProfileUnkHOSB kind:bss addr:0x021637d8 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkHOL1E8sProfileE kind:bss addr:0x02163600 +@32173 kind:bss addr:0x02163604 +_ZN15ProfileInstanceI23MapObjectProfileUnkHOL1E8sProfileE kind:bss addr:0x02163610 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkHOLBE8sProfileE kind:bss addr:0x021636e4 +@32179 kind:bss addr:0x021636e8 +_ZN15ProfileInstanceI23MapObjectProfileUnkHOLBE8sProfileE kind:bss addr:0x021636f4 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkHOSBE8sProfileE kind:bss addr:0x021637c8 +@32185 kind:bss addr:0x021637cc +_ZN15ProfileInstanceI23MapObjectProfileUnkHOSBE8sProfileE kind:bss addr:0x021637d8 data_ov062_02163884 kind:bss addr:0x02163884 ambiguous -data_ov062_021638ac kind:bss addr:0x021638ac -data_ov062_021638b0 kind:bss addr:0x021638b0 -sMapObjectProfileUnkGBDR kind:bss addr:0x021638bc +_ZGVN15ProfileInstanceI23MapObjectProfileUnkGBDRE8sProfileE kind:bss addr:0x021638ac +@32191 kind:bss addr:0x021638b0 +_ZN15ProfileInstanceI23MapObjectProfileUnkGBDRE8sProfileE kind:bss addr:0x021638bc data_ov062_02163918 kind:bss addr:0x02163918 ambiguous data_ov062_02163938 kind:bss addr:0x02163938 ambiguous data_ov062_02163990 kind:bss addr:0x02163990 diff --git a/config/jp/arm9/overlays/ov063/delinks.txt b/config/jp/arm9/overlays/ov063/delinks.txt index 8280b1af..533024dc 100644 --- a/config/jp/arm9/overlays/ov063/delinks.txt +++ b/config/jp/arm9/overlays/ov063/delinks.txt @@ -9,76 +9,76 @@ src/063_Shrine/Actor/ActorUnkCANS.cpp: .text start:0x02159be0 end:0x0215c894 .init start:0x02164548 end:0x021645b8 .ctor start:0x02164c58 end:0x02164c5c - .bss start:0x02165990 end:0x02165a68 + .bss start:0x02165980 end:0x02165a68 src/063_Shrine/Actor/ActorUnkCASE.cpp: .text start:0x0215c894 end:0x0215d890 .init start:0x021645b8 end:0x0216464c .ctor start:0x02164c5c end:0x02164c60 - .bss start:0x02165a78 end:0x02165b50 + .bss start:0x02165a68 end:0x02165b50 src/063_Shrine/Actor/ActorUnkRMSV.cpp: .text start:0x0215d9c0 end:0x0215dd24 .init start:0x0216464c end:0x0216469c .ctor start:0x02164c60 end:0x02164c64 - .bss start:0x02165b60 end:0x02165c38 + .bss start:0x02165b50 end:0x02165c38 src/063_Shrine/Actor/ActorUnkRMSW.cpp: .text start:0x0215dd24 end:0x0215df6c .init start:0x0216469c end:0x021646ec .ctor start:0x02164c64 end:0x02164c68 - .bss start:0x02165c48 end:0x02165d20 + .bss start:0x02165c38 end:0x02165d20 src/063_Shrine/Actor/ActorUnkRMSF.cpp: .text start:0x0215df6c end:0x0215e0d0 .init start:0x021646ec end:0x0216473c .ctor start:0x02164c68 end:0x02164c6c - .bss start:0x02165d30 end:0x02165e08 + .bss start:0x02165d20 end:0x02165e08 src/063_Shrine/Actor/ActorUnkRMSD.cpp: .text start:0x0215e0d0 end:0x0215e318 .init start:0x0216473c end:0x0216478c .ctor start:0x02164c6c end:0x02164c70 - .bss start:0x02165e18 end:0x02165ef0 + .bss start:0x02165e08 end:0x02165ef0 src/063_Shrine/Actor/ActorUnkRMSS.cpp: .text start:0x0215e318 end:0x0215e47c .init start:0x0216478c end:0x021647dc .ctor start:0x02164c70 end:0x02164c74 - .bss start:0x02165f00 end:0x02165fd8 + .bss start:0x02165ef0 end:0x02166138 src/063_Shrine/Actor/ActorUnkRBLS.cpp: .text start:0x0216108c end:0x02161318 .init start:0x02164944 end:0x02164994 .ctor start:0x02164c78 end:0x02164c7c - .bss start:0x02166148 end:0x02166220 + .bss start:0x02166138 end:0x02166220 src/063_Shrine/MapObject/MapObjectUnkSTAT.cpp: .text start:0x02161318 end:0x02161b68 .init start:0x02164994 end:0x021649e4 .ctor start:0x02164c7c end:0x02164c80 - .bss start:0x02166230 end:0x02166304 + .bss start:0x02166220 end:0x021663a4 src/063_Shrine/MapObject/MapObjectUnkWLMS.cpp: .text start:0x02161b68 end:0x02162878 .init start:0x021649e4 end:0x02164b38 .ctor start:0x02164c80 end:0x02164c84 - .bss start:0x02166424 end:0x021664f8 + .bss start:0x021663a4 end:0x02166518 src/063_Shrine/MapObject/MapObjectUnkLTRW.cpp: .text start:0x021628e8 end:0x02162cb0 .init start:0x02164b38 end:0x02164bb8 .ctor start:0x02164c84 end:0x02164c88 - .bss start:0x02166528 end:0x021665fc + .bss start:0x02166518 end:0x02166620 src/063_Shrine/MapObject/MapObjectUnkMTJR.cpp: .text start:0x02162cb0 end:0x02163248 .init start:0x02164bb8 end:0x02164c08 .ctor start:0x02164c88 end:0x02164c8c - .bss start:0x02166630 end:0x02166704 + .bss start:0x02166620 end:0x02166724 src/063_Shrine/MapObject/MapObjectUnkSWCR.cpp: .text start:0x02163248 end:0x02163f60 .init start:0x02164c08 end:0x02164c58 .ctor start:0x02164c8c end:0x02164c90 - .bss start:0x02166734 end:0x02166754 + .bss start:0x02166724 end:0x02166754 diff --git a/config/jp/arm9/overlays/ov063/symbols.txt b/config/jp/arm9/overlays/ov063/symbols.txt index 35dc6b4e..8706d456 100644 --- a/config/jp/arm9/overlays/ov063/symbols.txt +++ b/config/jp/arm9/overlays/ov063/symbols.txt @@ -500,27 +500,27 @@ data_ov063_021658d8 kind:data(any) addr:0x021658d8 data_ov063_02165918 kind:data(any) addr:0x02165918 data_ov063_0216592c kind:data(any) addr:0x0216592c data_ov063_02165948 kind:data(any) addr:0x02165948 -data_ov063_02165980 kind:bss addr:0x02165980 -data_ov063_02165984 kind:bss addr:0x02165984 -sActorProfileUnkCANS kind:bss addr:0x02165990 -data_ov063_02165a68 kind:bss addr:0x02165a68 -data_ov063_02165a6c kind:bss addr:0x02165a6c -sActorProfileUnkCASE kind:bss addr:0x02165a78 -data_ov063_02165b50 kind:bss addr:0x02165b50 -data_ov063_02165b54 kind:bss addr:0x02165b54 -sActorProfileUnkRMSV kind:bss addr:0x02165b60 -data_ov063_02165c38 kind:bss addr:0x02165c38 -data_ov063_02165c3c kind:bss addr:0x02165c3c -sActorProfileUnkRMSW kind:bss addr:0x02165c48 -data_ov063_02165d20 kind:bss addr:0x02165d20 -data_ov063_02165d24 kind:bss addr:0x02165d24 -sActorProfileUnkRMSF kind:bss addr:0x02165d30 -data_ov063_02165e08 kind:bss addr:0x02165e08 -data_ov063_02165e0c kind:bss addr:0x02165e0c -sActorProfileUnkRMSD kind:bss addr:0x02165e18 -data_ov063_02165ef0 kind:bss addr:0x02165ef0 -data_ov063_02165ef4 kind:bss addr:0x02165ef4 -sActorProfileUnkRMSS kind:bss addr:0x02165f00 +_ZGVN15ProfileInstanceI19ActorProfileUnkCANSE8sProfileE kind:bss addr:0x02165980 +@32611 kind:bss addr:0x02165984 +_ZN15ProfileInstanceI19ActorProfileUnkCANSE8sProfileE kind:bss addr:0x02165990 +_ZGVN15ProfileInstanceI19ActorProfileUnkCASEE8sProfileE kind:bss addr:0x02165a68 +@32617 kind:bss addr:0x02165a6c +_ZN15ProfileInstanceI19ActorProfileUnkCASEE8sProfileE kind:bss addr:0x02165a78 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMSVE8sProfileE kind:bss addr:0x02165b50 +@32623 kind:bss addr:0x02165b54 +_ZN15ProfileInstanceI19ActorProfileUnkRMSVE8sProfileE kind:bss addr:0x02165b60 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMSWE8sProfileE kind:bss addr:0x02165c38 +@32629 kind:bss addr:0x02165c3c +_ZN15ProfileInstanceI19ActorProfileUnkRMSWE8sProfileE kind:bss addr:0x02165c48 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMSFE8sProfileE kind:bss addr:0x02165d20 +@32635 kind:bss addr:0x02165d24 +_ZN15ProfileInstanceI19ActorProfileUnkRMSFE8sProfileE kind:bss addr:0x02165d30 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMSDE8sProfileE kind:bss addr:0x02165e08 +@32641 kind:bss addr:0x02165e0c +_ZN15ProfileInstanceI19ActorProfileUnkRMSDE8sProfileE kind:bss addr:0x02165e18 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMSSE8sProfileE kind:bss addr:0x02165ef0 +@32647 kind:bss addr:0x02165ef4 +_ZN15ProfileInstanceI19ActorProfileUnkRMSSE8sProfileE kind:bss addr:0x02165f00 data_ov063_02165fd8 kind:bss addr:0x02165fd8 data_ov063_02165fdc kind:bss addr:0x02165fdc data_ov063_02165fe8 kind:bss addr:0x02165fe8 @@ -528,30 +528,30 @@ data_ov063_02165ff0 kind:bss addr:0x02165ff0 ambiguous data_ov063_02166040 kind:bss addr:0x02166040 ambiguous data_ov063_02166054 kind:bss addr:0x02166054 ambiguous data_ov063_0216611c kind:bss addr:0x0216611c ambiguous -data_ov063_02166138 kind:bss addr:0x02166138 -data_ov063_0216613c kind:bss addr:0x0216613c -sActorProfileUnkRBLS kind:bss addr:0x02166148 -data_ov063_02166220 kind:bss addr:0x02166220 -data_ov063_02166224 kind:bss addr:0x02166224 -sMapObjectProfileUnkSTAT kind:bss addr:0x02166230 +_ZGVN15ProfileInstanceI19ActorProfileUnkRBLSE8sProfileE kind:bss addr:0x02166138 +@32653 kind:bss addr:0x0216613c +_ZN15ProfileInstanceI19ActorProfileUnkRBLSE8sProfileE kind:bss addr:0x02166148 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkSTATE8sProfileE kind:bss addr:0x02166220 +@32251 kind:bss addr:0x02166224 +_ZN15ProfileInstanceI23MapObjectProfileUnkSTATE8sProfileE kind:bss addr:0x02166230 data_ov063_02166304 kind:bss addr:0x02166304 data_ov063_02166324 kind:bss addr:0x02166324 data_ov063_02166328 kind:bss addr:0x02166328 data_ov063_02166334 kind:bss addr:0x02166334 -data_ov063_021663a4 kind:bss addr:0x021663a4 ambiguous -data_ov063_021663ac kind:bss addr:0x021663ac -sMapObjectProfileUnkWLMS kind:bss addr:0x02166424 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkWLMSE8sProfileE kind:bss addr:0x021663a4 ambiguous +@32257 kind:bss addr:0x021663ac +_ZN15ProfileInstanceI23MapObjectProfileUnkWLMSE8sProfileE kind:bss addr:0x02166424 data_ov063_021664f8 kind:bss addr:0x021664f8 -data_ov063_02166518 kind:bss addr:0x02166518 -data_ov063_0216651c kind:bss addr:0x0216651c -sMapObjectProfileUnkLTRW kind:bss addr:0x02166528 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkLTRWE8sProfileE kind:bss addr:0x02166518 +@32263 kind:bss addr:0x0216651c +_ZN15ProfileInstanceI23MapObjectProfileUnkLTRWE8sProfileE kind:bss addr:0x02166528 data_ov063_021665fc kind:bss addr:0x021665fc -data_ov063_02166620 kind:bss addr:0x02166620 -data_ov063_02166624 kind:bss addr:0x02166624 -sMapObjectProfileUnkMTJR kind:bss addr:0x02166630 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkMTJRE8sProfileE kind:bss addr:0x02166620 +@32269 kind:bss addr:0x02166624 +_ZN15ProfileInstanceI23MapObjectProfileUnkMTJRE8sProfileE kind:bss addr:0x02166630 data_ov063_02166704 kind:bss addr:0x02166704 -data_ov063_02166724 kind:bss addr:0x02166724 -data_ov063_02166728 kind:bss addr:0x02166728 -sMapObjectProfileUnkSWCR kind:bss addr:0x02166734 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkSWCRE8sProfileE kind:bss addr:0x02166724 +@32275 kind:bss addr:0x02166728 +_ZN15ProfileInstanceI23MapObjectProfileUnkSWCRE8sProfileE kind:bss addr:0x02166734 data_ov063_02166754 kind:bss addr:0x02166754 data_ov063_02166808 kind:bss addr:0x02166808 diff --git a/config/jp/arm9/overlays/ov064/delinks.txt b/config/jp/arm9/overlays/ov064/delinks.txt index 64eff284..8d351909 100644 --- a/config/jp/arm9/overlays/ov064/delinks.txt +++ b/config/jp/arm9/overlays/ov064/delinks.txt @@ -9,46 +9,46 @@ src/064_FldForest/MapObject/MapObjectUnkFSFR.cpp: .text start:0x0215ae80 end:0x0215afb8 .init start:0x0215c084 end:0x0215c0d4 .ctor start:0x0215c32c end:0x0215c330 - .bss start:0x0215cb34 end:0x0215cc08 + .bss start:0x0215cb24 end:0x0215cc08 src/064_FldForest/Actor/ActorUnkRMF0.cpp: .text start:0x0215afb8 end:0x0215b0dc .init start:0x0215c0d4 end:0x0215c124 .ctor start:0x0215c330 end:0x0215c334 - .bss start:0x0215cc18 end:0x0215cc3c + .bss start:0x0215cc08 end:0x0215ccf0 src/064_FldForest/Actor/ActorUnkRMF1.cpp: .text start:0x0215b0dc end:0x0215b200 .init start:0x0215c124 end:0x0215c174 .ctor start:0x0215c334 end:0x0215c338 - .bss start:0x0215cd00 end:0x0215cdbc + .bss start:0x0215ccf0 end:0x0215cdd8 src/064_FldForest/Actor/ActorUnkRMTZ.cpp: .text start:0x0215b200 end:0x0215b3cc .init start:0x0215c174 end:0x0215c1c4 .ctor start:0x0215c338 end:0x0215c33c - .bss start:0x0215cde8 end:0x0215ce70 + .bss start:0x0215cdd8 end:0x0215ced0 src/064_FldForest/Actor/ActorUnkFOMD.cpp: .text start:0x0215b3cc end:0x0215bbcc .init start:0x0215c1c4 end:0x0215c23c .ctor start:0x0215c33c end:0x0215c340 - .bss start:0x0215cf18 end:0x0215cff0 + .bss start:0x0215ced0 end:0x0215cff0 src/064_FldForest/MapObject/MapObjectUnkHOF1.cpp: .text start:0x0215bbcc end:0x0215bd38 .init start:0x0215c23c end:0x0215c28c .ctor start:0x0215c340 end:0x0215c344 - .bss start:0x0215d000 end:0x0215d004 + .bss start:0x0215cff0 end:0x0215d0f8 src/064_FldForest/MapObject/MapObjectUnkHOF0.cpp: .text start:0x0215bd38 end:0x0215beb0 .init start:0x0215c28c end:0x0215c2dc .ctor start:0x0215c344 end:0x0215c348 - .bss start:0x0215d108 end:0x0215d114 + .bss start:0x0215d0f8 end:0x0215d204 src/064_FldForest/MapObject/MapObjectUnkLEVN.cpp: .text start:0x0215beb0 end:0x0215c018 .init start:0x0215c2dc end:0x0215c32c .ctor start:0x0215c348 end:0x0215c34c - .bss start:0x0215d210 end:0x0215d260 + .bss start:0x0215d204 end:0x0215d260 diff --git a/config/jp/arm9/overlays/ov064/symbols.txt b/config/jp/arm9/overlays/ov064/symbols.txt index 90430ae4..0f8ce462 100644 --- a/config/jp/arm9/overlays/ov064/symbols.txt +++ b/config/jp/arm9/overlays/ov064/symbols.txt @@ -188,37 +188,37 @@ data_ov064_0215cab8 kind:data(any) addr:0x0215cab8 data_ov064_0215caec kind:data(any) addr:0x0215caec ambiguous data_ov064_0215cb00 kind:bss addr:0x0215cb00 data_ov064_0215cb04 kind:bss addr:0x0215cb04 -data_ov064_0215cb24 kind:bss addr:0x0215cb24 -data_ov064_0215cb28 kind:bss addr:0x0215cb28 -sMapObjectProfileUnkFSFR kind:bss addr:0x0215cb34 -data_ov064_0215cc08 kind:bss addr:0x0215cc08 -data_ov064_0215cc0c kind:bss addr:0x0215cc0c -sActorProfileUnkRMF0 kind:bss addr:0x0215cc18 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkFSFRE8sProfileE kind:bss addr:0x0215cb24 +@32287 kind:bss addr:0x0215cb28 +_ZN15ProfileInstanceI23MapObjectProfileUnkFSFRE8sProfileE kind:bss addr:0x0215cb34 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMF0E8sProfileE kind:bss addr:0x0215cc08 +@32701 kind:bss addr:0x0215cc0c +_ZN15ProfileInstanceI19ActorProfileUnkRMF0E8sProfileE kind:bss addr:0x0215cc18 data_ov064_0215cc3c kind:bss addr:0x0215cc3c ambiguous -data_ov064_0215ccf0 kind:bss addr:0x0215ccf0 -data_ov064_0215ccf4 kind:bss addr:0x0215ccf4 -sActorProfileUnkRMF1 kind:bss addr:0x0215cd00 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMF1E8sProfileE kind:bss addr:0x0215ccf0 +@32707 kind:bss addr:0x0215ccf4 +_ZN15ProfileInstanceI19ActorProfileUnkRMF1E8sProfileE kind:bss addr:0x0215cd00 data_ov064_0215cdbc kind:bss addr:0x0215cdbc ambiguous -data_ov064_0215cdd8 kind:bss addr:0x0215cdd8 -data_ov064_0215cddc kind:bss addr:0x0215cddc -sActorProfileUnkRMTZ kind:bss addr:0x0215cde8 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMTZE8sProfileE kind:bss addr:0x0215cdd8 +@32713 kind:bss addr:0x0215cddc +_ZN15ProfileInstanceI19ActorProfileUnkRMTZE8sProfileE kind:bss addr:0x0215cde8 data_ov064_0215ce70 kind:bss addr:0x0215ce70 ambiguous data_ov064_0215cec0 kind:bss addr:0x0215cec0 data_ov064_0215cec4 kind:bss addr:0x0215cec4 -data_ov064_0215ced0 kind:bss addr:0x0215ced0 -data_ov064_0215cedc kind:bss addr:0x0215cedc -sActorProfileUnkFOMD kind:bss addr:0x0215cf18 -data_ov064_0215cff0 kind:bss addr:0x0215cff0 -data_ov064_0215cff4 kind:bss addr:0x0215cff4 -sMapObjectProfileUnkHOF1 kind:bss addr:0x0215d000 +_ZGVN15ProfileInstanceI19ActorProfileUnkFOMDE8sProfileE kind:bss addr:0x0215ced0 +@32719 kind:bss addr:0x0215cedc +_ZN15ProfileInstanceI19ActorProfileUnkFOMDE8sProfileE kind:bss addr:0x0215cf18 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkHOF1E8sProfileE kind:bss addr:0x0215cff0 +@32317 kind:bss addr:0x0215cff4 +_ZN15ProfileInstanceI23MapObjectProfileUnkHOF1E8sProfileE kind:bss addr:0x0215d000 data_ov064_0215d004 kind:bss addr:0x0215d004 ambiguous data_ov064_0215d0e0 kind:bss addr:0x0215d0e0 ambiguous -data_ov064_0215d0f8 kind:bss addr:0x0215d0f8 -data_ov064_0215d0fc kind:bss addr:0x0215d0fc -sMapObjectProfileUnkHOF0 kind:bss addr:0x0215d108 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkHOF0E8sProfileE kind:bss addr:0x0215d0f8 +@32323 kind:bss addr:0x0215d0fc +_ZN15ProfileInstanceI23MapObjectProfileUnkHOF0E8sProfileE kind:bss addr:0x0215d108 data_ov064_0215d114 kind:bss addr:0x0215d114 ambiguous data_ov064_0215d1ec kind:bss addr:0x0215d1ec ambiguous data_ov064_0215d200 kind:bss addr:0x0215d200 -data_ov064_0215d204 kind:bss addr:0x0215d204 -data_ov064_0215d208 kind:bss addr:0x0215d208 ambiguous -sMapObjectProfileUnkLEVN kind:bss addr:0x0215d210 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkLEVNE8sProfileE kind:bss addr:0x0215d204 +@32329 kind:bss addr:0x0215d208 ambiguous +_ZN15ProfileInstanceI23MapObjectProfileUnkLEVNE8sProfileE kind:bss addr:0x0215d210 diff --git a/config/jp/arm9/overlays/ov065/delinks.txt b/config/jp/arm9/overlays/ov065/delinks.txt index c65af825..9461626f 100644 --- a/config/jp/arm9/overlays/ov065/delinks.txt +++ b/config/jp/arm9/overlays/ov065/delinks.txt @@ -9,70 +9,70 @@ src/065_FldSnow/Actor/ActorUnkYUKI.cpp: .text start:0x02159be0 end:0x0215a6c8 .init start:0x0215bda4 end:0x0215be1c .ctor start:0x0215c1e8 end:0x0215c1ec - .bss start:0x0215cd4c end:0x0215cdbc + .bss start:0x0215ccf0 end:0x0215ce24 src/065_FldSnow/Actor/ActorUnkRMS0.cpp: .text start:0x0215aad0 end:0x0215abf4 .init start:0x0215be1c end:0x0215be6c .ctor start:0x0215c1ec end:0x0215c1f0 - .bss start:0x0215ce34 end:0x0215ce70 + .bss start:0x0215ce24 end:0x0215cf0c src/065_FldSnow/Actor/ActorUnkRMS1.cpp: .text start:0x0215abf4 end:0x0215ad18 .init start:0x0215be6c end:0x0215bebc .ctor start:0x0215c1f0 end:0x0215c1f4 - .bss start:0x0215cf1c end:0x0215cff0 + .bss start:0x0215cf0c end:0x0215cff4 src/065_FldSnow/Actor/ActorUnkRMS2.cpp: .text start:0x0215ad18 end:0x0215ae3c .init start:0x0215bebc end:0x0215bf0c .ctor start:0x0215c1f4 end:0x0215c1f8 - .bss start:0x0215d004 end:0x0215d0dc + .bss start:0x0215cff4 end:0x0215d0dc src/065_FldSnow/Actor/ActorUnkRMS3.cpp: .text start:0x0215ae3c end:0x0215af60 .init start:0x0215bf0c end:0x0215bf5c .ctor start:0x0215c1f8 end:0x0215c1fc - .bss start:0x0215d0ec end:0x0215d114 + .bss start:0x0215d0dc end:0x0215d1c4 src/065_FldSnow/Actor/ActorUnkRMS4.cpp: .text start:0x0215af60 end:0x0215b084 .init start:0x0215bf5c end:0x0215bfac .ctor start:0x0215c1fc end:0x0215c200 - .bss start:0x0215d1d4 end:0x0215d1ec + .bss start:0x0215d1c4 end:0x0215d2ac src/065_FldSnow/Actor/ActorUnkRMS5.cpp: .text start:0x0215b084 end:0x0215b1a8 .init start:0x0215bfac end:0x0215bffc .ctor start:0x0215c200 end:0x0215c204 - .bss start:0x0215d2bc end:0x0215d394 + .bss start:0x0215d2ac end:0x0215d394 src/065_FldSnow/Actor/ActorUnkRMTE.cpp: .text start:0x0215b1a8 end:0x0215b438 .init start:0x0215bffc end:0x0215c04c .ctor start:0x0215c204 end:0x0215c208 - .bss start:0x0215d3a4 end:0x0215d47c + .bss start:0x0215d394 end:0x0215d498 src/065_FldSnow/Actor/ActorUnkYWIS.cpp: .text start:0x0215b438 end:0x0215b660 .init start:0x0215c04c end:0x0215c0c8 .ctor start:0x0215c208 end:0x0215c20c - .bss start:0x0215d4a4 end:0x0215d4e0 + .bss start:0x0215d498 end:0x0215d4e0 src/065_FldSnow/MapObject/MapObjectUnkTSGM.cpp: .text start:0x0215b660 end:0x0215b958 .init start:0x0215c0c8 end:0x0215c148 .ctor start:0x0215c20c end:0x0215c210 - .bss start:0x0215d4fc end:0x0215d51c + .bss start:0x0215d4e0 end:0x0215d53c src/065_FldSnow/MapObject/MapObjectUnkHOSO.cpp: .text start:0x0215b9b8 end:0x0215bb0c .init start:0x0215c148 end:0x0215c198 .ctor start:0x0215c210 end:0x0215c214 - .bss start:0x0215d54c end:0x0215d590 + .bss start:0x0215d53c end:0x0215d620 src/065_FldSnow/MapObject/MapObjectUnkMTIC.cpp: .text start:0x0215bb0c end:0x0215bd14 .init start:0x0215c198 end:0x0215c1e8 .ctor start:0x0215c214 end:0x0215c218 - .bss start:0x0215d630 end:0x0215d644 + .bss start:0x0215d620 end:0x0215d644 diff --git a/config/jp/arm9/overlays/ov065/relocs.txt b/config/jp/arm9/overlays/ov065/relocs.txt index d23eeec1..6803a539 100644 --- a/config/jp/arm9/overlays/ov065/relocs.txt +++ b/config/jp/arm9/overlays/ov065/relocs.txt @@ -265,9 +265,9 @@ from:0x0215b48c kind:load to:0x0215ca48 add:0x8 module:overlay(65) from:0x0215b498 kind:arm_call to:0x02099b30 module:overlay(0) from:0x0215b4d0 kind:arm_call to:0x020611a8 module:overlay(0) from:0x0215b4e8 kind:load to:0x0215ca6c add:0x8 module:overlay(65) -from:0x0215b4ec kind:load to:0x0215d49a module:overlay(65) +from:0x0215b4ec kind:load to:0x0215d48c add:0xe module:overlay(65) from:0x0215b4f0 kind:load to:0x0215d48c module:overlay(65) -from:0x0215b4f4 kind:load to:0x0215d496 module:overlay(65) +from:0x0215b4f4 kind:load to:0x0215d48c add:0xa module:overlay(65) from:0x0215b4f8 kind:load to:0x0215d47c module:overlay(65) from:0x0215b530 kind:load to:0x027e09b8 module:dtcm from:0x0215b580 kind:arm_call to:0x020c89bc module:overlay(24) diff --git a/config/jp/arm9/overlays/ov065/symbols.txt b/config/jp/arm9/overlays/ov065/symbols.txt index 8e94c0be..6236c3b1 100644 --- a/config/jp/arm9/overlays/ov065/symbols.txt +++ b/config/jp/arm9/overlays/ov065/symbols.txt @@ -249,55 +249,55 @@ data_ov065_0215cc64 kind:data(any) addr:0x0215cc64 data_ov065_0215cc8c kind:data(any) addr:0x0215cc8c data_ov065_0215cce0 kind:bss addr:0x0215cce0 data_ov065_0215cce4 kind:bss addr:0x0215cce4 -data_ov065_0215ccf0 kind:bss addr:0x0215ccf0 -data_ov065_0215ccfc kind:bss addr:0x0215ccfc -sActorProfileUnkYUKI kind:bss addr:0x0215cd4c +_ZGVN15ProfileInstanceI19ActorProfileUnkYUKIE8sProfileE kind:bss addr:0x0215ccf0 +@32749 kind:bss addr:0x0215ccfc +_ZN15ProfileInstanceI19ActorProfileUnkYUKIE8sProfileE kind:bss addr:0x0215cd4c data_ov065_0215cdbc kind:bss addr:0x0215cdbc ambiguous -data_ov065_0215ce24 kind:bss addr:0x0215ce24 -data_ov065_0215ce28 kind:bss addr:0x0215ce28 -sActorProfileUnkRMS0 kind:bss addr:0x0215ce34 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMS0E8sProfileE kind:bss addr:0x0215ce24 +@32755 kind:bss addr:0x0215ce28 +_ZN15ProfileInstanceI19ActorProfileUnkRMS0E8sProfileE kind:bss addr:0x0215ce34 data_ov065_0215ce70 kind:bss addr:0x0215ce70 ambiguous -data_ov065_0215cf0c kind:bss addr:0x0215cf0c -data_ov065_0215cf10 kind:bss addr:0x0215cf10 -sActorProfileUnkRMS1 kind:bss addr:0x0215cf1c +_ZGVN15ProfileInstanceI19ActorProfileUnkRMS1E8sProfileE kind:bss addr:0x0215cf0c +@32761 kind:bss addr:0x0215cf10 +_ZN15ProfileInstanceI19ActorProfileUnkRMS1E8sProfileE kind:bss addr:0x0215cf1c data_ov065_0215cff0 kind:bss addr:0x0215cff0 ambiguous -data_ov065_0215cff4 kind:bss addr:0x0215cff4 -data_ov065_0215cff8 kind:bss addr:0x0215cff8 -sActorProfileUnkRMS2 kind:bss addr:0x0215d004 -data_ov065_0215d0dc kind:bss addr:0x0215d0dc -data_ov065_0215d0e0 kind:bss addr:0x0215d0e0 -sActorProfileUnkRMS3 kind:bss addr:0x0215d0ec +_ZGVN15ProfileInstanceI19ActorProfileUnkRMS2E8sProfileE kind:bss addr:0x0215cff4 +@32767 kind:bss addr:0x0215cff8 +_ZN15ProfileInstanceI19ActorProfileUnkRMS2E8sProfileE kind:bss addr:0x0215d004 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMS3E8sProfileE kind:bss addr:0x0215d0dc +@32773 kind:bss addr:0x0215d0e0 +_ZN15ProfileInstanceI19ActorProfileUnkRMS3E8sProfileE kind:bss addr:0x0215d0ec data_ov065_0215d114 kind:bss addr:0x0215d114 ambiguous -data_ov065_0215d1c4 kind:bss addr:0x0215d1c4 -data_ov065_0215d1c8 kind:bss addr:0x0215d1c8 -sActorProfileUnkRMS4 kind:bss addr:0x0215d1d4 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMS4E8sProfileE kind:bss addr:0x0215d1c4 +@32779 kind:bss addr:0x0215d1c8 +_ZN15ProfileInstanceI19ActorProfileUnkRMS4E8sProfileE kind:bss addr:0x0215d1d4 data_ov065_0215d1ec kind:bss addr:0x0215d1ec ambiguous data_ov065_0215d204 kind:bss addr:0x0215d204 ambiguous data_ov065_0215d208 kind:bss addr:0x0215d208 ambiguous data_ov065_0215d24c kind:bss addr:0x0215d24c ambiguous -data_ov065_0215d2ac kind:bss addr:0x0215d2ac -data_ov065_0215d2b0 kind:bss addr:0x0215d2b0 -sActorProfileUnkRMS5 kind:bss addr:0x0215d2bc -data_ov065_0215d394 kind:bss addr:0x0215d394 -data_ov065_0215d398 kind:bss addr:0x0215d398 -sActorProfileUnkRMTE kind:bss addr:0x0215d3a4 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMS5E8sProfileE kind:bss addr:0x0215d2ac +@32785 kind:bss addr:0x0215d2b0 +_ZN15ProfileInstanceI19ActorProfileUnkRMS5E8sProfileE kind:bss addr:0x0215d2bc +_ZGVN15ProfileInstanceI19ActorProfileUnkRMTEE8sProfileE kind:bss addr:0x0215d394 +@32791 kind:bss addr:0x0215d398 +_ZN15ProfileInstanceI19ActorProfileUnkRMTEE8sProfileE kind:bss addr:0x0215d3a4 data_ov065_0215d47c kind:bss addr:0x0215d47c data_ov065_0215d480 kind:bss addr:0x0215d480 data_ov065_0215d48c kind:bss addr:0x0215d48c -data_ov065_0215d496 kind:bss addr:0x0215d496 -data_ov065_0215d49a kind:bss addr:0x0215d49a -sActorProfileUnkYWIS kind:bss addr:0x0215d4a4 -data_ov065_0215d4e0 kind:bss addr:0x0215d4e0 -data_ov065_0215d4f0 kind:bss addr:0x0215d4f0 -sMapObjectProfileUnkTSGM kind:bss addr:0x0215d4fc +_ZGVN15ProfileInstanceI19ActorProfileUnkYWISE8sProfileE kind:bss addr:0x0215d498 +@32797 kind:bss addr:0x0215d49c +_ZN15ProfileInstanceI19ActorProfileUnkYWISE8sProfileE kind:bss addr:0x0215d4a4 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTSGME8sProfileE kind:bss addr:0x0215d4e0 +@32395 kind:bss addr:0x0215d4f0 +_ZN15ProfileInstanceI23MapObjectProfileUnkTSGME8sProfileE kind:bss addr:0x0215d4fc data_ov065_0215d51c kind:bss addr:0x0215d51c -data_ov065_0215d53c kind:bss addr:0x0215d53c -data_ov065_0215d540 kind:bss addr:0x0215d540 -sMapObjectProfileUnkHOSO kind:bss addr:0x0215d54c +_ZGVN15ProfileInstanceI23MapObjectProfileUnkHOSOE8sProfileE kind:bss addr:0x0215d53c +@32401 kind:bss addr:0x0215d540 +_ZN15ProfileInstanceI23MapObjectProfileUnkHOSOE8sProfileE kind:bss addr:0x0215d54c data_ov065_0215d590 kind:bss addr:0x0215d590 ambiguous -data_ov065_0215d620 kind:bss addr:0x0215d620 -data_ov065_0215d624 kind:bss addr:0x0215d624 -sMapObjectProfileUnkMTIC kind:bss addr:0x0215d630 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkMTICE8sProfileE kind:bss addr:0x0215d620 +@33407 kind:bss addr:0x0215d624 +_ZN15ProfileInstanceI23MapObjectProfileUnkMTICE8sProfileE kind:bss addr:0x0215d630 data_ov065_0215d644 kind:bss addr:0x0215d644 ambiguous data_ov065_0215d6e4 kind:bss addr:0x0215d6e4 ambiguous data_ov065_0215d704 kind:bss addr:0x0215d704 diff --git a/config/jp/arm9/overlays/ov066/delinks.txt b/config/jp/arm9/overlays/ov066/delinks.txt index 58304214..b3ba9bc0 100644 --- a/config/jp/arm9/overlays/ov066/delinks.txt +++ b/config/jp/arm9/overlays/ov066/delinks.txt @@ -9,64 +9,64 @@ src/066_FldWater/Actor/ActorUnkVCCH.cpp: .text start:0x02159be0 end:0x0215aad0 .init start:0x0215f608 end:0x0215f658 .ctor start:0x0215fa00 end:0x0215fa04 - .bss start:0x02164370 end:0x02164448 + .bss start:0x02164360 end:0x02164448 src/066_FldWater/Actor/ActorUnkVCFT.cpp: .text start:0x0215aad0 end:0x0215d798 .init start:0x0215f658 end:0x0215f6a8 .ctor start:0x0215fa04 end:0x0215fa08 - .bss start:0x02164458 end:0x02164484 + .bss start:0x02164448 end:0x02164538 src/066_FldWater/Actor/ActorUnkWAWB_WAWS.cpp: .text start:0x0215d798 end:0x0215dcac .init start:0x0215f6a8 end:0x0215f73c .ctor start:0x0215fa08 end:0x0215fa0c - .bss start:0x02164550 end:0x02164700 + .bss start:0x02164538 end:0x02164708 src/066_FldWater/Actor/ActorUnkWAWA_WAWC.cpp: .text start:0x0215dcac end:0x0215e184 .init start:0x0215f73c end:0x0215f7d0 .ctor start:0x0215fa0c end:0x0215fa10 - .bss start:0x02164720 end:0x021648d0 + .bss start:0x02164708 end:0x021648d0 src/066_FldWater/Actor/ActorUnkRMW1.cpp: .text start:0x0215e184 end:0x0215e2a8 .init start:0x0215f7d0 end:0x0215f820 .ctor start:0x0215fa10 end:0x0215fa14 - .bss start:0x021648e0 end:0x021648e4 + .bss start:0x021648d0 end:0x021649b8 src/066_FldWater/Actor/ActorUnkRMW0.cpp: .text start:0x0215e2a8 end:0x0215e718 .init start:0x0215f820 end:0x0215f870 .ctor start:0x0215fa14 end:0x0215fa18 - .bss start:0x021649c8 end:0x02164a08 + .bss start:0x021649b8 end:0x02164aa0 src/066_FldWater/MapObject/MapObjectUnkFSWT.cpp: .text start:0x0215e718 end:0x0215e850 .init start:0x0215f870 end:0x0215f8c0 .ctor start:0x0215fa18 end:0x0215fa1c - .bss start:0x02164ab0 end:0x02164b84 + .bss start:0x02164aa0 end:0x02164b84 src/066_FldWater/Actor/ActorUnkSWHI.cpp: .text start:0x0215e850 end:0x0215eb54 .init start:0x0215f8c0 end:0x0215f910 .ctor start:0x0215fa1c end:0x0215fa20 - .bss start:0x02164b94 end:0x02164bd0 + .bss start:0x02164b84 end:0x02164bd0 src/066_FldWater/MapObject/MapObjectUnkHOW0.cpp: .text start:0x0215eb54 end:0x0215eca8 .init start:0x0215f910 end:0x0215f960 .ctor start:0x0215fa20 end:0x0215fa24 - .bss start:0x02164be0 end:0x02164cb4 + .bss start:0x02164bd0 end:0x02164cb4 src/066_FldWater/MapObject/MapObjectUnkHOW1.cpp: .text start:0x0215eca8 end:0x0215edfc .init start:0x0215f960 end:0x0215f9b0 .ctor start:0x0215fa24 end:0x0215fa28 - .bss start:0x02164cc4 end:0x02164d98 + .bss start:0x02164cb4 end:0x02164d98 src/066_FldWater/MapObject/MapObjectUnkMTFS.cpp: .text start:0x0215ee7c end:0x0215f4e0 .init start:0x0215f9b0 end:0x0215fa00 .ctor start:0x0215fa28 end:0x0215fa2c - .bss start:0x02164da8 end:0x02164e7c + .bss start:0x02164d98 end:0x02164e7c diff --git a/config/jp/arm9/overlays/ov066/symbols.txt b/config/jp/arm9/overlays/ov066/symbols.txt index 4aa87a03..c9746adb 100644 --- a/config/jp/arm9/overlays/ov066/symbols.txt +++ b/config/jp/arm9/overlays/ov066/symbols.txt @@ -961,45 +961,45 @@ data_ov066_021642c4 kind:data(any) addr:0x021642c4 data_ov066_021642ec kind:data(any) addr:0x021642ec data_ov066_02164300 kind:data(any) addr:0x02164300 ambiguous data_ov066_02164318 kind:data(any) addr:0x02164318 -data_ov066_02164360 kind:bss addr:0x02164360 -data_ov066_02164364 kind:bss addr:0x02164364 -sActorProfileUnkVCCH kind:bss addr:0x02164370 -data_ov066_02164448 kind:bss addr:0x02164448 -data_ov066_0216444c kind:bss addr:0x0216444c -sActorProfileUnkVCFT kind:bss addr:0x02164458 +_ZGVN15ProfileInstanceI19ActorProfileUnkVCCHE8sProfileE kind:bss addr:0x02164360 +@32827 kind:bss addr:0x02164364 +_ZN15ProfileInstanceI19ActorProfileUnkVCCHE8sProfileE kind:bss addr:0x02164370 +_ZGVN15ProfileInstanceI19ActorProfileUnkVCFTE8sProfileE kind:bss addr:0x02164448 +@32833 kind:bss addr:0x0216444c +_ZN15ProfileInstanceI19ActorProfileUnkVCFTE8sProfileE kind:bss addr:0x02164458 data_ov066_02164484 kind:bss addr:0x02164484 ambiguous data_ov066_02164530 kind:bss addr:0x02164530 -data_ov066_02164538 kind:bss addr:0x02164538 -data_ov066_02164544 kind:bss addr:0x02164544 -sActorProfileUnkWAWS kind:bss addr:0x02164550 -sActorProfileUnkWAWB kind:bss addr:0x02164628 +_ZGVN15ProfileInstanceI19ActorProfileUnkWAWSE8sProfileE kind:bss addr:0x02164538 +@32839 kind:bss addr:0x02164544 +_ZN15ProfileInstanceI19ActorProfileUnkWAWSE8sProfileE kind:bss addr:0x02164550 +_ZN15ProfileInstanceI19ActorProfileUnkWAWBE8sProfileE kind:bss addr:0x02164628 data_ov066_02164700 kind:bss addr:0x02164700 -data_ov066_02164708 kind:bss addr:0x02164708 -data_ov066_02164714 kind:bss addr:0x02164714 -sActorProfileUnkWAWA kind:bss addr:0x02164720 +_ZGVN15ProfileInstanceI19ActorProfileUnkWAWAE8sProfileE kind:bss addr:0x02164708 +@32845 kind:bss addr:0x02164714 +_ZN15ProfileInstanceI19ActorProfileUnkWAWAE8sProfileE kind:bss addr:0x02164720 data_ov066_0216473c kind:bss addr:0x0216473c ambiguous -sActorProfileUnkWAWC kind:bss addr:0x021647f8 -data_ov066_021648d0 kind:bss addr:0x021648d0 -data_ov066_021648d4 kind:bss addr:0x021648d4 -sActorProfileUnkRMW1 kind:bss addr:0x021648e0 +_ZN15ProfileInstanceI19ActorProfileUnkWAWCE8sProfileE kind:bss addr:0x021647f8 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMW1E8sProfileE kind:bss addr:0x021648d0 +@32851 kind:bss addr:0x021648d4 +_ZN15ProfileInstanceI19ActorProfileUnkRMW1E8sProfileE kind:bss addr:0x021648e0 data_ov066_021648e4 kind:bss addr:0x021648e4 ambiguous -data_ov066_021649b8 kind:bss addr:0x021649b8 -data_ov066_021649bc kind:bss addr:0x021649bc -sActorProfileUnkRMW0 kind:bss addr:0x021649c8 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMW0E8sProfileE kind:bss addr:0x021649b8 +@32857 kind:bss addr:0x021649bc +_ZN15ProfileInstanceI19ActorProfileUnkRMW0E8sProfileE kind:bss addr:0x021649c8 data_ov066_02164a08 kind:bss addr:0x02164a08 ambiguous -data_ov066_02164aa0 kind:bss addr:0x02164aa0 -data_ov066_02164aa4 kind:bss addr:0x02164aa4 -sMapObjectProfileUnkFSWT kind:bss addr:0x02164ab0 -data_ov066_02164b84 kind:bss addr:0x02164b84 -data_ov066_02164b88 kind:bss addr:0x02164b88 -sActorProfileUnkSWHI kind:bss addr:0x02164b94 -data_ov066_02164bd0 kind:bss addr:0x02164bd0 -data_ov066_02164bd4 kind:bss addr:0x02164bd4 -sMapObjectProfileUnkHOW0 kind:bss addr:0x02164be0 -data_ov066_02164cb4 kind:bss addr:0x02164cb4 -data_ov066_02164cb8 kind:bss addr:0x02164cb8 -sMapObjectProfileUnkHOW1 kind:bss addr:0x02164cc4 -data_ov066_02164d98 kind:bss addr:0x02164d98 -data_ov066_02164d9c kind:bss addr:0x02164d9c -sMapObjectProfileUnkMTFS kind:bss addr:0x02164da8 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkFSWTE8sProfileE kind:bss addr:0x02164aa0 +@33455 kind:bss addr:0x02164aa4 +_ZN15ProfileInstanceI23MapObjectProfileUnkFSWTE8sProfileE kind:bss addr:0x02164ab0 +_ZGVN15ProfileInstanceI19ActorProfileUnkSWHIE8sProfileE kind:bss addr:0x02164b84 +@32869 kind:bss addr:0x02164b88 +_ZN15ProfileInstanceI19ActorProfileUnkSWHIE8sProfileE kind:bss addr:0x02164b94 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkHOW0E8sProfileE kind:bss addr:0x02164bd0 +@32467 kind:bss addr:0x02164bd4 +_ZN15ProfileInstanceI23MapObjectProfileUnkHOW0E8sProfileE kind:bss addr:0x02164be0 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkHOW1E8sProfileE kind:bss addr:0x02164cb4 +@32473 kind:bss addr:0x02164cb8 +_ZN15ProfileInstanceI23MapObjectProfileUnkHOW1E8sProfileE kind:bss addr:0x02164cc4 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkMTFSE8sProfileE kind:bss addr:0x02164d98 +@33479 kind:bss addr:0x02164d9c +_ZN15ProfileInstanceI23MapObjectProfileUnkMTFSE8sProfileE kind:bss addr:0x02164da8 data_ov066_02164e7c kind:bss addr:0x02164e7c diff --git a/config/jp/arm9/overlays/ov067/delinks.txt b/config/jp/arm9/overlays/ov067/delinks.txt index 0f33d08f..0a073bfd 100644 --- a/config/jp/arm9/overlays/ov067/delinks.txt +++ b/config/jp/arm9/overlays/ov067/delinks.txt @@ -9,70 +9,70 @@ src/067_FldFlame/Actor/ActorUnkGOCA_GOCB_GORK_GORM.cpp: .text start:0x02159be0 end:0x0215b2d0 .init start:0x0215e358 end:0x0215e474 .ctor start:0x0215e7fc end:0x0215e800 - .bss start:0x0215f600 end:0x0215f960 + .bss start:0x0215f5e8 end:0x0215f960 src/067_FldFlame/Actor/ActorUnkGORS.cpp: .text start:0x0215b2d0 end:0x0215bab0 .init start:0x0215e474 end:0x0215e4c4 .ctor start:0x0215e800 end:0x0215e804 - .bss start:0x0215f970 end:0x0215f9bc + .bss start:0x0215f960 end:0x0215fa48 src/067_FldFlame/Actor/ActorUnkRMV0.cpp: .text start:0x0215bab0 end:0x0215bbd4 .init start:0x0215e4c4 end:0x0215e514 .ctor start:0x0215e804 end:0x0215e808 - .bss start:0x0215fa58 end:0x0215fad8 + .bss start:0x0215fa48 end:0x0215fb30 src/067_FldFlame/Actor/ActorUnkRMV1.cpp: .text start:0x0215bbd4 end:0x0215bcf8 .init start:0x0215e514 end:0x0215e564 .ctor start:0x0215e808 end:0x0215e80c - .bss start:0x0215fb40 end:0x0215fc18 + .bss start:0x0215fb30 end:0x0215fc18 src/067_FldFlame/Actor/ActorUnkDMFT.cpp: .text start:0x0215bd20 end:0x0215c8ac .init start:0x0215e564 end:0x0215e5b4 .ctor start:0x0215e80c end:0x0215e810 - .bss start:0x0215fc28 end:0x0215fc64 + .bss start:0x0215fc18 end:0x0215fc64 src/067_FldFlame/Actor/ActorUnkDMGN.cpp: .text start:0x0215c8ac end:0x0215cdbc .init start:0x0215e5b4 end:0x0215e604 .ctor start:0x0215e810 end:0x0215e814 - .bss start:0x0215fc74 end:0x0215fcb8 + .bss start:0x0215fc64 end:0x0215fcb8 src/067_FldFlame/MapObject/MapObjectUnkBRGL.cpp: .text start:0x0215cdbc end:0x0215d0e0 .init start:0x0215e604 end:0x0215e654 .ctor start:0x0215e814 end:0x0215e818 - .bss start:0x0215fcc8 end:0x0215fd04 + .bss start:0x0215fcb8 end:0x0215fda4 src/067_FldFlame/MapObject/MapObjectUnkLVVT.cpp: .text start:0x0215d0e0 end:0x0215d7cc .init start:0x0215e654 end:0x0215e6bc .ctor start:0x0215e818 end:0x0215e81c - .bss start:0x0215fdbc end:0x0215fdcc + .bss start:0x0215fda4 end:0x0215fe90 src/067_FldFlame/MapObject/MapObjectUnkDRGN.cpp: .text start:0x0215d7cc end:0x0215da98 .init start:0x0215e6bc end:0x0215e70c .ctor start:0x0215e81c end:0x0215e820 - .bss start:0x0215fea0 end:0x0215fec0 + .bss start:0x0215fe90 end:0x0215fec0 src/067_FldFlame/MapObject/MapObjectUnkMTIR.cpp: .text start:0x0215da98 end:0x0215dc98 .init start:0x0215e70c end:0x0215e75c .ctor start:0x0215e820 end:0x0215e824 - .bss start:0x0215fed0 end:0x0215fef4 + .bss start:0x0215fec0 end:0x0215ffc8 src/067_FldFlame/MapObject/MapObjectUnkMTOR.cpp: .text start:0x0215dc98 end:0x0215de98 .init start:0x0215e75c end:0x0215e7ac .ctor start:0x0215e824 end:0x0215e828 - .bss start:0x0215ffd8 end:0x021600ac + .bss start:0x0215ffc8 end:0x021600d0 src/067_FldFlame/MapObject/MapObjectUnkDRVT.cpp: .text start:0x0215de98 end:0x0215e24c .init start:0x0215e7ac end:0x0215e7fc .ctor start:0x0215e828 end:0x0215e82c - .bss start:0x021600e0 end:0x02160100 + .bss start:0x021600d0 end:0x02160100 diff --git a/config/jp/arm9/overlays/ov067/symbols.txt b/config/jp/arm9/overlays/ov067/symbols.txt index 10adb696..cf8da5d9 100644 --- a/config/jp/arm9/overlays/ov067/symbols.txt +++ b/config/jp/arm9/overlays/ov067/symbols.txt @@ -338,60 +338,60 @@ data_ov067_0215f5c0 kind:bss addr:0x0215f5c0 data_ov067_0215f5c8 kind:bss addr:0x0215f5c8 ambiguous data_ov067_0215f5d0 kind:bss addr:0x0215f5d0 data_ov067_0215f5dc kind:bss addr:0x0215f5dc -data_ov067_0215f5e8 kind:bss addr:0x0215f5e8 -data_ov067_0215f5f4 kind:bss addr:0x0215f5f4 -sActorProfileUnkGOCA kind:bss addr:0x0215f600 +_ZGVN15ProfileInstanceI19ActorProfileUnkGOCAE8sProfileE kind:bss addr:0x0215f5e8 +@34899 kind:bss addr:0x0215f5f4 +_ZN15ProfileInstanceI19ActorProfileUnkGOCAE8sProfileE kind:bss addr:0x0215f600 data_ov067_0215f664 kind:bss addr:0x0215f664 ambiguous -sActorProfileUnkGOCB kind:bss addr:0x0215f6d8 +_ZN15ProfileInstanceI19ActorProfileUnkGOCBE8sProfileE kind:bss addr:0x0215f6d8 data_ov067_0215f71c kind:bss addr:0x0215f71c ambiguous data_ov067_0215f768 kind:bss addr:0x0215f768 ambiguous -sActorProfileUnkGORK kind:bss addr:0x0215f7b0 -sActorProfileUnkGORM kind:bss addr:0x0215f888 -data_ov067_0215f960 kind:bss addr:0x0215f960 -data_ov067_0215f964 kind:bss addr:0x0215f964 -sActorProfileUnkGORS kind:bss addr:0x0215f970 +_ZN15ProfileInstanceI19ActorProfileUnkGORKE8sProfileE kind:bss addr:0x0215f7b0 +_ZN15ProfileInstanceI19ActorProfileUnkGORME8sProfileE kind:bss addr:0x0215f888 +_ZGVN15ProfileInstanceI19ActorProfileUnkGORSE8sProfileE kind:bss addr:0x0215f960 +@34905 kind:bss addr:0x0215f964 +_ZN15ProfileInstanceI19ActorProfileUnkGORSE8sProfileE kind:bss addr:0x0215f970 data_ov067_0215f9bc kind:bss addr:0x0215f9bc ambiguous -data_ov067_0215fa48 kind:bss addr:0x0215fa48 -data_ov067_0215fa4c kind:bss addr:0x0215fa4c -sActorProfileUnkRMV0 kind:bss addr:0x0215fa58 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMV0E8sProfileE kind:bss addr:0x0215fa48 +@34911 kind:bss addr:0x0215fa4c +_ZN15ProfileInstanceI19ActorProfileUnkRMV0E8sProfileE kind:bss addr:0x0215fa58 data_ov067_0215fad8 kind:bss addr:0x0215fad8 ambiguous -data_ov067_0215fb30 kind:bss addr:0x0215fb30 -data_ov067_0215fb34 kind:bss addr:0x0215fb34 -sActorProfileUnkRMV1 kind:bss addr:0x0215fb40 -data_ov067_0215fc18 kind:bss addr:0x0215fc18 -data_ov067_0215fc1c kind:bss addr:0x0215fc1c -sActorProfileUnkDMFT kind:bss addr:0x0215fc28 -data_ov067_0215fc64 kind:bss addr:0x0215fc64 -data_ov067_0215fc68 kind:bss addr:0x0215fc68 -sActorProfileUnkDMGN kind:bss addr:0x0215fc74 -data_ov067_0215fcb8 kind:bss addr:0x0215fcb8 -data_ov067_0215fcbc kind:bss addr:0x0215fcbc -sMapObjectProfileUnkBRGL kind:bss addr:0x0215fcc8 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMV1E8sProfileE kind:bss addr:0x0215fb30 +@34917 kind:bss addr:0x0215fb34 +_ZN15ProfileInstanceI19ActorProfileUnkRMV1E8sProfileE kind:bss addr:0x0215fb40 +_ZGVN15ProfileInstanceI19ActorProfileUnkDMFTE8sProfileE kind:bss addr:0x0215fc18 +@34923 kind:bss addr:0x0215fc1c +_ZN15ProfileInstanceI19ActorProfileUnkDMFTE8sProfileE kind:bss addr:0x0215fc28 +_ZGVN15ProfileInstanceI19ActorProfileUnkDMGNE8sProfileE kind:bss addr:0x0215fc64 +@34929 kind:bss addr:0x0215fc68 +_ZN15ProfileInstanceI19ActorProfileUnkDMGNE8sProfileE kind:bss addr:0x0215fc74 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkBRGLE8sProfileE kind:bss addr:0x0215fcb8 +@34527 kind:bss addr:0x0215fcbc +_ZN15ProfileInstanceI23MapObjectProfileUnkBRGLE8sProfileE kind:bss addr:0x0215fcc8 data_ov067_0215fd04 kind:bss addr:0x0215fd04 ambiguous data_ov067_0215fd74 kind:bss addr:0x0215fd74 ambiguous data_ov067_0215fd9c kind:bss addr:0x0215fd9c -data_ov067_0215fda4 kind:bss addr:0x0215fda4 -data_ov067_0215fdb0 kind:bss addr:0x0215fdb0 -sMapObjectProfileUnkLVVT kind:bss addr:0x0215fdbc +_ZGVN15ProfileInstanceI23MapObjectProfileUnkLVVTE8sProfileE kind:bss addr:0x0215fda4 +@34533 kind:bss addr:0x0215fdb0 +_ZN15ProfileInstanceI23MapObjectProfileUnkLVVTE8sProfileE kind:bss addr:0x0215fdbc data_ov067_0215fdcc kind:bss addr:0x0215fdcc ambiguous data_ov067_0215fddc kind:bss addr:0x0215fddc -data_ov067_0215fe90 kind:bss addr:0x0215fe90 -data_ov067_0215fe94 kind:bss addr:0x0215fe94 -sMapObjectProfileUnkDRGN kind:bss addr:0x0215fea0 -data_ov067_0215fec0 kind:bss addr:0x0215fec0 -data_ov067_0215fec4 kind:bss addr:0x0215fec4 -sMapObjectProfileUnkMTIR kind:bss addr:0x0215fed0 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkDRGNE8sProfileE kind:bss addr:0x0215fe90 +@34539 kind:bss addr:0x0215fe94 +_ZN15ProfileInstanceI23MapObjectProfileUnkDRGNE8sProfileE kind:bss addr:0x0215fea0 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkMTIRE8sProfileE kind:bss addr:0x0215fec0 +@34545 kind:bss addr:0x0215fec4 +_ZN15ProfileInstanceI23MapObjectProfileUnkMTIRE8sProfileE kind:bss addr:0x0215fed0 data_ov067_0215fef4 kind:bss addr:0x0215fef4 ambiguous data_ov067_0215ff08 kind:bss addr:0x0215ff08 ambiguous data_ov067_0215ff98 kind:bss addr:0x0215ff98 ambiguous data_ov067_0215ffa4 kind:bss addr:0x0215ffa4 -data_ov067_0215ffc8 kind:bss addr:0x0215ffc8 -data_ov067_0215ffcc kind:bss addr:0x0215ffcc -sMapObjectProfileUnkMTOR kind:bss addr:0x0215ffd8 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkMTORE8sProfileE kind:bss addr:0x0215ffc8 +@34551 kind:bss addr:0x0215ffcc +_ZN15ProfileInstanceI23MapObjectProfileUnkMTORE8sProfileE kind:bss addr:0x0215ffd8 data_ov067_021600ac kind:bss addr:0x021600ac -data_ov067_021600d0 kind:bss addr:0x021600d0 -data_ov067_021600d4 kind:bss addr:0x021600d4 -sMapObjectProfileUnkDRVT kind:bss addr:0x021600e0 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkDRVTE8sProfileE kind:bss addr:0x021600d0 +@34557 kind:bss addr:0x021600d4 +_ZN15ProfileInstanceI23MapObjectProfileUnkDRVTE8sProfileE kind:bss addr:0x021600e0 data_ov067_02160100 kind:bss addr:0x02160100 data_ov067_02160168 kind:bss addr:0x02160168 ambiguous data_ov067_02160170 kind:bss addr:0x02160170 ambiguous diff --git a/config/jp/arm9/overlays/ov068/delinks.txt b/config/jp/arm9/overlays/ov068/delinks.txt index 12955d0d..28ac4470 100644 --- a/config/jp/arm9/overlays/ov068/delinks.txt +++ b/config/jp/arm9/overlays/ov068/delinks.txt @@ -9,106 +9,106 @@ src/068_FldAjito/Actor/ActorUnkRMAJ.cpp: .text start:0x02159be0 end:0x02159ce0 .init start:0x02163ed0 end:0x02163f20 .ctor start:0x021644c0 end:0x021644c4 - .bss start:0x02165b30 end:0x02165b6c + .bss start:0x02165b20 end:0x02165b6c src/068_FldAjito/Actor/ActorUnkAJMN.cpp: .text start:0x02159ce0 end:0x0215a824 .init start:0x02163f20 end:0x02163f70 .ctor start:0x021644c4 end:0x021644c8 - .bss start:0x02165b7c end:0x02165bb8 + .bss start:0x02165b6c end:0x02165bb8 src/068_FldAjito/Actor/ActorUnkAJAI.cpp: .text start:0x0215a824 end:0x0215b078 .init start:0x02163f70 end:0x02163fc0 .ctor start:0x021644c8 end:0x021644cc - .bss start:0x02165bc8 end:0x02165ca0 + .bss start:0x02165bb8 end:0x02165ca0 src/068_FldAjito/Actor/ActorUnkAJEM.cpp: .text start:0x0215b078 end:0x0215c60c .init start:0x02163fc0 end:0x02164010 .ctor start:0x021644cc end:0x021644d0 - .bss start:0x02165cb4 end:0x02165d8c + .bss start:0x02165ca0 end:0x02165d8c src/068_FldAjito/Actor/ActorUnkTSCN.cpp: .text start:0x0215c60c end:0x0215c8fc .init start:0x02164010 end:0x02164060 .ctor start:0x021644d0 end:0x021644d4 - .bss start:0x02165d9c end:0x02165dd8 + .bss start:0x02165d8c end:0x02165dd8 src/068_FldAjito/Actor/ActorUnkAJET.cpp: .text start:0x0215c8fc end:0x0215e064 .init start:0x02164060 end:0x021640b0 .ctor start:0x021644d4 end:0x021644d8 - .bss start:0x02165de8 end:0x02165ec0 + .bss start:0x02165dd8 end:0x02165ec0 src/068_FldAjito/Actor/ActorUnkAJTM.cpp: .text start:0x0215e064 end:0x0215efb0 .init start:0x021640b0 end:0x02164100 .ctor start:0x021644d8 end:0x021644dc - .bss start:0x02165ed0 end:0x02165f0c + .bss start:0x02165ec0 end:0x02165f0c src/068_FldAjito/Actor/ActorUnkAJNP.cpp: .text start:0x0215efb0 end:0x0215f768 .init start:0x02164100 end:0x02164150 .ctor start:0x021644dc end:0x021644e0 - .bss start:0x02165f1c end:0x02165fe8 + .bss start:0x02165f0c end:0x02165ff4 src/068_FldAjito/Actor/ActorUnkAJCR.cpp: .text start:0x0215f768 end:0x0215f928 .init start:0x02164150 end:0x021641a0 .ctor start:0x021644e0 end:0x021644e4 - .bss start:0x02166004 end:0x02166040 + .bss start:0x02165ff4 end:0x021662b4 src/068_FldAjito/Actor/ActorUnkMGAJ.cpp: .text start:0x0216057c end:0x02160970 .init start:0x021641f0 end:0x02164240 .ctor start:0x021644e8 end:0x021644ec - .bss start:0x021662c4 end:0x0216639c + .bss start:0x021662b4 end:0x021663a0 src/068_FldAjito/Actor/ActorUnkAJBS.cpp: .text start:0x02160970 end:0x0216243c .init start:0x02164240 end:0x02164290 .ctor start:0x021644ec end:0x021644f0 - .bss start:0x021663ac end:0x02166484 + .bss start:0x021663a0 end:0x02166484 src/068_FldAjito/Actor/ActorUnkRMA1.cpp: .text start:0x0216243c end:0x0216258c .init start:0x02164290 end:0x021642e0 .ctor start:0x021644f0 end:0x021644f4 - .bss start:0x02166494 end:0x0216656c + .bss start:0x02166484 end:0x0216656c src/068_FldAjito/Actor/ActorUnkRMA2.cpp: .text start:0x0216258c end:0x021626dc .init start:0x021642e0 end:0x02164330 .ctor start:0x021644f4 end:0x021644f8 - .bss start:0x0216657c end:0x02166654 + .bss start:0x0216656c end:0x02166654 src/068_FldAjito/Actor/ActorUnkRMA0.cpp: .text start:0x021626dc end:0x0216282c .init start:0x02164330 end:0x02164380 .ctor start:0x021644f8 end:0x021644fc - .bss start:0x02166664 end:0x0216673c + .bss start:0x02166654 end:0x0216673c src/068_FldAjito/Actor/ActorUnkRMA3.cpp: .text start:0x0216282c end:0x0216297c .init start:0x02164380 end:0x021643d0 .ctor start:0x021644fc end:0x02164500 - .bss start:0x0216674c end:0x02166824 + .bss start:0x0216673c end:0x02166824 src/068_FldAjito/Actor/ActorUnkAJSP.cpp: .text start:0x0216297c end:0x02162bd4 .init start:0x021643d0 end:0x02164420 .ctor start:0x02164500 end:0x02164504 - .bss start:0x02166834 end:0x021668f0 + .bss start:0x02166824 end:0x0216690c src/068_FldAjito/MapObject/MapObjectUnkDRVC.cpp: .text start:0x02162bd4 end:0x02163584 .init start:0x02164420 end:0x02164470 .ctor start:0x02164504 end:0x02164508 - .bss start:0x0216691c end:0x021669f0 + .bss start:0x0216690c end:0x021669f0 src/068_FldAjito/MapObject/MapObjectUnkRKAG.cpp: .text start:0x02163584 end:0x021637ac .init start:0x02164470 end:0x021644c0 .ctor start:0x02164508 end:0x0216450c - .bss start:0x02166a00 end:0x02166ad4 + .bss start:0x021669f0 end:0x02166ad4 diff --git a/config/jp/arm9/overlays/ov068/symbols.txt b/config/jp/arm9/overlays/ov068/symbols.txt index 33fad738..8a8c474b 100644 --- a/config/jp/arm9/overlays/ov068/symbols.txt +++ b/config/jp/arm9/overlays/ov068/symbols.txt @@ -561,67 +561,67 @@ data_ov068_02165a7c kind:data(any) addr:0x02165a7c data_ov068_02165a98 kind:data(any) addr:0x02165a98 data_ov068_02165ac0 kind:data(any) addr:0x02165ac0 data_ov068_02165b04 kind:data(any) addr:0x02165b04 -data_ov068_02165b20 kind:bss addr:0x02165b20 -data_ov068_02165b24 kind:bss addr:0x02165b24 -sActorProfileUnkRMAJ kind:bss addr:0x02165b30 -data_ov068_02165b6c kind:bss addr:0x02165b6c -data_ov068_02165b70 kind:bss addr:0x02165b70 -sActorProfileUnkAJMN kind:bss addr:0x02165b7c -data_ov068_02165bb8 kind:bss addr:0x02165bb8 -data_ov068_02165bbc kind:bss addr:0x02165bbc -sActorProfileUnkAJAI kind:bss addr:0x02165bc8 -data_ov068_02165ca0 kind:bss addr:0x02165ca0 -data_ov068_02165ca8 kind:bss addr:0x02165ca8 -sActorProfileUnkAJEM kind:bss addr:0x02165cb4 -data_ov068_02165d8c kind:bss addr:0x02165d8c -data_ov068_02165d90 kind:bss addr:0x02165d90 -sActorProfileUnkTSCN kind:bss addr:0x02165d9c -data_ov068_02165dd8 kind:bss addr:0x02165dd8 -data_ov068_02165ddc kind:bss addr:0x02165ddc -sActorProfileUnkAJET kind:bss addr:0x02165de8 -data_ov068_02165ec0 kind:bss addr:0x02165ec0 -data_ov068_02165ec4 kind:bss addr:0x02165ec4 -sActorProfileUnkAJTM kind:bss addr:0x02165ed0 -data_ov068_02165f0c kind:bss addr:0x02165f0c -data_ov068_02165f10 kind:bss addr:0x02165f10 -sActorProfileUnkAJNP kind:bss addr:0x02165f1c +_ZGVN15ProfileInstanceI19ActorProfileUnkRMAJE8sProfileE kind:bss addr:0x02165b20 +@32977 kind:bss addr:0x02165b24 +_ZN15ProfileInstanceI19ActorProfileUnkRMAJE8sProfileE kind:bss addr:0x02165b30 +_ZGVN15ProfileInstanceI19ActorProfileUnkAJMNE8sProfileE kind:bss addr:0x02165b6c +@32983 kind:bss addr:0x02165b70 +_ZN15ProfileInstanceI19ActorProfileUnkAJMNE8sProfileE kind:bss addr:0x02165b7c +_ZGVN15ProfileInstanceI19ActorProfileUnkAJAIE8sProfileE kind:bss addr:0x02165bb8 +@32989 kind:bss addr:0x02165bbc +_ZN15ProfileInstanceI19ActorProfileUnkAJAIE8sProfileE kind:bss addr:0x02165bc8 +_ZGVN15ProfileInstanceI19ActorProfileUnkAJEME8sProfileE kind:bss addr:0x02165ca0 +@32995 kind:bss addr:0x02165ca8 +_ZN15ProfileInstanceI19ActorProfileUnkAJEME8sProfileE kind:bss addr:0x02165cb4 +_ZGVN15ProfileInstanceI19ActorProfileUnkTSCNE8sProfileE kind:bss addr:0x02165d8c +@33001 kind:bss addr:0x02165d90 +_ZN15ProfileInstanceI19ActorProfileUnkTSCNE8sProfileE kind:bss addr:0x02165d9c +_ZGVN15ProfileInstanceI19ActorProfileUnkAJETE8sProfileE kind:bss addr:0x02165dd8 +@33007 kind:bss addr:0x02165ddc +_ZN15ProfileInstanceI19ActorProfileUnkAJETE8sProfileE kind:bss addr:0x02165de8 +_ZGVN15ProfileInstanceI19ActorProfileUnkAJTME8sProfileE kind:bss addr:0x02165ec0 +@33013 kind:bss addr:0x02165ec4 +_ZN15ProfileInstanceI19ActorProfileUnkAJTME8sProfileE kind:bss addr:0x02165ed0 +_ZGVN15ProfileInstanceI19ActorProfileUnkAJNPE8sProfileE kind:bss addr:0x02165f0c +@33019 kind:bss addr:0x02165f10 +_ZN15ProfileInstanceI19ActorProfileUnkAJNPE8sProfileE kind:bss addr:0x02165f1c data_ov068_02165fe8 kind:bss addr:0x02165fe8 ambiguous data_ov068_02165ff0 kind:bss addr:0x02165ff0 ambiguous -data_ov068_02165ff4 kind:bss addr:0x02165ff4 -data_ov068_02165ff8 kind:bss addr:0x02165ff8 -sActorProfileUnkAJCR kind:bss addr:0x02166004 +_ZGVN15ProfileInstanceI19ActorProfileUnkAJCRE8sProfileE kind:bss addr:0x02165ff4 +@33025 kind:bss addr:0x02165ff8 +_ZN15ProfileInstanceI19ActorProfileUnkAJCRE8sProfileE kind:bss addr:0x02166004 data_ov068_02166040 kind:bss addr:0x02166040 data_ov068_02166048 kind:bss addr:0x02166048 data_ov068_02166054 kind:bss addr:0x02166054 data_ov068_0216611c kind:bss addr:0x0216611c ambiguous data_ov068_02166254 kind:bss addr:0x02166254 -data_ov068_021662b4 kind:bss addr:0x021662b4 -data_ov068_021662b8 kind:bss addr:0x021662b8 -sActorProfileUnkMGAJ kind:bss addr:0x021662c4 +_ZGVN15ProfileInstanceI19ActorProfileUnkMGAJE8sProfileE kind:bss addr:0x021662b4 +@33031 kind:bss addr:0x021662b8 +_ZN15ProfileInstanceI19ActorProfileUnkMGAJE8sProfileE kind:bss addr:0x021662c4 data_ov068_0216639c kind:bss addr:0x0216639c -data_ov068_021663a0 kind:bss addr:0x021663a0 -data_ov068_021663a4 kind:bss addr:0x021663a4 ambiguous -sActorProfileUnkAJBS kind:bss addr:0x021663ac -data_ov068_02166484 kind:bss addr:0x02166484 -data_ov068_02166488 kind:bss addr:0x02166488 -sActorProfileUnkRMA1 kind:bss addr:0x02166494 -data_ov068_0216656c kind:bss addr:0x0216656c -data_ov068_02166570 kind:bss addr:0x02166570 -sActorProfileUnkRMA2 kind:bss addr:0x0216657c -data_ov068_02166654 kind:bss addr:0x02166654 -data_ov068_02166658 kind:bss addr:0x02166658 -sActorProfileUnkRMA0 kind:bss addr:0x02166664 -data_ov068_0216673c kind:bss addr:0x0216673c -data_ov068_02166740 kind:bss addr:0x02166740 -sActorProfileUnkRMA3 kind:bss addr:0x0216674c -data_ov068_02166824 kind:bss addr:0x02166824 -data_ov068_02166828 kind:bss addr:0x02166828 -sActorProfileUnkAJSP kind:bss addr:0x02166834 +_ZGVN15ProfileInstanceI19ActorProfileUnkAJBSE8sProfileE kind:bss addr:0x021663a0 +@33037 kind:bss addr:0x021663a4 ambiguous +_ZN15ProfileInstanceI19ActorProfileUnkAJBSE8sProfileE kind:bss addr:0x021663ac +_ZGVN15ProfileInstanceI19ActorProfileUnkRMA1E8sProfileE kind:bss addr:0x02166484 +@33043 kind:bss addr:0x02166488 +_ZN15ProfileInstanceI19ActorProfileUnkRMA1E8sProfileE kind:bss addr:0x02166494 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMA2E8sProfileE kind:bss addr:0x0216656c +@33049 kind:bss addr:0x02166570 +_ZN15ProfileInstanceI19ActorProfileUnkRMA2E8sProfileE kind:bss addr:0x0216657c +_ZGVN15ProfileInstanceI19ActorProfileUnkRMA0E8sProfileE kind:bss addr:0x02166654 +@33055 kind:bss addr:0x02166658 +_ZN15ProfileInstanceI19ActorProfileUnkRMA0E8sProfileE kind:bss addr:0x02166664 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMA3E8sProfileE kind:bss addr:0x0216673c +@33061 kind:bss addr:0x02166740 +_ZN15ProfileInstanceI19ActorProfileUnkRMA3E8sProfileE kind:bss addr:0x0216674c +_ZGVN15ProfileInstanceI19ActorProfileUnkAJSPE8sProfileE kind:bss addr:0x02166824 +@33067 kind:bss addr:0x02166828 +_ZN15ProfileInstanceI19ActorProfileUnkAJSPE8sProfileE kind:bss addr:0x02166834 data_ov068_021668f0 kind:bss addr:0x021668f0 ambiguous -data_ov068_0216690c kind:bss addr:0x0216690c -data_ov068_02166910 kind:bss addr:0x02166910 -sMapObjectProfileUnkDRVC kind:bss addr:0x0216691c -data_ov068_021669f0 kind:bss addr:0x021669f0 -data_ov068_021669f4 kind:bss addr:0x021669f4 -sMapObjectProfileUnkRKAG kind:bss addr:0x02166a00 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkDRVCE8sProfileE kind:bss addr:0x0216690c +@32665 kind:bss addr:0x02166910 +_ZN15ProfileInstanceI23MapObjectProfileUnkDRVCE8sProfileE kind:bss addr:0x0216691c +_ZGVN15ProfileInstanceI23MapObjectProfileUnkRKAGE8sProfileE kind:bss addr:0x021669f0 +@32671 kind:bss addr:0x021669f4 +_ZN15ProfileInstanceI23MapObjectProfileUnkRKAGE8sProfileE kind:bss addr:0x02166a00 data_ov068_02166ad4 kind:bss addr:0x02166ad4 diff --git a/config/jp/arm9/overlays/ov069/delinks.txt b/config/jp/arm9/overlays/ov069/delinks.txt index bdc9b615..7c9d5e62 100644 --- a/config/jp/arm9/overlays/ov069/delinks.txt +++ b/config/jp/arm9/overlays/ov069/delinks.txt @@ -9,19 +9,19 @@ src/069_FldRabbit/Actor/ActorUnkBANI.cpp: .text start:0x02159be0 end:0x0215ab08 .init start:0x0215c7e8 end:0x0215c838 .ctor start:0x0215c978 end:0x0215c97c - .bss start:0x0215d150 end:0x0215d1ec + .bss start:0x0215d140 end:0x0215d228 src/069_FldRabbit/Actor/ActorUnkRB1F.cpp: .text start:0x0215ab08 end:0x0215bc4c .init start:0x0215c838 end:0x0215c888 .ctor start:0x0215c97c end:0x0215c980 - .bss start:0x0215d238 end:0x0215d24c + .bss start:0x0215d228 end:0x0215d340 src/069_FldRabbit/Actor/ActorUnkRBRP.cpp: .text start:0x0215bf6c end:0x0215c5d8 .init start:0x0215c8d8 end:0x0215c928 .ctor start:0x0215c984 end:0x0215c988 - .bss start:0x0215d350 end:0x0215d428 + .bss start:0x0215d340 end:0x0215d428 src/069_FldRabbit/MapObject/MapObjectUnkGTRB.cpp: .text start:0x0215c5d8 end:0x0215c7d4 diff --git a/config/jp/arm9/overlays/ov069/symbols.txt b/config/jp/arm9/overlays/ov069/symbols.txt index 14d3f0c0..71f990e7 100644 --- a/config/jp/arm9/overlays/ov069/symbols.txt +++ b/config/jp/arm9/overlays/ov069/symbols.txt @@ -147,22 +147,22 @@ data_ov069_0215d0e0 kind:data(any) addr:0x0215d0e0 ambiguous data_ov069_0215d0e4 kind:data(any) addr:0x0215d0e4 data_ov069_0215d100 kind:data(any) addr:0x0215d100 data_ov069_0215d114 kind:data(any) addr:0x0215d114 ambiguous -data_ov069_0215d140 kind:bss addr:0x0215d140 -data_ov069_0215d144 kind:bss addr:0x0215d144 -sActorProfileUnkBANI kind:bss addr:0x0215d150 +_ZGVN15ProfileInstanceI19ActorProfileUnkBANIE8sProfileE kind:bss addr:0x0215d140 +@33091 kind:bss addr:0x0215d144 +_ZN15ProfileInstanceI19ActorProfileUnkBANIE8sProfileE kind:bss addr:0x0215d150 data_ov069_0215d1ec kind:bss addr:0x0215d1ec ambiguous data_ov069_0215d204 kind:bss addr:0x0215d204 ambiguous data_ov069_0215d208 kind:bss addr:0x0215d208 ambiguous -data_ov069_0215d228 kind:bss addr:0x0215d228 -data_ov069_0215d22c kind:bss addr:0x0215d22c -sActorProfileUnkRB1F kind:bss addr:0x0215d238 +_ZGVN15ProfileInstanceI19ActorProfileUnkRB1FE8sProfileE kind:bss addr:0x0215d228 +@33097 kind:bss addr:0x0215d22c +_ZN15ProfileInstanceI19ActorProfileUnkRB1FE8sProfileE kind:bss addr:0x0215d238 data_ov069_0215d24c kind:bss addr:0x0215d24c ambiguous data_ov069_0215d310 kind:bss addr:0x0215d310 data_ov069_0215d314 kind:bss addr:0x0215d314 data_ov069_0215d320 kind:bss addr:0x0215d320 -data_ov069_0215d340 kind:bss addr:0x0215d340 -data_ov069_0215d344 kind:bss addr:0x0215d344 -sActorProfileUnkRBRP kind:bss addr:0x0215d350 +_ZGVN15ProfileInstanceI19ActorProfileUnkRBRPE8sProfileE kind:bss addr:0x0215d340 +@33103 kind:bss addr:0x0215d344 +_ZN15ProfileInstanceI19ActorProfileUnkRBRPE8sProfileE kind:bss addr:0x0215d350 data_ov069_0215d428 kind:bss addr:0x0215d428 data_ov069_0215d42c kind:bss addr:0x0215d42c -sMapObjectProfileUnkGTRB kind:bss addr:0x0215d438 +_ZN15ProfileInstanceI23MapObjectProfileUnkGTRBE8sProfileE kind:bss addr:0x0215d438 diff --git a/config/jp/arm9/overlays/ov070/delinks.txt b/config/jp/arm9/overlays/ov070/delinks.txt index 150fa967..c9ed9000 100644 --- a/config/jp/arm9/overlays/ov070/delinks.txt +++ b/config/jp/arm9/overlays/ov070/delinks.txt @@ -9,145 +9,145 @@ src/070_Dungeon/Actor/ActorUnkENGE.cpp: .text start:0x021410cc end:0x0214151c .init start:0x0214fe10 end:0x0214fe60 .ctor start:0x02150794 end:0x02150798 - .bss start:0x02151890 end:0x021518cc + .bss start:0x02151880 end:0x021518cc src/070_Dungeon/Actor/ActorUnkALEV.cpp: .text start:0x0214151c end:0x02141710 .init start:0x0214fe60 end:0x0214feb0 .ctor start:0x02150798 end:0x0215079c - .bss start:0x021518dc end:0x02151918 + .bss start:0x021518cc end:0x02151918 src/070_Dungeon/Actor/ActorUnkBROW.cpp: .text start:0x02141de0 end:0x02142788 .init start:0x0214feb0 end:0x0214ff00 .ctor start:0x0215079c end:0x021507a0 - .bss start:0x02151928 end:0x021519b8 + .bss start:0x02151918 end:0x02151a08 src/070_Dungeon/Actor/ActorUnkKEYN.cpp: .text start:0x0214313c end:0x021444bc .init start:0x0214ff00 end:0x0214ff5c .ctor start:0x021507a0 end:0x021507a4 - .bss start:0x02151a20 end:0x02151a54 + .bss start:0x02151a08 end:0x02151afc src/070_Dungeon/Actor/ActorUnkLIRA.cpp: .text start:0x021444bc end:0x02145358 .init start:0x0214ff5c end:0x0214ffb8 .ctor start:0x021507a4 end:0x021507a8 - .bss start:0x02151b14 end:0x02151bec + .bss start:0x02151afc end:0x02151ce0 src/070_Dungeon/Actor/ActorUnkBMHN.cpp: .text start:0x02145358 end:0x02145440 .init start:0x0214ffb8 end:0x02150008 .ctor start:0x021507a8 end:0x021507ac - .bss start:0x02151cf0 end:0x02151d2c + .bss start:0x02151ce0 end:0x02151d2c src/070_Dungeon/Actor/ActorUnkSWDS.cpp: .text start:0x02145750 end:0x02145a14 .init start:0x02150008 end:0x02150058 .ctor start:0x021507ac end:0x021507b0 - .bss start:0x02151d3c end:0x02151d78 + .bss start:0x02151d2c end:0x02151d78 src/070_Dungeon/Actor/ActorUnkRCSG.cpp: .text start:0x02145a14 end:0x02145d4c .init start:0x02150058 end:0x021500a8 .ctor start:0x021507b0 end:0x021507b4 - .bss start:0x02151d88 end:0x02151dc4 + .bss start:0x02151d78 end:0x02151dc4 src/070_Dungeon/MapObject/MapObjectUnkBLCK.cpp: .text start:0x02145d7c end:0x02145f78 .init start:0x021500a8 end:0x021500f8 .ctor start:0x021507b4 end:0x021507b8 - .bss start:0x02151dd4 end:0x02151df4 + .bss start:0x02151dc4 end:0x02151e4c src/070_Dungeon/MapObject/MapObjectUnkFLSP.cpp: .text start:0x02145f94 end:0x02146e7c .init start:0x021500f8 end:0x021501cc .ctor start:0x021507b8 end:0x021507bc - .bss start:0x02151e64 end:0x02151f38 + .bss start:0x02151e4c end:0x02151f5c src/070_Dungeon/MapObject/MapObjectUnkFSPS.cpp: .text start:0x02146e7c end:0x0214704c .init start:0x021501cc end:0x0215021c .ctor start:0x021507bc end:0x021507c0 - .bss start:0x02151f6c end:0x02152040 + .bss start:0x02151f5c end:0x02152068 src/070_Dungeon/MapObject/MapObjectUnkBLRB.cpp: .text start:0x02147120 end:0x021479a8 .init start:0x0215021c end:0x02150290 .ctor start:0x021507c0 end:0x021507c4 - .bss start:0x021520a4 end:0x02152178 + .bss start:0x02152068 end:0x0215219c src/070_Dungeon/MapObject/MapObjectUnkSWRB.cpp: .text start:0x021479a8 end:0x02147ee4 .init start:0x02150290 end:0x021502e0 .ctor start:0x021507c4 end:0x021507c8 - .bss start:0x021521ac end:0x021521cc + .bss start:0x0215219c end:0x021522a0 src/070_Dungeon/MapObject/MapObjectUnkARWL.cpp: .text start:0x02147ee4 end:0x02148824 .init start:0x021502e0 end:0x02150330 .ctor start:0x021507c8 end:0x021507cc - .bss start:0x021522b0 end:0x02152384 + .bss start:0x021522a0 end:0x021523a8 src/070_Dungeon/MapObject/MapObjectUnkSWWN.cpp: .text start:0x02148824 end:0x0214916c .init start:0x02150330 end:0x02150380 .ctor start:0x021507cc end:0x021507d0 - .bss start:0x021523b8 end:0x0215248c + .bss start:0x021523a8 end:0x021524b0 src/070_Dungeon/MapObject/MapObjectUnkSWEY.cpp: .text start:0x0214916c end:0x02149a80 .init start:0x02150380 end:0x021503d0 .ctor start:0x021507d0 end:0x021507d4 - .bss start:0x021524c0 end:0x021524e0 + .bss start:0x021524b0 end:0x021525b4 src/070_Dungeon/Actor/ActorUnkTRAP.cpp: .text start:0x02149bd0 end:0x0214a95c .init start:0x021503d0 end:0x02150420 .ctor start:0x021507d4 end:0x021507d8 - .bss start:0x021525c4 end:0x0215269c + .bss start:0x021525b4 end:0x0215269c src/070_Dungeon/MapObject/MapObjectUnkDRST.cpp: .text start:0x0214a95c end:0x0214adc0 .init start:0x02150420 end:0x02150484 .ctor start:0x021507d8 end:0x021507dc - .bss start:0x021526ac end:0x021526e0 + .bss start:0x0215269c end:0x02152784 src/070_Dungeon/MapObject/MapObjectUnkFRWL.cpp: .text start:0x0214ade0 end:0x0214bdc8 .init start:0x02150484 end:0x021504e0 .ctor start:0x021507dc end:0x021507e0 - .bss start:0x0215279c end:0x02152870 + .bss start:0x02152784 end:0x02152894 src/070_Dungeon/MapObject/MapObjectUnkSTSH.cpp: .text start:0x0214bdc8 end:0x0214d1c8 .init start:0x021504e0 end:0x0215057c .ctor start:0x021507e0 end:0x021507e4 - .bss start:0x021528a4 end:0x02152978 + .bss start:0x02152894 end:0x02152978 src/070_Dungeon/MapObject/MapObjectUnkTRLS.cpp: .text start:0x0214d1d8 end:0x0214d3a4 .init start:0x0215057c end:0x021505ec .ctor start:0x021507e4 end:0x021507e8 - .bss start:0x02152988 end:0x02152a5c + .bss start:0x02152978 end:0x02152a5c src/070_Dungeon/MapObject/MapObjectUnkTRLD.cpp: .text start:0x0214d3a4 end:0x0214d590 .init start:0x021505ec end:0x0215065c .ctor start:0x021507e8 end:0x021507ec - .bss start:0x02152a6c end:0x02152a90 + .bss start:0x02152a5c end:0x02152a90 src/070_Dungeon/MapObject/MapObjectUnkTRLW.cpp: .text start:0x0214d590 end:0x0214d784 .init start:0x0215065c end:0x021506cc .ctor start:0x021507ec end:0x021507f0 - .bss start:0x02152aa0 end:0x02152ac4 + .bss start:0x02152a90 end:0x02152ac8 src/070_Dungeon/MapObject/MapObjectUnkPTFL.cpp: .text start:0x0214d784 end:0x0214decc .init start:0x021506cc end:0x02150728 .ctor start:0x021507f0 end:0x021507f4 - .bss start:0x02152ae0 end:0x02152b00 + .bss start:0x02152ac8 end:0x02152b00 src/070_Dungeon/Actor/ActorUnkRYAW.cpp: .text start:0x0214decc end:0x0214fc24 diff --git a/config/jp/arm9/overlays/ov070/symbols.txt b/config/jp/arm9/overlays/ov070/symbols.txt index c13b727c..05ba3804 100644 --- a/config/jp/arm9/overlays/ov070/symbols.txt +++ b/config/jp/arm9/overlays/ov070/symbols.txt @@ -729,106 +729,106 @@ data_ov070_021517b0 kind:data(any) addr:0x021517b0 data_ov070_021517cc kind:data(any) addr:0x021517cc _ZTV19data_ov070_021517e0 kind:data(any) addr:0x021517e0 _ZTV19data_ov070_02151804 kind:data(any) addr:0x02151804 -data_ov070_02151880 kind:bss addr:0x02151880 -data_ov070_02151884 kind:bss addr:0x02151884 -sActorProfileUnkENGE kind:bss addr:0x02151890 -data_ov070_021518cc kind:bss addr:0x021518cc -data_ov070_021518d0 kind:bss addr:0x021518d0 -sActorProfileUnkALEV kind:bss addr:0x021518dc -data_ov070_02151918 kind:bss addr:0x02151918 -data_ov070_0215191c kind:bss addr:0x0215191c -sActorProfileUnkBROW kind:bss addr:0x02151928 +_ZGVN15ProfileInstanceI19ActorProfileUnkENGEE8sProfileE kind:bss addr:0x02151880 +@33120 kind:bss addr:0x02151884 +_ZN15ProfileInstanceI19ActorProfileUnkENGEE8sProfileE kind:bss addr:0x02151890 +_ZGVN15ProfileInstanceI19ActorProfileUnkALEVE8sProfileE kind:bss addr:0x021518cc +@33126 kind:bss addr:0x021518d0 +_ZN15ProfileInstanceI19ActorProfileUnkALEVE8sProfileE kind:bss addr:0x021518dc +_ZGVN15ProfileInstanceI19ActorProfileUnkBROWE8sProfileE kind:bss addr:0x02151918 +@33132 kind:bss addr:0x0215191c +_ZN15ProfileInstanceI19ActorProfileUnkBROWE8sProfileE kind:bss addr:0x02151928 data_ov070_021519b8 kind:bss addr:0x021519b8 ambiguous data_ov070_021519cc kind:bss addr:0x021519cc ambiguous data_ov070_02151a00 kind:bss addr:0x02151a00 data_ov070_02151a04 kind:bss addr:0x02151a04 -data_ov070_02151a08 kind:bss addr:0x02151a08 -data_ov070_02151a14 kind:bss addr:0x02151a14 -sActorProfileUnkKEYN kind:bss addr:0x02151a20 +_ZGVN15ProfileInstanceI19ActorProfileUnkKEYNE8sProfileE kind:bss addr:0x02151a08 +@33138 kind:bss addr:0x02151a14 +_ZN15ProfileInstanceI19ActorProfileUnkKEYNE8sProfileE kind:bss addr:0x02151a20 data_ov070_02151a54 kind:bss addr:0x02151a54 ambiguous data_ov070_02151af8 kind:bss addr:0x02151af8 -data_ov070_02151afc kind:bss addr:0x02151afc -data_ov070_02151b08 kind:bss addr:0x02151b08 -sActorProfileUnkLIRA kind:bss addr:0x02151b14 +_ZGVN15ProfileInstanceI19ActorProfileUnkLIRAE8sProfileE kind:bss addr:0x02151afc +@33144 kind:bss addr:0x02151b08 +_ZN15ProfileInstanceI19ActorProfileUnkLIRAE8sProfileE kind:bss addr:0x02151b14 data_ov070_02151bec kind:bss addr:0x02151bec data_ov070_02151c0c kind:bss addr:0x02151c0c ambiguous data_ov070_02151c10 kind:bss addr:0x02151c10 -data_ov070_02151ce0 kind:bss addr:0x02151ce0 -data_ov070_02151ce4 kind:bss addr:0x02151ce4 -sActorProfileUnkBMHN kind:bss addr:0x02151cf0 -data_ov070_02151d2c kind:bss addr:0x02151d2c -data_ov070_02151d30 kind:bss addr:0x02151d30 -sActorProfileUnkSWDS kind:bss addr:0x02151d3c -data_ov070_02151d78 kind:bss addr:0x02151d78 -data_ov070_02151d7c kind:bss addr:0x02151d7c -sActorProfileUnkRCSG kind:bss addr:0x02151d88 -data_ov070_02151dc4 kind:bss addr:0x02151dc4 -data_ov070_02151dc8 kind:bss addr:0x02151dc8 -sMapObjectProfileUnkBLCK kind:bss addr:0x02151dd4 +_ZGVN15ProfileInstanceI19ActorProfileUnkBMHNE8sProfileE kind:bss addr:0x02151ce0 +@33150 kind:bss addr:0x02151ce4 +_ZN15ProfileInstanceI19ActorProfileUnkBMHNE8sProfileE kind:bss addr:0x02151cf0 +_ZGVN15ProfileInstanceI19ActorProfileUnkSWDSE8sProfileE kind:bss addr:0x02151d2c +@33156 kind:bss addr:0x02151d30 +_ZN15ProfileInstanceI19ActorProfileUnkSWDSE8sProfileE kind:bss addr:0x02151d3c +_ZGVN15ProfileInstanceI19ActorProfileUnkRCSGE8sProfileE kind:bss addr:0x02151d78 +@33162 kind:bss addr:0x02151d7c +_ZN15ProfileInstanceI19ActorProfileUnkRCSGE8sProfileE kind:bss addr:0x02151d88 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkBLCKE8sProfileE kind:bss addr:0x02151dc4 +@32760 kind:bss addr:0x02151dc8 +_ZN15ProfileInstanceI23MapObjectProfileUnkBLCKE8sProfileE kind:bss addr:0x02151dd4 data_ov070_02151df4 kind:bss addr:0x02151df4 data_ov070_02151e3c kind:bss addr:0x02151e3c data_ov070_02151e40 kind:bss addr:0x02151e40 -data_ov070_02151e4c kind:bss addr:0x02151e4c -data_ov070_02151e58 kind:bss addr:0x02151e58 -sMapObjectProfileUnkFLSP kind:bss addr:0x02151e64 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkFLSPE8sProfileE kind:bss addr:0x02151e4c +@32766 kind:bss addr:0x02151e58 +_ZN15ProfileInstanceI23MapObjectProfileUnkFLSPE8sProfileE kind:bss addr:0x02151e64 data_ov070_02151f38 kind:bss addr:0x02151f38 -data_ov070_02151f5c kind:bss addr:0x02151f5c -data_ov070_02151f60 kind:bss addr:0x02151f60 -sMapObjectProfileUnkFSPS kind:bss addr:0x02151f6c +_ZGVN15ProfileInstanceI23MapObjectProfileUnkFSPSE8sProfileE kind:bss addr:0x02151f5c +@32772 kind:bss addr:0x02151f60 +_ZN15ProfileInstanceI23MapObjectProfileUnkFSPSE8sProfileE kind:bss addr:0x02151f6c data_ov070_02152040 kind:bss addr:0x02152040 data_ov070_02152064 kind:bss addr:0x02152064 -data_ov070_02152068 kind:bss addr:0x02152068 -data_ov070_02152074 kind:bss addr:0x02152074 -sMapObjectProfileUnkBLRB kind:bss addr:0x021520a4 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkBLRBE8sProfileE kind:bss addr:0x02152068 +@32778 kind:bss addr:0x02152074 +_ZN15ProfileInstanceI23MapObjectProfileUnkBLRBE8sProfileE kind:bss addr:0x021520a4 data_ov070_02152178 kind:bss addr:0x02152178 -data_ov070_0215219c kind:bss addr:0x0215219c -data_ov070_021521a0 kind:bss addr:0x021521a0 -sMapObjectProfileUnkSWRB kind:bss addr:0x021521ac +_ZGVN15ProfileInstanceI23MapObjectProfileUnkSWRBE8sProfileE kind:bss addr:0x0215219c +@32784 kind:bss addr:0x021521a0 +_ZN15ProfileInstanceI23MapObjectProfileUnkSWRBE8sProfileE kind:bss addr:0x021521ac data_ov070_021521cc kind:bss addr:0x021521cc data_ov070_02152280 kind:bss addr:0x02152280 -data_ov070_021522a0 kind:bss addr:0x021522a0 -data_ov070_021522a4 kind:bss addr:0x021522a4 -sMapObjectProfileUnkARWL kind:bss addr:0x021522b0 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkARWLE8sProfileE kind:bss addr:0x021522a0 +@32790 kind:bss addr:0x021522a4 +_ZN15ProfileInstanceI23MapObjectProfileUnkARWLE8sProfileE kind:bss addr:0x021522b0 data_ov070_02152384 kind:bss addr:0x02152384 -data_ov070_021523a8 kind:bss addr:0x021523a8 -data_ov070_021523ac kind:bss addr:0x021523ac -sMapObjectProfileUnkSWWN kind:bss addr:0x021523b8 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkSWWNE8sProfileE kind:bss addr:0x021523a8 +@32796 kind:bss addr:0x021523ac +_ZN15ProfileInstanceI23MapObjectProfileUnkSWWNE8sProfileE kind:bss addr:0x021523b8 data_ov070_0215248c kind:bss addr:0x0215248c -data_ov070_021524b0 kind:bss addr:0x021524b0 -data_ov070_021524b4 kind:bss addr:0x021524b4 -sMapObjectProfileUnkSWEY kind:bss addr:0x021524c0 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkSWEYE8sProfileE kind:bss addr:0x021524b0 +@32802 kind:bss addr:0x021524b4 +_ZN15ProfileInstanceI23MapObjectProfileUnkSWEYE8sProfileE kind:bss addr:0x021524c0 data_ov070_021524e0 kind:bss addr:0x021524e0 data_ov070_02152594 kind:bss addr:0x02152594 -data_ov070_021525b4 kind:bss addr:0x021525b4 -data_ov070_021525b8 kind:bss addr:0x021525b8 -sActorProfileUnkTRAP kind:bss addr:0x021525c4 -data_ov070_0215269c kind:bss addr:0x0215269c -data_ov070_021526a0 kind:bss addr:0x021526a0 -sMapObjectProfileUnkDRST kind:bss addr:0x021526ac +_ZGVN15ProfileInstanceI19ActorProfileUnkTRAPE8sProfileE kind:bss addr:0x021525b4 +@33216 kind:bss addr:0x021525b8 +_ZN15ProfileInstanceI19ActorProfileUnkTRAPE8sProfileE kind:bss addr:0x021525c4 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkDRSTE8sProfileE kind:bss addr:0x0215269c +@32814 kind:bss addr:0x021526a0 +_ZN15ProfileInstanceI23MapObjectProfileUnkDRSTE8sProfileE kind:bss addr:0x021526ac data_ov070_021526e0 kind:bss addr:0x021526e0 ambiguous data_ov070_02152780 kind:bss addr:0x02152780 -data_ov070_02152784 kind:bss addr:0x02152784 -data_ov070_02152790 kind:bss addr:0x02152790 -sMapObjectProfileUnkFRWL kind:bss addr:0x0215279c +_ZGVN15ProfileInstanceI23MapObjectProfileUnkFRWLE8sProfileE kind:bss addr:0x02152784 +@32820 kind:bss addr:0x02152790 +_ZN15ProfileInstanceI23MapObjectProfileUnkFRWLE8sProfileE kind:bss addr:0x0215279c data_ov070_02152870 kind:bss addr:0x02152870 -data_ov070_02152894 kind:bss addr:0x02152894 -data_ov070_02152898 kind:bss addr:0x02152898 -sMapObjectProfileUnkSTSH kind:bss addr:0x021528a4 -data_ov070_02152978 kind:bss addr:0x02152978 -data_ov070_0215297c kind:bss addr:0x0215297c -sMapObjectProfileUnkTRLS kind:bss addr:0x02152988 -data_ov070_02152a5c kind:bss addr:0x02152a5c -data_ov070_02152a60 kind:bss addr:0x02152a60 -sMapObjectProfileUnkTRLD kind:bss addr:0x02152a6c -data_ov070_02152a90 kind:bss addr:0x02152a90 -data_ov070_02152a94 kind:bss addr:0x02152a94 -sMapObjectProfileUnkTRLW kind:bss addr:0x02152aa0 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkSTSHE8sProfileE kind:bss addr:0x02152894 +@32826 kind:bss addr:0x02152898 +_ZN15ProfileInstanceI23MapObjectProfileUnkSTSHE8sProfileE kind:bss addr:0x021528a4 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRLSE8sProfileE kind:bss addr:0x02152978 +@32832 kind:bss addr:0x0215297c +_ZN15ProfileInstanceI23MapObjectProfileUnkTRLSE8sProfileE kind:bss addr:0x02152988 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRLDE8sProfileE kind:bss addr:0x02152a5c +@32838 kind:bss addr:0x02152a60 +_ZN15ProfileInstanceI23MapObjectProfileUnkTRLDE8sProfileE kind:bss addr:0x02152a6c +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRLWE8sProfileE kind:bss addr:0x02152a90 +@32844 kind:bss addr:0x02152a94 +_ZN15ProfileInstanceI23MapObjectProfileUnkTRLWE8sProfileE kind:bss addr:0x02152aa0 data_ov070_02152ac4 kind:bss addr:0x02152ac4 -data_ov070_02152ac8 kind:bss addr:0x02152ac8 -data_ov070_02152ad4 kind:bss addr:0x02152ad4 -sMapObjectProfileUnkPTFL kind:bss addr:0x02152ae0 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkPTFLE8sProfileE kind:bss addr:0x02152ac8 +@32850 kind:bss addr:0x02152ad4 +_ZN15ProfileInstanceI23MapObjectProfileUnkPTFLE8sProfileE kind:bss addr:0x02152ae0 data_ov070_02152b00 kind:bss addr:0x02152b00 data_ov070_02152b24 kind:bss addr:0x02152b24 data_ov070_02152b28 kind:bss addr:0x02152b28 data_ov070_02152b34 kind:bss addr:0x02152b34 -sActorProfileUnkRYAW kind:bss addr:0x02152b44 +_ZN15ProfileInstanceI19ActorProfileUnkRYAWE8sProfileE kind:bss addr:0x02152b44 diff --git a/config/jp/arm9/overlays/ov071/delinks.txt b/config/jp/arm9/overlays/ov071/delinks.txt index 7fd746ac..4fb6ff3f 100644 --- a/config/jp/arm9/overlays/ov071/delinks.txt +++ b/config/jp/arm9/overlays/ov071/delinks.txt @@ -9,43 +9,43 @@ src/071_Tower/Actor/ActorUnkSZKU.cpp: .text start:0x02161450 end:0x02162358 .init start:0x02166030 end:0x021660a4 .ctor start:0x0216631c end:0x02166320 - .bss start:0x021673c8 end:0x021674a0 + .bss start:0x021673b0 end:0x021674a0 src/071_Tower/Actor/ActorUnkKMSO.cpp: .text start:0x02162358 end:0x02162bbc .init start:0x021660a4 end:0x021660f4 .ctor start:0x02166320 end:0x02166324 - .bss start:0x021674b0 end:0x02167588 + .bss start:0x021674a0 end:0x02167588 src/071_Tower/MapObject/MapObjectUnkRNBO.cpp: .text start:0x02162bbc end:0x02162df8 .init start:0x021660f4 end:0x02166144 .ctor start:0x02166324 end:0x02166328 - .bss start:0x02167598 end:0x0216766c + .bss start:0x02167588 end:0x02167690 src/071_Tower/MapObject/MapObjectUnkRPFL.cpp: .text start:0x02162df8 end:0x02163b9c .init start:0x02166144 end:0x02166194 .ctor start:0x02166328 end:0x0216632c - .bss start:0x021676a0 end:0x021676c0 + .bss start:0x02167690 end:0x02167798 src/071_Tower/MapObject/MapObjectUnkBLCE.cpp: .text start:0x02163b9c end:0x02163d2c .init start:0x02166194 end:0x021661e4 .ctor start:0x0216632c end:0x02166330 - .bss start:0x021677a8 end:0x021678a0 + .bss start:0x02167798 end:0x021678a0 src/071_Tower/MapObject/MapObjectUnkSTAL.cpp: .text start:0x02163d2c end:0x02164300 .init start:0x021661e4 end:0x02166234 .ctor start:0x02166330 end:0x02166334 - .bss start:0x021678b0 end:0x02167984 + .bss start:0x021678a0 end:0x02167994 src/071_Tower/MapObject/MapObjectUnkBRGS.cpp: .text start:0x02164300 end:0x02165194 .init start:0x02166234 end:0x02166298 .ctor start:0x02166334 end:0x02166338 - .bss start:0x021679ac end:0x02167a80 + .bss start:0x02167994 end:0x02167a80 src/071_Tower/MapObject/MapObjectUnkBLCT.cpp: .text start:0x02165194 end:0x021659c0 diff --git a/config/jp/arm9/overlays/ov071/symbols.txt b/config/jp/arm9/overlays/ov071/symbols.txt index 306b8217..dff88640 100644 --- a/config/jp/arm9/overlays/ov071/symbols.txt +++ b/config/jp/arm9/overlays/ov071/symbols.txt @@ -570,32 +570,32 @@ data_ov071_02167388 kind:bss addr:0x02167388 data_ov071_02167394 kind:bss addr:0x02167394 data_ov071_021673a0 kind:bss addr:0x021673a0 data_ov071_021673ac kind:bss addr:0x021673ac -data_ov071_021673b0 kind:bss addr:0x021673b0 -data_ov071_021673bc kind:bss addr:0x021673bc -sActorProfileUnkSZKU kind:bss addr:0x021673c8 -data_ov071_021674a0 kind:bss addr:0x021674a0 -data_ov071_021674a4 kind:bss addr:0x021674a4 -sActorProfileUnkKMSO kind:bss addr:0x021674b0 -data_ov071_02167588 kind:bss addr:0x02167588 -data_ov071_0216758c kind:bss addr:0x0216758c -sMapObjectProfileUnkRNBO kind:bss addr:0x02167598 +_ZGVN15ProfileInstanceI19ActorProfileUnkSZKUE8sProfileE kind:bss addr:0x021673b0 +@33275 kind:bss addr:0x021673bc +_ZN15ProfileInstanceI19ActorProfileUnkSZKUE8sProfileE kind:bss addr:0x021673c8 +_ZGVN15ProfileInstanceI19ActorProfileUnkKMSOE8sProfileE kind:bss addr:0x021674a0 +@33281 kind:bss addr:0x021674a4 +_ZN15ProfileInstanceI19ActorProfileUnkKMSOE8sProfileE kind:bss addr:0x021674b0 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkRNBOE8sProfileE kind:bss addr:0x02167588 +@32879 kind:bss addr:0x0216758c +_ZN15ProfileInstanceI23MapObjectProfileUnkRNBOE8sProfileE kind:bss addr:0x02167598 data_ov071_0216766c kind:bss addr:0x0216766c -data_ov071_02167690 kind:bss addr:0x02167690 -data_ov071_02167694 kind:bss addr:0x02167694 -sMapObjectProfileUnkRPFL kind:bss addr:0x021676a0 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkRPFLE8sProfileE kind:bss addr:0x02167690 +@32885 kind:bss addr:0x02167694 +_ZN15ProfileInstanceI23MapObjectProfileUnkRPFLE8sProfileE kind:bss addr:0x021676a0 data_ov071_021676c0 kind:bss addr:0x021676c0 data_ov071_02167774 kind:bss addr:0x02167774 -data_ov071_02167798 kind:bss addr:0x02167798 -data_ov071_0216779c kind:bss addr:0x0216779c -sMapObjectProfileUnkBLCE kind:bss addr:0x021677a8 -data_ov071_021678a0 kind:bss addr:0x021678a0 -data_ov071_021678a4 kind:bss addr:0x021678a4 -sMapObjectProfileUnkSTAL kind:bss addr:0x021678b0 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkBLCEE8sProfileE kind:bss addr:0x02167798 +@32891 kind:bss addr:0x0216779c +_ZN15ProfileInstanceI23MapObjectProfileUnkBLCEE8sProfileE kind:bss addr:0x021677a8 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkSTALE8sProfileE kind:bss addr:0x021678a0 +@32897 kind:bss addr:0x021678a4 +_ZN15ProfileInstanceI23MapObjectProfileUnkSTALE8sProfileE kind:bss addr:0x021678b0 data_ov071_02167984 kind:bss addr:0x02167984 -data_ov071_02167994 kind:bss addr:0x02167994 -data_ov071_021679a0 kind:bss addr:0x021679a0 -sMapObjectProfileUnkBRGS kind:bss addr:0x021679ac +_ZGVN15ProfileInstanceI23MapObjectProfileUnkBRGSE8sProfileE kind:bss addr:0x02167994 +@32903 kind:bss addr:0x021679a0 +_ZN15ProfileInstanceI23MapObjectProfileUnkBRGSE8sProfileE kind:bss addr:0x021679ac data_ov071_02167a80 kind:bss addr:0x02167a80 data_ov071_02167a84 kind:bss addr:0x02167a84 data_ov071_02167a90 kind:bss addr:0x02167a90 -sMapObjectProfileUnkBLCT kind:bss addr:0x02167a9c +_ZN15ProfileInstanceI23MapObjectProfileUnkBLCTE8sProfileE kind:bss addr:0x02167a9c diff --git a/config/jp/arm9/overlays/ov072/delinks.txt b/config/jp/arm9/overlays/ov072/delinks.txt index 6c19cce0..331bd9ce 100644 --- a/config/jp/arm9/overlays/ov072/delinks.txt +++ b/config/jp/arm9/overlays/ov072/delinks.txt @@ -9,7 +9,7 @@ src/072_TowerLobby/Actor/ActorUnkRMM0.cpp: .text start:0x02152ca0 end:0x02154074 .init start:0x021545c0 end:0x02154610 .ctor start:0x02154660 end:0x02154664 - .bss start:0x021548b0 end:0x021548ec + .bss start:0x021548a0 end:0x021548ec src/072_TowerLobby/Actor/ActorUnkRMM3.cpp: .text start:0x02154074 end:0x0215450c diff --git a/config/jp/arm9/overlays/ov072/symbols.txt b/config/jp/arm9/overlays/ov072/symbols.txt index 89178417..8c3c1673 100644 --- a/config/jp/arm9/overlays/ov072/symbols.txt +++ b/config/jp/arm9/overlays/ov072/symbols.txt @@ -68,10 +68,10 @@ _ZTV19data_ov072_021547f0 kind:data(any) addr:0x021547f0 _ZTV19data_ov072_02154814 kind:data(any) addr:0x02154814 data_ov072_02154878 kind:data(any) addr:0x02154878 data_ov072_02154884 kind:data(any) addr:0x02154884 -data_ov072_021548a0 kind:bss addr:0x021548a0 -data_ov072_021548a4 kind:bss addr:0x021548a4 -sActorProfileUnkRMM0 kind:bss addr:0x021548b0 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMM0E8sProfileE kind:bss addr:0x021548a0 +@33328 kind:bss addr:0x021548a4 +_ZN15ProfileInstanceI19ActorProfileUnkRMM0E8sProfileE kind:bss addr:0x021548b0 data_ov072_021548ec kind:bss addr:0x021548ec data_ov072_02154988 kind:bss addr:0x02154988 data_ov072_0215498c kind:bss addr:0x0215498c -sActorProfileUnkRMM3 kind:bss addr:0x02154998 +_ZN15ProfileInstanceI19ActorProfileUnkRMM3E8sProfileE kind:bss addr:0x02154998 diff --git a/config/jp/arm9/overlays/ov073/delinks.txt b/config/jp/arm9/overlays/ov073/delinks.txt index ac4eec51..3bd4fade 100644 --- a/config/jp/arm9/overlays/ov073/delinks.txt +++ b/config/jp/arm9/overlays/ov073/delinks.txt @@ -9,10 +9,10 @@ src/073_BossDeago/Actor/ActorUnkBDEA.cpp: .text start:0x02152c20 end:0x02165248 .init start:0x02165d68 end:0x02165e8c .ctor start:0x02165edc end:0x02165ee0 - .bss start:0x021667f0 end:0x021667f4 + .bss start:0x021667e0 end:0x021668c8 src/073_BossDeago/Actor/ActorUnkDGPC.cpp: .text start:0x02165248 end:0x021654ac .init start:0x02165e8c end:0x02165edc .ctor start:0x02165ee0 end:0x02165ee4 - .bss start:0x021668d8 end:0x021669c0 + .bss start:0x021668c8 end:0x021669c0 diff --git a/config/jp/arm9/overlays/ov073/symbols.txt b/config/jp/arm9/overlays/ov073/symbols.txt index 9d4805f4..857db0b5 100644 --- a/config/jp/arm9/overlays/ov073/symbols.txt +++ b/config/jp/arm9/overlays/ov073/symbols.txt @@ -288,10 +288,10 @@ data_ov073_02166708 kind:data(any) addr:0x02166708 _ZTV19data_ov073_02166720 kind:data(any) addr:0x02166720 _ZTV19data_ov073_02166744 kind:data(any) addr:0x02166744 _ZTV19data_ov073_021667ac kind:data(any) addr:0x021667ac -data_ov073_021667e0 kind:bss addr:0x021667e0 -data_ov073_021667e4 kind:bss addr:0x021667e4 -sActorProfileUnkBDEA kind:bss addr:0x021667f0 +_ZGVN15ProfileInstanceI19ActorProfileUnkBDEAE8sProfileE kind:bss addr:0x021667e0 +@33345 kind:bss addr:0x021667e4 +_ZN15ProfileInstanceI19ActorProfileUnkBDEAE8sProfileE kind:bss addr:0x021667f0 data_ov073_021667f4 kind:bss addr:0x021667f4 -data_ov073_021668c8 kind:bss addr:0x021668c8 -data_ov073_021668cc kind:bss addr:0x021668cc -sActorProfileUnkDGPC kind:bss addr:0x021668d8 +_ZGVN15ProfileInstanceI19ActorProfileUnkDGPCE8sProfileE kind:bss addr:0x021668c8 +@33351 kind:bss addr:0x021668cc +_ZN15ProfileInstanceI19ActorProfileUnkDGPCE8sProfileE kind:bss addr:0x021668d8 diff --git a/config/jp/arm9/overlays/ov074/delinks.txt b/config/jp/arm9/overlays/ov074/delinks.txt index 89783886..98a65f35 100644 --- a/config/jp/arm9/overlays/ov074/delinks.txt +++ b/config/jp/arm9/overlays/ov074/delinks.txt @@ -9,43 +9,43 @@ src/074_BossLast1/Actor/ActorUnkRBL1.cpp: .text start:0x02152c20 end:0x02153b34 .init start:0x0216441c end:0x021644e0 .ctor start:0x021647f8 end:0x021647fc - .bss start:0x02165590 end:0x02165668 + .bss start:0x02165580 end:0x02165668 src/074_BossLast1/Actor/ActorUnkMAGR.cpp: .text start:0x02153b34 end:0x02154e6c .init start:0x021644e0 end:0x02164564 .ctor start:0x021647fc end:0x02164800 - .bss start:0x02165678 end:0x02165750 + .bss start:0x02165668 end:0x02165750 src/074_BossLast1/Actor/ActorUnkZLBS.cpp: .text start:0x02154e6c end:0x021576fc .init start:0x02164564 end:0x021645d8 .ctor start:0x02164800 end:0x02164804 - .bss start:0x02165760 end:0x02165838 + .bss start:0x02165750 end:0x02165838 src/074_BossLast1/Actor/ActorUnkZLBB.cpp: .text start:0x021576fc end:0x02158ba8 .init start:0x021645d8 end:0x0216464c .ctor start:0x02164804 end:0x02164808 - .bss start:0x02165848 end:0x02165920 + .bss start:0x02165838 end:0x02165920 src/074_BossLast1/Actor/ActorUnkBSKM.cpp: .text start:0x02158ba8 end:0x0215ec38 .init start:0x0216464c end:0x021646c0 .ctor start:0x02164808 end:0x0216480c - .bss start:0x02165930 end:0x02165a08 + .bss start:0x02165920 end:0x02165a08 src/074_BossLast1/Actor/ActorUnkBKST.cpp: .text start:0x0215ec38 end:0x0215f9bc .init start:0x021646c0 end:0x02164710 .ctor start:0x0216480c end:0x02164810 - .bss start:0x02165a18 end:0x02165a54 + .bss start:0x02165a08 end:0x02165a54 src/074_BossLast1/Actor/ActorUnkKIMB.cpp: .text start:0x0215f9bc end:0x021608f4 .init start:0x02164710 end:0x02164784 .ctor start:0x02164810 end:0x02164814 - .bss start:0x02165a64 end:0x02165b3c + .bss start:0x02165a54 end:0x02165b3c src/074_BossLast1/Actor/ActorUnkPPPM.cpp: .text start:0x021608f4 end:0x02163e98 diff --git a/config/jp/arm9/overlays/ov074/symbols.txt b/config/jp/arm9/overlays/ov074/symbols.txt index e610112e..73d89d41 100644 --- a/config/jp/arm9/overlays/ov074/symbols.txt +++ b/config/jp/arm9/overlays/ov074/symbols.txt @@ -444,27 +444,27 @@ _ZTV19data_ov074_0216543c kind:data(any) addr:0x0216543c data_ov074_0216549c kind:data(any) addr:0x0216549c data_ov074_02165504 kind:data(any) addr:0x02165504 data_ov074_02165518 kind:data(any) addr:0x02165518 ambiguous -data_ov074_02165580 kind:bss addr:0x02165580 -data_ov074_02165584 kind:bss addr:0x02165584 -sActorProfileUnkRBL1 kind:bss addr:0x02165590 -data_ov074_02165668 kind:bss addr:0x02165668 -data_ov074_0216566c kind:bss addr:0x0216566c -sActorProfileUnkMAGR kind:bss addr:0x02165678 -data_ov074_02165750 kind:bss addr:0x02165750 -data_ov074_02165754 kind:bss addr:0x02165754 -sActorProfileUnkZLBS kind:bss addr:0x02165760 -data_ov074_02165838 kind:bss addr:0x02165838 -data_ov074_0216583c kind:bss addr:0x0216583c -sActorProfileUnkZLBB kind:bss addr:0x02165848 -data_ov074_02165920 kind:bss addr:0x02165920 -data_ov074_02165924 kind:bss addr:0x02165924 -sActorProfileUnkBSKM kind:bss addr:0x02165930 -data_ov074_02165a08 kind:bss addr:0x02165a08 -data_ov074_02165a0c kind:bss addr:0x02165a0c -sActorProfileUnkBKST kind:bss addr:0x02165a18 -data_ov074_02165a54 kind:bss addr:0x02165a54 -data_ov074_02165a58 kind:bss addr:0x02165a58 -sActorProfileUnkKIMB kind:bss addr:0x02165a64 +_ZGVN15ProfileInstanceI19ActorProfileUnkRBL1E8sProfileE kind:bss addr:0x02165580 +@33363 kind:bss addr:0x02165584 +_ZN15ProfileInstanceI19ActorProfileUnkRBL1E8sProfileE kind:bss addr:0x02165590 +_ZGVN15ProfileInstanceI19ActorProfileUnkMAGRE8sProfileE kind:bss addr:0x02165668 +@33369 kind:bss addr:0x0216566c +_ZN15ProfileInstanceI19ActorProfileUnkMAGRE8sProfileE kind:bss addr:0x02165678 +_ZGVN15ProfileInstanceI19ActorProfileUnkZLBSE8sProfileE kind:bss addr:0x02165750 +@33375 kind:bss addr:0x02165754 +_ZN15ProfileInstanceI19ActorProfileUnkZLBSE8sProfileE kind:bss addr:0x02165760 +_ZGVN15ProfileInstanceI19ActorProfileUnkZLBBE8sProfileE kind:bss addr:0x02165838 +@33381 kind:bss addr:0x0216583c +_ZN15ProfileInstanceI19ActorProfileUnkZLBBE8sProfileE kind:bss addr:0x02165848 +_ZGVN15ProfileInstanceI19ActorProfileUnkBSKME8sProfileE kind:bss addr:0x02165920 +@33387 kind:bss addr:0x02165924 +_ZN15ProfileInstanceI19ActorProfileUnkBSKME8sProfileE kind:bss addr:0x02165930 +_ZGVN15ProfileInstanceI19ActorProfileUnkBKSTE8sProfileE kind:bss addr:0x02165a08 +@33393 kind:bss addr:0x02165a0c +_ZN15ProfileInstanceI19ActorProfileUnkBKSTE8sProfileE kind:bss addr:0x02165a18 +_ZGVN15ProfileInstanceI19ActorProfileUnkKIMBE8sProfileE kind:bss addr:0x02165a54 +@33399 kind:bss addr:0x02165a58 +_ZN15ProfileInstanceI19ActorProfileUnkKIMBE8sProfileE kind:bss addr:0x02165a64 data_ov074_02165b3c kind:bss addr:0x02165b3c data_ov074_02165b40 kind:bss addr:0x02165b40 -sActorProfileUnkPPPM kind:bss addr:0x02165b4c +_ZN15ProfileInstanceI19ActorProfileUnkPPPME8sProfileE kind:bss addr:0x02165b4c diff --git a/config/jp/arm9/overlays/ov075/delinks.txt b/config/jp/arm9/overlays/ov075/delinks.txt index 252bc795..3d58a5d6 100644 --- a/config/jp/arm9/overlays/ov075/delinks.txt +++ b/config/jp/arm9/overlays/ov075/delinks.txt @@ -9,22 +9,22 @@ src/075_BossLast2/Actor/ActorUnkMRDA_MRDO.cpp: .text start:0x02152c20 end:0x021560f8 .init start:0x0216433c end:0x0216446c .ctor start:0x02164670 end:0x02164674 - .bss start:0x02165364 end:0x02165514 + .bss start:0x0216534c end:0x02165528 src/075_BossLast2/Actor/ActorUnkMRD2.cpp: .text start:0x021561c4 end:0x0215ff08 .init start:0x0216446c end:0x02164578 .ctor start:0x02164674 end:0x02164678 - .bss start:0x02165544 end:0x02165588 + .bss start:0x02165528 end:0x02165588 src/075_BossLast2/Actor/ActorUnkMRDL.cpp: .text start:0x0215ff08 end:0x02160268 .init start:0x02164578 end:0x021645c8 .ctor start:0x02164678 end:0x0216467c - .bss start:0x02165598 end:0x021655d4 + .bss start:0x02165588 end:0x021655dc src/075_BossLast2/Actor/ActorUnkMABL.cpp: .text start:0x02160268 end:0x02162730 .init start:0x021645c8 end:0x02164670 .ctor start:0x0216467c end:0x02164680 - .bss start:0x021655f4 end:0x021656e0 + .bss start:0x021655dc end:0x021656e0 diff --git a/config/jp/arm9/overlays/ov075/symbols.txt b/config/jp/arm9/overlays/ov075/symbols.txt index ef175047..ce522ca4 100644 --- a/config/jp/arm9/overlays/ov075/symbols.txt +++ b/config/jp/arm9/overlays/ov075/symbols.txt @@ -393,20 +393,20 @@ data_ov075_021652fc kind:data(any) addr:0x021652fc data_ov075_02165328 kind:data(any) addr:0x02165328 data_ov075_02165340 kind:bss addr:0x02165340 data_ov075_02165344 kind:bss addr:0x02165344 -data_ov075_0216534c kind:bss addr:0x0216534c -data_ov075_02165358 kind:bss addr:0x02165358 -sActorProfileUnkMRDA kind:bss addr:0x02165364 -sActorProfileUnkMRDO kind:bss addr:0x0216543c +_ZGVN15ProfileInstanceI19ActorProfileUnkMRDAE8sProfileE kind:bss addr:0x0216534c +@33416 kind:bss addr:0x02165358 +_ZN15ProfileInstanceI19ActorProfileUnkMRDAE8sProfileE kind:bss addr:0x02165364 +_ZN15ProfileInstanceI19ActorProfileUnkMRDOE8sProfileE kind:bss addr:0x0216543c data_ov075_02165514 kind:bss addr:0x02165514 data_ov075_02165518 kind:bss addr:0x02165518 data_ov075_0216551c kind:bss addr:0x0216551c -data_ov075_02165528 kind:bss addr:0x02165528 -data_ov075_02165534 kind:bss addr:0x02165534 -sActorProfileUnkMRD2 kind:bss addr:0x02165544 -data_ov075_02165588 kind:bss addr:0x02165588 -data_ov075_0216558c kind:bss addr:0x0216558c -sActorProfileUnkMRDL kind:bss addr:0x02165598 +_ZGVN15ProfileInstanceI19ActorProfileUnkMRD2E8sProfileE kind:bss addr:0x02165528 +@33422 kind:bss addr:0x02165534 +_ZN15ProfileInstanceI19ActorProfileUnkMRD2E8sProfileE kind:bss addr:0x02165544 +_ZGVN15ProfileInstanceI19ActorProfileUnkMRDLE8sProfileE kind:bss addr:0x02165588 +@33428 kind:bss addr:0x0216558c +_ZN15ProfileInstanceI19ActorProfileUnkMRDLE8sProfileE kind:bss addr:0x02165598 data_ov075_021655d4 kind:bss addr:0x021655d4 -data_ov075_021655dc kind:bss addr:0x021655dc -data_ov075_021655e8 kind:bss addr:0x021655e8 -sActorProfileUnkMABL kind:bss addr:0x021655f4 +_ZGVN15ProfileInstanceI19ActorProfileUnkMABLE8sProfileE kind:bss addr:0x021655dc +@33434 kind:bss addr:0x021655e8 +_ZN15ProfileInstanceI19ActorProfileUnkMABLE8sProfileE kind:bss addr:0x021655f4 diff --git a/config/jp/arm9/overlays/ov076/delinks.txt b/config/jp/arm9/overlays/ov076/delinks.txt index 5745536f..5d930c05 100644 --- a/config/jp/arm9/overlays/ov076/delinks.txt +++ b/config/jp/arm9/overlays/ov076/delinks.txt @@ -9,4 +9,4 @@ src/076_DgnLv1/Actor/ActorUnkBGOK.cpp: .text start:0x02152c20 end:0x02154ae0 .init start:0x02154b00 end:0x02154b50 .ctor start:0x02154b50 end:0x02154b54 - .bss start:0x02154dd0 end:0x02154ec0 + .bss start:0x02154dc0 end:0x02154ec0 diff --git a/config/jp/arm9/overlays/ov076/symbols.txt b/config/jp/arm9/overlays/ov076/symbols.txt index 399d90bb..698b5381 100644 --- a/config/jp/arm9/overlays/ov076/symbols.txt +++ b/config/jp/arm9/overlays/ov076/symbols.txt @@ -73,6 +73,6 @@ data_ov076_02154d14 kind:data(any) addr:0x02154d14 data_ov076_02154d2c kind:data(any) addr:0x02154d2c data_ov076_02154d44 kind:data(any) addr:0x02154d44 _ZTV19data_ov076_02154d5c kind:data(any) addr:0x02154d5c -data_ov076_02154dc0 kind:bss addr:0x02154dc0 -data_ov076_02154dc4 kind:bss addr:0x02154dc4 -sActorProfileUnkBGOK kind:bss addr:0x02154dd0 +_ZGVN15ProfileInstanceI19ActorProfileUnkBGOKE8sProfileE kind:bss addr:0x02154dc0 +@33446 kind:bss addr:0x02154dc4 +_ZN15ProfileInstanceI19ActorProfileUnkBGOKE8sProfileE kind:bss addr:0x02154dd0 diff --git a/config/jp/arm9/overlays/ov077/delinks.txt b/config/jp/arm9/overlays/ov077/delinks.txt index 16216e2d..e9b5b674 100644 --- a/config/jp/arm9/overlays/ov077/delinks.txt +++ b/config/jp/arm9/overlays/ov077/delinks.txt @@ -9,52 +9,52 @@ src/077_DgnForest/Actor/ActorUnkASYU.cpp: .text start:0x02154f28 end:0x02158f9c .init start:0x0215d140 end:0x0215d1a4 .ctor start:0x0215d424 end:0x0215d428 - .bss start:0x0215ddb8 end:0x0215ddf8 + .bss start:0x0215dda4 end:0x0215de94 src/077_DgnForest/Actor/ActorUnkASBA.cpp: .text start:0x02158f9c end:0x02159af4 .init start:0x0215d1a4 end:0x0215d1f4 .ctor start:0x0215d428 end:0x0215d42c - .bss start:0x0215dea0 end:0x0215dee4 + .bss start:0x0215de94 end:0x0215dee4 src/077_DgnForest/Actor/ActorUnkBBLE.cpp: .text start:0x02159af4 end:0x0215ab98 .init start:0x0215d1f4 end:0x0215d244 .ctor start:0x0215d42c end:0x0215d430 - .bss start:0x0215def4 end:0x0215df30 + .bss start:0x0215dee4 end:0x0215dfcc src/077_DgnForest/Actor/ActorUnkDSFR.cpp: .text start:0x0215ab98 end:0x0215acbc .init start:0x0215d244 end:0x0215d294 .ctor start:0x0215d430 end:0x0215d434 - .bss start:0x0215dfdc end:0x0215e064 + .bss start:0x0215dfcc end:0x0215e0b4 src/077_DgnForest/Actor/ActorUnkGOKI.cpp: .text start:0x0215acbc end:0x0215bd2c .init start:0x0215d294 end:0x0215d2e4 .ctor start:0x0215d434 end:0x0215d438 - .bss start:0x0215e0c4 end:0x0215e0d0 + .bss start:0x0215e0b4 end:0x0215e19c src/077_DgnForest/Actor/ActorUnkPMST.cpp: .text start:0x0215bd2c end:0x0215caec .init start:0x0215d2e4 end:0x0215d334 .ctor start:0x0215d438 end:0x0215d43c - .bss start:0x0215e1b0 end:0x0215e278 + .bss start:0x0215e19c end:0x0215e288 src/077_DgnForest/Actor/ActorUnkOFSW.cpp: .text start:0x0215caec end:0x0215cc3c .init start:0x0215d334 end:0x0215d384 .ctor start:0x0215d43c end:0x0215d440 - .bss start:0x0215e298 end:0x0215e2a8 + .bss start:0x0215e288 end:0x0215e2d4 src/077_DgnForest/MapObject/MapObjectUnkPLFR.cpp: .text start:0x0215cc3c end:0x0215ce70 .init start:0x0215d384 end:0x0215d3d4 .ctor start:0x0215d440 end:0x0215d444 - .bss start:0x0215e2e4 end:0x0215e2f8 + .bss start:0x0215e2d4 end:0x0215e3dc src/077_DgnForest/MapObject/MapObjectUnkGTRK.cpp: .text start:0x0215ce70 end:0x0215d0c4 .init start:0x0215d3d4 end:0x0215d424 .ctor start:0x0215d444 end:0x0215d448 - .bss start:0x0215e3ec end:0x0215e4c0 + .bss start:0x0215e3dc end:0x0215e4c0 diff --git a/config/jp/arm9/overlays/ov077/symbols.txt b/config/jp/arm9/overlays/ov077/symbols.txt index fdd1046b..45237dcc 100644 --- a/config/jp/arm9/overlays/ov077/symbols.txt +++ b/config/jp/arm9/overlays/ov077/symbols.txt @@ -319,44 +319,44 @@ data_ov077_0215dd38 kind:data(any) addr:0x0215dd38 data_ov077_0215dd54 kind:data(any) addr:0x0215dd54 data_ov077_0215dd5c kind:data(any) addr:0x0215dd5c ambiguous data_ov077_0215dda0 kind:bss addr:0x0215dda0 -data_ov077_0215dda4 kind:bss addr:0x0215dda4 -data_ov077_0215ddac kind:bss addr:0x0215ddac -sActorProfileUnkASYU kind:bss addr:0x0215ddb8 +_ZGVN15ProfileInstanceI19ActorProfileUnkASYUE8sProfileE kind:bss addr:0x0215dda4 +@33458 kind:bss addr:0x0215ddac +_ZN15ProfileInstanceI19ActorProfileUnkASYUE8sProfileE kind:bss addr:0x0215ddb8 data_ov077_0215ddf8 kind:bss addr:0x0215ddf8 ambiguous data_ov077_0215de90 kind:bss addr:0x0215de90 -data_ov077_0215de94 kind:bss addr:0x0215de94 -data_ov077_0215de98 kind:bss addr:0x0215de98 ambiguous -sActorProfileUnkASBA kind:bss addr:0x0215dea0 -data_ov077_0215dee4 kind:bss addr:0x0215dee4 -data_ov077_0215dee8 kind:bss addr:0x0215dee8 -sActorProfileUnkBBLE kind:bss addr:0x0215def4 +_ZGVN15ProfileInstanceI19ActorProfileUnkASBAE8sProfileE kind:bss addr:0x0215de94 +@33464 kind:bss addr:0x0215de98 ambiguous +_ZN15ProfileInstanceI19ActorProfileUnkASBAE8sProfileE kind:bss addr:0x0215dea0 +_ZGVN15ProfileInstanceI19ActorProfileUnkBBLEE8sProfileE kind:bss addr:0x0215dee4 +@33470 kind:bss addr:0x0215dee8 +_ZN15ProfileInstanceI19ActorProfileUnkBBLEE8sProfileE kind:bss addr:0x0215def4 data_ov077_0215df30 kind:bss addr:0x0215df30 data_ov077_0215df6c kind:bss addr:0x0215df6c ambiguous -data_ov077_0215dfcc kind:bss addr:0x0215dfcc -data_ov077_0215dfd0 kind:bss addr:0x0215dfd0 -sActorProfileUnkDSFR kind:bss addr:0x0215dfdc +_ZGVN15ProfileInstanceI19ActorProfileUnkDSFRE8sProfileE kind:bss addr:0x0215dfcc +@33476 kind:bss addr:0x0215dfd0 +_ZN15ProfileInstanceI19ActorProfileUnkDSFRE8sProfileE kind:bss addr:0x0215dfdc data_ov077_0215e064 kind:bss addr:0x0215e064 ambiguous -data_ov077_0215e0b4 kind:bss addr:0x0215e0b4 -data_ov077_0215e0b8 kind:bss addr:0x0215e0b8 -sActorProfileUnkGOKI kind:bss addr:0x0215e0c4 +_ZGVN15ProfileInstanceI19ActorProfileUnkGOKIE8sProfileE kind:bss addr:0x0215e0b4 +@33482 kind:bss addr:0x0215e0b8 +_ZN15ProfileInstanceI19ActorProfileUnkGOKIE8sProfileE kind:bss addr:0x0215e0c4 data_ov077_0215e0d0 kind:bss addr:0x0215e0d0 ambiguous data_ov077_0215e0f0 kind:bss addr:0x0215e0f0 ambiguous data_ov077_0215e178 kind:bss addr:0x0215e178 ambiguous data_ov077_0215e184 kind:bss addr:0x0215e184 ambiguous -data_ov077_0215e19c kind:bss addr:0x0215e19c -data_ov077_0215e1a4 kind:bss addr:0x0215e1a4 -sActorProfileUnkPMST kind:bss addr:0x0215e1b0 +_ZGVN15ProfileInstanceI19ActorProfileUnkPMSTE8sProfileE kind:bss addr:0x0215e19c +@33488 kind:bss addr:0x0215e1a4 +_ZN15ProfileInstanceI19ActorProfileUnkPMSTE8sProfileE kind:bss addr:0x0215e1b0 data_ov077_0215e278 kind:bss addr:0x0215e278 ambiguous -data_ov077_0215e288 kind:bss addr:0x0215e288 -data_ov077_0215e28c kind:bss addr:0x0215e28c -sActorProfileUnkOFSW kind:bss addr:0x0215e298 +_ZGVN15ProfileInstanceI19ActorProfileUnkOFSWE8sProfileE kind:bss addr:0x0215e288 +@33494 kind:bss addr:0x0215e28c +_ZN15ProfileInstanceI19ActorProfileUnkOFSWE8sProfileE kind:bss addr:0x0215e298 data_ov077_0215e2a8 kind:bss addr:0x0215e2a8 ambiguous -data_ov077_0215e2d4 kind:bss addr:0x0215e2d4 -data_ov077_0215e2d8 kind:bss addr:0x0215e2d8 -sMapObjectProfileUnkPLFR kind:bss addr:0x0215e2e4 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkPLFRE8sProfileE kind:bss addr:0x0215e2d4 +@32962 kind:bss addr:0x0215e2d8 +_ZN15ProfileInstanceI23MapObjectProfileUnkPLFRE8sProfileE kind:bss addr:0x0215e2e4 data_ov077_0215e2f8 kind:bss addr:0x0215e2f8 ambiguous data_ov077_0215e318 kind:bss addr:0x0215e318 ambiguous data_ov077_0215e3b8 kind:bss addr:0x0215e3b8 -data_ov077_0215e3dc kind:bss addr:0x0215e3dc -data_ov077_0215e3e0 kind:bss addr:0x0215e3e0 -sMapObjectProfileUnkGTRK kind:bss addr:0x0215e3ec +_ZGVN15ProfileInstanceI23MapObjectProfileUnkGTRKE8sProfileE kind:bss addr:0x0215e3dc +@32968 kind:bss addr:0x0215e3e0 +_ZN15ProfileInstanceI23MapObjectProfileUnkGTRKE8sProfileE kind:bss addr:0x0215e3ec diff --git a/config/jp/arm9/overlays/ov078/delinks.txt b/config/jp/arm9/overlays/ov078/delinks.txt index fecd6221..37ba6992 100644 --- a/config/jp/arm9/overlays/ov078/delinks.txt +++ b/config/jp/arm9/overlays/ov078/delinks.txt @@ -9,16 +9,16 @@ src/078_BossForest/Actor/ActorUnkFRBS.cpp: .text start:0x02154ec0 end:0x0215ecd4 .init start:0x0215f42c end:0x0215f4d0 .ctor start:0x0215f570 end:0x0215f574 - .bss start:0x0215fd04 end:0x0215fd74 + .bss start:0x0215fcc8 end:0x0215fddc src/078_BossForest/Actor/ActorUnkRBFR.cpp: .text start:0x0215ecd4 end:0x0215efe8 .init start:0x0215f4d0 end:0x0215f520 .ctor start:0x0215f574 end:0x0215f578 - .bss start:0x0215fdec end:0x0215fec4 + .bss start:0x0215fddc end:0x0215fec4 src/078_BossForest/MapObject/MapObjectUnkSTSF.cpp: .text start:0x0215efe8 end:0x0215f1e0 .init start:0x0215f520 end:0x0215f570 .ctor start:0x0215f578 end:0x0215f57c - .bss start:0x0215fed4 end:0x0215ff40 + .bss start:0x0215fec4 end:0x0215ff40 diff --git a/config/jp/arm9/overlays/ov078/symbols.txt b/config/jp/arm9/overlays/ov078/symbols.txt index eedab036..7a497126 100644 --- a/config/jp/arm9/overlays/ov078/symbols.txt +++ b/config/jp/arm9/overlays/ov078/symbols.txt @@ -217,14 +217,14 @@ data_ov078_0215fc8c kind:data(any) addr:0x0215fc8c data_ov078_0215fca0 kind:bss addr:0x0215fca0 data_ov078_0215fcb0 kind:bss addr:0x0215fcb0 data_ov078_0215fcbc kind:bss addr:0x0215fcbc -data_ov078_0215fcc8 kind:bss addr:0x0215fcc8 -data_ov078_0215fcd4 kind:bss addr:0x0215fcd4 -sActorProfileUnkFRBS kind:bss addr:0x0215fd04 +_ZGVN15ProfileInstanceI19ActorProfileUnkFRBSE8sProfileE kind:bss addr:0x0215fcc8 +@33518 kind:bss addr:0x0215fcd4 +_ZN15ProfileInstanceI19ActorProfileUnkFRBSE8sProfileE kind:bss addr:0x0215fd04 data_ov078_0215fd74 kind:bss addr:0x0215fd74 ambiguous data_ov078_0215fdcc kind:bss addr:0x0215fdcc ambiguous -data_ov078_0215fddc kind:bss addr:0x0215fddc -data_ov078_0215fde0 kind:bss addr:0x0215fde0 -sActorProfileUnkRBFR kind:bss addr:0x0215fdec -data_ov078_0215fec4 kind:bss addr:0x0215fec4 -data_ov078_0215fec8 kind:bss addr:0x0215fec8 -sMapObjectProfileUnkSTSF kind:bss addr:0x0215fed4 +_ZGVN15ProfileInstanceI19ActorProfileUnkRBFRE8sProfileE kind:bss addr:0x0215fddc +@33524 kind:bss addr:0x0215fde0 +_ZN15ProfileInstanceI19ActorProfileUnkRBFRE8sProfileE kind:bss addr:0x0215fdec +_ZGVN15ProfileInstanceI23MapObjectProfileUnkSTSFE8sProfileE kind:bss addr:0x0215fec4 +@32992 kind:bss addr:0x0215fec8 +_ZN15ProfileInstanceI23MapObjectProfileUnkSTSFE8sProfileE kind:bss addr:0x0215fed4 diff --git a/config/jp/arm9/overlays/ov079/delinks.txt b/config/jp/arm9/overlays/ov079/delinks.txt index 98b59ff7..ba676353 100644 --- a/config/jp/arm9/overlays/ov079/delinks.txt +++ b/config/jp/arm9/overlays/ov079/delinks.txt @@ -9,58 +9,58 @@ src/079_DgnSnow/Actor/ActorUnkPSBL.cpp: .text start:0x02152c20 end:0x02154b74 .init start:0x021592a4 end:0x02159300 .ctor start:0x02159630 end:0x02159634 - .bss start:0x02159db8 end:0x02159de4 + .bss start:0x02159da0 end:0x02159e90 src/079_DgnSnow/Actor/ActorUnkSSFC.cpp: .text start:0x02154b74 end:0x02154f88 .init start:0x02159300 end:0x02159350 .ctor start:0x02159634 end:0x02159638 - .bss start:0x02159ea0 end:0x02159edc + .bss start:0x02159e90 end:0x02159edc src/079_DgnSnow/Actor/ActorUnkOCTW.cpp: .text start:0x02154f88 end:0x021570f8 .init start:0x02159350 end:0x021593dc .ctor start:0x02159638 end:0x0215963c - .bss start:0x02159eec end:0x02159f74 + .bss start:0x02159edc end:0x02159fc4 src/079_DgnSnow/Actor/ActorUnkOCWS.cpp: .text start:0x021570f8 end:0x0215798c .init start:0x021593dc end:0x02159450 .ctor start:0x0215963c end:0x02159640 - .bss start:0x02159fd4 end:0x0215a098 + .bss start:0x02159fc4 end:0x0215a0ac src/079_DgnSnow/Actor/ActorUnkDSSN.cpp: .text start:0x0215798c end:0x02157ab0 .init start:0x02159450 end:0x021594a0 .ctor start:0x02159640 end:0x02159644 - .bss start:0x0215a0bc end:0x0215a0d0 + .bss start:0x0215a0ac end:0x0215a194 src/079_DgnSnow/MapObject/MapObjectUnkICGR.cpp: .text start:0x02157ab0 end:0x021585f8 .init start:0x021594a0 end:0x021594f0 .ctor start:0x02159644 end:0x02159648 - .bss start:0x0215a1a4 end:0x0215a1bc + .bss start:0x0215a194 end:0x0215a29c src/079_DgnSnow/MapObject/MapObjectUnkBLHL.cpp: .text start:0x021585f8 end:0x021588f8 .init start:0x021594f0 end:0x02159540 .ctor start:0x02159648 end:0x0215964c - .bss start:0x0215a2ac end:0x0215a2e0 + .bss start:0x0215a29c end:0x0215a3a4 src/079_DgnSnow/MapObject/MapObjectUnkDRSN.cpp: .text start:0x021588f8 end:0x02158d00 .init start:0x02159540 end:0x02159590 .ctor start:0x0215964c end:0x02159650 - .bss start:0x0215a3b4 end:0x0215a3b8 + .bss start:0x0215a3a4 end:0x0215a488 src/079_DgnSnow/MapObject/MapObjectUnkGTSN.cpp: .text start:0x02158d20 end:0x02158fdc .init start:0x02159590 end:0x021595e0 .ctor start:0x02159650 end:0x02159654 - .bss start:0x0215a498 end:0x0215a56c + .bss start:0x0215a488 end:0x0215a56c src/079_DgnSnow/MapObject/MapObjectUnkFSSV.cpp: .text start:0x02158fdc end:0x02159204 .init start:0x021595e0 end:0x02159630 .ctor start:0x02159654 end:0x02159658 - .bss start:0x0215a57c end:0x0215a660 + .bss start:0x0215a56c end:0x0215a660 diff --git a/config/jp/arm9/overlays/ov079/symbols.txt b/config/jp/arm9/overlays/ov079/symbols.txt index f75d8293..8cf2563d 100644 --- a/config/jp/arm9/overlays/ov079/symbols.txt +++ b/config/jp/arm9/overlays/ov079/symbols.txt @@ -275,50 +275,50 @@ data_ov079_02159d34 kind:data(any) addr:0x02159d34 ambiguous data_ov079_02159d44 kind:data(any) addr:0x02159d44 data_ov079_02159d58 kind:data(any) addr:0x02159d58 ambiguous data_ov079_02159d60 kind:data(any) addr:0x02159d60 -data_ov079_02159da0 kind:bss addr:0x02159da0 -data_ov079_02159dac kind:bss addr:0x02159dac -sActorProfileUnkPSBL kind:bss addr:0x02159db8 +_ZGVN15ProfileInstanceI19ActorProfileUnkPSBLE8sProfileE kind:bss addr:0x02159da0 +@33542 kind:bss addr:0x02159dac +_ZN15ProfileInstanceI19ActorProfileUnkPSBLE8sProfileE kind:bss addr:0x02159db8 data_ov079_02159de4 kind:bss addr:0x02159de4 ambiguous data_ov079_02159e50 kind:bss addr:0x02159e50 ambiguous data_ov079_02159e58 kind:bss addr:0x02159e58 ambiguous -data_ov079_02159e90 kind:bss addr:0x02159e90 -data_ov079_02159e94 kind:bss addr:0x02159e94 -sActorProfileUnkSSFC kind:bss addr:0x02159ea0 -data_ov079_02159edc kind:bss addr:0x02159edc -data_ov079_02159ee0 kind:bss addr:0x02159ee0 -sActorProfileUnkOCTW kind:bss addr:0x02159eec +_ZGVN15ProfileInstanceI19ActorProfileUnkSSFCE8sProfileE kind:bss addr:0x02159e90 +@33548 kind:bss addr:0x02159e94 +_ZN15ProfileInstanceI19ActorProfileUnkSSFCE8sProfileE kind:bss addr:0x02159ea0 +_ZGVN15ProfileInstanceI19ActorProfileUnkOCTWE8sProfileE kind:bss addr:0x02159edc +@33554 kind:bss addr:0x02159ee0 +_ZN15ProfileInstanceI19ActorProfileUnkOCTWE8sProfileE kind:bss addr:0x02159eec data_ov079_02159f74 kind:bss addr:0x02159f74 ambiguous data_ov079_02159f7c kind:bss addr:0x02159f7c ambiguous -data_ov079_02159fc4 kind:bss addr:0x02159fc4 -data_ov079_02159fc8 kind:bss addr:0x02159fc8 -sActorProfileUnkOCWS kind:bss addr:0x02159fd4 +_ZGVN15ProfileInstanceI19ActorProfileUnkOCWSE8sProfileE kind:bss addr:0x02159fc4 +@33560 kind:bss addr:0x02159fc8 +_ZN15ProfileInstanceI19ActorProfileUnkOCWSE8sProfileE kind:bss addr:0x02159fd4 data_ov079_0215a098 kind:bss addr:0x0215a098 ambiguous data_ov079_0215a0a0 kind:bss addr:0x0215a0a0 ambiguous -data_ov079_0215a0ac kind:bss addr:0x0215a0ac -data_ov079_0215a0b0 kind:bss addr:0x0215a0b0 -sActorProfileUnkDSSN kind:bss addr:0x0215a0bc +_ZGVN15ProfileInstanceI19ActorProfileUnkDSSNE8sProfileE kind:bss addr:0x0215a0ac +@33566 kind:bss addr:0x0215a0b0 +_ZN15ProfileInstanceI19ActorProfileUnkDSSNE8sProfileE kind:bss addr:0x0215a0bc data_ov079_0215a0d0 kind:bss addr:0x0215a0d0 ambiguous -data_ov079_0215a194 kind:bss addr:0x0215a194 -data_ov079_0215a198 kind:bss addr:0x0215a198 -sMapObjectProfileUnkICGR kind:bss addr:0x0215a1a4 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkICGRE8sProfileE kind:bss addr:0x0215a194 +@33034 kind:bss addr:0x0215a198 +_ZN15ProfileInstanceI23MapObjectProfileUnkICGRE8sProfileE kind:bss addr:0x0215a1a4 data_ov079_0215a1bc kind:bss addr:0x0215a1bc ambiguous data_ov079_0215a1fc kind:bss addr:0x0215a1fc ambiguous data_ov079_0215a278 kind:bss addr:0x0215a278 -data_ov079_0215a29c kind:bss addr:0x0215a29c -data_ov079_0215a2a0 kind:bss addr:0x0215a2a0 -sMapObjectProfileUnkBLHL kind:bss addr:0x0215a2ac +_ZGVN15ProfileInstanceI23MapObjectProfileUnkBLHLE8sProfileE kind:bss addr:0x0215a29c +@33040 kind:bss addr:0x0215a2a0 +_ZN15ProfileInstanceI23MapObjectProfileUnkBLHLE8sProfileE kind:bss addr:0x0215a2ac data_ov079_0215a2e0 kind:bss addr:0x0215a2e0 ambiguous data_ov079_0215a320 kind:bss addr:0x0215a320 ambiguous data_ov079_0215a380 kind:bss addr:0x0215a380 -data_ov079_0215a3a4 kind:bss addr:0x0215a3a4 -data_ov079_0215a3a8 kind:bss addr:0x0215a3a8 -sMapObjectProfileUnkDRSN kind:bss addr:0x0215a3b4 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkDRSNE8sProfileE kind:bss addr:0x0215a3a4 +@33046 kind:bss addr:0x0215a3a8 +_ZN15ProfileInstanceI23MapObjectProfileUnkDRSNE8sProfileE kind:bss addr:0x0215a3b4 data_ov079_0215a3b8 kind:bss addr:0x0215a3b8 ambiguous data_ov079_0215a3d4 kind:bss addr:0x0215a3d4 data_ov079_0215a474 kind:bss addr:0x0215a474 ambiguous -data_ov079_0215a488 kind:bss addr:0x0215a488 -data_ov079_0215a48c kind:bss addr:0x0215a48c -sMapObjectProfileUnkGTSN kind:bss addr:0x0215a498 -data_ov079_0215a56c kind:bss addr:0x0215a56c -data_ov079_0215a570 kind:bss addr:0x0215a570 -sMapObjectProfileUnkFSSV kind:bss addr:0x0215a57c +_ZGVN15ProfileInstanceI23MapObjectProfileUnkGTSNE8sProfileE kind:bss addr:0x0215a488 +@33052 kind:bss addr:0x0215a48c +_ZN15ProfileInstanceI23MapObjectProfileUnkGTSNE8sProfileE kind:bss addr:0x0215a498 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkFSSVE8sProfileE kind:bss addr:0x0215a56c +@33058 kind:bss addr:0x0215a570 +_ZN15ProfileInstanceI23MapObjectProfileUnkFSSVE8sProfileE kind:bss addr:0x0215a57c diff --git a/config/jp/arm9/overlays/ov080/delinks.txt b/config/jp/arm9/overlays/ov080/delinks.txt index 96f6c7be..7cd395f2 100644 --- a/config/jp/arm9/overlays/ov080/delinks.txt +++ b/config/jp/arm9/overlays/ov080/delinks.txt @@ -9,22 +9,22 @@ src/080_BossSnow/Actor/ActorUnkICBS.cpp: .text start:0x02152c58 end:0x0215e9f0 .init start:0x02160f0c end:0x02161470 .ctor start:0x02161584 end:0x02161588 - .bss start:0x02161ffc end:0x02162000 + .bss start:0x02161fe4 end:0x02162284 src/080_BossSnow/Actor/ActorUnkICBA.cpp: .text start:0x0215e9f0 end:0x021606c0 .init start:0x02161470 end:0x021614e4 .ctor start:0x02161588 end:0x0216158c - .bss start:0x02162294 end:0x02162358 + .bss start:0x02162284 end:0x0216238c src/080_BossSnow/MapObject/MapObjectUnkSTSS.cpp: .text start:0x021608fc end:0x02160b9c .init start:0x021614e4 end:0x02161534 .ctor start:0x0216158c end:0x02161590 - .bss start:0x0216239c end:0x02162404 + .bss start:0x0216238c end:0x02162404 src/080_BossSnow/Actor/ActorUnkRBSN.cpp: .text start:0x02160bc8 end:0x02160e50 .init start:0x02161534 end:0x02161584 .ctor start:0x02161590 end:0x02161594 - .bss start:0x02162414 end:0x02162500 + .bss start:0x02162404 end:0x02162500 diff --git a/config/jp/arm9/overlays/ov080/symbols.txt b/config/jp/arm9/overlays/ov080/symbols.txt index dfffd39a..0a30f87f 100644 --- a/config/jp/arm9/overlays/ov080/symbols.txt +++ b/config/jp/arm9/overlays/ov080/symbols.txt @@ -340,22 +340,22 @@ _ZTV19data_ov080_02161f04 kind:data(any) addr:0x02161f04 data_ov080_02161f30 kind:data(any) addr:0x02161f30 _ZTV19data_ov080_02161f70 kind:data(any) addr:0x02161f70 data_ov080_02161fe0 kind:bss addr:0x02161fe0 -data_ov080_02161fe4 kind:bss addr:0x02161fe4 -data_ov080_02161ff0 kind:bss addr:0x02161ff0 -sActorProfileUnkICBS kind:bss addr:0x02161ffc +_ZGVN15ProfileInstanceI19ActorProfileUnkICBSE8sProfileE kind:bss addr:0x02161fe4 +@33608 kind:bss addr:0x02161ff0 +_ZN15ProfileInstanceI19ActorProfileUnkICBSE8sProfileE kind:bss addr:0x02161ffc data_ov080_02162000 kind:bss addr:0x02162000 data_ov080_021620a4 kind:bss addr:0x021620a4 ambiguous data_ov080_021620d4 kind:bss addr:0x021620d4 data_ov080_021621c9 kind:bss addr:0x021621c9 ambiguous data_ov080_02162274 kind:bss addr:0x02162274 ambiguous -data_ov080_02162284 kind:bss addr:0x02162284 -data_ov080_02162288 kind:bss addr:0x02162288 -sActorProfileUnkICBA kind:bss addr:0x02162294 +_ZGVN15ProfileInstanceI19ActorProfileUnkICBAE8sProfileE kind:bss addr:0x02162284 +@33614 kind:bss addr:0x02162288 +_ZN15ProfileInstanceI19ActorProfileUnkICBAE8sProfileE kind:bss addr:0x02162294 data_ov080_02162358 kind:bss addr:0x02162358 ambiguous data_ov080_0216236c kind:bss addr:0x0216236c -data_ov080_0216238c kind:bss addr:0x0216238c -data_ov080_02162390 kind:bss addr:0x02162390 -sMapObjectProfileUnkSTSS kind:bss addr:0x0216239c -data_ov080_02162404 kind:bss addr:0x02162404 -data_ov080_02162408 kind:bss addr:0x02162408 -sActorProfileUnkRBSN kind:bss addr:0x02162414 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkSTSSE8sProfileE kind:bss addr:0x0216238c +@33082 kind:bss addr:0x02162390 +_ZN15ProfileInstanceI23MapObjectProfileUnkSTSSE8sProfileE kind:bss addr:0x0216239c +_ZGVN15ProfileInstanceI19ActorProfileUnkRBSNE8sProfileE kind:bss addr:0x02162404 +@33626 kind:bss addr:0x02162408 +_ZN15ProfileInstanceI19ActorProfileUnkRBSNE8sProfileE kind:bss addr:0x02162414 diff --git a/config/jp/arm9/overlays/ov081/delinks.txt b/config/jp/arm9/overlays/ov081/delinks.txt index 6e849f7c..41858c20 100644 --- a/config/jp/arm9/overlays/ov081/delinks.txt +++ b/config/jp/arm9/overlays/ov081/delinks.txt @@ -9,16 +9,16 @@ src/081_DgnLv3/Actor/ActorUnkPRPL.cpp: .text start:0x02152c20 end:0x02153a80 .init start:0x02154658 end:0x021546a8 .ctor start:0x02154774 end:0x02154778 - .bss start:0x02154a50 end:0x02154a8c + .bss start:0x02154a40 end:0x02154a8c src/081_DgnLv3/Actor/ActorUnkPRPP.cpp: .text start:0x02153a80 end:0x02153f48 .init start:0x021546a8 end:0x021546f8 .ctor start:0x02154778 end:0x0215477c - .bss start:0x02154a9c end:0x02154ad8 + .bss start:0x02154a8c end:0x02154ad8 src/081_DgnLv3/MapObject/MapObjectUnkPRSH.cpp: .text start:0x02153f48 end:0x02154608 .init start:0x021546f8 end:0x02154774 .ctor start:0x0215477c end:0x02154780 - .bss start:0x02154ae8 end:0x02154b74 + .bss start:0x02154ad8 end:0x02154b74 diff --git a/config/jp/arm9/overlays/ov081/symbols.txt b/config/jp/arm9/overlays/ov081/symbols.txt index 14979f11..dd108441 100644 --- a/config/jp/arm9/overlays/ov081/symbols.txt +++ b/config/jp/arm9/overlays/ov081/symbols.txt @@ -106,14 +106,14 @@ data_ov081_02154998 kind:data(any) addr:0x02154998 data_ov081_021549b4 kind:data(any) addr:0x021549b4 data_ov081_021549dc kind:data(any) addr:0x021549dc data_ov081_02154a08 kind:data(any) addr:0x02154a08 -data_ov081_02154a40 kind:bss addr:0x02154a40 -data_ov081_02154a44 kind:bss addr:0x02154a44 -sActorProfileUnkPRPL kind:bss addr:0x02154a50 -data_ov081_02154a8c kind:bss addr:0x02154a8c -data_ov081_02154a90 kind:bss addr:0x02154a90 -sActorProfileUnkPRPP kind:bss addr:0x02154a9c -data_ov081_02154ad8 kind:bss addr:0x02154ad8 -data_ov081_02154adc kind:bss addr:0x02154adc -sMapObjectProfileUnkPRSH kind:bss addr:0x02154ae8 +_ZGVN15ProfileInstanceI19ActorProfileUnkPRPLE8sProfileE kind:bss addr:0x02154a40 +@33638 kind:bss addr:0x02154a44 +_ZN15ProfileInstanceI19ActorProfileUnkPRPLE8sProfileE kind:bss addr:0x02154a50 +_ZGVN15ProfileInstanceI19ActorProfileUnkPRPPE8sProfileE kind:bss addr:0x02154a8c +@33644 kind:bss addr:0x02154a90 +_ZN15ProfileInstanceI19ActorProfileUnkPRPPE8sProfileE kind:bss addr:0x02154a9c +_ZGVN15ProfileInstanceI23MapObjectProfileUnkPRSHE8sProfileE kind:bss addr:0x02154ad8 +@33112 kind:bss addr:0x02154adc +_ZN15ProfileInstanceI23MapObjectProfileUnkPRSHE8sProfileE kind:bss addr:0x02154ae8 data_ov081_02154b74 kind:bss addr:0x02154b74 ambiguous data_ov081_02154bbc kind:bss addr:0x02154bbc diff --git a/config/jp/arm9/overlays/ov082/delinks.txt b/config/jp/arm9/overlays/ov082/delinks.txt index d801d76c..b36dc595 100644 --- a/config/jp/arm9/overlays/ov082/delinks.txt +++ b/config/jp/arm9/overlays/ov082/delinks.txt @@ -9,16 +9,16 @@ src/082_DgnWater/Actor/ActorUnkWHMA.cpp: .text start:0x02154be0 end:0x0215961c .init start:0x0215a798 end:0x0215a7e8 .ctor start:0x0215a888 end:0x0215a88c - .bss start:0x0215add0 end:0x0215ae3c + .bss start:0x0215adc0 end:0x0215aea8 src/082_DgnWater/Actor/ActorUnkEWHI.cpp: .text start:0x0215961c end:0x021599b0 .init start:0x0215a7e8 end:0x0215a838 .ctor start:0x0215a88c end:0x0215a890 - .bss start:0x0215aeb8 end:0x0215aee0 + .bss start:0x0215aea8 end:0x0215aef4 src/082_DgnWater/Actor/ActorUnkDSWT.cpp: .text start:0x021599b0 end:0x02159ad4 .init start:0x0215a838 end:0x0215a888 .ctor start:0x0215a890 end:0x0215a894 - .bss start:0x0215af04 end:0x0215afe0 + .bss start:0x0215aef4 end:0x0215afe0 diff --git a/config/jp/arm9/overlays/ov082/symbols.txt b/config/jp/arm9/overlays/ov082/symbols.txt index 33503f9e..c79fb41c 100644 --- a/config/jp/arm9/overlays/ov082/symbols.txt +++ b/config/jp/arm9/overlays/ov082/symbols.txt @@ -172,15 +172,15 @@ _ZTV19data_ov082_0215ad0c kind:data(any) addr:0x0215ad0c _ZTV19data_ov082_0215ad10 kind:data(any) addr:0x0215ad10 ambiguous _ZTV19data_ov082_0215ad30 kind:data(any) addr:0x0215ad30 _ZTV19data_ov082_0215ad90 kind:data(any) addr:0x0215ad90 -data_ov082_0215adc0 kind:bss addr:0x0215adc0 -data_ov082_0215adc4 kind:bss addr:0x0215adc4 -sActorProfileUnkWHMA kind:bss addr:0x0215add0 +_ZGVN15ProfileInstanceI19ActorProfileUnkWHMAE8sProfileE kind:bss addr:0x0215adc0 +@33662 kind:bss addr:0x0215adc4 +_ZN15ProfileInstanceI19ActorProfileUnkWHMAE8sProfileE kind:bss addr:0x0215add0 data_ov082_0215ae3c kind:bss addr:0x0215ae3c ambiguous data_ov082_0215ae80 kind:bss addr:0x0215ae80 ambiguous -data_ov082_0215aea8 kind:bss addr:0x0215aea8 -data_ov082_0215aeac kind:bss addr:0x0215aeac -sActorProfileUnkEWHI kind:bss addr:0x0215aeb8 +_ZGVN15ProfileInstanceI19ActorProfileUnkEWHIE8sProfileE kind:bss addr:0x0215aea8 +@33668 kind:bss addr:0x0215aeac +_ZN15ProfileInstanceI19ActorProfileUnkEWHIE8sProfileE kind:bss addr:0x0215aeb8 data_ov082_0215aee0 kind:bss addr:0x0215aee0 ambiguous -data_ov082_0215aef4 kind:bss addr:0x0215aef4 -data_ov082_0215aef8 kind:bss addr:0x0215aef8 -sActorProfileUnkDSWT kind:bss addr:0x0215af04 +_ZGVN15ProfileInstanceI19ActorProfileUnkDSWTE8sProfileE kind:bss addr:0x0215aef4 +@33674 kind:bss addr:0x0215aef8 +_ZN15ProfileInstanceI19ActorProfileUnkDSWTE8sProfileE kind:bss addr:0x0215af04 diff --git a/config/jp/arm9/overlays/ov083/delinks.txt b/config/jp/arm9/overlays/ov083/delinks.txt index 0337d225..c5b90572 100644 --- a/config/jp/arm9/overlays/ov083/delinks.txt +++ b/config/jp/arm9/overlays/ov083/delinks.txt @@ -9,49 +9,49 @@ src/083_BossWater/Actor/ActorUnkWTBS.cpp: .text start:0x02154ca4 end:0x0215c4c8 .init start:0x0215f2ac end:0x0215f3c0 .ctor start:0x0215f6f4 end:0x0215f6f8 - .bss start:0x021602b8 end:0x021602f0 + .bss start:0x021602a4 end:0x02160394 src/083_BossWater/Actor/ActorUnkWBPS.cpp: .text start:0x0215c4c8 end:0x0215cff0 .init start:0x0215f3c0 end:0x0215f450 .ctor start:0x0215f6f8 end:0x0215f6fc - .bss start:0x021603ac end:0x02160470 + .bss start:0x02160394 end:0x02160484 src/083_BossWater/Actor/ActorUnkWBEF.cpp: .text start:0x0215cff0 end:0x0215d644 .init start:0x0215f450 end:0x0215f4a0 .ctor start:0x0215f6fc end:0x0215f700 - .bss start:0x02160494 end:0x0216056c + .bss start:0x02160484 end:0x0216056c src/083_BossWater/Actor/ActorUnkRBWT.cpp: .text start:0x0215d644 end:0x0215e0f0 .init start:0x0215f4a0 end:0x0215f4f0 .ctor start:0x0215f700 end:0x0215f704 - .bss start:0x0216057c end:0x02160654 + .bss start:0x0216056c end:0x02160668 src/083_BossWater/Actor/ActorUnkRBWS.cpp: .text start:0x0215e0f0 end:0x0215e278 .init start:0x0215f4f0 end:0x0215f540 .ctor start:0x0215f704 end:0x0215f708 - .bss start:0x02160678 end:0x021606b4 + .bss start:0x02160668 end:0x02160750 src/083_BossWater/Actor/ActorUnkNPWC.cpp: .text start:0x0215e278 end:0x0215e40c .init start:0x0215f540 end:0x0215f590 .ctor start:0x0215f708 end:0x0215f70c - .bss start:0x02160760 end:0x0216079c + .bss start:0x02160750 end:0x0216079c src/083_BossWater/Actor/ActorUnkEFR3.cpp: .text start:0x0215e40c end:0x0215e5c0 .init start:0x0215f590 end:0x0215f5e0 .ctor start:0x0215f70c end:0x0215f710 - .bss start:0x021607ac end:0x02160884 + .bss start:0x0216079c end:0x02160884 src/083_BossWater/Actor/ActorUnkEFW3.cpp: .text start:0x0215e5c0 end:0x0215e774 .init start:0x0215f5e0 end:0x0215f630 .ctor start:0x0215f710 end:0x0215f714 - .bss start:0x02160894 end:0x021608f0 + .bss start:0x02160884 end:0x021608f0 src/083_BossWater/MapObject/MapObjectUnkSHWB.cpp: .text start:0x0215e774 end:0x0215ebe4 diff --git a/config/jp/arm9/overlays/ov083/symbols.txt b/config/jp/arm9/overlays/ov083/symbols.txt index cb24415b..5903cea6 100644 --- a/config/jp/arm9/overlays/ov083/symbols.txt +++ b/config/jp/arm9/overlays/ov083/symbols.txt @@ -347,40 +347,40 @@ data_ov083_0216020c kind:data(any) addr:0x0216020c data_ov083_02160268 kind:data(any) addr:0x02160268 ambiguous data_ov083_0216027c kind:data(any) addr:0x0216027c data_ov083_021602a0 kind:bss addr:0x021602a0 -data_ov083_021602a4 kind:bss addr:0x021602a4 -data_ov083_021602ac kind:bss addr:0x021602ac -sActorProfileUnkWTBS kind:bss addr:0x021602b8 +_ZGVN15ProfileInstanceI19ActorProfileUnkWTBSE8sProfileE kind:bss addr:0x021602a4 +@33686 kind:bss addr:0x021602ac +_ZN15ProfileInstanceI19ActorProfileUnkWTBSE8sProfileE kind:bss addr:0x021602b8 data_ov083_021602f0 kind:bss addr:0x021602f0 ambiguous data_ov083_02160348 kind:bss addr:0x02160348 ambiguous data_ov083_02160390 kind:bss addr:0x02160390 -data_ov083_02160394 kind:bss addr:0x02160394 -data_ov083_021603a0 kind:bss addr:0x021603a0 -sActorProfileUnkWBPS kind:bss addr:0x021603ac +_ZGVN15ProfileInstanceI19ActorProfileUnkWBPSE8sProfileE kind:bss addr:0x02160394 +@33692 kind:bss addr:0x021603a0 +_ZN15ProfileInstanceI19ActorProfileUnkWBPSE8sProfileE kind:bss addr:0x021603ac data_ov083_02160470 kind:bss addr:0x02160470 ambiguous -data_ov083_02160484 kind:bss addr:0x02160484 -data_ov083_02160488 kind:bss addr:0x02160488 -sActorProfileUnkWBEF kind:bss addr:0x02160494 -data_ov083_0216056c kind:bss addr:0x0216056c -data_ov083_02160570 kind:bss addr:0x02160570 -sActorProfileUnkRBWT kind:bss addr:0x0216057c +_ZGVN15ProfileInstanceI19ActorProfileUnkWBEFE8sProfileE kind:bss addr:0x02160484 +@33698 kind:bss addr:0x02160488 +_ZN15ProfileInstanceI19ActorProfileUnkWBEFE8sProfileE kind:bss addr:0x02160494 +_ZGVN15ProfileInstanceI19ActorProfileUnkRBWTE8sProfileE kind:bss addr:0x0216056c +@33704 kind:bss addr:0x02160570 +_ZN15ProfileInstanceI19ActorProfileUnkRBWTE8sProfileE kind:bss addr:0x0216057c data_ov083_02160654 kind:bss addr:0x02160654 -data_ov083_02160668 kind:bss addr:0x02160668 -data_ov083_0216066c kind:bss addr:0x0216066c -sActorProfileUnkRBWS kind:bss addr:0x02160678 +_ZGVN15ProfileInstanceI19ActorProfileUnkRBWSE8sProfileE kind:bss addr:0x02160668 +@33710 kind:bss addr:0x0216066c +_ZN15ProfileInstanceI19ActorProfileUnkRBWSE8sProfileE kind:bss addr:0x02160678 data_ov083_021606b4 kind:bss addr:0x021606b4 ambiguous data_ov083_021606b8 kind:bss addr:0x021606b8 ambiguous -data_ov083_02160750 kind:bss addr:0x02160750 -data_ov083_02160754 kind:bss addr:0x02160754 -sActorProfileUnkNPWC kind:bss addr:0x02160760 -data_ov083_0216079c kind:bss addr:0x0216079c -data_ov083_021607a0 kind:bss addr:0x021607a0 -sActorProfileUnkEFR3 kind:bss addr:0x021607ac -data_ov083_02160884 kind:bss addr:0x02160884 -data_ov083_02160888 kind:bss addr:0x02160888 -sActorProfileUnkEFW3 kind:bss addr:0x02160894 +_ZGVN15ProfileInstanceI19ActorProfileUnkNPWCE8sProfileE kind:bss addr:0x02160750 +@33716 kind:bss addr:0x02160754 +_ZN15ProfileInstanceI19ActorProfileUnkNPWCE8sProfileE kind:bss addr:0x02160760 +_ZGVN15ProfileInstanceI19ActorProfileUnkEFR3E8sProfileE kind:bss addr:0x0216079c +@33722 kind:bss addr:0x021607a0 +_ZN15ProfileInstanceI19ActorProfileUnkEFR3E8sProfileE kind:bss addr:0x021607ac +_ZGVN15ProfileInstanceI19ActorProfileUnkEFW3E8sProfileE kind:bss addr:0x02160884 +@33728 kind:bss addr:0x02160888 +_ZN15ProfileInstanceI19ActorProfileUnkEFW3E8sProfileE kind:bss addr:0x02160894 data_ov083_021608f0 kind:bss addr:0x021608f0 ambiguous data_ov083_021608f4 kind:bss addr:0x021608f4 ambiguous data_ov083_021608fc kind:bss addr:0x021608fc ambiguous data_ov083_0216096c kind:bss addr:0x0216096c data_ov083_02160970 kind:bss addr:0x02160970 -sMapObjectProfileUnkSHWB kind:bss addr:0x0216097c +_ZN15ProfileInstanceI23MapObjectProfileUnkSHWBE8sProfileE kind:bss addr:0x0216097c diff --git a/config/jp/arm9/overlays/ov084/delinks.txt b/config/jp/arm9/overlays/ov084/delinks.txt index ea72cf67..a6a6837f 100644 --- a/config/jp/arm9/overlays/ov084/delinks.txt +++ b/config/jp/arm9/overlays/ov084/delinks.txt @@ -9,88 +9,88 @@ src/084_BossFlame/Actor/ActorUnkIWTS.cpp: .text start:0x02152c20 end:0x0215bdec .init start:0x0216407c end:0x02164744 .ctor start:0x02164c50 end:0x02164c54 - .bss start:0x02165db0 end:0x02165e88 + .bss start:0x02165d64 end:0x02165e88 src/084_BossFlame/Actor/ActorUnkITSC.cpp: .text start:0x0215bdec end:0x0215c5a4 .init start:0x02164744 end:0x021647b4 .ctor start:0x02164c54 end:0x02164c58 - .bss start:0x02165e98 end:0x02165f70 + .bss start:0x02165e88 end:0x02165f70 src/084_BossFlame/Actor/ActorUnkFIRB.cpp: .text start:0x0215c5a4 end:0x0215d0e0 .init start:0x021647b4 end:0x02164804 .ctor start:0x02164c58 end:0x02164c5c - .bss start:0x02165f80 end:0x02165fe8 + .bss start:0x02165f70 end:0x02166058 src/084_BossFlame/Actor/ActorUnkDSVC.cpp: .text start:0x0215d0e0 end:0x0215d204 .init start:0x02164804 end:0x02164854 .ctor start:0x02164c5c end:0x02164c60 - .bss start:0x02166068 end:0x0216611c + .bss start:0x02166058 end:0x02166140 src/084_BossFlame/Actor/ActorUnkWIDR.cpp: .text start:0x0215d204 end:0x0215e858 .init start:0x02164854 end:0x021648a4 .ctor start:0x02164c60 end:0x02164c64 - .bss start:0x02166150 end:0x02166228 + .bss start:0x02166140 end:0x02166228 src/084_BossFlame/Actor/ActorUnkWIDT.cpp: .text start:0x0215e858 end:0x0215f294 .init start:0x021648a4 end:0x021648f4 .ctor start:0x02164c64 end:0x02164c68 - .bss start:0x02166238 end:0x0216627c + .bss start:0x02166228 end:0x0216627c src/084_BossFlame/Actor/ActorUnkRBVC.cpp: .text start:0x0215f294 end:0x0215f664 .init start:0x021648f4 end:0x02164944 .ctor start:0x02164c68 end:0x02164c6c - .bss start:0x0216628c end:0x02166364 + .bss start:0x0216627c end:0x02166364 src/084_BossFlame/MapObject/MapObjectUnkLVCM.cpp: .text start:0x0215f664 end:0x0215fd74 .init start:0x02164944 end:0x02164994 .ctor start:0x02164c6c end:0x02164c70 - .bss start:0x02166374 end:0x021663a4 + .bss start:0x02166364 end:0x02166468 src/084_BossFlame/MapObject/MapObjectUnkMLVC.cpp: .text start:0x0215fd74 end:0x02160168 .init start:0x02164994 end:0x021649e4 .ctor start:0x02164c70 end:0x02164c74 - .bss start:0x02166478 end:0x0216649c + .bss start:0x02166468 end:0x021664a0 src/084_BossFlame/Actor/ActorUnkLAVA.cpp: .text start:0x02160168 end:0x02160d54 .init start:0x021649e4 end:0x02164a44 .ctor start:0x02164c74 end:0x02164c78 - .bss start:0x021664b8 end:0x02166590 + .bss start:0x021664a0 end:0x021665b8 src/084_BossFlame/Actor/ActorUnkLVBD.cpp: .text start:0x02160d54 end:0x02162654 .init start:0x02164a44 end:0x02164ad8 .ctor start:0x02164c78 end:0x02164c7c - .bss start:0x02166688 end:0x02166760 + .bss start:0x021665b8 end:0x02166760 src/084_BossFlame/MapObject/MapObjectUnkTMLV.cpp: .text start:0x02162654 end:0x02162808 .init start:0x02164ad8 end:0x02164b28 .ctor start:0x02164c7c end:0x02164c80 - .bss start:0x02166770 end:0x02166790 + .bss start:0x02166760 end:0x02166790 src/084_BossFlame/MapObject/MapObjectUnkSTSV.cpp: .text start:0x02162808 end:0x02162a00 .init start:0x02164b28 end:0x02164b78 .ctor start:0x02164c80 end:0x02164c84 - .bss start:0x021667a0 end:0x02166808 + .bss start:0x02166790 end:0x02166808 src/084_BossFlame/Actor/ActorUnkLBRC.cpp: .text start:0x02162a2c end:0x02163428 .init start:0x02164b78 end:0x02164c00 .ctor start:0x02164c84 end:0x02164c88 - .bss start:0x02166818 end:0x021668f0 + .bss start:0x02166808 end:0x021668f4 src/084_BossFlame/MapObject/MapObjectUnkPLV2.cpp: .text start:0x021634c4 end:0x021636a0 .init start:0x02164c00 end:0x02164c50 .ctor start:0x02164c88 end:0x02164c8c - .bss start:0x02166904 end:0x021669d8 + .bss start:0x021668f4 end:0x021669d8 diff --git a/config/jp/arm9/overlays/ov084/symbols.txt b/config/jp/arm9/overlays/ov084/symbols.txt index 8a94fbf8..8b359290 100644 --- a/config/jp/arm9/overlays/ov084/symbols.txt +++ b/config/jp/arm9/overlays/ov084/symbols.txt @@ -610,61 +610,61 @@ data_ov084_02165cdc kind:data(any) addr:0x02165cdc data_ov084_02165cf8 kind:data(any) addr:0x02165cf8 data_ov084_02165d14 kind:data(any) addr:0x02165d14 data_ov084_02165d60 kind:bss addr:0x02165d60 -data_ov084_02165d64 kind:bss addr:0x02165d64 -data_ov084_02165d70 kind:bss addr:0x02165d70 -sActorProfileUnkIWTS kind:bss addr:0x02165db0 -data_ov084_02165e88 kind:bss addr:0x02165e88 -data_ov084_02165e8c kind:bss addr:0x02165e8c -sActorProfileUnkITSC kind:bss addr:0x02165e98 -data_ov084_02165f70 kind:bss addr:0x02165f70 -data_ov084_02165f74 kind:bss addr:0x02165f74 -sActorProfileUnkFIRB kind:bss addr:0x02165f80 +_ZGVN15ProfileInstanceI19ActorProfileUnkIWTSE8sProfileE kind:bss addr:0x02165d64 +@33745 kind:bss addr:0x02165d70 +_ZN15ProfileInstanceI19ActorProfileUnkIWTSE8sProfileE kind:bss addr:0x02165db0 +_ZGVN15ProfileInstanceI19ActorProfileUnkITSCE8sProfileE kind:bss addr:0x02165e88 +@33751 kind:bss addr:0x02165e8c +_ZN15ProfileInstanceI19ActorProfileUnkITSCE8sProfileE kind:bss addr:0x02165e98 +_ZGVN15ProfileInstanceI19ActorProfileUnkFIRBE8sProfileE kind:bss addr:0x02165f70 +@33757 kind:bss addr:0x02165f74 +_ZN15ProfileInstanceI19ActorProfileUnkFIRBE8sProfileE kind:bss addr:0x02165f80 data_ov084_02165fe8 kind:bss addr:0x02165fe8 ambiguous data_ov084_02165ff0 kind:bss addr:0x02165ff0 ambiguous data_ov084_02166040 kind:bss addr:0x02166040 ambiguous data_ov084_02166054 kind:bss addr:0x02166054 ambiguous -data_ov084_02166058 kind:bss addr:0x02166058 -data_ov084_0216605c kind:bss addr:0x0216605c -sActorProfileUnkDSVC kind:bss addr:0x02166068 +_ZGVN15ProfileInstanceI19ActorProfileUnkDSVCE8sProfileE kind:bss addr:0x02166058 +@33763 kind:bss addr:0x0216605c +_ZN15ProfileInstanceI19ActorProfileUnkDSVCE8sProfileE kind:bss addr:0x02166068 data_ov084_0216611c kind:bss addr:0x0216611c ambiguous -data_ov084_02166140 kind:bss addr:0x02166140 -data_ov084_02166144 kind:bss addr:0x02166144 -sActorProfileUnkWIDR kind:bss addr:0x02166150 -data_ov084_02166228 kind:bss addr:0x02166228 -data_ov084_0216622c kind:bss addr:0x0216622c -sActorProfileUnkWIDT kind:bss addr:0x02166238 -data_ov084_0216627c kind:bss addr:0x0216627c -data_ov084_02166280 kind:bss addr:0x02166280 -sActorProfileUnkRBVC kind:bss addr:0x0216628c -data_ov084_02166364 kind:bss addr:0x02166364 -data_ov084_02166368 kind:bss addr:0x02166368 -sMapObjectProfileUnkLVCM kind:bss addr:0x02166374 +_ZGVN15ProfileInstanceI19ActorProfileUnkWIDRE8sProfileE kind:bss addr:0x02166140 +@33769 kind:bss addr:0x02166144 +_ZN15ProfileInstanceI19ActorProfileUnkWIDRE8sProfileE kind:bss addr:0x02166150 +_ZGVN15ProfileInstanceI19ActorProfileUnkWIDTE8sProfileE kind:bss addr:0x02166228 +@33775 kind:bss addr:0x0216622c +_ZN15ProfileInstanceI19ActorProfileUnkWIDTE8sProfileE kind:bss addr:0x02166238 +_ZGVN15ProfileInstanceI19ActorProfileUnkRBVCE8sProfileE kind:bss addr:0x0216627c +@33781 kind:bss addr:0x02166280 +_ZN15ProfileInstanceI19ActorProfileUnkRBVCE8sProfileE kind:bss addr:0x0216628c +_ZGVN15ProfileInstanceI23MapObjectProfileUnkLVCME8sProfileE kind:bss addr:0x02166364 +@33225 kind:bss addr:0x02166368 +_ZN15ProfileInstanceI23MapObjectProfileUnkLVCME8sProfileE kind:bss addr:0x02166374 data_ov084_021663a4 kind:bss addr:0x021663a4 ambiguous data_ov084_02166448 kind:bss addr:0x02166448 -data_ov084_02166468 kind:bss addr:0x02166468 -data_ov084_0216646c kind:bss addr:0x0216646c -sMapObjectProfileUnkMLVC kind:bss addr:0x02166478 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkMLVCE8sProfileE kind:bss addr:0x02166468 +@33231 kind:bss addr:0x0216646c +_ZN15ProfileInstanceI23MapObjectProfileUnkMLVCE8sProfileE kind:bss addr:0x02166478 data_ov084_0216649c kind:bss addr:0x0216649c -data_ov084_021664a0 kind:bss addr:0x021664a0 -data_ov084_021664ac kind:bss addr:0x021664ac -sActorProfileUnkLAVA kind:bss addr:0x021664b8 +_ZGVN15ProfileInstanceI19ActorProfileUnkLAVAE8sProfileE kind:bss addr:0x021664a0 +@33799 kind:bss addr:0x021664ac +_ZN15ProfileInstanceI19ActorProfileUnkLAVAE8sProfileE kind:bss addr:0x021664b8 data_ov084_02166590 kind:bss addr:0x02166590 data_ov084_021665a0 kind:bss addr:0x021665a0 data_ov084_021665ac kind:bss addr:0x021665ac -data_ov084_021665b8 kind:bss addr:0x021665b8 -data_ov084_021665d0 kind:bss addr:0x021665d0 -sActorProfileUnkLVBD kind:bss addr:0x02166688 -data_ov084_02166760 kind:bss addr:0x02166760 -data_ov084_02166764 kind:bss addr:0x02166764 -sMapObjectProfileUnkTMLV kind:bss addr:0x02166770 -data_ov084_02166790 kind:bss addr:0x02166790 -data_ov084_02166794 kind:bss addr:0x02166794 -sMapObjectProfileUnkSTSV kind:bss addr:0x021667a0 -data_ov084_02166808 kind:bss addr:0x02166808 -data_ov084_0216680c kind:bss addr:0x0216680c -sActorProfileUnkLBRC kind:bss addr:0x02166818 +_ZGVN15ProfileInstanceI19ActorProfileUnkLVBDE8sProfileE kind:bss addr:0x021665b8 +@33805 kind:bss addr:0x021665d0 +_ZN15ProfileInstanceI19ActorProfileUnkLVBDE8sProfileE kind:bss addr:0x02166688 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTMLVE8sProfileE kind:bss addr:0x02166760 +@33249 kind:bss addr:0x02166764 +_ZN15ProfileInstanceI23MapObjectProfileUnkTMLVE8sProfileE kind:bss addr:0x02166770 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkSTSVE8sProfileE kind:bss addr:0x02166790 +@33255 kind:bss addr:0x02166794 +_ZN15ProfileInstanceI23MapObjectProfileUnkSTSVE8sProfileE kind:bss addr:0x021667a0 +_ZGVN15ProfileInstanceI19ActorProfileUnkLBRCE8sProfileE kind:bss addr:0x02166808 +@33823 kind:bss addr:0x0216680c +_ZN15ProfileInstanceI19ActorProfileUnkLBRCE8sProfileE kind:bss addr:0x02166818 data_ov084_021668f0 kind:bss addr:0x021668f0 -data_ov084_021668f4 kind:bss addr:0x021668f4 -data_ov084_021668f8 kind:bss addr:0x021668f8 -sMapObjectProfileUnkPLV2 kind:bss addr:0x02166904 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkPLV2E8sProfileE kind:bss addr:0x021668f4 +@33267 kind:bss addr:0x021668f8 +_ZN15ProfileInstanceI23MapObjectProfileUnkPLV2E8sProfileE kind:bss addr:0x02166904 data_ov084_021669d8 kind:bss addr:0x021669d8 diff --git a/config/jp/arm9/overlays/ov085/delinks.txt b/config/jp/arm9/overlays/ov085/delinks.txt index 39114fb8..5a59ee6a 100644 --- a/config/jp/arm9/overlays/ov085/delinks.txt +++ b/config/jp/arm9/overlays/ov085/delinks.txt @@ -9,16 +9,16 @@ src/085_DgnLv5/Actor/ActorUnkGRCM.cpp: .text start:0x02152c20 end:0x02152fac .init start:0x02155f08 end:0x02155f58 .ctor start:0x02155ff8 end:0x02155ffc - .bss start:0x02156270 end:0x0215628c + .bss start:0x02156260 end:0x021562ac src/085_DgnLv5/Actor/ActorUnkSRST.cpp: .text start:0x02152fac end:0x02155200 .init start:0x02155f58 end:0x02155fa8 .ctor start:0x02155ffc end:0x02156000 - .bss start:0x021562bc end:0x021562c0 + .bss start:0x021562ac end:0x02156394 src/085_DgnLv5/MapObject/MapObjectUnkCTPT.cpp: .text start:0x02155200 end:0x02155e64 .init start:0x02155fa8 end:0x02155ff8 .ctor start:0x02156000 end:0x02156004 - .bss start:0x021563a4 end:0x021563c4 + .bss start:0x02156394 end:0x021563c4 diff --git a/config/jp/arm9/overlays/ov085/symbols.txt b/config/jp/arm9/overlays/ov085/symbols.txt index 17ee01b1..cfa93937 100644 --- a/config/jp/arm9/overlays/ov085/symbols.txt +++ b/config/jp/arm9/overlays/ov085/symbols.txt @@ -108,15 +108,15 @@ data_ov085_021561c4 kind:data(any) addr:0x021561c4 ambiguous data_ov085_021561c8 kind:data(any) addr:0x021561c8 data_ov085_021561f0 kind:data(any) addr:0x021561f0 data_ov085_02156218 kind:data(any) addr:0x02156218 -data_ov085_02156260 kind:bss addr:0x02156260 -data_ov085_02156264 kind:bss addr:0x02156264 -sActorProfileUnkGRCM kind:bss addr:0x02156270 +_ZGVN15ProfileInstanceI19ActorProfileUnkGRCME8sProfileE kind:bss addr:0x02156260 +@33841 kind:bss addr:0x02156264 +_ZN15ProfileInstanceI19ActorProfileUnkGRCME8sProfileE kind:bss addr:0x02156270 data_ov085_0215628c kind:bss addr:0x0215628c ambiguous -data_ov085_021562ac kind:bss addr:0x021562ac -data_ov085_021562b0 kind:bss addr:0x021562b0 -sActorProfileUnkSRST kind:bss addr:0x021562bc +_ZGVN15ProfileInstanceI19ActorProfileUnkSRSTE8sProfileE kind:bss addr:0x021562ac +@33847 kind:bss addr:0x021562b0 +_ZN15ProfileInstanceI19ActorProfileUnkSRSTE8sProfileE kind:bss addr:0x021562bc data_ov085_021562c0 kind:bss addr:0x021562c0 ambiguous -data_ov085_02156394 kind:bss addr:0x02156394 -data_ov085_02156398 kind:bss addr:0x02156398 -sMapObjectProfileUnkCTPT kind:bss addr:0x021563a4 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkCTPTE8sProfileE kind:bss addr:0x02156394 +@33291 kind:bss addr:0x02156398 +_ZN15ProfileInstanceI23MapObjectProfileUnkCTPTE8sProfileE kind:bss addr:0x021563a4 data_ov085_021563c4 kind:bss addr:0x021563c4 diff --git a/config/jp/arm9/overlays/ov086/delinks.txt b/config/jp/arm9/overlays/ov086/delinks.txt index 2b98e63e..0980d38e 100644 --- a/config/jp/arm9/overlays/ov086/delinks.txt +++ b/config/jp/arm9/overlays/ov086/delinks.txt @@ -9,73 +9,73 @@ src/086_DgnDesert/Actor/ActorUnkDSDS.cpp: .text start:0x021564a0 end:0x021565c4 .init start:0x021611e8 end:0x02161238 .ctor start:0x02161634 end:0x02161638 - .bss start:0x021623b0 end:0x0216243c + .bss start:0x021623a0 end:0x02162488 src/086_DgnDesert/Actor/ActorUnkHAMN.cpp: .text start:0x021565c4 end:0x0215a0d0 .init start:0x02161238 end:0x02161288 .ctor start:0x02161638 end:0x0216163c - .bss start:0x02162498 end:0x02162570 + .bss start:0x02162488 end:0x02162570 src/086_DgnDesert/Actor/ActorUnkOCTG.cpp: .text start:0x0215a0d0 end:0x0215d004 .init start:0x02161288 end:0x02161314 .ctor start:0x0216163c end:0x02161640 - .bss start:0x02162580 end:0x0216258c + .bss start:0x02162570 end:0x02162658 src/086_DgnDesert/Actor/ActorUnkOCGS.cpp: .text start:0x0215d004 end:0x0215d864 .init start:0x02161314 end:0x02161364 .ctor start:0x02161640 end:0x02161644 - .bss start:0x02162668 end:0x021626dc + .bss start:0x02162658 end:0x02162740 src/086_DgnDesert/Actor/ActorUnkEFSC.cpp: .text start:0x0215d864 end:0x0215db94 .init start:0x02161364 end:0x021613b4 .ctor start:0x02161644 end:0x02161648 - .bss start:0x02162750 end:0x02162808 + .bss start:0x02162740 end:0x02162828 src/086_DgnDesert/Actor/ActorUnkQKSD.cpp: .text start:0x0215db94 end:0x0215ddf8 .init start:0x021613b4 end:0x02161404 .ctor start:0x02161648 end:0x0216164c - .bss start:0x02162838 end:0x021628e8 + .bss start:0x02162828 end:0x02162910 src/086_DgnDesert/Actor/ActorUnkRNTN.cpp: .text start:0x0215ddf8 end:0x0215fad8 .init start:0x02161404 end:0x02161454 .ctor start:0x0216164c end:0x02161650 - .bss start:0x02162920 end:0x0216297c + .bss start:0x02162910 end:0x021629f8 src/086_DgnDesert/Actor/ActorUnkRMDS.cpp: .text start:0x0215fad8 end:0x0215fd04 .init start:0x02161454 end:0x021614a4 .ctor start:0x02161650 end:0x02161654 - .bss start:0x02162a08 end:0x02162a2c + .bss start:0x021629f8 end:0x02162ae0 src/086_DgnDesert/Actor/ActorUnkQKTG.cpp: .text start:0x0215fd04 end:0x0215ff98 .init start:0x021614a4 end:0x021614f4 .ctor start:0x02161654 end:0x02161658 - .bss start:0x02162af0 end:0x02162b2c + .bss start:0x02162ae0 end:0x02162b2c src/086_DgnDesert/MapObject/MapObjectUnkSTDS.cpp: .text start:0x0215ff98 end:0x02160170 .init start:0x021614f4 end:0x02161544 .ctor start:0x02161658 end:0x0216165c - .bss start:0x02162b3c end:0x02162b7c + .bss start:0x02162b2c end:0x02162c10 src/086_DgnDesert/MapObject/MapObjectUnkDRBR.cpp: .text start:0x02160170 end:0x021602d0 .init start:0x02161544 end:0x02161594 .ctor start:0x0216165c end:0x02161660 - .bss start:0x02162c20 end:0x02162cb0 + .bss start:0x02162c10 end:0x02162cf4 src/086_DgnDesert/MapObject/MapObjectUnkGRSG.cpp: .text start:0x021602f0 end:0x021606b8 .init start:0x02161594 end:0x021615e4 .ctor start:0x02161660 end:0x02161664 - .bss start:0x02162d04 end:0x02162dd8 + .bss start:0x02162cf4 end:0x02162dd8 src/086_DgnDesert/MapObject/MapObjectUnkDRRS.cpp: .text start:0x021606b8 end:0x02160c44 diff --git a/config/jp/arm9/overlays/ov086/symbols.txt b/config/jp/arm9/overlays/ov086/symbols.txt index fd976b33..29ce4bcf 100644 --- a/config/jp/arm9/overlays/ov086/symbols.txt +++ b/config/jp/arm9/overlays/ov086/symbols.txt @@ -401,57 +401,57 @@ data_ov086_02162338 kind:data(any) addr:0x02162338 data_ov086_0216234c kind:data(any) addr:0x0216234c data_ov086_02162358 kind:data(any) addr:0x02162358 ambiguous data_ov086_02162368 kind:data(any) addr:0x02162368 -data_ov086_021623a0 kind:bss addr:0x021623a0 -data_ov086_021623a4 kind:bss addr:0x021623a4 -sActorProfileUnkDSDS kind:bss addr:0x021623b0 +_ZGVN15ProfileInstanceI19ActorProfileUnkDSDSE8sProfileE kind:bss addr:0x021623a0 +@35865 kind:bss addr:0x021623a4 +_ZN15ProfileInstanceI19ActorProfileUnkDSDSE8sProfileE kind:bss addr:0x021623b0 data_ov086_0216243c kind:bss addr:0x0216243c ambiguous -data_ov086_02162488 kind:bss addr:0x02162488 -data_ov086_0216248c kind:bss addr:0x0216248c -sActorProfileUnkHAMN kind:bss addr:0x02162498 -data_ov086_02162570 kind:bss addr:0x02162570 -data_ov086_02162574 kind:bss addr:0x02162574 -sActorProfileUnkOCTG kind:bss addr:0x02162580 +_ZGVN15ProfileInstanceI19ActorProfileUnkHAMNE8sProfileE kind:bss addr:0x02162488 +@35871 kind:bss addr:0x0216248c +_ZN15ProfileInstanceI19ActorProfileUnkHAMNE8sProfileE kind:bss addr:0x02162498 +_ZGVN15ProfileInstanceI19ActorProfileUnkOCTGE8sProfileE kind:bss addr:0x02162570 +@35877 kind:bss addr:0x02162574 +_ZN15ProfileInstanceI19ActorProfileUnkOCTGE8sProfileE kind:bss addr:0x02162580 data_ov086_0216258c kind:bss addr:0x0216258c ambiguous data_ov086_02162654 kind:bss addr:0x02162654 ambiguous -data_ov086_02162658 kind:bss addr:0x02162658 -data_ov086_0216265c kind:bss addr:0x0216265c -sActorProfileUnkOCGS kind:bss addr:0x02162668 +_ZGVN15ProfileInstanceI19ActorProfileUnkOCGSE8sProfileE kind:bss addr:0x02162658 +@35883 kind:bss addr:0x0216265c +_ZN15ProfileInstanceI19ActorProfileUnkOCGSE8sProfileE kind:bss addr:0x02162668 data_ov086_021626dc kind:bss addr:0x021626dc ambiguous data_ov086_0216271c kind:bss addr:0x0216271c ambiguous -data_ov086_02162740 kind:bss addr:0x02162740 -data_ov086_02162744 kind:bss addr:0x02162744 -sActorProfileUnkEFSC kind:bss addr:0x02162750 +_ZGVN15ProfileInstanceI19ActorProfileUnkEFSCE8sProfileE kind:bss addr:0x02162740 +@35889 kind:bss addr:0x02162744 +_ZN15ProfileInstanceI19ActorProfileUnkEFSCE8sProfileE kind:bss addr:0x02162750 data_ov086_02162808 kind:bss addr:0x02162808 ambiguous -data_ov086_02162828 kind:bss addr:0x02162828 -data_ov086_0216282c kind:bss addr:0x0216282c -sActorProfileUnkQKSD kind:bss addr:0x02162838 +_ZGVN15ProfileInstanceI19ActorProfileUnkQKSDE8sProfileE kind:bss addr:0x02162828 +@35895 kind:bss addr:0x0216282c +_ZN15ProfileInstanceI19ActorProfileUnkQKSDE8sProfileE kind:bss addr:0x02162838 data_ov086_021628e8 kind:bss addr:0x021628e8 ambiguous -data_ov086_02162910 kind:bss addr:0x02162910 -data_ov086_02162914 kind:bss addr:0x02162914 -sActorProfileUnkRNTN kind:bss addr:0x02162920 +_ZGVN15ProfileInstanceI19ActorProfileUnkRNTNE8sProfileE kind:bss addr:0x02162910 +@35901 kind:bss addr:0x02162914 +_ZN15ProfileInstanceI19ActorProfileUnkRNTNE8sProfileE kind:bss addr:0x02162920 data_ov086_0216297c kind:bss addr:0x0216297c ambiguous -data_ov086_021629f8 kind:bss addr:0x021629f8 -data_ov086_021629fc kind:bss addr:0x021629fc -sActorProfileUnkRMDS kind:bss addr:0x02162a08 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMDSE8sProfileE kind:bss addr:0x021629f8 +@35907 kind:bss addr:0x021629fc +_ZN15ProfileInstanceI19ActorProfileUnkRMDSE8sProfileE kind:bss addr:0x02162a08 data_ov086_02162a2c kind:bss addr:0x02162a2c ambiguous -data_ov086_02162ae0 kind:bss addr:0x02162ae0 -data_ov086_02162ae4 kind:bss addr:0x02162ae4 -sActorProfileUnkQKTG kind:bss addr:0x02162af0 -data_ov086_02162b2c kind:bss addr:0x02162b2c -data_ov086_02162b30 kind:bss addr:0x02162b30 -sMapObjectProfileUnkSTDS kind:bss addr:0x02162b3c +_ZGVN15ProfileInstanceI19ActorProfileUnkQKTGE8sProfileE kind:bss addr:0x02162ae0 +@35913 kind:bss addr:0x02162ae4 +_ZN15ProfileInstanceI19ActorProfileUnkQKTGE8sProfileE kind:bss addr:0x02162af0 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkSTDSE8sProfileE kind:bss addr:0x02162b2c +@35357 kind:bss addr:0x02162b30 +_ZN15ProfileInstanceI23MapObjectProfileUnkSTDSE8sProfileE kind:bss addr:0x02162b3c data_ov086_02162b7c kind:bss addr:0x02162b7c ambiguous data_ov086_02162bbc kind:bss addr:0x02162bbc ambiguous data_ov086_02162bd4 kind:bss addr:0x02162bd4 ambiguous -data_ov086_02162c10 kind:bss addr:0x02162c10 -data_ov086_02162c14 kind:bss addr:0x02162c14 -sMapObjectProfileUnkDRBR kind:bss addr:0x02162c20 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkDRBRE8sProfileE kind:bss addr:0x02162c10 +@35363 kind:bss addr:0x02162c14 +_ZN15ProfileInstanceI23MapObjectProfileUnkDRBRE8sProfileE kind:bss addr:0x02162c20 data_ov086_02162cb0 kind:bss addr:0x02162cb0 ambiguous -data_ov086_02162cf4 kind:bss addr:0x02162cf4 -data_ov086_02162cf8 kind:bss addr:0x02162cf8 -sMapObjectProfileUnkGRSG kind:bss addr:0x02162d04 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkGRSGE8sProfileE kind:bss addr:0x02162cf4 +@35369 kind:bss addr:0x02162cf8 +_ZN15ProfileInstanceI23MapObjectProfileUnkGRSGE8sProfileE kind:bss addr:0x02162d04 data_ov086_02162dd8 kind:bss addr:0x02162dd8 data_ov086_02162df8 kind:bss addr:0x02162df8 ambiguous data_ov086_02162dfc kind:bss addr:0x02162dfc data_ov086_02162e00 kind:bss addr:0x02162e00 -sMapObjectProfileUnkDRRS kind:bss addr:0x02162e0c +_ZN15ProfileInstanceI23MapObjectProfileUnkDRRSE8sProfileE kind:bss addr:0x02162e0c diff --git a/config/jp/arm9/overlays/ov087/delinks.txt b/config/jp/arm9/overlays/ov087/delinks.txt index 2550a444..604aeb06 100644 --- a/config/jp/arm9/overlays/ov087/delinks.txt +++ b/config/jp/arm9/overlays/ov087/delinks.txt @@ -9,31 +9,31 @@ src/087_BossDesert/Actor/ActorUnkDSBN.cpp: .text start:0x021564a0 end:0x0215d208 .init start:0x02163fd0 end:0x02164020 .ctor start:0x021641d0 end:0x021641d4 - .bss start:0x02164b90 end:0x02164c68 + .bss start:0x02164b80 end:0x02164c68 src/087_BossDesert/Actor/ActorUnkDSBB.cpp: .text start:0x0215d208 end:0x0215e2f8 .init start:0x02164020 end:0x02164070 .ctor start:0x021641d4 end:0x021641d8 - .bss start:0x02164c78 end:0x02164d50 + .bss start:0x02164c68 end:0x02164d50 src/087_BossDesert/Actor/ActorUnkDSBH.cpp: .text start:0x0215e2f8 end:0x021631d8 .init start:0x02164070 end:0x021640c0 .ctor start:0x021641d8 end:0x021641dc - .bss start:0x02164d60 end:0x02164e38 + .bss start:0x02164d50 end:0x02164e38 src/087_BossDesert/Actor/ActorUnkRBDS.cpp: .text start:0x021631d8 end:0x02163408 .init start:0x021640c0 end:0x02164110 .ctor start:0x021641dc end:0x021641e0 - .bss start:0x02164e48 end:0x02164f20 + .bss start:0x02164e38 end:0x02164f20 src/087_BossDesert/Actor/ActorUnkRBD2.cpp: .text start:0x02163408 end:0x02163a88 .init start:0x02164110 end:0x02164160 .ctor start:0x021641e0 end:0x021641e4 - .bss start:0x02164f30 end:0x02165008 + .bss start:0x02164f20 end:0x02165008 src/087_BossDesert/MapObject/MapObjectUnkSTSD.cpp: .text start:0x02163a88 end:0x02163d10 diff --git a/config/jp/arm9/overlays/ov087/symbols.txt b/config/jp/arm9/overlays/ov087/symbols.txt index fe56e2dc..bcebed03 100644 --- a/config/jp/arm9/overlays/ov087/symbols.txt +++ b/config/jp/arm9/overlays/ov087/symbols.txt @@ -295,21 +295,21 @@ data_ov087_02164abc kind:data(any) addr:0x02164abc data_ov087_02164ad0 kind:data(any) addr:0x02164ad0 data_ov087_02164af8 kind:data(any) addr:0x02164af8 data_ov087_02164b68 kind:data(any) addr:0x02164b68 -data_ov087_02164b80 kind:bss addr:0x02164b80 -data_ov087_02164b84 kind:bss addr:0x02164b84 -sActorProfileUnkDSBN kind:bss addr:0x02164b90 -data_ov087_02164c68 kind:bss addr:0x02164c68 -data_ov087_02164c6c kind:bss addr:0x02164c6c -sActorProfileUnkDSBB kind:bss addr:0x02164c78 -data_ov087_02164d50 kind:bss addr:0x02164d50 -data_ov087_02164d54 kind:bss addr:0x02164d54 -sActorProfileUnkDSBH kind:bss addr:0x02164d60 -data_ov087_02164e38 kind:bss addr:0x02164e38 -data_ov087_02164e3c kind:bss addr:0x02164e3c -sActorProfileUnkRBDS kind:bss addr:0x02164e48 -data_ov087_02164f20 kind:bss addr:0x02164f20 -data_ov087_02164f24 kind:bss addr:0x02164f24 -sActorProfileUnkRBD2 kind:bss addr:0x02164f30 +_ZGVN15ProfileInstanceI19ActorProfileUnkDSBNE8sProfileE kind:bss addr:0x02164b80 +@33948 kind:bss addr:0x02164b84 +_ZN15ProfileInstanceI19ActorProfileUnkDSBNE8sProfileE kind:bss addr:0x02164b90 +_ZGVN15ProfileInstanceI19ActorProfileUnkDSBBE8sProfileE kind:bss addr:0x02164c68 +@33954 kind:bss addr:0x02164c6c +_ZN15ProfileInstanceI19ActorProfileUnkDSBBE8sProfileE kind:bss addr:0x02164c78 +_ZGVN15ProfileInstanceI19ActorProfileUnkDSBHE8sProfileE kind:bss addr:0x02164d50 +@33960 kind:bss addr:0x02164d54 +_ZN15ProfileInstanceI19ActorProfileUnkDSBHE8sProfileE kind:bss addr:0x02164d60 +_ZGVN15ProfileInstanceI19ActorProfileUnkRBDSE8sProfileE kind:bss addr:0x02164e38 +@33966 kind:bss addr:0x02164e3c +_ZN15ProfileInstanceI19ActorProfileUnkRBDSE8sProfileE kind:bss addr:0x02164e48 +_ZGVN15ProfileInstanceI19ActorProfileUnkRBD2E8sProfileE kind:bss addr:0x02164f20 +@33972 kind:bss addr:0x02164f24 +_ZN15ProfileInstanceI19ActorProfileUnkRBD2E8sProfileE kind:bss addr:0x02164f30 data_ov087_02165008 kind:bss addr:0x02165008 data_ov087_0216500c kind:bss addr:0x0216500c -sMapObjectProfileUnkSTSD kind:bss addr:0x02165018 +_ZN15ProfileInstanceI23MapObjectProfileUnkSTSDE8sProfileE kind:bss addr:0x02165018 diff --git a/config/jp/arm9/overlays/ov088/delinks.txt b/config/jp/arm9/overlays/ov088/delinks.txt index b60e8587..22b79f6f 100644 --- a/config/jp/arm9/overlays/ov088/delinks.txt +++ b/config/jp/arm9/overlays/ov088/delinks.txt @@ -9,112 +9,112 @@ src/088_Stb/Actor/ActorUnkDMCH.cpp: .text start:0x0216c7cc end:0x0216e5c8 .init start:0x02176978 end:0x021769ec .ctor start:0x02176f90 end:0x02176f94 - .bss start:0x0217834c end:0x02178388 + .bss start:0x0217833c end:0x02178388 src/088_Stb/Actor/ActorUnkDMZS.cpp: .text start:0x0216e5c8 end:0x0216e924 .init start:0x021769ec end:0x02176a3c .ctor start:0x02176f94 end:0x02176f98 - .bss start:0x0217839c end:0x021783d8 + .bss start:0x02178388 end:0x021783d8 src/088_Stb/Actor/ActorUnkDMTR.cpp: .text start:0x0216e924 end:0x0216ef34 .init start:0x02176a3c end:0x02176a8c .ctor start:0x02176f98 end:0x02176f9c - .bss start:0x021783e8 end:0x02178424 + .bss start:0x021783d8 end:0x02178424 src/088_Stb/Actor/ActorUnkDMT2.cpp: .text start:0x0216ef34 end:0x0216f504 .init start:0x02176a8c end:0x02176adc .ctor start:0x02176f9c end:0x02176fa0 - .bss start:0x02178434 end:0x02178470 + .bss start:0x02178424 end:0x02178470 src/088_Stb/Actor/ActorUnkDMPS.cpp: .text start:0x0216f578 end:0x021704bc .init start:0x02176adc end:0x02176b2c .ctor start:0x02176fa0 end:0x02176fa4 - .bss start:0x02178480 end:0x021784bc + .bss start:0x02178470 end:0x021784bc src/088_Stb/Actor/ActorUnkDMEQ.cpp: .text start:0x021704bc end:0x02170a98 .init start:0x02176b2c end:0x02176b7c .ctor start:0x02176fa4 end:0x02176fa8 - .bss start:0x021784cc end:0x02178508 + .bss start:0x021784bc end:0x02178508 src/088_Stb/Actor/ActorUnkDMGM.cpp: .text start:0x02170a98 end:0x02170f84 .init start:0x02176b7c end:0x02176bcc .ctor start:0x02176fa8 end:0x02176fac - .bss start:0x02178518 end:0x02178554 + .bss start:0x02178508 end:0x02178a34 src/088_Stb/Actor/ActorUnkDMFR.cpp: .text start:0x02172824 end:0x02172aa4 .init start:0x02176bcc end:0x02176c1c .ctor start:0x02176fac end:0x02176fb0 - .bss start:0x02178a44 end:0x02178b1c + .bss start:0x02178a34 end:0x02178b1c src/088_Stb/Actor/ActorUnkDMMT.cpp: .text start:0x02172b3c end:0x02172f48 .init start:0x02176c1c end:0x02176c6c .ctor start:0x02176fb0 end:0x02176fb4 - .bss start:0x02178b2c end:0x02178c04 + .bss start:0x02178b1c end:0x02178c04 src/088_Stb/Actor/ActorUnkDMPK.cpp: .text start:0x02172fe0 end:0x02173408 .init start:0x02176c6c end:0x02176cbc .ctor start:0x02176fb4 end:0x02176fb8 - .bss start:0x02178c14 end:0x02178cec + .bss start:0x02178c04 end:0x02178cec src/088_Stb/Actor/ActorUnkDMST.cpp: .text start:0x02173408 end:0x02173628 .init start:0x02176cbc end:0x02176d0c .ctor start:0x02176fb8 end:0x02176fbc - .bss start:0x02178cfc end:0x02178dd4 + .bss start:0x02178cec end:0x02178dd4 src/088_Stb/Actor/ActorUnkDMSS.cpp: .text start:0x02173628 end:0x0217386c .init start:0x02176d0c end:0x02176d5c .ctor start:0x02176fbc end:0x02176fc0 - .bss start:0x02178de4 end:0x02178ea4 + .bss start:0x02178dd4 end:0x02178ebc src/088_Stb/Actor/ActorUnkDMWS.cpp: .text start:0x0217386c end:0x02173a80 .init start:0x02176d5c end:0x02176dac .ctor start:0x02176fc0 end:0x02176fc4 - .bss start:0x02178ecc end:0x02178fa4 + .bss start:0x02178ebc end:0x02178fa4 src/088_Stb/Actor/ActorUnkDMWT.cpp: .text start:0x02173a80 end:0x02173ca0 .init start:0x02176dac end:0x02176dfc .ctor start:0x02176fc4 end:0x02176fc8 - .bss start:0x02178fb4 end:0x0217908c + .bss start:0x02178fa4 end:0x0217908c src/088_Stb/Actor/ActorUnkRMDO.cpp: .text start:0x02173ca0 end:0x02173dbc .init start:0x02176dfc end:0x02176e4c .ctor start:0x02176fc8 end:0x02176fcc - .bss start:0x0217909c end:0x021790d8 + .bss start:0x0217908c end:0x021790d8 src/088_Stb/Actor/ActorUnkDMMS.cpp: .text start:0x02173dbc end:0x02173fd0 .init start:0x02176e4c end:0x02176e9c .ctor start:0x02176fcc end:0x02176fd0 - .bss start:0x021790e8 end:0x021791c0 + .bss start:0x021790d8 end:0x021791c0 src/088_Stb/Actor/ActorUnkDMMM.cpp: .text start:0x02173fd0 end:0x021741f0 .init start:0x02176e9c end:0x02176eec .ctor start:0x02176fd0 end:0x02176fd4 - .bss start:0x021791d0 end:0x021792a8 + .bss start:0x021791c0 end:0x021792a8 src/088_Stb/Actor/ActorUnkDMET.cpp: .text start:0x021741f0 end:0x02174430 .init start:0x02176eec end:0x02176f3c .ctor start:0x02176fd4 end:0x02176fd8 - .bss start:0x021792b8 end:0x02179390 + .bss start:0x021792a8 end:0x02179390 src/088_Stb/Actor/ActorUnkRMM2.cpp: .text start:0x02174430 end:0x0217456c .init start:0x02176f3c end:0x02176f8c .ctor start:0x02176fd8 end:0x02176fdc - .bss start:0x021793a0 end:0x02179478 + .bss start:0x02179390 end:0x02179478 diff --git a/config/jp/arm9/overlays/ov088/symbols.txt b/config/jp/arm9/overlays/ov088/symbols.txt index a240f5d6..c74cddd1 100644 --- a/config/jp/arm9/overlays/ov088/symbols.txt +++ b/config/jp/arm9/overlays/ov088/symbols.txt @@ -836,63 +836,63 @@ data_ov088_02178324 kind:bss addr:0x02178324 data_ov088_02178328 kind:bss addr:0x02178328 ambiguous data_ov088_0217832c kind:bss addr:0x0217832c data_ov088_02178330 kind:bss addr:0x02178330 -data_ov088_0217833c kind:bss addr:0x0217833c -data_ov088_02178344 kind:bss addr:0x02178344 -sActorProfileUnkDMCH kind:bss addr:0x0217834c -data_ov088_02178388 kind:bss addr:0x02178388 -data_ov088_02178390 kind:bss addr:0x02178390 -sActorProfileUnkDMZS kind:bss addr:0x0217839c -data_ov088_021783d8 kind:bss addr:0x021783d8 -data_ov088_021783dc kind:bss addr:0x021783dc -sActorProfileUnkDMTR kind:bss addr:0x021783e8 -data_ov088_02178424 kind:bss addr:0x02178424 -data_ov088_02178428 kind:bss addr:0x02178428 -sActorProfileUnkDMT2 kind:bss addr:0x02178434 -data_ov088_02178470 kind:bss addr:0x02178470 -data_ov088_02178474 kind:bss addr:0x02178474 -sActorProfileUnkDMPS kind:bss addr:0x02178480 -data_ov088_021784bc kind:bss addr:0x021784bc -data_ov088_021784c0 kind:bss addr:0x021784c0 -sActorProfileUnkDMEQ kind:bss addr:0x021784cc -data_ov088_02178508 kind:bss addr:0x02178508 -data_ov088_0217850c kind:bss addr:0x0217850c -sActorProfileUnkDMGM kind:bss addr:0x02178518 +_ZGVN15ProfileInstanceI19ActorProfileUnkDMCHE8sProfileE kind:bss addr:0x0217833c +@33989 kind:bss addr:0x02178344 +_ZN15ProfileInstanceI19ActorProfileUnkDMCHE8sProfileE kind:bss addr:0x0217834c +_ZGVN15ProfileInstanceI19ActorProfileUnkDMZSE8sProfileE kind:bss addr:0x02178388 +@33995 kind:bss addr:0x02178390 +_ZN15ProfileInstanceI19ActorProfileUnkDMZSE8sProfileE kind:bss addr:0x0217839c +_ZGVN15ProfileInstanceI19ActorProfileUnkDMTRE8sProfileE kind:bss addr:0x021783d8 +@34001 kind:bss addr:0x021783dc +_ZN15ProfileInstanceI19ActorProfileUnkDMTRE8sProfileE kind:bss addr:0x021783e8 +_ZGVN15ProfileInstanceI19ActorProfileUnkDMT2E8sProfileE kind:bss addr:0x02178424 +@34007 kind:bss addr:0x02178428 +_ZN15ProfileInstanceI19ActorProfileUnkDMT2E8sProfileE kind:bss addr:0x02178434 +_ZGVN15ProfileInstanceI19ActorProfileUnkDMPSE8sProfileE kind:bss addr:0x02178470 +@34013 kind:bss addr:0x02178474 +_ZN15ProfileInstanceI19ActorProfileUnkDMPSE8sProfileE kind:bss addr:0x02178480 +_ZGVN15ProfileInstanceI19ActorProfileUnkDMEQE8sProfileE kind:bss addr:0x021784bc +@34019 kind:bss addr:0x021784c0 +_ZN15ProfileInstanceI19ActorProfileUnkDMEQE8sProfileE kind:bss addr:0x021784cc +_ZGVN15ProfileInstanceI19ActorProfileUnkDMGME8sProfileE kind:bss addr:0x02178508 +@34025 kind:bss addr:0x0217850c +_ZN15ProfileInstanceI19ActorProfileUnkDMGME8sProfileE kind:bss addr:0x02178518 data_ov088_02178554 kind:bss addr:0x02178554 -data_ov088_02178a34 kind:bss addr:0x02178a34 -data_ov088_02178a38 kind:bss addr:0x02178a38 -sActorProfileUnkDMFR kind:bss addr:0x02178a44 -data_ov088_02178b1c kind:bss addr:0x02178b1c -data_ov088_02178b20 kind:bss addr:0x02178b20 -sActorProfileUnkDMMT kind:bss addr:0x02178b2c -data_ov088_02178c04 kind:bss addr:0x02178c04 -data_ov088_02178c08 kind:bss addr:0x02178c08 -sActorProfileUnkDMPK kind:bss addr:0x02178c14 -data_ov088_02178cec kind:bss addr:0x02178cec -data_ov088_02178cf0 kind:bss addr:0x02178cf0 -sActorProfileUnkDMST kind:bss addr:0x02178cfc -data_ov088_02178dd4 kind:bss addr:0x02178dd4 -data_ov088_02178dd8 kind:bss addr:0x02178dd8 -sActorProfileUnkDMSS kind:bss addr:0x02178de4 +_ZGVN15ProfileInstanceI19ActorProfileUnkDMFRE8sProfileE kind:bss addr:0x02178a34 +@34031 kind:bss addr:0x02178a38 +_ZN15ProfileInstanceI19ActorProfileUnkDMFRE8sProfileE kind:bss addr:0x02178a44 +_ZGVN15ProfileInstanceI19ActorProfileUnkDMMTE8sProfileE kind:bss addr:0x02178b1c +@34037 kind:bss addr:0x02178b20 +_ZN15ProfileInstanceI19ActorProfileUnkDMMTE8sProfileE kind:bss addr:0x02178b2c +_ZGVN15ProfileInstanceI19ActorProfileUnkDMPKE8sProfileE kind:bss addr:0x02178c04 +@34043 kind:bss addr:0x02178c08 +_ZN15ProfileInstanceI19ActorProfileUnkDMPKE8sProfileE kind:bss addr:0x02178c14 +_ZGVN15ProfileInstanceI19ActorProfileUnkDMSTE8sProfileE kind:bss addr:0x02178cec +@34049 kind:bss addr:0x02178cf0 +_ZN15ProfileInstanceI19ActorProfileUnkDMSTE8sProfileE kind:bss addr:0x02178cfc +_ZGVN15ProfileInstanceI19ActorProfileUnkDMSSE8sProfileE kind:bss addr:0x02178dd4 +@34055 kind:bss addr:0x02178dd8 +_ZN15ProfileInstanceI19ActorProfileUnkDMSSE8sProfileE kind:bss addr:0x02178de4 data_ov088_02178ea4 kind:bss addr:0x02178ea4 ambiguous -data_ov088_02178ebc kind:bss addr:0x02178ebc -data_ov088_02178ec0 kind:bss addr:0x02178ec0 -sActorProfileUnkDMWS kind:bss addr:0x02178ecc -data_ov088_02178fa4 kind:bss addr:0x02178fa4 -data_ov088_02178fa8 kind:bss addr:0x02178fa8 -sActorProfileUnkDMWT kind:bss addr:0x02178fb4 -data_ov088_0217908c kind:bss addr:0x0217908c -data_ov088_02179090 kind:bss addr:0x02179090 -sActorProfileUnkRMDO kind:bss addr:0x0217909c -data_ov088_021790d8 kind:bss addr:0x021790d8 -data_ov088_021790dc kind:bss addr:0x021790dc -sActorProfileUnkDMMS kind:bss addr:0x021790e8 -data_ov088_021791c0 kind:bss addr:0x021791c0 -data_ov088_021791c4 kind:bss addr:0x021791c4 -sActorProfileUnkDMMM kind:bss addr:0x021791d0 -data_ov088_021792a8 kind:bss addr:0x021792a8 -data_ov088_021792ac kind:bss addr:0x021792ac -sActorProfileUnkDMET kind:bss addr:0x021792b8 -data_ov088_02179390 kind:bss addr:0x02179390 -data_ov088_02179394 kind:bss addr:0x02179394 -sActorProfileUnkRMM2 kind:bss addr:0x021793a0 +_ZGVN15ProfileInstanceI19ActorProfileUnkDMWSE8sProfileE kind:bss addr:0x02178ebc +@34061 kind:bss addr:0x02178ec0 +_ZN15ProfileInstanceI19ActorProfileUnkDMWSE8sProfileE kind:bss addr:0x02178ecc +_ZGVN15ProfileInstanceI19ActorProfileUnkDMWTE8sProfileE kind:bss addr:0x02178fa4 +@34067 kind:bss addr:0x02178fa8 +_ZN15ProfileInstanceI19ActorProfileUnkDMWTE8sProfileE kind:bss addr:0x02178fb4 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMDOE8sProfileE kind:bss addr:0x0217908c +@34073 kind:bss addr:0x02179090 +_ZN15ProfileInstanceI19ActorProfileUnkRMDOE8sProfileE kind:bss addr:0x0217909c +_ZGVN15ProfileInstanceI19ActorProfileUnkDMMSE8sProfileE kind:bss addr:0x021790d8 +@34079 kind:bss addr:0x021790dc +_ZN15ProfileInstanceI19ActorProfileUnkDMMSE8sProfileE kind:bss addr:0x021790e8 +_ZGVN15ProfileInstanceI19ActorProfileUnkDMMME8sProfileE kind:bss addr:0x021791c0 +@34085 kind:bss addr:0x021791c4 +_ZN15ProfileInstanceI19ActorProfileUnkDMMME8sProfileE kind:bss addr:0x021791d0 +_ZGVN15ProfileInstanceI19ActorProfileUnkDMETE8sProfileE kind:bss addr:0x021792a8 +@34091 kind:bss addr:0x021792ac +_ZN15ProfileInstanceI19ActorProfileUnkDMETE8sProfileE kind:bss addr:0x021792b8 +_ZGVN15ProfileInstanceI19ActorProfileUnkRMM2E8sProfileE kind:bss addr:0x02179390 +@34097 kind:bss addr:0x02179394 +_ZN15ProfileInstanceI19ActorProfileUnkRMM2E8sProfileE kind:bss addr:0x021793a0 data_ov088_02179478 kind:bss addr:0x02179478 diff --git a/config/jp/arm9/overlays/ov090/delinks.txt b/config/jp/arm9/overlays/ov090/delinks.txt index 5cae09cb..404b80f5 100644 --- a/config/jp/arm9/overlays/ov090/delinks.txt +++ b/config/jp/arm9/overlays/ov090/delinks.txt @@ -9,115 +9,115 @@ src/090_TrainNormal/Actor/ActorUnkSZRD.cpp: .text start:0x02167b00 end:0x0216adac .init start:0x02177760 end:0x02177868 .ctor start:0x02177ec0 end:0x02177ec4 - .bss start:0x02179214 end:0x021792ec + .bss start:0x021791f4 end:0x021792f4 src/090_TrainNormal/Actor/ActorUnkWDBA.cpp: .text start:0x0216adac end:0x0216ff90 .init start:0x02177868 end:0x021778d8 .ctor start:0x02177ec4 end:0x02177ec8 - .bss start:0x0217930c end:0x021793e4 + .bss start:0x021792f4 end:0x021793e4 src/090_TrainNormal/Actor/ActorUnkWDRD.cpp: .text start:0x0216ff90 end:0x02171734 .init start:0x021778d8 end:0x02177928 .ctor start:0x02177ec8 end:0x02177ecc - .bss start:0x021793f4 end:0x02179478 + .bss start:0x021793e4 end:0x021794d0 src/090_TrainNormal/Actor/ActorUnkSPID.cpp: .text start:0x02171734 end:0x021731e0 .init start:0x02177928 end:0x02177984 .ctor start:0x02177ecc end:0x02177ed0 - .bss start:0x021794e8 end:0x021795c0 + .bss start:0x021794d0 end:0x021795c0 src/090_TrainNormal/Actor/ActorUnkE3GL.cpp: .text start:0x021731e0 end:0x02173380 .init start:0x02177984 end:0x021779d4 .ctor start:0x02177ed0 end:0x02177ed4 - .bss start:0x021795d0 end:0x0217960c + .bss start:0x021795c0 end:0x0217960c src/090_TrainNormal/Actor/ActorUnkE3TT.cpp: .text start:0x02173380 end:0x021736ac .init start:0x021779d4 end:0x02177a24 .ctor start:0x02177ed4 end:0x02177ed8 - .bss start:0x0217961c end:0x02179658 + .bss start:0x0217960c end:0x02179658 src/090_TrainNormal/Actor/ActorUnkE3ST.cpp: .text start:0x021736ac end:0x0217381c .init start:0x02177a24 end:0x02177a74 .ctor start:0x02177ed8 end:0x02177edc - .bss start:0x02179668 end:0x021796a4 + .bss start:0x02179658 end:0x021796a4 src/090_TrainNormal/MapObject/MapObjectUnkTWPG.cpp: .text start:0x0217381c end:0x02174440 .init start:0x02177a74 end:0x02177ac4 .ctor start:0x02177edc end:0x02177ee0 - .bss start:0x021796b4 end:0x021796d4 + .bss start:0x021796a4 end:0x02179788 src/090_TrainNormal/MapObject/MapObjectUnkTWGS.cpp: .text start:0x02174440 end:0x02174b94 .init start:0x02177ac4 end:0x02177b38 .ctor start:0x02177ee0 end:0x02177ee4 - .bss start:0x02179798 end:0x021797b8 + .bss start:0x02179788 end:0x02179890 src/090_TrainNormal/MapObject/MapObjectUnkTWPC.cpp: .text start:0x02174b94 end:0x02174fcc .init start:0x02177b38 end:0x02177b88 .ctor start:0x02177ee4 end:0x02177ee8 - .bss start:0x021798a0 end:0x021798c0 + .bss start:0x02179890 end:0x021798c0 src/090_TrainNormal/MapObject/MapObjectUnkSTTR.cpp: .text start:0x02174fcc end:0x021752e0 .init start:0x02177b88 end:0x02177bf0 .ctor start:0x02177ee8 end:0x02177eec - .bss start:0x021798d4 end:0x021798f4 + .bss start:0x021798c0 end:0x021798f4 src/090_TrainNormal/MapObject/MapObjectUnkTRGW.cpp: .text start:0x021752e0 end:0x0217566c .init start:0x02177bf0 end:0x02177c40 .ctor start:0x02177eec end:0x02177ef0 - .bss start:0x02179904 end:0x021799d8 + .bss start:0x021798f4 end:0x021799f8 src/090_TrainNormal/MapObject/MapObjectUnkTRSD.cpp: .text start:0x0217566c end:0x02175980 .init start:0x02177c40 end:0x02177c90 .ctor start:0x02177ef0 end:0x02177ef4 - .bss start:0x02179a08 end:0x02179adc + .bss start:0x021799f8 end:0x02179afc src/090_TrainNormal/MapObject/MapObjectUnkNPST.cpp: .text start:0x02175980 end:0x0217692c .init start:0x02177c90 end:0x02177ce0 .ctor start:0x02177ef4 end:0x02177ef8 - .bss start:0x02179b0c end:0x02179b2c + .bss start:0x02179afc end:0x02179c00 src/090_TrainNormal/MapObject/MapObjectUnkRBRC.cpp: .text start:0x0217692c end:0x02176b20 .init start:0x02177ce0 end:0x02177d30 .ctor start:0x02177ef8 end:0x02177efc - .bss start:0x02179c10 end:0x02179c54 + .bss start:0x02179c00 end:0x02179c58 src/090_TrainNormal/MapObject/MapObjectUnkTRMR.cpp: .text start:0x02176b20 end:0x02176d80 .init start:0x02177d30 end:0x02177d80 .ctor start:0x02177efc end:0x02177f00 - .bss start:0x02179c64 end:0x02179d38 + .bss start:0x02179c58 end:0x02179d58 src/090_TrainNormal/MapObject/MapObjectUnkRBMR.cpp: .text start:0x02176d80 end:0x02176f74 .init start:0x02177d80 end:0x02177dd0 .ctor start:0x02177f00 end:0x02177f04 - .bss start:0x02179d68 end:0x02179dac + .bss start:0x02179d58 end:0x02179dac src/090_TrainNormal/MapObject/MapObjectUnkTRDT.cpp: .text start:0x02176f74 end:0x02177210 .init start:0x02177dd0 end:0x02177e20 .ctor start:0x02177f04 end:0x02177f08 - .bss start:0x02179dbc end:0x02179e90 + .bss start:0x02179dac end:0x02179eb0 src/090_TrainNormal/MapObject/MapObjectUnkTRCC.cpp: .text start:0x02177210 end:0x021774ac .init start:0x02177e20 end:0x02177e70 .ctor start:0x02177f08 end:0x02177f0c - .bss start:0x02179ec0 end:0x02179f94 + .bss start:0x02179eb0 end:0x02179f94 src/090_TrainNormal/MapObject/MapObjectUnkETNM.cpp: .text start:0x021774ac end:0x021775fc diff --git a/config/jp/arm9/overlays/ov090/symbols.txt b/config/jp/arm9/overlays/ov090/symbols.txt index 6e35e3bc..45baf6e0 100644 --- a/config/jp/arm9/overlays/ov090/symbols.txt +++ b/config/jp/arm9/overlays/ov090/symbols.txt @@ -589,79 +589,79 @@ data_ov090_02179138 kind:data(any) addr:0x02179138 data_ov090_02179154 kind:data(any) addr:0x02179154 data_ov090_021791e0 kind:bss addr:0x021791e0 data_ov090_021791e8 kind:bss addr:0x021791e8 -data_ov090_021791f4 kind:bss addr:0x021791f4 -data_ov090_02179200 kind:bss addr:0x02179200 -sActorProfileUnkSZRD kind:bss addr:0x02179214 +_ZGVN15ProfileInstanceI19ActorProfileUnkSZRDE8sProfileE kind:bss addr:0x021791f4 +@34109 kind:bss addr:0x02179200 +_ZN15ProfileInstanceI19ActorProfileUnkSZRDE8sProfileE kind:bss addr:0x02179214 data_ov090_021792ec kind:bss addr:0x021792ec -data_ov090_021792f4 kind:bss addr:0x021792f4 -data_ov090_02179300 kind:bss addr:0x02179300 -sActorProfileUnkWDBA kind:bss addr:0x0217930c -data_ov090_021793e4 kind:bss addr:0x021793e4 -data_ov090_021793e8 kind:bss addr:0x021793e8 -sActorProfileUnkWDRD kind:bss addr:0x021793f4 +_ZGVN15ProfileInstanceI19ActorProfileUnkWDBAE8sProfileE kind:bss addr:0x021792f4 +@34115 kind:bss addr:0x02179300 +_ZN15ProfileInstanceI19ActorProfileUnkWDBAE8sProfileE kind:bss addr:0x0217930c +_ZGVN15ProfileInstanceI19ActorProfileUnkWDRDE8sProfileE kind:bss addr:0x021793e4 +@34121 kind:bss addr:0x021793e8 +_ZN15ProfileInstanceI19ActorProfileUnkWDRDE8sProfileE kind:bss addr:0x021793f4 data_ov090_02179478 kind:bss addr:0x02179478 ambiguous data_ov090_021794a0 kind:bss addr:0x021794a0 ambiguous data_ov090_021794cc kind:bss addr:0x021794cc -data_ov090_021794d0 kind:bss addr:0x021794d0 -data_ov090_021794dc kind:bss addr:0x021794dc -sActorProfileUnkSPID kind:bss addr:0x021794e8 -data_ov090_021795c0 kind:bss addr:0x021795c0 -data_ov090_021795c4 kind:bss addr:0x021795c4 -sActorProfileUnkE3GL kind:bss addr:0x021795d0 -data_ov090_0217960c kind:bss addr:0x0217960c -data_ov090_02179610 kind:bss addr:0x02179610 -sActorProfileUnkE3TT kind:bss addr:0x0217961c -data_ov090_02179658 kind:bss addr:0x02179658 -data_ov090_0217965c kind:bss addr:0x0217965c -sActorProfileUnkE3ST kind:bss addr:0x02179668 -data_ov090_021796a4 kind:bss addr:0x021796a4 -data_ov090_021796a8 kind:bss addr:0x021796a8 -sMapObjectProfileUnkTWPG kind:bss addr:0x021796b4 +_ZGVN15ProfileInstanceI19ActorProfileUnkSPIDE8sProfileE kind:bss addr:0x021794d0 +@34127 kind:bss addr:0x021794dc +_ZN15ProfileInstanceI19ActorProfileUnkSPIDE8sProfileE kind:bss addr:0x021794e8 +_ZGVN15ProfileInstanceI19ActorProfileUnkE3GLE8sProfileE kind:bss addr:0x021795c0 +@34133 kind:bss addr:0x021795c4 +_ZN15ProfileInstanceI19ActorProfileUnkE3GLE8sProfileE kind:bss addr:0x021795d0 +_ZGVN15ProfileInstanceI19ActorProfileUnkE3TTE8sProfileE kind:bss addr:0x0217960c +@34139 kind:bss addr:0x02179610 +_ZN15ProfileInstanceI19ActorProfileUnkE3TTE8sProfileE kind:bss addr:0x0217961c +_ZGVN15ProfileInstanceI19ActorProfileUnkE3STE8sProfileE kind:bss addr:0x02179658 +@34145 kind:bss addr:0x0217965c +_ZN15ProfileInstanceI19ActorProfileUnkE3STE8sProfileE kind:bss addr:0x02179668 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTWPGE8sProfileE kind:bss addr:0x021796a4 +@33469 kind:bss addr:0x021796a8 +_ZN15ProfileInstanceI23MapObjectProfileUnkTWPGE8sProfileE kind:bss addr:0x021796b4 data_ov090_021796d4 kind:bss addr:0x021796d4 -data_ov090_02179788 kind:bss addr:0x02179788 -data_ov090_0217978c kind:bss addr:0x0217978c -sMapObjectProfileUnkTWGS kind:bss addr:0x02179798 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTWGSE8sProfileE kind:bss addr:0x02179788 +@33475 kind:bss addr:0x0217978c +_ZN15ProfileInstanceI23MapObjectProfileUnkTWGSE8sProfileE kind:bss addr:0x02179798 data_ov090_021797b8 kind:bss addr:0x021797b8 data_ov090_0217986c kind:bss addr:0x0217986c -data_ov090_02179890 kind:bss addr:0x02179890 -data_ov090_02179894 kind:bss addr:0x02179894 -sMapObjectProfileUnkTWPC kind:bss addr:0x021798a0 -data_ov090_021798c0 kind:bss addr:0x021798c0 -data_ov090_021798c8 kind:bss addr:0x021798c8 -sMapObjectProfileUnkSTTR kind:bss addr:0x021798d4 -data_ov090_021798f4 kind:bss addr:0x021798f4 -data_ov090_021798f8 kind:bss addr:0x021798f8 -sMapObjectProfileUnkTRGW kind:bss addr:0x02179904 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTWPCE8sProfileE kind:bss addr:0x02179890 +@33481 kind:bss addr:0x02179894 +_ZN15ProfileInstanceI23MapObjectProfileUnkTWPCE8sProfileE kind:bss addr:0x021798a0 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkSTTRE8sProfileE kind:bss addr:0x021798c0 +@33487 kind:bss addr:0x021798c8 +_ZN15ProfileInstanceI23MapObjectProfileUnkSTTRE8sProfileE kind:bss addr:0x021798d4 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRGWE8sProfileE kind:bss addr:0x021798f4 +@33493 kind:bss addr:0x021798f8 +_ZN15ProfileInstanceI23MapObjectProfileUnkTRGWE8sProfileE kind:bss addr:0x02179904 data_ov090_021799d8 kind:bss addr:0x021799d8 -data_ov090_021799f8 kind:bss addr:0x021799f8 -data_ov090_021799fc kind:bss addr:0x021799fc -sMapObjectProfileUnkTRSD kind:bss addr:0x02179a08 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRSDE8sProfileE kind:bss addr:0x021799f8 +@33499 kind:bss addr:0x021799fc +_ZN15ProfileInstanceI23MapObjectProfileUnkTRSDE8sProfileE kind:bss addr:0x02179a08 data_ov090_02179adc kind:bss addr:0x02179adc -data_ov090_02179afc kind:bss addr:0x02179afc -data_ov090_02179b00 kind:bss addr:0x02179b00 -sMapObjectProfileUnkNPST kind:bss addr:0x02179b0c +_ZGVN15ProfileInstanceI23MapObjectProfileUnkNPSTE8sProfileE kind:bss addr:0x02179afc +@33505 kind:bss addr:0x02179b00 +_ZN15ProfileInstanceI23MapObjectProfileUnkNPSTE8sProfileE kind:bss addr:0x02179b0c data_ov090_02179b2c kind:bss addr:0x02179b2c data_ov090_02179be0 kind:bss addr:0x02179be0 -data_ov090_02179c00 kind:bss addr:0x02179c00 -data_ov090_02179c04 kind:bss addr:0x02179c04 -sMapObjectProfileUnkRBRC kind:bss addr:0x02179c10 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkRBRCE8sProfileE kind:bss addr:0x02179c00 +@33511 kind:bss addr:0x02179c04 +_ZN15ProfileInstanceI23MapObjectProfileUnkRBRCE8sProfileE kind:bss addr:0x02179c10 data_ov090_02179c54 kind:bss addr:0x02179c54 -data_ov090_02179c58 kind:bss addr:0x02179c58 -data_ov090_02179c5c kind:bss addr:0x02179c5c ambiguous -sMapObjectProfileUnkTRMR kind:bss addr:0x02179c64 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRMRE8sProfileE kind:bss addr:0x02179c58 +@33517 kind:bss addr:0x02179c5c ambiguous +_ZN15ProfileInstanceI23MapObjectProfileUnkTRMRE8sProfileE kind:bss addr:0x02179c64 data_ov090_02179d38 kind:bss addr:0x02179d38 -data_ov090_02179d58 kind:bss addr:0x02179d58 -data_ov090_02179d5c kind:bss addr:0x02179d5c -sMapObjectProfileUnkRBMR kind:bss addr:0x02179d68 -data_ov090_02179dac kind:bss addr:0x02179dac -data_ov090_02179db0 kind:bss addr:0x02179db0 -sMapObjectProfileUnkTRDT kind:bss addr:0x02179dbc +_ZGVN15ProfileInstanceI23MapObjectProfileUnkRBMRE8sProfileE kind:bss addr:0x02179d58 +@33523 kind:bss addr:0x02179d5c +_ZN15ProfileInstanceI23MapObjectProfileUnkRBMRE8sProfileE kind:bss addr:0x02179d68 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRDTE8sProfileE kind:bss addr:0x02179dac +@33529 kind:bss addr:0x02179db0 +_ZN15ProfileInstanceI23MapObjectProfileUnkTRDTE8sProfileE kind:bss addr:0x02179dbc data_ov090_02179e90 kind:bss addr:0x02179e90 -data_ov090_02179eb0 kind:bss addr:0x02179eb0 -data_ov090_02179eb4 kind:bss addr:0x02179eb4 -sMapObjectProfileUnkTRCC kind:bss addr:0x02179ec0 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRCCE8sProfileE kind:bss addr:0x02179eb0 +@33535 kind:bss addr:0x02179eb4 +_ZN15ProfileInstanceI23MapObjectProfileUnkTRCCE8sProfileE kind:bss addr:0x02179ec0 data_ov090_02179f94 kind:bss addr:0x02179f94 data_ov090_02179fa0 kind:bss addr:0x02179fa0 ambiguous data_ov090_02179fb4 kind:bss addr:0x02179fb4 data_ov090_02179fb8 kind:bss addr:0x02179fb8 -sMapObjectProfileUnkETNM kind:bss addr:0x02179fc4 +_ZN15ProfileInstanceI23MapObjectProfileUnkETNME8sProfileE kind:bss addr:0x02179fc4 diff --git a/config/jp/arm9/overlays/ov091/delinks.txt b/config/jp/arm9/overlays/ov091/delinks.txt index a36a60e1..09f340e8 100644 --- a/config/jp/arm9/overlays/ov091/delinks.txt +++ b/config/jp/arm9/overlays/ov091/delinks.txt @@ -9,103 +9,103 @@ src/091_TrainExtra/MapObject/MapObjectUnkFRSH.cpp: .text start:0x02169c04 end:0x02169d78 .init start:0x02178c24 end:0x02178c74 .ctor start:0x02179294 end:0x02179298 - .bss start:0x0217a454 end:0x0217a4d4 + .bss start:0x0217a444 end:0x0217a528 src/091_TrainExtra/MapObject/MapObjectUnkMZFX.cpp: .text start:0x02169d78 end:0x02169f20 .init start:0x02178c74 end:0x02178cc4 .ctor start:0x02179298 end:0x0217929c - .bss start:0x0217a538 end:0x0217a55c + .bss start:0x0217a528 end:0x0217a55c src/091_TrainExtra/MapObject/MapObjectUnkMZTR.cpp: .text start:0x02169f20 end:0x0216a26c .init start:0x02178cc4 end:0x02178d14 .ctor start:0x0217929c end:0x021792a0 - .bss start:0x0217a56c end:0x0217a57c + .bss start:0x0217a55c end:0x0217a648 src/091_TrainExtra/MapObject/MapObjectUnkTMSB.cpp: .text start:0x0216a26c end:0x0216a830 .init start:0x02178d14 end:0x02178d84 .ctor start:0x021792a0 end:0x021792a4 - .bss start:0x0217a660 end:0x0217a734 + .bss start:0x0217a648 end:0x0217a738 src/091_TrainExtra/MapObject/MapObjectUnkETUS.cpp: .text start:0x0216a830 end:0x0216aa78 .init start:0x02178d84 end:0x02178dd4 .ctor start:0x021792a4 end:0x021792a8 - .bss start:0x0217a744 end:0x0217a748 + .bss start:0x0217a738 end:0x0217a818 src/091_TrainExtra/MapObject/MapObjectUnkBOGN.cpp: .text start:0x0216aa78 end:0x0216ae68 .init start:0x02178dd4 end:0x02178e24 .ctor start:0x021792a8 end:0x021792ac - .bss start:0x0217a828 end:0x0217a848 + .bss start:0x0217a818 end:0x0217a848 src/091_TrainExtra/Actor/ActorUnkMZCT.cpp: .text start:0x0216ae68 end:0x0216be60 .init start:0x02178e24 end:0x02178e74 .ctor start:0x021792ac end:0x021792b0 - .bss start:0x0217a858 end:0x0217a904 + .bss start:0x0217a848 end:0x0217a930 src/091_TrainExtra/Actor/ActorUnkSMCT.cpp: .text start:0x0216be60 end:0x0216c03c .init start:0x02178e74 end:0x02178ec4 .ctor start:0x021792b0 end:0x021792b4 - .bss start:0x0217a940 end:0x0217a97c + .bss start:0x0217a930 end:0x0217a97c src/091_TrainExtra/Actor/ActorUnkSTCT.cpp: .text start:0x0216c03c end:0x0216c1d8 .init start:0x02178ec4 end:0x02178f14 .ctor start:0x021792b4 end:0x021792b8 - .bss start:0x0217a98c end:0x0217aa64 + .bss start:0x0217a97c end:0x0217aa68 src/091_TrainExtra/Actor/ActorUnkCTFS.cpp: .text start:0x0216c1d8 end:0x0216d588 .init start:0x02178f14 end:0x02178f8c .ctor start:0x021792b8 end:0x021792bc - .bss start:0x0217aa80 end:0x0217ab58 + .bss start:0x0217aa68 end:0x0217ab60 src/091_TrainExtra/Actor/ActorUnkNLTR.cpp: .text start:0x0216d588 end:0x0216e278 .init start:0x02178f8c end:0x02178fdc .ctor start:0x021792bc end:0x021792c0 - .bss start:0x0217ab7c end:0x0217ac54 + .bss start:0x0217ab60 end:0x0217acdc src/091_TrainExtra/Actor/ActorUnkSEFS.cpp: .text start:0x0216e278 end:0x0216fc28 .init start:0x02178fdc end:0x0217905c .ctor start:0x021792c0 end:0x021792c4 - .bss start:0x0217ad10 end:0x0217ade8 + .bss start:0x0217acdc end:0x0217ae00 src/091_TrainExtra/Actor/ActorUnkTPDO.cpp: .text start:0x0216fc28 end:0x02170904 .init start:0x0217905c end:0x021790ac .ctor start:0x021792c4 end:0x021792c8 - .bss start:0x0217ae20 end:0x0217aef8 + .bss start:0x0217ae00 end:0x0217aef8 src/091_TrainExtra/Actor/ActorUnkBMOC.cpp: .text start:0x02170904 end:0x02171194 .init start:0x021790ac end:0x021790fc .ctor start:0x021792c8 end:0x021792cc - .bss start:0x0217af08 end:0x0217afe0 + .bss start:0x0217aef8 end:0x0217afe0 src/091_TrainExtra/Actor/ActorUnkTSMT.cpp: .text start:0x02171194 end:0x02171300 .init start:0x021790fc end:0x0217914c .ctor start:0x021792cc end:0x021792d0 - .bss start:0x0217aff4 end:0x0217b030 + .bss start:0x0217afe0 end:0x0217b030 src/091_TrainExtra/Actor/ActorUnkTTKB.cpp: .text start:0x02171300 end:0x02177a88 .init start:0x0217914c end:0x021791d4 .ctor start:0x021792d0 end:0x021792d4 - .bss start:0x0217b040 end:0x0217b084 + .bss start:0x0217b030 end:0x0217b118 src/091_TrainExtra/Actor/ActorUnkTTUT.cpp: .text start:0x02177a88 end:0x02177f74 .init start:0x021791d4 end:0x02179224 .ctor start:0x021792d4 end:0x021792d8 - .bss start:0x0217b128 end:0x0217b164 + .bss start:0x0217b118 end:0x0217b164 src/091_TrainExtra/Actor/ActorUnkTRIC.cpp: .text start:0x02177f74 end:0x02178af4 diff --git a/config/jp/arm9/overlays/ov091/symbols.txt b/config/jp/arm9/overlays/ov091/symbols.txt index 56c4ffde..53b9ddd6 100644 --- a/config/jp/arm9/overlays/ov091/symbols.txt +++ b/config/jp/arm9/overlays/ov091/symbols.txt @@ -577,53 +577,53 @@ data_ov091_0217a374 kind:bss addr:0x0217a374 data_ov091_0217a37c kind:bss addr:0x0217a37c ambiguous data_ov091_0217a3dc kind:bss addr:0x0217a3dc data_ov091_0217a428 kind:bss addr:0x0217a428 ambiguous -data_ov091_0217a444 kind:bss addr:0x0217a444 -data_ov091_0217a448 kind:bss addr:0x0217a448 -sMapObjectProfileUnkFRSH kind:bss addr:0x0217a454 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkFRSHE8sProfileE kind:bss addr:0x0217a444 +@33552 kind:bss addr:0x0217a448 +_ZN15ProfileInstanceI23MapObjectProfileUnkFRSHE8sProfileE kind:bss addr:0x0217a454 data_ov091_0217a4d4 kind:bss addr:0x0217a4d4 ambiguous -data_ov091_0217a528 kind:bss addr:0x0217a528 -data_ov091_0217a52c kind:bss addr:0x0217a52c -sMapObjectProfileUnkMZFX kind:bss addr:0x0217a538 -data_ov091_0217a55c kind:bss addr:0x0217a55c -data_ov091_0217a560 kind:bss addr:0x0217a560 -sMapObjectProfileUnkMZTR kind:bss addr:0x0217a56c +_ZGVN15ProfileInstanceI23MapObjectProfileUnkMZFXE8sProfileE kind:bss addr:0x0217a528 +@33558 kind:bss addr:0x0217a52c +_ZN15ProfileInstanceI23MapObjectProfileUnkMZFXE8sProfileE kind:bss addr:0x0217a538 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkMZTRE8sProfileE kind:bss addr:0x0217a55c +@33564 kind:bss addr:0x0217a560 +_ZN15ProfileInstanceI23MapObjectProfileUnkMZTRE8sProfileE kind:bss addr:0x0217a56c data_ov091_0217a57c kind:bss addr:0x0217a57c ambiguous data_ov091_0217a640 kind:bss addr:0x0217a640 -data_ov091_0217a648 kind:bss addr:0x0217a648 -data_ov091_0217a654 kind:bss addr:0x0217a654 -sMapObjectProfileUnkTMSB kind:bss addr:0x0217a660 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTMSBE8sProfileE kind:bss addr:0x0217a648 +@33570 kind:bss addr:0x0217a654 +_ZN15ProfileInstanceI23MapObjectProfileUnkTMSBE8sProfileE kind:bss addr:0x0217a660 data_ov091_0217a734 kind:bss addr:0x0217a734 -data_ov091_0217a738 kind:bss addr:0x0217a738 -data_ov091_0217a740 kind:bss addr:0x0217a740 ambiguous -sMapObjectProfileUnkETUS kind:bss addr:0x0217a744 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkETUSE8sProfileE kind:bss addr:0x0217a738 +@33576 kind:bss addr:0x0217a740 ambiguous +_ZN15ProfileInstanceI23MapObjectProfileUnkETUSE8sProfileE kind:bss addr:0x0217a744 data_ov091_0217a748 kind:bss addr:0x0217a748 ambiguous data_ov091_0217a75c kind:bss addr:0x0217a75c ambiguous data_ov091_0217a764 kind:bss addr:0x0217a764 ambiguous data_ov091_0217a768 kind:bss addr:0x0217a768 ambiguous data_ov091_0217a76c kind:bss addr:0x0217a76c ambiguous data_ov091_0217a7f0 kind:bss addr:0x0217a7f0 ambiguous -data_ov091_0217a818 kind:bss addr:0x0217a818 -data_ov091_0217a81c kind:bss addr:0x0217a81c -sMapObjectProfileUnkBOGN kind:bss addr:0x0217a828 -data_ov091_0217a848 kind:bss addr:0x0217a848 -data_ov091_0217a84c kind:bss addr:0x0217a84c -sActorProfileUnkMZCT kind:bss addr:0x0217a858 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkBOGNE8sProfileE kind:bss addr:0x0217a818 +@33582 kind:bss addr:0x0217a81c +_ZN15ProfileInstanceI23MapObjectProfileUnkBOGNE8sProfileE kind:bss addr:0x0217a828 +_ZGVN15ProfileInstanceI19ActorProfileUnkMZCTE8sProfileE kind:bss addr:0x0217a848 +@34270 kind:bss addr:0x0217a84c +_ZN15ProfileInstanceI19ActorProfileUnkMZCTE8sProfileE kind:bss addr:0x0217a858 data_ov091_0217a904 kind:bss addr:0x0217a904 ambiguous -data_ov091_0217a930 kind:bss addr:0x0217a930 -data_ov091_0217a934 kind:bss addr:0x0217a934 -sActorProfileUnkSMCT kind:bss addr:0x0217a940 -data_ov091_0217a97c kind:bss addr:0x0217a97c -data_ov091_0217a980 kind:bss addr:0x0217a980 -sActorProfileUnkSTCT kind:bss addr:0x0217a98c +_ZGVN15ProfileInstanceI19ActorProfileUnkSMCTE8sProfileE kind:bss addr:0x0217a930 +@34276 kind:bss addr:0x0217a934 +_ZN15ProfileInstanceI19ActorProfileUnkSMCTE8sProfileE kind:bss addr:0x0217a940 +_ZGVN15ProfileInstanceI19ActorProfileUnkSTCTE8sProfileE kind:bss addr:0x0217a97c +@34282 kind:bss addr:0x0217a980 +_ZN15ProfileInstanceI19ActorProfileUnkSTCTE8sProfileE kind:bss addr:0x0217a98c data_ov091_0217aa64 kind:bss addr:0x0217aa64 -data_ov091_0217aa68 kind:bss addr:0x0217aa68 -data_ov091_0217aa74 kind:bss addr:0x0217aa74 -sActorProfileUnkCTFS kind:bss addr:0x0217aa80 +_ZGVN15ProfileInstanceI19ActorProfileUnkCTFSE8sProfileE kind:bss addr:0x0217aa68 +@34288 kind:bss addr:0x0217aa74 +_ZN15ProfileInstanceI19ActorProfileUnkCTFSE8sProfileE kind:bss addr:0x0217aa80 data_ov091_0217ab58 kind:bss addr:0x0217ab58 data_ov091_0217ab5c kind:bss addr:0x0217ab5c -data_ov091_0217ab60 kind:bss addr:0x0217ab60 -data_ov091_0217ab6c kind:bss addr:0x0217ab6c -sActorProfileUnkNLTR kind:bss addr:0x0217ab7c +_ZGVN15ProfileInstanceI19ActorProfileUnkNLTRE8sProfileE kind:bss addr:0x0217ab60 +@34294 kind:bss addr:0x0217ab6c +_ZN15ProfileInstanceI19ActorProfileUnkNLTRE8sProfileE kind:bss addr:0x0217ab7c data_ov091_0217ac54 kind:bss addr:0x0217ac54 data_ov091_0217ac58 kind:bss addr:0x0217ac58 data_ov091_0217ac68 kind:bss addr:0x0217ac68 @@ -633,29 +633,29 @@ data_ov091_0217ac8c kind:bss addr:0x0217ac8c data_ov091_0217ac98 kind:bss addr:0x0217ac98 data_ov091_0217aca4 kind:bss addr:0x0217aca4 data_ov091_0217acb0 kind:bss addr:0x0217acb0 -data_ov091_0217acdc kind:bss addr:0x0217acdc -data_ov091_0217ace8 kind:bss addr:0x0217ace8 -sActorProfileUnkSEFS kind:bss addr:0x0217ad10 +_ZGVN15ProfileInstanceI19ActorProfileUnkSEFSE8sProfileE kind:bss addr:0x0217acdc +@34300 kind:bss addr:0x0217ace8 +_ZN15ProfileInstanceI19ActorProfileUnkSEFSE8sProfileE kind:bss addr:0x0217ad10 data_ov091_0217ade8 kind:bss addr:0x0217ade8 data_ov091_0217adec kind:bss addr:0x0217adec data_ov091_0217adf0 kind:bss addr:0x0217adf0 data_ov091_0217adfc kind:bss addr:0x0217adfc -data_ov091_0217ae00 kind:bss addr:0x0217ae00 -data_ov091_0217ae10 kind:bss addr:0x0217ae10 -sActorProfileUnkTPDO kind:bss addr:0x0217ae20 -data_ov091_0217aef8 kind:bss addr:0x0217aef8 -data_ov091_0217aefc kind:bss addr:0x0217aefc -sActorProfileUnkBMOC kind:bss addr:0x0217af08 -data_ov091_0217afe0 kind:bss addr:0x0217afe0 -data_ov091_0217afe8 kind:bss addr:0x0217afe8 -sActorProfileUnkTSMT kind:bss addr:0x0217aff4 -data_ov091_0217b030 kind:bss addr:0x0217b030 -data_ov091_0217b034 kind:bss addr:0x0217b034 -sActorProfileUnkTTKB kind:bss addr:0x0217b040 +_ZGVN15ProfileInstanceI19ActorProfileUnkTPDOE8sProfileE kind:bss addr:0x0217ae00 +@34306 kind:bss addr:0x0217ae10 +_ZN15ProfileInstanceI19ActorProfileUnkTPDOE8sProfileE kind:bss addr:0x0217ae20 +_ZGVN15ProfileInstanceI19ActorProfileUnkBMOCE8sProfileE kind:bss addr:0x0217aef8 +@34312 kind:bss addr:0x0217aefc +_ZN15ProfileInstanceI19ActorProfileUnkBMOCE8sProfileE kind:bss addr:0x0217af08 +_ZGVN15ProfileInstanceI19ActorProfileUnkTSMTE8sProfileE kind:bss addr:0x0217afe0 +@34318 kind:bss addr:0x0217afe8 +_ZN15ProfileInstanceI19ActorProfileUnkTSMTE8sProfileE kind:bss addr:0x0217aff4 +_ZGVN15ProfileInstanceI19ActorProfileUnkTTKBE8sProfileE kind:bss addr:0x0217b030 +@34324 kind:bss addr:0x0217b034 +_ZN15ProfileInstanceI19ActorProfileUnkTTKBE8sProfileE kind:bss addr:0x0217b040 data_ov091_0217b084 kind:bss addr:0x0217b084 ambiguous -data_ov091_0217b118 kind:bss addr:0x0217b118 -data_ov091_0217b11c kind:bss addr:0x0217b11c -sActorProfileUnkTTUT kind:bss addr:0x0217b128 +_ZGVN15ProfileInstanceI19ActorProfileUnkTTUTE8sProfileE kind:bss addr:0x0217b118 +@34330 kind:bss addr:0x0217b11c +_ZN15ProfileInstanceI19ActorProfileUnkTTUTE8sProfileE kind:bss addr:0x0217b128 data_ov091_0217b164 kind:bss addr:0x0217b164 data_ov091_0217b168 kind:bss addr:0x0217b168 -sActorProfileUnkTRIC kind:bss addr:0x0217b174 +_ZN15ProfileInstanceI19ActorProfileUnkTRICE8sProfileE kind:bss addr:0x0217b174 diff --git a/config/jp/arm9/overlays/ov092/delinks.txt b/config/jp/arm9/overlays/ov092/delinks.txt index 41338859..f3a76bfe 100644 --- a/config/jp/arm9/overlays/ov092/delinks.txt +++ b/config/jp/arm9/overlays/ov092/delinks.txt @@ -9,130 +9,130 @@ src/092_TrainDark/MapObject/MapObjectUnkTDBP.cpp: .text start:0x02168680 end:0x02168850 .init start:0x0217d180 end:0x0217d1d0 .ctor start:0x0217ddac end:0x0217ddb0 - .bss start:0x0217f490 end:0x0217f564 + .bss start:0x0217f480 end:0x0217f564 src/092_TrainDark/MapObject/MapObjectUnkTDBR.cpp: .text start:0x02168850 end:0x02168a18 .init start:0x0217d1d0 end:0x0217d220 .ctor start:0x0217ddb0 end:0x0217ddb4 - .bss start:0x0217f574 end:0x0217f648 + .bss start:0x0217f564 end:0x0217f648 src/092_TrainDark/MapObject/MapObjectUnkTDDR.cpp: .text start:0x02168a18 end:0x02168cb8 .init start:0x0217d220 end:0x0217d270 .ctor start:0x0217ddb4 end:0x0217ddb8 - .bss start:0x0217f658 end:0x0217f72c + .bss start:0x0217f648 end:0x0217f72c src/092_TrainDark/MapObject/MapObjectUnkETET.cpp: .text start:0x02168cb8 end:0x02169124 .init start:0x0217d270 end:0x0217d2c0 .ctor start:0x0217ddb8 end:0x0217ddbc - .bss start:0x0217f73c end:0x0217f75c + .bss start:0x0217f72c end:0x0217f810 src/092_TrainDark/MapObject/MapObjectUnkETFD.cpp: .text start:0x02169124 end:0x02169550 .init start:0x0217d2c0 end:0x0217d310 .ctor start:0x0217ddbc end:0x0217ddc0 - .bss start:0x0217f820 end:0x0217f840 + .bss start:0x0217f810 end:0x0217f840 src/092_TrainDark/MapObject/MapObjectUnkETMW.cpp: .text start:0x02169550 end:0x0216983c .init start:0x0217d310 end:0x0217d360 .ctor start:0x0217ddc0 end:0x0217ddc4 - .bss start:0x0217f850 end:0x0217f870 + .bss start:0x0217f840 end:0x0217f924 src/092_TrainDark/MapObject/MapObjectUnkETYG.cpp: .text start:0x0216983c end:0x02169d54 .init start:0x0217d360 end:0x0217d3b0 .ctor start:0x0217ddc4 end:0x0217ddc8 - .bss start:0x0217f934 end:0x0217f954 + .bss start:0x0217f924 end:0x0217fa08 src/092_TrainDark/MapObject/MapObjectUnkTBSD.cpp: .text start:0x02169d54 end:0x02169ff4 .init start:0x0217d3b0 end:0x0217d400 .ctor start:0x0217ddc8 end:0x0217ddcc - .bss start:0x0217fa18 end:0x0217faec + .bss start:0x0217fa08 end:0x0217fb0c src/092_TrainDark/MapObject/MapObjectUnkTRDR.cpp: .text start:0x02169ff4 end:0x0216a314 .init start:0x0217d400 end:0x0217d450 .ctor start:0x0217ddcc end:0x0217ddd0 - .bss start:0x0217fb1c end:0x0217fbf0 + .bss start:0x0217fb0c end:0x0217fc10 src/092_TrainDark/MapObject/MapObjectUnkETDD.cpp: .text start:0x0216a314 end:0x0216a648 .init start:0x0217d450 end:0x0217d4a0 .ctor start:0x0217ddd0 end:0x0217ddd4 - .bss start:0x0217fc20 end:0x0217fc40 + .bss start:0x0217fc10 end:0x0217fc74 src/092_TrainDark/Actor/ActorUnkMATR.cpp: .text start:0x0216af1c end:0x02171a38 .init start:0x0217d4a0 end:0x0217d818 .ctor start:0x0217ddd4 end:0x0217ddd8 - .bss start:0x0217fc8c end:0x0217fd64 + .bss start:0x0217fc74 end:0x0217fd64 src/092_TrainDark/Actor/ActorUnkMTWP.cpp: .text start:0x02171a38 end:0x02172694 .init start:0x0217d818 end:0x0217d868 .ctor start:0x0217ddd8 end:0x0217dddc - .bss start:0x0217fd74 end:0x0217fdb0 + .bss start:0x0217fd64 end:0x0217fdb4 src/092_TrainDark/Actor/ActorUnkMTFL.cpp: .text start:0x02172694 end:0x02173f08 .init start:0x0217d868 end:0x0217d930 .ctor start:0x0217dddc end:0x0217dde0 - .bss start:0x0217fdd4 end:0x0217feac + .bss start:0x0217fdb4 end:0x0217feb0 src/092_TrainDark/Actor/ActorUnkMTFB.cpp: .text start:0x02173f08 end:0x02175998 .init start:0x0217d930 end:0x0217d9f8 .ctor start:0x0217dde0 end:0x0217dde4 - .bss start:0x0217fed4 end:0x0217ffac + .bss start:0x0217feb0 end:0x0217ffac src/092_TrainDark/Actor/ActorUnkMBCC.cpp: .text start:0x02175998 end:0x021768b4 .init start:0x0217d9f8 end:0x0217dac8 .ctor start:0x0217dde4 end:0x0217dde8 - .bss start:0x0217ffbc end:0x02180048 + .bss start:0x0217ffac end:0x02180094 src/092_TrainDark/Actor/ActorUnkMABC.cpp: .text start:0x021768b4 end:0x021775f0 .init start:0x0217dac8 end:0x0217db18 .ctor start:0x0217dde8 end:0x0217ddec - .bss start:0x021800a4 end:0x0218017c + .bss start:0x02180094 end:0x0218017c src/092_TrainDark/Actor/ActorUnkMARG.cpp: .text start:0x021775f0 end:0x02178ea4 .init start:0x0217db18 end:0x0217dbe0 .ctor start:0x0217ddec end:0x0217ddf0 - .bss start:0x0218018c end:0x02180264 + .bss start:0x0218017c end:0x02180268 src/092_TrainDark/Actor/ActorUnkMAFI.cpp: .text start:0x02178ea4 end:0x021794a0 .init start:0x0217dbe0 end:0x0217dc3c .ctor start:0x0217ddf0 end:0x0217ddf4 - .bss start:0x02180280 end:0x02180358 + .bss start:0x02180268 end:0x0218035c src/092_TrainDark/Actor/ActorUnkTDKT.cpp: .text start:0x021794a0 end:0x0217a168 .init start:0x0217dc3c end:0x0217dc8c .ctor start:0x0217ddf4 end:0x0217ddf8 - .bss start:0x0218036c end:0x021803a8 + .bss start:0x0218035c end:0x021803a8 src/092_TrainDark/Actor/ActorUnkTEVT.cpp: .text start:0x0217a168 end:0x0217a904 .init start:0x0217dc8c end:0x0217dcf0 .ctor start:0x0217ddf8 end:0x0217ddfc - .bss start:0x021803bc end:0x021803f8 + .bss start:0x021803a8 end:0x021803f8 src/092_TrainDark/Actor/ActorUnkSZKL.cpp: .text start:0x0217a904 end:0x0217b084 .init start:0x0217dcf0 end:0x0217dd40 .ctor start:0x0217ddfc end:0x0217de00 - .bss start:0x02180408 end:0x021804e0 + .bss start:0x021803f8 end:0x021804e8 src/092_TrainDark/Actor/ActorUnkDKCB.cpp: .text start:0x0217b084 end:0x0217bbc8 .init start:0x0217dd40 end:0x0217dd90 .ctor start:0x0217de00 end:0x0217de04 - .bss start:0x021804f8 end:0x02180534 + .bss start:0x021804e8 end:0x02180534 diff --git a/config/jp/arm9/overlays/ov092/symbols.txt b/config/jp/arm9/overlays/ov092/symbols.txt index 51824b49..f43c7839 100644 --- a/config/jp/arm9/overlays/ov092/symbols.txt +++ b/config/jp/arm9/overlays/ov092/symbols.txt @@ -796,87 +796,87 @@ _ZTV19data_ov092_0217f394 kind:data(any) addr:0x0217f394 data_ov092_0217f400 kind:data(any) addr:0x0217f400 data_ov092_0217f444 kind:data(any) addr:0x0217f444 data_ov092_0217f464 kind:data(any) addr:0x0217f464 -data_ov092_0217f480 kind:bss addr:0x0217f480 -data_ov092_0217f484 kind:bss addr:0x0217f484 -sMapObjectProfileUnkTDBP kind:bss addr:0x0217f490 -data_ov092_0217f564 kind:bss addr:0x0217f564 -data_ov092_0217f568 kind:bss addr:0x0217f568 -sMapObjectProfileUnkTDBR kind:bss addr:0x0217f574 -data_ov092_0217f648 kind:bss addr:0x0217f648 -data_ov092_0217f64c kind:bss addr:0x0217f64c -sMapObjectProfileUnkTDDR kind:bss addr:0x0217f658 -data_ov092_0217f72c kind:bss addr:0x0217f72c -data_ov092_0217f730 kind:bss addr:0x0217f730 -sMapObjectProfileUnkETET kind:bss addr:0x0217f73c +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTDBPE8sProfileE kind:bss addr:0x0217f480 +@33665 kind:bss addr:0x0217f484 +_ZN15ProfileInstanceI23MapObjectProfileUnkTDBPE8sProfileE kind:bss addr:0x0217f490 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTDBRE8sProfileE kind:bss addr:0x0217f564 +@33671 kind:bss addr:0x0217f568 +_ZN15ProfileInstanceI23MapObjectProfileUnkTDBRE8sProfileE kind:bss addr:0x0217f574 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTDDRE8sProfileE kind:bss addr:0x0217f648 +@33677 kind:bss addr:0x0217f64c +_ZN15ProfileInstanceI23MapObjectProfileUnkTDDRE8sProfileE kind:bss addr:0x0217f658 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkETETE8sProfileE kind:bss addr:0x0217f72c +@33683 kind:bss addr:0x0217f730 +_ZN15ProfileInstanceI23MapObjectProfileUnkETETE8sProfileE kind:bss addr:0x0217f73c data_ov092_0217f75c kind:bss addr:0x0217f75c -data_ov092_0217f810 kind:bss addr:0x0217f810 -data_ov092_0217f814 kind:bss addr:0x0217f814 -sMapObjectProfileUnkETFD kind:bss addr:0x0217f820 -data_ov092_0217f840 kind:bss addr:0x0217f840 -data_ov092_0217f844 kind:bss addr:0x0217f844 -sMapObjectProfileUnkETMW kind:bss addr:0x0217f850 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkETFDE8sProfileE kind:bss addr:0x0217f810 +@33689 kind:bss addr:0x0217f814 +_ZN15ProfileInstanceI23MapObjectProfileUnkETFDE8sProfileE kind:bss addr:0x0217f820 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkETMWE8sProfileE kind:bss addr:0x0217f840 +@33695 kind:bss addr:0x0217f844 +_ZN15ProfileInstanceI23MapObjectProfileUnkETMWE8sProfileE kind:bss addr:0x0217f850 data_ov092_0217f870 kind:bss addr:0x0217f870 -data_ov092_0217f924 kind:bss addr:0x0217f924 -data_ov092_0217f928 kind:bss addr:0x0217f928 -sMapObjectProfileUnkETYG kind:bss addr:0x0217f934 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkETYGE8sProfileE kind:bss addr:0x0217f924 +@33701 kind:bss addr:0x0217f928 +_ZN15ProfileInstanceI23MapObjectProfileUnkETYGE8sProfileE kind:bss addr:0x0217f934 data_ov092_0217f954 kind:bss addr:0x0217f954 -data_ov092_0217fa08 kind:bss addr:0x0217fa08 -data_ov092_0217fa0c kind:bss addr:0x0217fa0c -sMapObjectProfileUnkTBSD kind:bss addr:0x0217fa18 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTBSDE8sProfileE kind:bss addr:0x0217fa08 +@33707 kind:bss addr:0x0217fa0c +_ZN15ProfileInstanceI23MapObjectProfileUnkTBSDE8sProfileE kind:bss addr:0x0217fa18 data_ov092_0217faec kind:bss addr:0x0217faec -data_ov092_0217fb0c kind:bss addr:0x0217fb0c -data_ov092_0217fb10 kind:bss addr:0x0217fb10 -sMapObjectProfileUnkTRDR kind:bss addr:0x0217fb1c +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTRDRE8sProfileE kind:bss addr:0x0217fb0c +@33713 kind:bss addr:0x0217fb10 +_ZN15ProfileInstanceI23MapObjectProfileUnkTRDRE8sProfileE kind:bss addr:0x0217fb1c data_ov092_0217fbf0 kind:bss addr:0x0217fbf0 -data_ov092_0217fc10 kind:bss addr:0x0217fc10 -data_ov092_0217fc14 kind:bss addr:0x0217fc14 -sMapObjectProfileUnkETDD kind:bss addr:0x0217fc20 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkETDDE8sProfileE kind:bss addr:0x0217fc10 +@33719 kind:bss addr:0x0217fc14 +_ZN15ProfileInstanceI23MapObjectProfileUnkETDDE8sProfileE kind:bss addr:0x0217fc20 data_ov092_0217fc40 kind:bss addr:0x0217fc40 data_ov092_0217fc44 kind:bss addr:0x0217fc44 data_ov092_0217fc50 kind:bss addr:0x0217fc50 data_ov092_0217fc68 kind:bss addr:0x0217fc68 -data_ov092_0217fc74 kind:bss addr:0x0217fc74 -data_ov092_0217fc80 kind:bss addr:0x0217fc80 -sActorProfileUnkMATR kind:bss addr:0x0217fc8c -data_ov092_0217fd64 kind:bss addr:0x0217fd64 -data_ov092_0217fd68 kind:bss addr:0x0217fd68 -sActorProfileUnkMTWP kind:bss addr:0x0217fd74 +_ZGVN15ProfileInstanceI19ActorProfileUnkMATRE8sProfileE kind:bss addr:0x0217fc74 +@34407 kind:bss addr:0x0217fc80 +_ZN15ProfileInstanceI19ActorProfileUnkMATRE8sProfileE kind:bss addr:0x0217fc8c +_ZGVN15ProfileInstanceI19ActorProfileUnkMTWPE8sProfileE kind:bss addr:0x0217fd64 +@34413 kind:bss addr:0x0217fd68 +_ZN15ProfileInstanceI19ActorProfileUnkMTWPE8sProfileE kind:bss addr:0x0217fd74 data_ov092_0217fdb0 kind:bss addr:0x0217fdb0 -data_ov092_0217fdb4 kind:bss addr:0x0217fdb4 -data_ov092_0217fdc0 kind:bss addr:0x0217fdc0 -sActorProfileUnkMTFL kind:bss addr:0x0217fdd4 +_ZGVN15ProfileInstanceI19ActorProfileUnkMTFLE8sProfileE kind:bss addr:0x0217fdb4 +@34419 kind:bss addr:0x0217fdc0 +_ZN15ProfileInstanceI19ActorProfileUnkMTFLE8sProfileE kind:bss addr:0x0217fdd4 data_ov092_0217feac kind:bss addr:0x0217feac -data_ov092_0217feb0 kind:bss addr:0x0217feb0 -data_ov092_0217febc kind:bss addr:0x0217febc -sActorProfileUnkMTFB kind:bss addr:0x0217fed4 -data_ov092_0217ffac kind:bss addr:0x0217ffac -data_ov092_0217ffb0 kind:bss addr:0x0217ffb0 -sActorProfileUnkMBCC kind:bss addr:0x0217ffbc +_ZGVN15ProfileInstanceI19ActorProfileUnkMTFBE8sProfileE kind:bss addr:0x0217feb0 +@34425 kind:bss addr:0x0217febc +_ZN15ProfileInstanceI19ActorProfileUnkMTFBE8sProfileE kind:bss addr:0x0217fed4 +_ZGVN15ProfileInstanceI19ActorProfileUnkMBCCE8sProfileE kind:bss addr:0x0217ffac +@34431 kind:bss addr:0x0217ffb0 +_ZN15ProfileInstanceI19ActorProfileUnkMBCCE8sProfileE kind:bss addr:0x0217ffbc data_ov092_02180048 kind:bss addr:0x02180048 ambiguous -data_ov092_02180094 kind:bss addr:0x02180094 -data_ov092_02180098 kind:bss addr:0x02180098 -sActorProfileUnkMABC kind:bss addr:0x021800a4 -data_ov092_0218017c kind:bss addr:0x0218017c -data_ov092_02180180 kind:bss addr:0x02180180 -sActorProfileUnkMARG kind:bss addr:0x0218018c +_ZGVN15ProfileInstanceI19ActorProfileUnkMABCE8sProfileE kind:bss addr:0x02180094 +@34437 kind:bss addr:0x02180098 +_ZN15ProfileInstanceI19ActorProfileUnkMABCE8sProfileE kind:bss addr:0x021800a4 +_ZGVN15ProfileInstanceI19ActorProfileUnkMARGE8sProfileE kind:bss addr:0x0218017c +@34443 kind:bss addr:0x02180180 +_ZN15ProfileInstanceI19ActorProfileUnkMARGE8sProfileE kind:bss addr:0x0218018c data_ov092_02180264 kind:bss addr:0x02180264 -data_ov092_02180268 kind:bss addr:0x02180268 -data_ov092_02180274 kind:bss addr:0x02180274 -sActorProfileUnkMAFI kind:bss addr:0x02180280 +_ZGVN15ProfileInstanceI19ActorProfileUnkMAFIE8sProfileE kind:bss addr:0x02180268 +@34449 kind:bss addr:0x02180274 +_ZN15ProfileInstanceI19ActorProfileUnkMAFIE8sProfileE kind:bss addr:0x02180280 data_ov092_02180358 kind:bss addr:0x02180358 -data_ov092_0218035c kind:bss addr:0x0218035c ambiguous -data_ov092_02180360 kind:bss addr:0x02180360 -sActorProfileUnkTDKT kind:bss addr:0x0218036c -data_ov092_021803a8 kind:bss addr:0x021803a8 -data_ov092_021803b0 kind:bss addr:0x021803b0 -sActorProfileUnkTEVT kind:bss addr:0x021803bc -data_ov092_021803f8 kind:bss addr:0x021803f8 -data_ov092_021803fc kind:bss addr:0x021803fc -sActorProfileUnkSZKL kind:bss addr:0x02180408 +_ZGVN15ProfileInstanceI19ActorProfileUnkTDKTE8sProfileE kind:bss addr:0x0218035c ambiguous +@34455 kind:bss addr:0x02180360 +_ZN15ProfileInstanceI19ActorProfileUnkTDKTE8sProfileE kind:bss addr:0x0218036c +_ZGVN15ProfileInstanceI19ActorProfileUnkTEVTE8sProfileE kind:bss addr:0x021803a8 +@34461 kind:bss addr:0x021803b0 +_ZN15ProfileInstanceI19ActorProfileUnkTEVTE8sProfileE kind:bss addr:0x021803bc +_ZGVN15ProfileInstanceI19ActorProfileUnkSZKLE8sProfileE kind:bss addr:0x021803f8 +@34467 kind:bss addr:0x021803fc +_ZN15ProfileInstanceI19ActorProfileUnkSZKLE8sProfileE kind:bss addr:0x02180408 data_ov092_021804e0 kind:bss addr:0x021804e0 data_ov092_021804e4 kind:bss addr:0x021804e4 -data_ov092_021804e8 kind:bss addr:0x021804e8 -data_ov092_021804ec kind:bss addr:0x021804ec -sActorProfileUnkDKCB kind:bss addr:0x021804f8 +_ZGVN15ProfileInstanceI19ActorProfileUnkDKCBE8sProfileE kind:bss addr:0x021804e8 +@34473 kind:bss addr:0x021804ec +_ZN15ProfileInstanceI19ActorProfileUnkDKCBE8sProfileE kind:bss addr:0x021804f8 data_ov092_02180534 kind:bss addr:0x02180534 data_ov092_02180544 kind:bss addr:0x02180544 diff --git a/config/jp/arm9/overlays/ov093/delinks.txt b/config/jp/arm9/overlays/ov093/delinks.txt index 40661a98..6882efd0 100644 --- a/config/jp/arm9/overlays/ov093/delinks.txt +++ b/config/jp/arm9/overlays/ov093/delinks.txt @@ -9,37 +9,37 @@ src/093_PlayerSub/Actor/ActorUnkSPTT.cpp: .text start:0x021794dc end:0x02179c5c .init start:0x0217aec8 end:0x0217af18 .ctor start:0x0217b154 end:0x0217b158 - .bss start:0x0217b7e0 end:0x0217b81c + .bss start:0x0217b7cc end:0x0217b81c src/093_PlayerSub/Actor/ActorUnkTCAM.cpp: .text start:0x02179c5c end:0x02179fa0 .init start:0x0217af18 end:0x0217af68 .ctor start:0x0217b158 end:0x0217b15c - .bss start:0x0217b82c end:0x0217b868 + .bss start:0x0217b81c end:0x0217b868 src/093_PlayerSub/Actor/ActorUnkBLON.cpp: .text start:0x02179fa0 end:0x0217a37c .init start:0x0217af68 end:0x0217afb8 .ctor start:0x0217b15c end:0x0217b160 - .bss start:0x0217b878 end:0x0217b8b4 + .bss start:0x0217b868 end:0x0217b8b4 src/093_PlayerSub/Actor/ActorUnkPHTM.cpp: .text start:0x0217a37c end:0x0217a428 .init start:0x0217afb8 end:0x0217b014 .ctor start:0x0217b160 end:0x0217b164 - .bss start:0x0217b8d0 end:0x0217b9a8 + .bss start:0x0217b8b4 end:0x0217b9a8 src/093_PlayerSub/Actor/ActorUnkPMTB.cpp: .text start:0x0217a428 end:0x0217a4d4 .init start:0x0217b014 end:0x0217b070 .ctor start:0x0217b164 end:0x0217b168 - .bss start:0x0217b9c4 end:0x0217ba9c + .bss start:0x0217b9a8 end:0x0217ba9c src/093_PlayerSub/Actor/ActorUnkPMTC.cpp: .text start:0x0217a4d4 end:0x0217a57c .init start:0x0217b070 end:0x0217b0cc .ctor start:0x0217b168 end:0x0217b16c - .bss start:0x0217bab8 end:0x0217bb90 + .bss start:0x0217ba9c end:0x0217bb90 src/093_PlayerSub/Actor/ActorUnkPMTD.cpp: .text start:0x0217a57c end:0x0217a628 diff --git a/config/jp/arm9/overlays/ov093/symbols.txt b/config/jp/arm9/overlays/ov093/symbols.txt index a9769c0d..c7c9e6cd 100644 --- a/config/jp/arm9/overlays/ov093/symbols.txt +++ b/config/jp/arm9/overlays/ov093/symbols.txt @@ -602,24 +602,24 @@ _ZTV19data_ov093_0217b788 kind:data(any) addr:0x0217b788 data_ov093_0217b7c0 kind:bss addr:0x0217b7c0 data_ov093_0217b7c4 kind:bss addr:0x0217b7c4 data_ov093_0217b7c8 kind:bss addr:0x0217b7c8 -data_ov093_0217b7cc kind:bss addr:0x0217b7cc -data_ov093_0217b7d4 kind:bss addr:0x0217b7d4 -sActorProfileUnkSPTT kind:bss addr:0x0217b7e0 -data_ov093_0217b81c kind:bss addr:0x0217b81c -data_ov093_0217b820 kind:bss addr:0x0217b820 -sActorProfileUnkTCAM kind:bss addr:0x0217b82c -data_ov093_0217b868 kind:bss addr:0x0217b868 -data_ov093_0217b86c kind:bss addr:0x0217b86c -sActorProfileUnkBLON kind:bss addr:0x0217b878 -data_ov093_0217b8b4 kind:bss addr:0x0217b8b4 -data_ov093_0217b8c4 kind:bss addr:0x0217b8c4 -sActorProfileUnkPHTM kind:bss addr:0x0217b8d0 -data_ov093_0217b9a8 kind:bss addr:0x0217b9a8 -data_ov093_0217b9b8 kind:bss addr:0x0217b9b8 -sActorProfileUnkPMTB kind:bss addr:0x0217b9c4 -data_ov093_0217ba9c kind:bss addr:0x0217ba9c -data_ov093_0217baac kind:bss addr:0x0217baac -sActorProfileUnkPMTC kind:bss addr:0x0217bab8 +_ZGVN15ProfileInstanceI19ActorProfileUnkSPTTE8sProfileE kind:bss addr:0x0217b7cc +@34485 kind:bss addr:0x0217b7d4 +_ZN15ProfileInstanceI19ActorProfileUnkSPTTE8sProfileE kind:bss addr:0x0217b7e0 +_ZGVN15ProfileInstanceI19ActorProfileUnkTCAME8sProfileE kind:bss addr:0x0217b81c +@34491 kind:bss addr:0x0217b820 +_ZN15ProfileInstanceI19ActorProfileUnkTCAME8sProfileE kind:bss addr:0x0217b82c +_ZGVN15ProfileInstanceI19ActorProfileUnkBLONE8sProfileE kind:bss addr:0x0217b868 +@34497 kind:bss addr:0x0217b86c +_ZN15ProfileInstanceI19ActorProfileUnkBLONE8sProfileE kind:bss addr:0x0217b878 +_ZGVN15ProfileInstanceI19ActorProfileUnkPHTME8sProfileE kind:bss addr:0x0217b8b4 +@34503 kind:bss addr:0x0217b8c4 +_ZN15ProfileInstanceI19ActorProfileUnkPHTME8sProfileE kind:bss addr:0x0217b8d0 +_ZGVN15ProfileInstanceI19ActorProfileUnkPMTBE8sProfileE kind:bss addr:0x0217b9a8 +@34509 kind:bss addr:0x0217b9b8 +_ZN15ProfileInstanceI19ActorProfileUnkPMTBE8sProfileE kind:bss addr:0x0217b9c4 +_ZGVN15ProfileInstanceI19ActorProfileUnkPMTCE8sProfileE kind:bss addr:0x0217ba9c +@34515 kind:bss addr:0x0217baac +_ZN15ProfileInstanceI19ActorProfileUnkPMTCE8sProfileE kind:bss addr:0x0217bab8 data_ov093_0217bb90 kind:bss addr:0x0217bb90 data_ov093_0217bba0 kind:bss addr:0x0217bba0 -sActorProfileUnkPMTD kind:bss addr:0x0217bbac +_ZN15ProfileInstanceI19ActorProfileUnkPMTDE8sProfileE kind:bss addr:0x0217bbac diff --git a/config/jp/arm9/overlays/ov094/delinks.txt b/config/jp/arm9/overlays/ov094/delinks.txt index 6eb3f0ad..98f6a504 100644 --- a/config/jp/arm9/overlays/ov094/delinks.txt +++ b/config/jp/arm9/overlays/ov094/delinks.txt @@ -9,142 +9,142 @@ src/094_Land2/Actor/ActorUnkLOCK.cpp: .text start:0x02168298 end:0x02168528 .init start:0x02178898 end:0x021788e8 .ctor start:0x02179138 end:0x0217913c - .bss start:0x0217a828 end:0x0217a864 + .bss start:0x0217a818 end:0x0217a874 src/094_Land2/Actor/ActorUnkPSWB.cpp: .text start:0x02168528 end:0x0216a638 .init start:0x021788e8 end:0x02178960 .ctor start:0x0217913c end:0x02179140 - .bss start:0x0217a898 end:0x0217a904 + .bss start:0x0217a874 end:0x0217aa4c src/094_Land2/Actor/ActorUnkVRGN.cpp: .text start:0x0216a638 end:0x0216ac20 .init start:0x02178960 end:0x021789b0 .ctor start:0x02179140 end:0x02179144 - .bss start:0x0217aa5c end:0x0217aa98 + .bss start:0x0217aa4c end:0x0217aa98 src/094_Land2/Actor/ActorUnkVLCR.cpp: .text start:0x0216ac20 end:0x0216b7b4 .init start:0x021789b0 end:0x02178a00 .ctor start:0x02179144 end:0x02179148 - .bss start:0x0217aaa8 end:0x0217ab80 + .bss start:0x0217aa98 end:0x0217ab80 src/094_Land2/Actor/ActorUnkSYRN.cpp: .text start:0x0216b7b4 end:0x0216c38c .init start:0x02178a00 end:0x02178a50 .ctor start:0x02179148 end:0x0217914c - .bss start:0x0217ab90 end:0x0217ac68 + .bss start:0x0217ab80 end:0x0217ac68 src/094_Land2/Actor/ActorUnkSTTG.cpp: .text start:0x0216c598 end:0x0216d44c .init start:0x02178a50 end:0x02178aa0 .ctor start:0x0217914c end:0x02179150 - .bss start:0x0217ac78 end:0x0217ad50 + .bss start:0x0217ac68 end:0x0217ad54 src/094_Land2/Actor/ActorUnkPCTG.cpp: .text start:0x0216d4fc end:0x0216e624 .init start:0x02178aa0 end:0x02178afc .ctor start:0x02179150 end:0x02179154 - .bss start:0x0217ada4 end:0x0217ae7c + .bss start:0x0217ad54 end:0x0217ae7c src/094_Land2/Actor/ActorUnkSPTG.cpp: .text start:0x0216e8a4 end:0x0216fd38 .init start:0x02178afc end:0x02178b4c .ctor start:0x02179154 end:0x02179158 - .bss start:0x0217ae8c end:0x0217af64 + .bss start:0x0217ae7c end:0x0217af64 src/094_Land2/Actor/ActorUnkSNOW.cpp: .text start:0x0216fd38 end:0x021700e0 .init start:0x02178b4c end:0x02178b9c .ctor start:0x02179158 end:0x0217915c - .bss start:0x0217af74 end:0x0217afb0 + .bss start:0x0217af64 end:0x0217afb0 src/094_Land2/Actor/ActorUnkFBRG.cpp: .text start:0x021700e0 end:0x0217061c .init start:0x02178b9c end:0x02178bec .ctor start:0x0217915c end:0x02179160 - .bss start:0x0217afc0 end:0x0217b084 + .bss start:0x0217afb0 end:0x0217b0ac src/094_Land2/Actor/ActorUnkKOTA.cpp: .text start:0x0217061c end:0x0217108c .init start:0x02178bec end:0x02178c3c .ctor start:0x02179160 end:0x02179164 - .bss start:0x0217b0bc end:0x0217b0f8 + .bss start:0x0217b0ac end:0x0217b0f8 src/094_Land2/Actor/ActorUnkEFOC.cpp: .text start:0x0217108c end:0x021717bc .init start:0x02178c3c end:0x02178c9c .ctor start:0x02179164 end:0x02179168 - .bss start:0x0217b108 end:0x0217b1e0 + .bss start:0x0217b0f8 end:0x0217b1e8 src/094_Land2/Actor/ActorUnkMNCB.cpp: .text start:0x02171d04 end:0x02172970 .init start:0x02178c9c end:0x02178cec .ctor start:0x02179168 end:0x0217916c - .bss start:0x0217b1f8 end:0x0217b234 + .bss start:0x0217b1e8 end:0x0217b254 src/094_Land2/Actor/ActorUnkEFR2.cpp: .text start:0x02172970 end:0x02172b24 .init start:0x02178cec end:0x02178d3c .ctor start:0x0217916c end:0x02179170 - .bss start:0x0217b264 end:0x0217b33c + .bss start:0x0217b254 end:0x0217b33c src/094_Land2/Actor/ActorUnkEFW2.cpp: .text start:0x02172b24 end:0x02172cd8 .init start:0x02178d3c end:0x02178d8c .ctor start:0x02179170 end:0x02179174 - .bss start:0x0217b34c end:0x0217b424 + .bss start:0x0217b33c end:0x0217b424 src/094_Land2/MapObject/MapObjectUnkFNCE.cpp: .text start:0x02172cd8 end:0x021730e4 .init start:0x02178d8c end:0x02178ddc .ctor start:0x02179174 end:0x02179178 - .bss start:0x0217b434 end:0x0217b508 + .bss start:0x0217b424 end:0x0217b508 src/094_Land2/MapObject/MapObjectUnkWLMP.cpp: .text start:0x021732f4 end:0x02173a2c .init start:0x02178ddc end:0x02178e2c .ctor start:0x02179178 end:0x0217917c - .bss start:0x0217b518 end:0x0217b538 + .bss start:0x0217b508 end:0x0217b5a0 src/094_Land2/MapObject/MapObjectUnkCLMN.cpp: .text start:0x02173ac8 end:0x02173c98 .init start:0x02178e2c end:0x02178e7c .ctor start:0x0217917c end:0x02179180 - .bss start:0x0217b5b0 end:0x0217b684 + .bss start:0x0217b5a0 end:0x0217b6a4 src/094_Land2/MapObject/MapObjectUnkWDST.cpp: .text start:0x02173c98 end:0x02175b98 .init start:0x02178e7c end:0x02178f04 .ctor start:0x02179180 end:0x02179184 - .bss start:0x0217b6b8 end:0x0217b78c + .bss start:0x0217b6a4 end:0x0217b7f8 src/094_Land2/MapObject/MapObjectUnkICEB.cpp: .text start:0x02175c28 end:0x02176bf4 .init start:0x02178f04 end:0x02178fd0 .ctor start:0x02179184 end:0x02179188 - .bss start:0x0217b8d4 end:0x0217b9a8 + .bss start:0x0217b7f8 end:0x0217b9cc src/094_Land2/MapObject/MapObjectUnkBRGW.cpp: .text start:0x02176bf4 end:0x0217718c .init start:0x02178fd0 end:0x02179020 .ctor start:0x02179188 end:0x0217918c - .bss start:0x0217b9dc end:0x0217bab0 + .bss start:0x0217b9cc end:0x0217bab0 src/094_Land2/MapObject/MapObjectUnkMBBS.cpp: .text start:0x0217718c end:0x02177728 .init start:0x02179020 end:0x02179094 .ctor start:0x0217918c end:0x02179190 - .bss start:0x0217bac0 end:0x0217bb94 + .bss start:0x0217bab0 end:0x0217bbb8 src/094_Land2/MapObject/MapObjectUnkTHAW.cpp: .text start:0x02177728 end:0x02177e08 .init start:0x02179094 end:0x021790e4 .ctor start:0x02179190 end:0x02179194 - .bss start:0x0217bbc8 end:0x0217bc9c + .bss start:0x0217bbb8 end:0x0217bcbc src/094_Land2/MapObject/MapObjectUnkMTWD.cpp: .text start:0x02177e08 end:0x02178200 .init start:0x021790e4 end:0x02179134 .ctor start:0x02179194 end:0x02179198 - .bss start:0x0217bccc end:0x0217bda0 + .bss start:0x0217bcbc end:0x0217bda0 diff --git a/config/jp/arm9/overlays/ov094/symbols.txt b/config/jp/arm9/overlays/ov094/symbols.txt index d0eb13c1..bc00aa8a 100644 --- a/config/jp/arm9/overlays/ov094/symbols.txt +++ b/config/jp/arm9/overlays/ov094/symbols.txt @@ -736,77 +736,77 @@ data_ov094_0217a794 kind:data(any) addr:0x0217a794 data_ov094_0217a7e0 kind:bss addr:0x0217a7e0 data_ov094_0217a7e4 kind:bss addr:0x0217a7e4 data_ov094_0217a7f0 kind:bss addr:0x0217a7f0 -data_ov094_0217a818 kind:bss addr:0x0217a818 -data_ov094_0217a81c kind:bss addr:0x0217a81c -sActorProfileUnkLOCK kind:bss addr:0x0217a828 +_ZGVN15ProfileInstanceI19ActorProfileUnkLOCKE8sProfileE kind:bss addr:0x0217a818 +@34532 kind:bss addr:0x0217a81c +_ZN15ProfileInstanceI19ActorProfileUnkLOCKE8sProfileE kind:bss addr:0x0217a828 data_ov094_0217a864 kind:bss addr:0x0217a864 data_ov094_0217a868 kind:bss addr:0x0217a868 -data_ov094_0217a874 kind:bss addr:0x0217a874 -data_ov094_0217a880 kind:bss addr:0x0217a880 -sActorProfileUnkPSWB kind:bss addr:0x0217a898 +_ZGVN15ProfileInstanceI19ActorProfileUnkPSWBE8sProfileE kind:bss addr:0x0217a874 +@34538 kind:bss addr:0x0217a880 +_ZN15ProfileInstanceI19ActorProfileUnkPSWBE8sProfileE kind:bss addr:0x0217a898 data_ov094_0217a904 kind:bss addr:0x0217a904 ambiguous data_ov094_0217a970 kind:bss addr:0x0217a970 -data_ov094_0217aa4c kind:bss addr:0x0217aa4c -data_ov094_0217aa50 kind:bss addr:0x0217aa50 -sActorProfileUnkVRGN kind:bss addr:0x0217aa5c -data_ov094_0217aa98 kind:bss addr:0x0217aa98 -data_ov094_0217aa9c kind:bss addr:0x0217aa9c -sActorProfileUnkVLCR kind:bss addr:0x0217aaa8 -data_ov094_0217ab80 kind:bss addr:0x0217ab80 -data_ov094_0217ab84 kind:bss addr:0x0217ab84 -sActorProfileUnkSYRN kind:bss addr:0x0217ab90 -data_ov094_0217ac68 kind:bss addr:0x0217ac68 -data_ov094_0217ac6c kind:bss addr:0x0217ac6c -sActorProfileUnkSTTG kind:bss addr:0x0217ac78 +_ZGVN15ProfileInstanceI19ActorProfileUnkVRGNE8sProfileE kind:bss addr:0x0217aa4c +@34544 kind:bss addr:0x0217aa50 +_ZN15ProfileInstanceI19ActorProfileUnkVRGNE8sProfileE kind:bss addr:0x0217aa5c +_ZGVN15ProfileInstanceI19ActorProfileUnkVLCRE8sProfileE kind:bss addr:0x0217aa98 +@34550 kind:bss addr:0x0217aa9c +_ZN15ProfileInstanceI19ActorProfileUnkVLCRE8sProfileE kind:bss addr:0x0217aaa8 +_ZGVN15ProfileInstanceI19ActorProfileUnkSYRNE8sProfileE kind:bss addr:0x0217ab80 +@34556 kind:bss addr:0x0217ab84 +_ZN15ProfileInstanceI19ActorProfileUnkSYRNE8sProfileE kind:bss addr:0x0217ab90 +_ZGVN15ProfileInstanceI19ActorProfileUnkSTTGE8sProfileE kind:bss addr:0x0217ac68 +@34562 kind:bss addr:0x0217ac6c +_ZN15ProfileInstanceI19ActorProfileUnkSTTGE8sProfileE kind:bss addr:0x0217ac78 data_ov094_0217ad50 kind:bss addr:0x0217ad50 -data_ov094_0217ad54 kind:bss addr:0x0217ad54 -data_ov094_0217ad60 kind:bss addr:0x0217ad60 -sActorProfileUnkPCTG kind:bss addr:0x0217ada4 -data_ov094_0217ae7c kind:bss addr:0x0217ae7c -data_ov094_0217ae80 kind:bss addr:0x0217ae80 -sActorProfileUnkSPTG kind:bss addr:0x0217ae8c -data_ov094_0217af64 kind:bss addr:0x0217af64 -data_ov094_0217af68 kind:bss addr:0x0217af68 -sActorProfileUnkSNOW kind:bss addr:0x0217af74 -data_ov094_0217afb0 kind:bss addr:0x0217afb0 -data_ov094_0217afb4 kind:bss addr:0x0217afb4 -sActorProfileUnkFBRG kind:bss addr:0x0217afc0 +_ZGVN15ProfileInstanceI19ActorProfileUnkPCTGE8sProfileE kind:bss addr:0x0217ad54 +@34568 kind:bss addr:0x0217ad60 +_ZN15ProfileInstanceI19ActorProfileUnkPCTGE8sProfileE kind:bss addr:0x0217ada4 +_ZGVN15ProfileInstanceI19ActorProfileUnkSPTGE8sProfileE kind:bss addr:0x0217ae7c +@34574 kind:bss addr:0x0217ae80 +_ZN15ProfileInstanceI19ActorProfileUnkSPTGE8sProfileE kind:bss addr:0x0217ae8c +_ZGVN15ProfileInstanceI19ActorProfileUnkSNOWE8sProfileE kind:bss addr:0x0217af64 +@34580 kind:bss addr:0x0217af68 +_ZN15ProfileInstanceI19ActorProfileUnkSNOWE8sProfileE kind:bss addr:0x0217af74 +_ZGVN15ProfileInstanceI19ActorProfileUnkFBRGE8sProfileE kind:bss addr:0x0217afb0 +@34586 kind:bss addr:0x0217afb4 +_ZN15ProfileInstanceI19ActorProfileUnkFBRGE8sProfileE kind:bss addr:0x0217afc0 data_ov094_0217b084 kind:bss addr:0x0217b084 ambiguous data_ov094_0217b098 kind:bss addr:0x0217b098 -data_ov094_0217b0ac kind:bss addr:0x0217b0ac -data_ov094_0217b0b0 kind:bss addr:0x0217b0b0 -sActorProfileUnkKOTA kind:bss addr:0x0217b0bc -data_ov094_0217b0f8 kind:bss addr:0x0217b0f8 -data_ov094_0217b0fc kind:bss addr:0x0217b0fc -sActorProfileUnkEFOC kind:bss addr:0x0217b108 +_ZGVN15ProfileInstanceI19ActorProfileUnkKOTAE8sProfileE kind:bss addr:0x0217b0ac +@34592 kind:bss addr:0x0217b0b0 +_ZN15ProfileInstanceI19ActorProfileUnkKOTAE8sProfileE kind:bss addr:0x0217b0bc +_ZGVN15ProfileInstanceI19ActorProfileUnkEFOCE8sProfileE kind:bss addr:0x0217b0f8 +@34598 kind:bss addr:0x0217b0fc +_ZN15ProfileInstanceI19ActorProfileUnkEFOCE8sProfileE kind:bss addr:0x0217b108 data_ov094_0217b1e0 kind:bss addr:0x0217b1e0 data_ov094_0217b1e4 kind:bss addr:0x0217b1e4 -data_ov094_0217b1e8 kind:bss addr:0x0217b1e8 -data_ov094_0217b1ec kind:bss addr:0x0217b1ec -sActorProfileUnkMNCB kind:bss addr:0x0217b1f8 +_ZGVN15ProfileInstanceI19ActorProfileUnkMNCBE8sProfileE kind:bss addr:0x0217b1e8 +@34604 kind:bss addr:0x0217b1ec +_ZN15ProfileInstanceI19ActorProfileUnkMNCBE8sProfileE kind:bss addr:0x0217b1f8 data_ov094_0217b234 kind:bss addr:0x0217b234 data_ov094_0217b244 kind:bss addr:0x0217b244 -data_ov094_0217b254 kind:bss addr:0x0217b254 -data_ov094_0217b258 kind:bss addr:0x0217b258 -sActorProfileUnkEFR2 kind:bss addr:0x0217b264 -data_ov094_0217b33c kind:bss addr:0x0217b33c -data_ov094_0217b340 kind:bss addr:0x0217b340 -sActorProfileUnkEFW2 kind:bss addr:0x0217b34c -data_ov094_0217b424 kind:bss addr:0x0217b424 -data_ov094_0217b428 kind:bss addr:0x0217b428 -sMapObjectProfileUnkFNCE kind:bss addr:0x0217b434 -data_ov094_0217b508 kind:bss addr:0x0217b508 -data_ov094_0217b50c kind:bss addr:0x0217b50c -sMapObjectProfileUnkWLMP kind:bss addr:0x0217b518 +_ZGVN15ProfileInstanceI19ActorProfileUnkEFR2E8sProfileE kind:bss addr:0x0217b254 +@34610 kind:bss addr:0x0217b258 +_ZN15ProfileInstanceI19ActorProfileUnkEFR2E8sProfileE kind:bss addr:0x0217b264 +_ZGVN15ProfileInstanceI19ActorProfileUnkEFW2E8sProfileE kind:bss addr:0x0217b33c +@34616 kind:bss addr:0x0217b340 +_ZN15ProfileInstanceI19ActorProfileUnkEFW2E8sProfileE kind:bss addr:0x0217b34c +_ZGVN15ProfileInstanceI23MapObjectProfileUnkFNCEE8sProfileE kind:bss addr:0x0217b424 +@33893 kind:bss addr:0x0217b428 +_ZN15ProfileInstanceI23MapObjectProfileUnkFNCEE8sProfileE kind:bss addr:0x0217b434 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkWLMPE8sProfileE kind:bss addr:0x0217b508 +@33899 kind:bss addr:0x0217b50c +_ZN15ProfileInstanceI23MapObjectProfileUnkWLMPE8sProfileE kind:bss addr:0x0217b518 data_ov094_0217b538 kind:bss addr:0x0217b538 data_ov094_0217b580 kind:bss addr:0x0217b580 -data_ov094_0217b5a0 kind:bss addr:0x0217b5a0 -data_ov094_0217b5a4 kind:bss addr:0x0217b5a4 -sMapObjectProfileUnkCLMN kind:bss addr:0x0217b5b0 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkCLMNE8sProfileE kind:bss addr:0x0217b5a0 +@33905 kind:bss addr:0x0217b5a4 +_ZN15ProfileInstanceI23MapObjectProfileUnkCLMNE8sProfileE kind:bss addr:0x0217b5b0 data_ov094_0217b684 kind:bss addr:0x0217b684 -data_ov094_0217b6a4 kind:bss addr:0x0217b6a4 -data_ov094_0217b6ac kind:bss addr:0x0217b6ac -sMapObjectProfileUnkWDST kind:bss addr:0x0217b6b8 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkWDSTE8sProfileE kind:bss addr:0x0217b6a4 +@33911 kind:bss addr:0x0217b6ac +_ZN15ProfileInstanceI23MapObjectProfileUnkWDSTE8sProfileE kind:bss addr:0x0217b6b8 data_ov094_0217b78c kind:bss addr:0x0217b78c data_ov094_0217b7ac kind:bss addr:0x0217b7ac data_ov094_0217b7b0 kind:bss addr:0x0217b7b0 @@ -814,22 +814,22 @@ data_ov094_0217b7bc kind:bss addr:0x0217b7bc data_ov094_0217b7c8 kind:bss addr:0x0217b7c8 data_ov094_0217b7d4 kind:bss addr:0x0217b7d4 data_ov094_0217b7e0 kind:bss addr:0x0217b7e0 -data_ov094_0217b7f8 kind:bss addr:0x0217b7f8 -data_ov094_0217b81c kind:bss addr:0x0217b81c -sMapObjectProfileUnkICEB kind:bss addr:0x0217b8d4 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkICEBE8sProfileE kind:bss addr:0x0217b7f8 +@33917 kind:bss addr:0x0217b81c +_ZN15ProfileInstanceI23MapObjectProfileUnkICEBE8sProfileE kind:bss addr:0x0217b8d4 data_ov094_0217b9a8 kind:bss addr:0x0217b9a8 -data_ov094_0217b9cc kind:bss addr:0x0217b9cc -data_ov094_0217b9d0 kind:bss addr:0x0217b9d0 -sMapObjectProfileUnkBRGW kind:bss addr:0x0217b9dc -data_ov094_0217bab0 kind:bss addr:0x0217bab0 -data_ov094_0217bab4 kind:bss addr:0x0217bab4 -sMapObjectProfileUnkMBBS kind:bss addr:0x0217bac0 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkBRGWE8sProfileE kind:bss addr:0x0217b9cc +@33923 kind:bss addr:0x0217b9d0 +_ZN15ProfileInstanceI23MapObjectProfileUnkBRGWE8sProfileE kind:bss addr:0x0217b9dc +_ZGVN15ProfileInstanceI23MapObjectProfileUnkMBBSE8sProfileE kind:bss addr:0x0217bab0 +@33929 kind:bss addr:0x0217bab4 +_ZN15ProfileInstanceI23MapObjectProfileUnkMBBSE8sProfileE kind:bss addr:0x0217bac0 data_ov094_0217bb94 kind:bss addr:0x0217bb94 -data_ov094_0217bbb8 kind:bss addr:0x0217bbb8 -data_ov094_0217bbbc kind:bss addr:0x0217bbbc -sMapObjectProfileUnkTHAW kind:bss addr:0x0217bbc8 +_ZGVN15ProfileInstanceI23MapObjectProfileUnkTHAWE8sProfileE kind:bss addr:0x0217bbb8 +@33935 kind:bss addr:0x0217bbbc +_ZN15ProfileInstanceI23MapObjectProfileUnkTHAWE8sProfileE kind:bss addr:0x0217bbc8 data_ov094_0217bc9c kind:bss addr:0x0217bc9c -data_ov094_0217bcbc kind:bss addr:0x0217bcbc -data_ov094_0217bcc0 kind:bss addr:0x0217bcc0 -sMapObjectProfileUnkMTWD kind:bss addr:0x0217bccc +_ZGVN15ProfileInstanceI23MapObjectProfileUnkMTWDE8sProfileE kind:bss addr:0x0217bcbc +@33941 kind:bss addr:0x0217bcc0 +_ZN15ProfileInstanceI23MapObjectProfileUnkMTWDE8sProfileE kind:bss addr:0x0217bccc data_ov094_0217bda0 kind:bss addr:0x0217bda0 diff --git a/config/jp/arm9/overlays/ov096/delinks.txt b/config/jp/arm9/overlays/ov096/delinks.txt index a3999dba..ef240ce8 100644 --- a/config/jp/arm9/overlays/ov096/delinks.txt +++ b/config/jp/arm9/overlays/ov096/delinks.txt @@ -9,22 +9,22 @@ src/096_PlayerZelda/Actor/ActorUnkLZET.cpp: .text start:0x0217c94c end:0x0217c9f8 .init start:0x0217fe98 end:0x0217fee8 .ctor start:0x02180028 end:0x0218002c - .bss start:0x02180510 end:0x0218054c + .bss start:0x02180500 end:0x0218054c src/096_PlayerZelda/Actor/ActorUnkCLBT.cpp: .text start:0x0217c9f8 end:0x0217ce2c .init start:0x0217fee8 end:0x0217ff38 .ctor start:0x0218002c end:0x02180030 - .bss start:0x0218055c end:0x02180598 + .bss start:0x0218054c end:0x02180598 src/096_PlayerZelda/Actor/ActorUnkTKYT.cpp: .text start:0x0217ce4c end:0x0217cff8 .init start:0x0217ff38 end:0x0217ff88 .ctor start:0x02180030 end:0x02180034 - .bss start:0x021805a8 end:0x021805e4 + .bss start:0x02180598 end:0x021805e4 src/096_PlayerZelda/Actor/ActorUnkBPBS.cpp: .text start:0x0217cff8 end:0x0217f578 .init start:0x0217ff88 end:0x0217ffd8 .ctor start:0x02180034 end:0x02180038 - .bss start:0x021805f4 end:0x021806cc + .bss start:0x021805e4 end:0x021806cc diff --git a/config/jp/arm9/overlays/ov096/symbols.txt b/config/jp/arm9/overlays/ov096/symbols.txt index 344b55d6..10483c34 100644 --- a/config/jp/arm9/overlays/ov096/symbols.txt +++ b/config/jp/arm9/overlays/ov096/symbols.txt @@ -161,18 +161,18 @@ data_ov096_021803c8 kind:data(any) addr:0x021803c8 data_ov096_02180428 kind:data(any) addr:0x02180428 data_ov096_021804c0 kind:data(any) addr:0x021804c0 data_ov096_021804f0 kind:data(any) addr:0x021804f0 -data_ov096_02180500 kind:bss addr:0x02180500 -data_ov096_02180504 kind:bss addr:0x02180504 -sActorProfileUnkLZET kind:bss addr:0x02180510 -data_ov096_0218054c kind:bss addr:0x0218054c -data_ov096_02180550 kind:bss addr:0x02180550 -sActorProfileUnkCLBT kind:bss addr:0x0218055c -data_ov096_02180598 kind:bss addr:0x02180598 -data_ov096_0218059c kind:bss addr:0x0218059c -sActorProfileUnkTKYT kind:bss addr:0x021805a8 -data_ov096_021805e4 kind:bss addr:0x021805e4 -data_ov096_021805e8 kind:bss addr:0x021805e8 -sActorProfileUnkBPBS kind:bss addr:0x021805f4 +_ZGVN15ProfileInstanceI19ActorProfileUnkLZETE8sProfileE kind:bss addr:0x02180500 +@34682 kind:bss addr:0x02180504 +_ZN15ProfileInstanceI19ActorProfileUnkLZETE8sProfileE kind:bss addr:0x02180510 +_ZGVN15ProfileInstanceI19ActorProfileUnkCLBTE8sProfileE kind:bss addr:0x0218054c +@34688 kind:bss addr:0x02180550 +_ZN15ProfileInstanceI19ActorProfileUnkCLBTE8sProfileE kind:bss addr:0x0218055c +_ZGVN15ProfileInstanceI19ActorProfileUnkTKYTE8sProfileE kind:bss addr:0x02180598 +@34694 kind:bss addr:0x0218059c +_ZN15ProfileInstanceI19ActorProfileUnkTKYTE8sProfileE kind:bss addr:0x021805a8 +_ZGVN15ProfileInstanceI19ActorProfileUnkBPBSE8sProfileE kind:bss addr:0x021805e4 +@34700 kind:bss addr:0x021805e8 +_ZN15ProfileInstanceI19ActorProfileUnkBPBSE8sProfileE kind:bss addr:0x021805f4 data_ov096_021806cc kind:bss addr:0x021806cc data_ov096_021806d4 kind:bss addr:0x021806d4 data_ov096_021806e0 kind:bss addr:0x021806e0 diff --git a/config/jp/arm9/overlays/ov098/delinks.txt b/config/jp/arm9/overlays/ov098/delinks.txt index aa974adf..abad0713 100644 --- a/config/jp/arm9/overlays/ov098/delinks.txt +++ b/config/jp/arm9/overlays/ov098/delinks.txt @@ -9,28 +9,28 @@ src/098_MapWater/Actor/ActorUnkEFWV.cpp: .text start:0x02182c58 end:0x02183208 .init start:0x02183d50 end:0x02183da0 .ctor start:0x02183ee0 end:0x02183ee4 - .bss start:0x02184310 end:0x021843e8 + .bss start:0x02184300 end:0x021843e8 src/098_MapWater/Actor/ActorUnkEFWI.cpp: .text start:0x02183208 end:0x021833ec .init start:0x02183da0 end:0x02183df0 .ctor start:0x02183ee4 end:0x02183ee8 - .bss start:0x021843f8 end:0x021844d0 + .bss start:0x021843e8 end:0x021844d0 src/098_MapWater/Actor/ActorUnkEFRP.cpp: .text start:0x021833ec end:0x0218390c .init start:0x02183df0 end:0x02183e40 .ctor start:0x02183ee8 end:0x02183eec - .bss start:0x021844e0 end:0x021845b8 + .bss start:0x021844d0 end:0x021845b8 src/098_MapWater/Actor/ActorUnkEFRI.cpp: .text start:0x0218390c end:0x02183af0 .init start:0x02183e40 end:0x02183e90 .ctor start:0x02183eec end:0x02183ef0 - .bss start:0x021845c8 end:0x021846a0 + .bss start:0x021845b8 end:0x021846a0 src/098_MapWater/Actor/ActorUnkSEAT.cpp: .text start:0x02183af0 end:0x02183d3c .init start:0x02183e90 end:0x02183ee0 .ctor start:0x02183ef0 end:0x02183ef4 - .bss start:0x021846b0 end:0x021846ec + .bss start:0x021846a0 end:0x021846ec diff --git a/config/jp/arm9/overlays/ov098/symbols.txt b/config/jp/arm9/overlays/ov098/symbols.txt index 24c8a388..337b7d9e 100644 --- a/config/jp/arm9/overlays/ov098/symbols.txt +++ b/config/jp/arm9/overlays/ov098/symbols.txt @@ -96,19 +96,19 @@ data_ov098_021841f4 kind:data(any) addr:0x021841f4 _ZTV19data_ov098_0218420c kind:data(any) addr:0x0218420c _ZTV19data_ov098_0218426c kind:data(any) addr:0x0218426c _ZTV19data_ov098_02184290 kind:data(any) addr:0x02184290 -data_ov098_02184300 kind:bss addr:0x02184300 -data_ov098_02184304 kind:bss addr:0x02184304 -sActorProfileUnkEFWV kind:bss addr:0x02184310 -data_ov098_021843e8 kind:bss addr:0x021843e8 -data_ov098_021843ec kind:bss addr:0x021843ec -sActorProfileUnkEFWI kind:bss addr:0x021843f8 -data_ov098_021844d0 kind:bss addr:0x021844d0 -data_ov098_021844d4 kind:bss addr:0x021844d4 -sActorProfileUnkEFRP kind:bss addr:0x021844e0 -data_ov098_021845b8 kind:bss addr:0x021845b8 -data_ov098_021845bc kind:bss addr:0x021845bc -sActorProfileUnkEFRI kind:bss addr:0x021845c8 -data_ov098_021846a0 kind:bss addr:0x021846a0 -data_ov098_021846a4 kind:bss addr:0x021846a4 -sActorProfileUnkSEAT kind:bss addr:0x021846b0 +_ZGVN15ProfileInstanceI19ActorProfileUnkEFWVE8sProfileE kind:bss addr:0x02184300 +@34712 kind:bss addr:0x02184304 +_ZN15ProfileInstanceI19ActorProfileUnkEFWVE8sProfileE kind:bss addr:0x02184310 +_ZGVN15ProfileInstanceI19ActorProfileUnkEFWIE8sProfileE kind:bss addr:0x021843e8 +@34718 kind:bss addr:0x021843ec +_ZN15ProfileInstanceI19ActorProfileUnkEFWIE8sProfileE kind:bss addr:0x021843f8 +_ZGVN15ProfileInstanceI19ActorProfileUnkEFRPE8sProfileE kind:bss addr:0x021844d0 +@34724 kind:bss addr:0x021844d4 +_ZN15ProfileInstanceI19ActorProfileUnkEFRPE8sProfileE kind:bss addr:0x021844e0 +_ZGVN15ProfileInstanceI19ActorProfileUnkEFRIE8sProfileE kind:bss addr:0x021845b8 +@34730 kind:bss addr:0x021845bc +_ZN15ProfileInstanceI19ActorProfileUnkEFRIE8sProfileE kind:bss addr:0x021845c8 +_ZGVN15ProfileInstanceI19ActorProfileUnkSEATE8sProfileE kind:bss addr:0x021846a0 +@34736 kind:bss addr:0x021846a4 +_ZN15ProfileInstanceI19ActorProfileUnkSEATE8sProfileE kind:bss addr:0x021846b0 data_ov098_021846ec kind:bss addr:0x021846ec diff --git a/config/jp/arm9/overlays/ov099/delinks.txt b/config/jp/arm9/overlays/ov099/delinks.txt index 22872f99..3ae0dff5 100644 --- a/config/jp/arm9/overlays/ov099/delinks.txt +++ b/config/jp/arm9/overlays/ov099/delinks.txt @@ -8,19 +8,19 @@ src/099_MapLava/Actor/ActorUnkEFWL.cpp: .text start:0x02182c34 end:0x02182fdc .init start:0x02183c50 end:0x02183ca0 .ctor start:0x02183d90 end:0x02183d94 - .bss start:0x02184130 end:0x02184208 + .bss start:0x02184120 end:0x02184208 src/099_MapLava/Actor/ActorUnkEFRL.cpp: .text start:0x02182fdc end:0x02183408 .init start:0x02183ca0 end:0x02183cf0 .ctor start:0x02183d94 end:0x02183d98 - .bss start:0x02184218 end:0x021842f0 + .bss start:0x02184208 end:0x021842f0 src/099_MapLava/Actor/ActorUnkVOLV.cpp: .text start:0x02183408 end:0x02183744 .init start:0x02183cf0 end:0x02183d40 .ctor start:0x02183d98 end:0x02183d9c - .bss start:0x02184300 end:0x021843d8 + .bss start:0x021842f0 end:0x021843d8 src/099_MapLava/Actor/ActorUnkE3LV.cpp: .text start:0x02183744 end:0x02183a34 diff --git a/config/jp/arm9/overlays/ov099/symbols.txt b/config/jp/arm9/overlays/ov099/symbols.txt index bc5db00a..e7a94a42 100644 --- a/config/jp/arm9/overlays/ov099/symbols.txt +++ b/config/jp/arm9/overlays/ov099/symbols.txt @@ -82,15 +82,15 @@ _ZTV19data_ov099_02184058 kind:data(any) addr:0x02184058 data_ov099_0218407c kind:data(any) addr:0x0218407c data_ov099_02184094 kind:data(any) addr:0x02184094 _ZTV19data_ov099_021840ac kind:data(any) addr:0x021840ac -data_ov099_02184120 kind:bss addr:0x02184120 -data_ov099_02184124 kind:bss addr:0x02184124 -sActorProfileUnkEFWL kind:bss addr:0x02184130 -data_ov099_02184208 kind:bss addr:0x02184208 -data_ov099_0218420c kind:bss addr:0x0218420c -sActorProfileUnkEFRL kind:bss addr:0x02184218 -data_ov099_021842f0 kind:bss addr:0x021842f0 -data_ov099_021842f4 kind:bss addr:0x021842f4 -sActorProfileUnkVOLV kind:bss addr:0x02184300 +_ZGVN15ProfileInstanceI19ActorProfileUnkEFWLE8sProfileE kind:bss addr:0x02184120 +@34747 kind:bss addr:0x02184124 +_ZN15ProfileInstanceI19ActorProfileUnkEFWLE8sProfileE kind:bss addr:0x02184130 +_ZGVN15ProfileInstanceI19ActorProfileUnkEFRLE8sProfileE kind:bss addr:0x02184208 +@34753 kind:bss addr:0x0218420c +_ZN15ProfileInstanceI19ActorProfileUnkEFRLE8sProfileE kind:bss addr:0x02184218 +_ZGVN15ProfileInstanceI19ActorProfileUnkVOLVE8sProfileE kind:bss addr:0x021842f0 +@34759 kind:bss addr:0x021842f4 +_ZN15ProfileInstanceI19ActorProfileUnkVOLVE8sProfileE kind:bss addr:0x02184300 data_ov099_021843d8 kind:bss addr:0x021843d8 data_ov099_021843dc kind:bss addr:0x021843dc -sActorProfileUnkE3LV kind:bss addr:0x021843e8 +_ZN15ProfileInstanceI19ActorProfileUnkE3LVE8sProfileE kind:bss addr:0x021843e8 diff --git a/config/jp/arm9/overlays/ov105/symbols.txt b/config/jp/arm9/overlays/ov105/symbols.txt index 00c384b9..d9e81b17 100644 --- a/config/jp/arm9/overlays/ov105/symbols.txt +++ b/config/jp/arm9/overlays/ov105/symbols.txt @@ -137,4 +137,4 @@ data_ov105_0218be6c kind:data(any) addr:0x0218be6c _ZTV19data_ov105_0218be7c kind:data(any) addr:0x0218be7c data_ov105_0218bea0 kind:bss addr:0x0218bea0 data_ov105_0218bea4 kind:bss addr:0x0218bea4 -sActorProfileUnkITWP kind:bss addr:0x0218beb0 +_ZN15ProfileInstanceI19ActorProfileUnkITWPE8sProfileE kind:bss addr:0x0218beb0 diff --git a/include/Actor/ActorProfile.hpp b/include/Actor/ActorProfile.hpp index d009eea8..89944065 100644 --- a/include/Actor/ActorProfile.hpp +++ b/include/Actor/ActorProfile.hpp @@ -3,6 +3,7 @@ #include "Actor/ActorId.hpp" #include "Physics/Cylinder.hpp" #include "System/SysNew.hpp" +#include "profile.hpp" #include "types.h" class Actor; diff --git a/include/MapObject/MapObjectProfile.hpp b/include/MapObject/MapObjectProfile.hpp index 7974adf3..0cb9709e 100644 --- a/include/MapObject/MapObjectProfile.hpp +++ b/include/MapObject/MapObjectProfile.hpp @@ -3,6 +3,7 @@ #include "Map/MapObjectId.hpp" #include "Physics/Cylinder.hpp" #include "System/SysNew.hpp" +#include "profile.hpp" #include "types.h" class MapObject; diff --git a/include/profile.hpp b/include/profile.hpp new file mode 100644 index 00000000..8bf4d60c --- /dev/null +++ b/include/profile.hpp @@ -0,0 +1,11 @@ +#pragma once + +#define DECL_PROFILE(T) \ + T ProfileInstance::sProfile; \ + T *T::GetProfile() { \ + return &ProfileInstance::sProfile; \ + } + +template struct ProfileInstance { + static T sProfile; +}; diff --git a/src/000_Second/Actor/ActorUnkEFIK.cpp b/src/000_Second/Actor/ActorUnkEFIK.cpp index 41fdcdb5..8d81892f 100644 --- a/src/000_Second/Actor/ActorUnkEFIK.cpp +++ b/src/000_Second/Actor/ActorUnkEFIK.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkEFIK.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkEFIK sActorProfileUnkEFIK; - -ARM ActorProfileUnkEFIK *ActorProfileUnkEFIK::GetProfile() { - return &sActorProfileUnkEFIK; -} +ARM DECL_PROFILE(ActorProfileUnkEFIK); ARM Actor *ActorProfileUnkEFIK::Create() { return new(HeapIndex_2) ActorUnkEFIK(); diff --git a/src/000_Second/Actor/ActorUnkEVIC.cpp b/src/000_Second/Actor/ActorUnkEVIC.cpp index 21e3c28c..10e0ece5 100644 --- a/src/000_Second/Actor/ActorUnkEVIC.cpp +++ b/src/000_Second/Actor/ActorUnkEVIC.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkEVIC.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkEVIC sActorProfileUnkEVIC; - -ARM ActorProfileUnkEVIC *ActorProfileUnkEVIC::GetProfile() { - return &sActorProfileUnkEVIC; -} +ARM DECL_PROFILE(ActorProfileUnkEVIC); ARM Actor *ActorProfileUnkEVIC::Create() { return new(HeapIndex_2) ActorUnkEVIC(); diff --git a/src/000_Second/Actor/ActorUnkSWOB.cpp b/src/000_Second/Actor/ActorUnkSWOB.cpp index 35a80a70..b3ea0d2e 100644 --- a/src/000_Second/Actor/ActorUnkSWOB.cpp +++ b/src/000_Second/Actor/ActorUnkSWOB.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkSWOB.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkSWOB sActorProfileUnkSWOB; - -ARM ActorProfileUnkSWOB *ActorProfileUnkSWOB::GetProfile() { - return &sActorProfileUnkSWOB; -} +ARM DECL_PROFILE(ActorProfileUnkSWOB); ARM Actor *ActorProfileUnkSWOB::Create() { return new(HeapIndex_2) ActorUnkSWOB(); diff --git a/src/000_Second/Actor/ActorUnkSWTM.cpp b/src/000_Second/Actor/ActorUnkSWTM.cpp index 0dfa96d0..a53ae315 100644 --- a/src/000_Second/Actor/ActorUnkSWTM.cpp +++ b/src/000_Second/Actor/ActorUnkSWTM.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkSWTM.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkSWTM sActorProfileUnkSWTM; - -ARM ActorProfileUnkSWTM *ActorProfileUnkSWTM::GetProfile() { - return &sActorProfileUnkSWTM; -} +ARM DECL_PROFILE(ActorProfileUnkSWTM); ARM Actor *ActorProfileUnkSWTM::Create() { return new(HeapIndex_2) ActorUnkSWTM(); diff --git a/src/000_Second/MapObject/MapObjectUnkBLCM.cpp b/src/000_Second/MapObject/MapObjectUnkBLCM.cpp index 4ad521aa..f452c07a 100644 --- a/src/000_Second/MapObject/MapObjectUnkBLCM.cpp +++ b/src/000_Second/MapObject/MapObjectUnkBLCM.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkBLCM.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkBLCM sMapObjectProfileUnkBLCM; - -ARM MapObjectProfileUnkBLCM *MapObjectProfileUnkBLCM::GetProfile() { - return &sMapObjectProfileUnkBLCM; -} +ARM DECL_PROFILE(MapObjectProfileUnkBLCM); ARM MapObject *MapObjectProfileUnkBLCM::Create() { return new(HeapIndex_2) MapObjectUnkBLCM(); diff --git a/src/000_Second/MapObject/MapObjectUnkSWST.cpp b/src/000_Second/MapObject/MapObjectUnkSWST.cpp index cb86d253..ad479b38 100644 --- a/src/000_Second/MapObject/MapObjectUnkSWST.cpp +++ b/src/000_Second/MapObject/MapObjectUnkSWST.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkSWST.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkSWST sMapObjectProfileUnkSWST; - -ARM MapObjectProfileUnkSWST *MapObjectProfileUnkSWST::GetProfile() { - return &sMapObjectProfileUnkSWST; -} +ARM DECL_PROFILE(MapObjectProfileUnkSWST); ARM MapObject *MapObjectProfileUnkSWST::Create() { return new(HeapIndex_2) MapObjectUnkSWST(); diff --git a/src/021_BattleGame/Actor/ActorUnkBAEY.cpp b/src/021_BattleGame/Actor/ActorUnkBAEY.cpp index b0db688f..38c93af9 100644 --- a/src/021_BattleGame/Actor/ActorUnkBAEY.cpp +++ b/src/021_BattleGame/Actor/ActorUnkBAEY.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkBAEY.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkBAEY sActorProfileUnkBAEY; - -ARM ActorProfileUnkBAEY *ActorProfileUnkBAEY::GetProfile() { - return &sActorProfileUnkBAEY; -} +ARM DECL_PROFILE(ActorProfileUnkBAEY); ARM Actor *ActorProfileUnkBAEY::Create() { return new(HeapIndex_2) ActorUnkBAEY(); diff --git a/src/021_BattleGame/Actor/ActorUnkBAFO.cpp b/src/021_BattleGame/Actor/ActorUnkBAFO.cpp index 720d276c..21306817 100644 --- a/src/021_BattleGame/Actor/ActorUnkBAFO.cpp +++ b/src/021_BattleGame/Actor/ActorUnkBAFO.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkBAFO.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkBAFO sActorProfileUnkBAFO; - -ARM ActorProfileUnkBAFO *ActorProfileUnkBAFO::GetProfile() { - return &sActorProfileUnkBAFO; -} +ARM DECL_PROFILE(ActorProfileUnkBAFO); ARM Actor *ActorProfileUnkBAFO::Create() { return new(HeapIndex_2) ActorUnkBAFO(); diff --git a/src/021_BattleGame/Actor/ActorUnkBAPH.cpp b/src/021_BattleGame/Actor/ActorUnkBAPH.cpp index e3fd91c0..c60de2c4 100644 --- a/src/021_BattleGame/Actor/ActorUnkBAPH.cpp +++ b/src/021_BattleGame/Actor/ActorUnkBAPH.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkBAPH.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkBAPH sActorProfileUnkBAPH; - -ARM ActorProfileUnkBAPH *ActorProfileUnkBAPH::GetProfile() { - return &sActorProfileUnkBAPH; -} +ARM DECL_PROFILE(ActorProfileUnkBAPH); ARM Actor *ActorProfileUnkBAPH::Create() { return new(HeapIndex_2) ActorUnkBAPH(); diff --git a/src/021_BattleGame/Actor/ActorUnkBFFN.cpp b/src/021_BattleGame/Actor/ActorUnkBFFN.cpp index e821dd70..bc89c8bf 100644 --- a/src/021_BattleGame/Actor/ActorUnkBFFN.cpp +++ b/src/021_BattleGame/Actor/ActorUnkBFFN.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkBFFN.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkBFFN sActorProfileUnkBFFN; - -ARM ActorProfileUnkBFFN *ActorProfileUnkBFFN::GetProfile() { - return &sActorProfileUnkBFFN; -} +ARM DECL_PROFILE(ActorProfileUnkBFFN); ARM Actor *ActorProfileUnkBFFN::Create() { return new(HeapIndex_2) ActorUnkBFFN(); diff --git a/src/021_BattleGame/Actor/ActorUnkBPAP.cpp b/src/021_BattleGame/Actor/ActorUnkBPAP.cpp index e55b8775..872197a8 100644 --- a/src/021_BattleGame/Actor/ActorUnkBPAP.cpp +++ b/src/021_BattleGame/Actor/ActorUnkBPAP.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkBPAP.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkBPAP sActorProfileUnkBPAP; - -ARM ActorProfileUnkBPAP *ActorProfileUnkBPAP::GetProfile() { - return &sActorProfileUnkBPAP; -} +ARM DECL_PROFILE(ActorProfileUnkBPAP); ARM Actor *ActorProfileUnkBPAP::Create() { return new(HeapIndex_2) ActorUnkBPAP(); diff --git a/src/021_BattleGame/Actor/ActorUnkBTIR.cpp b/src/021_BattleGame/Actor/ActorUnkBTIR.cpp index 4a48ddeb..b27b5a8c 100644 --- a/src/021_BattleGame/Actor/ActorUnkBTIR.cpp +++ b/src/021_BattleGame/Actor/ActorUnkBTIR.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkBTIR.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkBTIR sActorProfileUnkBTIR; - -ARM ActorProfileUnkBTIR *ActorProfileUnkBTIR::GetProfile() { - return &sActorProfileUnkBTIR; -} +ARM DECL_PROFILE(ActorProfileUnkBTIR); ARM Actor *ActorProfileUnkBTIR::Create() { return new(HeapIndex_2) ActorUnkBTIR(); diff --git a/src/021_BattleGame/Actor/ActorUnkCLZN.cpp b/src/021_BattleGame/Actor/ActorUnkCLZN.cpp index 4631e30a..16506bd6 100644 --- a/src/021_BattleGame/Actor/ActorUnkCLZN.cpp +++ b/src/021_BattleGame/Actor/ActorUnkCLZN.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkCLZN.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkCLZN sActorProfileUnkCLZN; - -ARM ActorProfileUnkCLZN *ActorProfileUnkCLZN::GetProfile() { - return &sActorProfileUnkCLZN; -} +ARM DECL_PROFILE(ActorProfileUnkCLZN); ARM Actor *ActorProfileUnkCLZN::Create() { return new(HeapIndex_2) ActorUnkCLZN(); diff --git a/src/021_BattleGame/Actor/ActorUnkFOFA.cpp b/src/021_BattleGame/Actor/ActorUnkFOFA.cpp index 637bd6bd..59c50470 100644 --- a/src/021_BattleGame/Actor/ActorUnkFOFA.cpp +++ b/src/021_BattleGame/Actor/ActorUnkFOFA.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkFOFA.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkFOFA sActorProfileUnkFOFA; - -ARM ActorProfileUnkFOFA *ActorProfileUnkFOFA::GetProfile() { - return &sActorProfileUnkFOFA; -} +ARM DECL_PROFILE(ActorProfileUnkFOFA); ARM Actor *ActorProfileUnkFOFA::Create() { return new(HeapIndex_2) ActorUnkFOFA(); diff --git a/src/021_BattleGame/Actor/ActorUnkLVOF.cpp b/src/021_BattleGame/Actor/ActorUnkLVOF.cpp index deb86613..6213d09c 100644 --- a/src/021_BattleGame/Actor/ActorUnkLVOF.cpp +++ b/src/021_BattleGame/Actor/ActorUnkLVOF.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkLVOF.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkLVOF sActorProfileUnkLVOF; - -ARM ActorProfileUnkLVOF *ActorProfileUnkLVOF::GetProfile() { - return &sActorProfileUnkLVOF; -} +ARM DECL_PROFILE(ActorProfileUnkLVOF); ARM Actor *ActorProfileUnkLVOF::Create() { return new(HeapIndex_2) ActorUnkLVOF(); diff --git a/src/021_BattleGame/MapObject/MapObjectUnkBAPL.cpp b/src/021_BattleGame/MapObject/MapObjectUnkBAPL.cpp index edaac655..31cdfc3f 100644 --- a/src/021_BattleGame/MapObject/MapObjectUnkBAPL.cpp +++ b/src/021_BattleGame/MapObject/MapObjectUnkBAPL.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkBAPL.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkBAPL sMapObjectProfileUnkBAPL; - -ARM MapObjectProfileUnkBAPL *MapObjectProfileUnkBAPL::GetProfile() { - return &sMapObjectProfileUnkBAPL; -} +ARM DECL_PROFILE(MapObjectProfileUnkBAPL); ARM MapObject *MapObjectProfileUnkBAPL::Create() { return new(HeapIndex_2) MapObjectUnkBAPL(); diff --git a/src/021_BattleGame/MapObject/MapObjectUnkBFFL.cpp b/src/021_BattleGame/MapObject/MapObjectUnkBFFL.cpp index 67161f7c..76a400d0 100644 --- a/src/021_BattleGame/MapObject/MapObjectUnkBFFL.cpp +++ b/src/021_BattleGame/MapObject/MapObjectUnkBFFL.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkBFFL.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkBFFL sMapObjectProfileUnkBFFL; - -ARM MapObjectProfileUnkBFFL *MapObjectProfileUnkBFFL::GetProfile() { - return &sMapObjectProfileUnkBFFL; -} +ARM DECL_PROFILE(MapObjectProfileUnkBFFL); ARM MapObject *MapObjectProfileUnkBFFL::Create() { return new(HeapIndex_2) MapObjectUnkBFFL(); diff --git a/src/021_BattleGame/MapObject/MapObjectUnkBFSP.cpp b/src/021_BattleGame/MapObject/MapObjectUnkBFSP.cpp index 167c4b46..053ba157 100644 --- a/src/021_BattleGame/MapObject/MapObjectUnkBFSP.cpp +++ b/src/021_BattleGame/MapObject/MapObjectUnkBFSP.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkBFSP.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkBFSP sMapObjectProfileUnkBFSP; - -ARM MapObjectProfileUnkBFSP *MapObjectProfileUnkBFSP::GetProfile() { - return &sMapObjectProfileUnkBFSP; -} +ARM DECL_PROFILE(MapObjectProfileUnkBFSP); ARM MapObject *MapObjectProfileUnkBFSP::Create() { return new(HeapIndex_2) MapObjectUnkBFSP(); diff --git a/src/024_MainGame/Actor/ActorUnkOBPC.cpp b/src/024_MainGame/Actor/ActorUnkOBPC.cpp index 1aad64b4..c599c9b9 100644 --- a/src/024_MainGame/Actor/ActorUnkOBPC.cpp +++ b/src/024_MainGame/Actor/ActorUnkOBPC.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkOBPC.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkOBPC sActorProfileUnkOBPC; - -ARM ActorProfileUnkOBPC *ActorProfileUnkOBPC::GetProfile() { - return &sActorProfileUnkOBPC; -} +ARM DECL_PROFILE(ActorProfileUnkOBPC); ARM Actor *ActorProfileUnkOBPC::Create() { return new(HeapIndex_2) ActorUnkOBPC(); diff --git a/src/026_Train/Actor/ActorUnkBDEM.cpp b/src/026_Train/Actor/ActorUnkBDEM.cpp index 596adcdf..e33b6ea1 100644 --- a/src/026_Train/Actor/ActorUnkBDEM.cpp +++ b/src/026_Train/Actor/ActorUnkBDEM.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkBDEM.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkBDEM sActorProfileUnkBDEM; - -ARM ActorProfileUnkBDEM *ActorProfileUnkBDEM::GetProfile() { - return &sActorProfileUnkBDEM; -} +ARM DECL_PROFILE(ActorProfileUnkBDEM); ARM Actor *ActorProfileUnkBDEM::Create() { return new(HeapIndex_2) ActorUnkBDEM(); diff --git a/src/026_Train/Actor/ActorUnkCNBL.cpp b/src/026_Train/Actor/ActorUnkCNBL.cpp index 351cd234..4893005e 100644 --- a/src/026_Train/Actor/ActorUnkCNBL.cpp +++ b/src/026_Train/Actor/ActorUnkCNBL.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkCNBL.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkCNBL sActorProfileUnkCNBL; - -ARM ActorProfileUnkCNBL *ActorProfileUnkCNBL::GetProfile() { - return &sActorProfileUnkCNBL; -} +ARM DECL_PROFILE(ActorProfileUnkCNBL); ARM Actor *ActorProfileUnkCNBL::Create() { return new(HeapIndex_2) ActorUnkCNBL(); diff --git a/src/026_Train/Actor/ActorUnkDKCL.cpp b/src/026_Train/Actor/ActorUnkDKCL.cpp index 224043b6..70f1a2fd 100644 --- a/src/026_Train/Actor/ActorUnkDKCL.cpp +++ b/src/026_Train/Actor/ActorUnkDKCL.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkDKCL.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkDKCL sActorProfileUnkDKCL; - -ARM ActorProfileUnkDKCL *ActorProfileUnkDKCL::GetProfile() { - return &sActorProfileUnkDKCL; -} +ARM DECL_PROFILE(ActorProfileUnkDKCL); ARM Actor *ActorProfileUnkDKCL::Create() { return new(HeapIndex_2) ActorUnkDKCL(); diff --git a/src/026_Train/Actor/ActorUnkDKTR.cpp b/src/026_Train/Actor/ActorUnkDKTR.cpp index 05ebfed1..33446718 100644 --- a/src/026_Train/Actor/ActorUnkDKTR.cpp +++ b/src/026_Train/Actor/ActorUnkDKTR.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkDKTR.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkDKTR sActorProfileUnkDKTR; - -ARM ActorProfileUnkDKTR *ActorProfileUnkDKTR::GetProfile() { - return &sActorProfileUnkDKTR; -} +ARM DECL_PROFILE(ActorProfileUnkDKTR); ARM Actor *ActorProfileUnkDKTR::Create() { return new(HeapIndex_2) ActorUnkDKTR(); diff --git a/src/026_Train/Actor/ActorUnkKLTR.cpp b/src/026_Train/Actor/ActorUnkKLTR.cpp index cb2ff6eb..20730b2b 100644 --- a/src/026_Train/Actor/ActorUnkKLTR.cpp +++ b/src/026_Train/Actor/ActorUnkKLTR.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkKLTR.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkKLTR sActorProfileUnkKLTR; - -ARM ActorProfileUnkKLTR *ActorProfileUnkKLTR::GetProfile() { - return &sActorProfileUnkKLTR; -} +ARM DECL_PROFILE(ActorProfileUnkKLTR); ARM Actor *ActorProfileUnkKLTR::Create() { return new(HeapIndex_2) ActorUnkKLTR(); diff --git a/src/026_Train/Actor/ActorUnkRB1T.cpp b/src/026_Train/Actor/ActorUnkRB1T.cpp index ec7d6bc1..f31e4430 100644 --- a/src/026_Train/Actor/ActorUnkRB1T.cpp +++ b/src/026_Train/Actor/ActorUnkRB1T.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkRB1T.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkRB1T sActorProfileUnkRB1T; - -ARM ActorProfileUnkRB1T *ActorProfileUnkRB1T::GetProfile() { - return &sActorProfileUnkRB1T; -} +ARM DECL_PROFILE(ActorProfileUnkRB1T); ARM Actor *ActorProfileUnkRB1T::Create() { return new(HeapIndex_2) ActorUnkRB1T(); diff --git a/src/026_Train/Actor/ActorUnkRBNT.cpp b/src/026_Train/Actor/ActorUnkRBNT.cpp index 42b1fc7e..2f04f883 100644 --- a/src/026_Train/Actor/ActorUnkRBNT.cpp +++ b/src/026_Train/Actor/ActorUnkRBNT.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkRBNT.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkRBNT sActorProfileUnkRBNT; - -ARM ActorProfileUnkRBNT *ActorProfileUnkRBNT::GetProfile() { - return &sActorProfileUnkRBNT; -} +ARM DECL_PROFILE(ActorProfileUnkRBNT); ARM Actor *ActorProfileUnkRBNT::Create() { return new(HeapIndex_2) ActorUnkRBNT(); diff --git a/src/026_Train/Actor/ActorUnkRBRT.cpp b/src/026_Train/Actor/ActorUnkRBRT.cpp index 2ac09e2a..955f83fc 100644 --- a/src/026_Train/Actor/ActorUnkRBRT.cpp +++ b/src/026_Train/Actor/ActorUnkRBRT.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkRBRT.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkRBRT sActorProfileUnkRBRT; - -ARM ActorProfileUnkRBRT *ActorProfileUnkRBRT::GetProfile() { - return &sActorProfileUnkRBRT; -} +ARM DECL_PROFILE(ActorProfileUnkRBRT); ARM Actor *ActorProfileUnkRBRT::Create() { return new(HeapIndex_2) ActorUnkRBRT(); diff --git a/src/026_Train/Actor/ActorUnkSNST.cpp b/src/026_Train/Actor/ActorUnkSNST.cpp index 45661c0b..f11fb8e0 100644 --- a/src/026_Train/Actor/ActorUnkSNST.cpp +++ b/src/026_Train/Actor/ActorUnkSNST.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkSNST.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkSNST sActorProfileUnkSNST; - -ARM ActorProfileUnkSNST *ActorProfileUnkSNST::GetProfile() { - return &sActorProfileUnkSNST; -} +ARM DECL_PROFILE(ActorProfileUnkSNST); ARM Actor *ActorProfileUnkSNST::Create() { return new(HeapIndex_2) ActorUnkSNST(); diff --git a/src/026_Train/Actor/ActorUnkTBRD.cpp b/src/026_Train/Actor/ActorUnkTBRD.cpp index c029fda3..7428843e 100644 --- a/src/026_Train/Actor/ActorUnkTBRD.cpp +++ b/src/026_Train/Actor/ActorUnkTBRD.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkTBRD.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkTBRD sActorProfileUnkTBRD; - -ARM ActorProfileUnkTBRD *ActorProfileUnkTBRD::GetProfile() { - return &sActorProfileUnkTBRD; -} +ARM DECL_PROFILE(ActorProfileUnkTBRD); ARM Actor *ActorProfileUnkTBRD::Create() { return new(HeapIndex_2) ActorUnkTBRD(); diff --git a/src/026_Train/Actor/ActorUnkTCOW_WCAS.cpp b/src/026_Train/Actor/ActorUnkTCOW_WCAS.cpp index f54f07f4..9dcb9dcb 100644 --- a/src/026_Train/Actor/ActorUnkTCOW_WCAS.cpp +++ b/src/026_Train/Actor/ActorUnkTCOW_WCAS.cpp @@ -5,11 +5,7 @@ // --- Actor TCOW --- -static ActorProfileUnkTCOW sActorProfileUnkTCOW; - -ARM ActorProfileUnkTCOW *ActorProfileUnkTCOW::GetProfile() { - return &sActorProfileUnkTCOW; -} +ARM DECL_PROFILE(ActorProfileUnkTCOW); ARM Actor *ActorProfileUnkTCOW::Create() { return new(HeapIndex_2) ActorUnkTCOW(); @@ -22,11 +18,7 @@ ARM ActorUnkTCOW::ActorUnkTCOW() {} // --- Actor WCAS --- -static ActorProfileUnkWCAS sActorProfileUnkWCAS; - -ARM ActorProfileUnkWCAS *ActorProfileUnkWCAS::GetProfile() { - return &sActorProfileUnkWCAS; -} +ARM DECL_PROFILE(ActorProfileUnkWCAS); ARM Actor *ActorProfileUnkWCAS::Create() { return new(HeapIndex_2) ActorUnkWCAS(); diff --git a/src/026_Train/Actor/ActorUnkTFAT.cpp b/src/026_Train/Actor/ActorUnkTFAT.cpp index 18a6d021..ef109730 100644 --- a/src/026_Train/Actor/ActorUnkTFAT.cpp +++ b/src/026_Train/Actor/ActorUnkTFAT.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkTFAT.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkTFAT sActorProfileUnkTFAT; - -ARM ActorProfileUnkTFAT *ActorProfileUnkTFAT::GetProfile() { - return &sActorProfileUnkTFAT; -} +ARM DECL_PROFILE(ActorProfileUnkTFAT); ARM Actor *ActorProfileUnkTFAT::Create() { return new(HeapIndex_2) ActorUnkTFAT(); diff --git a/src/026_Train/Actor/ActorUnkTHER.cpp b/src/026_Train/Actor/ActorUnkTHER.cpp index 628407c0..a7d7d6e5 100644 --- a/src/026_Train/Actor/ActorUnkTHER.cpp +++ b/src/026_Train/Actor/ActorUnkTHER.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkTHER.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkTHER sActorProfileUnkTHER; - -ARM ActorProfileUnkTHER *ActorProfileUnkTHER::GetProfile() { - return &sActorProfileUnkTHER; -} +ARM DECL_PROFILE(ActorProfileUnkTHER); ARM Actor *ActorProfileUnkTHER::Create() { return new(HeapIndex_2) ActorUnkTHER(); diff --git a/src/026_Train/Actor/ActorUnkTRBC.cpp b/src/026_Train/Actor/ActorUnkTRBC.cpp index 821d05ec..eac1f5ba 100644 --- a/src/026_Train/Actor/ActorUnkTRBC.cpp +++ b/src/026_Train/Actor/ActorUnkTRBC.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkTRBC.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkTRBC sActorProfileUnkTRBC; - -ARM ActorProfileUnkTRBC *ActorProfileUnkTRBC::GetProfile() { - return &sActorProfileUnkTRBC; -} +ARM DECL_PROFILE(ActorProfileUnkTRBC); ARM Actor *ActorProfileUnkTRBC::Create() { return new(HeapIndex_2) ActorUnkTRBC(); diff --git a/src/026_Train/Actor/ActorUnkTRCB.cpp b/src/026_Train/Actor/ActorUnkTRCB.cpp index df4aac72..96e325d0 100644 --- a/src/026_Train/Actor/ActorUnkTRCB.cpp +++ b/src/026_Train/Actor/ActorUnkTRCB.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkTRCB.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkTRCB sActorProfileUnkTRCB; - -ARM ActorProfileUnkTRCB *ActorProfileUnkTRCB::GetProfile() { - return &sActorProfileUnkTRCB; -} +ARM DECL_PROFILE(ActorProfileUnkTRCB); ARM Actor *ActorProfileUnkTRCB::Create() { return new(HeapIndex_2) ActorUnkTRCB(); diff --git a/src/026_Train/Actor/ActorUnkTRSG.cpp b/src/026_Train/Actor/ActorUnkTRSG.cpp index 32e5b488..409e1dc6 100644 --- a/src/026_Train/Actor/ActorUnkTRSG.cpp +++ b/src/026_Train/Actor/ActorUnkTRSG.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkTRSG.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkTRSG sActorProfileUnkTRSG; - -ARM ActorProfileUnkTRSG *ActorProfileUnkTRSG::GetProfile() { - return &sActorProfileUnkTRSG; -} +ARM DECL_PROFILE(ActorProfileUnkTRSG); ARM Actor *ActorProfileUnkTRSG::Create() { return new(HeapIndex_2) ActorUnkTRSG(); diff --git a/src/026_Train/Actor/ActorUnkTRSP.cpp b/src/026_Train/Actor/ActorUnkTRSP.cpp index 2da7a5dc..7a4d8f7b 100644 --- a/src/026_Train/Actor/ActorUnkTRSP.cpp +++ b/src/026_Train/Actor/ActorUnkTRSP.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkTRSP.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkTRSP sActorProfileUnkTRSP; - -ARM ActorProfileUnkTRSP *ActorProfileUnkTRSP::GetProfile() { - return &sActorProfileUnkTRSP; -} +ARM DECL_PROFILE(ActorProfileUnkTRSP); ARM Actor *ActorProfileUnkTRSP::Create() { return new(HeapIndex_2) ActorUnkTRSP(); diff --git a/src/026_Train/Actor/ActorUnkTRTT.cpp b/src/026_Train/Actor/ActorUnkTRTT.cpp index 0768495f..a9f00848 100644 --- a/src/026_Train/Actor/ActorUnkTRTT.cpp +++ b/src/026_Train/Actor/ActorUnkTRTT.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkTRTT.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkTRTT sActorProfileUnkTRTT; - -ARM ActorProfileUnkTRTT *ActorProfileUnkTRTT::GetProfile() { - return &sActorProfileUnkTRTT; -} +ARM DECL_PROFILE(ActorProfileUnkTRTT); ARM Actor *ActorProfileUnkTRTT::Create() { return new(HeapIndex_2) ActorUnkTRTT(); diff --git a/src/026_Train/Actor/ActorUnkTRUP.cpp b/src/026_Train/Actor/ActorUnkTRUP.cpp index 625ceb8e..dd108292 100644 --- a/src/026_Train/Actor/ActorUnkTRUP.cpp +++ b/src/026_Train/Actor/ActorUnkTRUP.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkTRUP.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkTRUP sActorProfileUnkTRUP; - -ARM ActorProfileUnkTRUP *ActorProfileUnkTRUP::GetProfile() { - return &sActorProfileUnkTRUP; -} +ARM DECL_PROFILE(ActorProfileUnkTRUP); ARM Actor *ActorProfileUnkTRUP::Create() { return new(HeapIndex_2) ActorUnkTRUP(); diff --git a/src/026_Train/Actor/ActorUnkTTET.cpp b/src/026_Train/Actor/ActorUnkTTET.cpp index 02ef65a2..2c3eaff3 100644 --- a/src/026_Train/Actor/ActorUnkTTET.cpp +++ b/src/026_Train/Actor/ActorUnkTTET.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkTTET.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkTTET sActorProfileUnkTTET; - -ARM ActorProfileUnkTTET *ActorProfileUnkTTET::GetProfile() { - return &sActorProfileUnkTTET; -} +ARM DECL_PROFILE(ActorProfileUnkTTET); ARM Actor *ActorProfileUnkTTET::Create() { return new(HeapIndex_2) ActorUnkTTET(); diff --git a/src/026_Train/Actor/ActorUnkTVLR.cpp b/src/026_Train/Actor/ActorUnkTVLR.cpp index 5c43946a..b458b168 100644 --- a/src/026_Train/Actor/ActorUnkTVLR.cpp +++ b/src/026_Train/Actor/ActorUnkTVLR.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkTVLR.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkTVLR sActorProfileUnkTVLR; - -ARM ActorProfileUnkTVLR *ActorProfileUnkTVLR::GetProfile() { - return &sActorProfileUnkTVLR; -} +ARM DECL_PROFILE(ActorProfileUnkTVLR); ARM Actor *ActorProfileUnkTVLR::Create() { return new(HeapIndex_2) ActorUnkTVLR(); diff --git a/src/026_Train/MapObject/MapObjectUnkEBRD.cpp b/src/026_Train/MapObject/MapObjectUnkEBRD.cpp index 739ddb0b..9813c4fc 100644 --- a/src/026_Train/MapObject/MapObjectUnkEBRD.cpp +++ b/src/026_Train/MapObject/MapObjectUnkEBRD.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkEBRD.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkEBRD sMapObjectProfileUnkEBRD; - -ARM MapObjectProfileUnkEBRD *MapObjectProfileUnkEBRD::GetProfile() { - return &sMapObjectProfileUnkEBRD; -} +ARM DECL_PROFILE(MapObjectProfileUnkEBRD); ARM MapObject *MapObjectProfileUnkEBRD::Create() { return new(HeapIndex_2) MapObjectUnkEBRD(); diff --git a/src/026_Train/MapObject/MapObjectUnkEFRS.cpp b/src/026_Train/MapObject/MapObjectUnkEFRS.cpp index 5c518b58..3b09296e 100644 --- a/src/026_Train/MapObject/MapObjectUnkEFRS.cpp +++ b/src/026_Train/MapObject/MapObjectUnkEFRS.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkEFRS.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkEFRS sMapObjectProfileUnkEFRS; - -ARM MapObjectProfileUnkEFRS *MapObjectProfileUnkEFRS::GetProfile() { - return &sMapObjectProfileUnkEFRS; -} +ARM DECL_PROFILE(MapObjectProfileUnkEFRS); ARM MapObject *MapObjectProfileUnkEFRS::Create() { return new(HeapIndex_2) MapObjectUnkEFRS(); diff --git a/src/026_Train/MapObject/MapObjectUnkETNL.cpp b/src/026_Train/MapObject/MapObjectUnkETNL.cpp index a4af4e44..d3c544bf 100644 --- a/src/026_Train/MapObject/MapObjectUnkETNL.cpp +++ b/src/026_Train/MapObject/MapObjectUnkETNL.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkETNL.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkETNL sMapObjectProfileUnkETNL; - -ARM MapObjectProfileUnkETNL *MapObjectProfileUnkETNL::GetProfile() { - return &sMapObjectProfileUnkETNL; -} +ARM DECL_PROFILE(MapObjectProfileUnkETNL); ARM MapObject *MapObjectProfileUnkETNL::Create() { return new(HeapIndex_2) MapObjectUnkETNL(); diff --git a/src/026_Train/MapObject/MapObjectUnkETSD.cpp b/src/026_Train/MapObject/MapObjectUnkETSD.cpp index ca6b4345..84315ec2 100644 --- a/src/026_Train/MapObject/MapObjectUnkETSD.cpp +++ b/src/026_Train/MapObject/MapObjectUnkETSD.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkETSD.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkETSD sMapObjectProfileUnkETSD; - -ARM MapObjectProfileUnkETSD *MapObjectProfileUnkETSD::GetProfile() { - return &sMapObjectProfileUnkETSD; -} +ARM DECL_PROFILE(MapObjectProfileUnkETSD); ARM MapObject *MapObjectProfileUnkETSD::Create() { return new(HeapIndex_2) MapObjectUnkETSD(); diff --git a/src/026_Train/MapObject/MapObjectUnkMTGT.cpp b/src/026_Train/MapObject/MapObjectUnkMTGT.cpp index 1fc55a88..45174e3a 100644 --- a/src/026_Train/MapObject/MapObjectUnkMTGT.cpp +++ b/src/026_Train/MapObject/MapObjectUnkMTGT.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkMTGT.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkMTGT sMapObjectProfileUnkMTGT; - -ARM MapObjectProfileUnkMTGT *MapObjectProfileUnkMTGT::GetProfile() { - return &sMapObjectProfileUnkMTGT; -} +ARM DECL_PROFILE(MapObjectProfileUnkMTGT); ARM MapObject *MapObjectProfileUnkMTGT::Create() { return new(HeapIndex_2) MapObjectUnkMTGT(); diff --git a/src/026_Train/MapObject/MapObjectUnkMTWR.cpp b/src/026_Train/MapObject/MapObjectUnkMTWR.cpp index c6e5606a..1a015516 100644 --- a/src/026_Train/MapObject/MapObjectUnkMTWR.cpp +++ b/src/026_Train/MapObject/MapObjectUnkMTWR.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkMTWR.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkMTWR sMapObjectProfileUnkMTWR; - -ARM MapObjectProfileUnkMTWR *MapObjectProfileUnkMTWR::GetProfile() { - return &sMapObjectProfileUnkMTWR; -} +ARM DECL_PROFILE(MapObjectProfileUnkMTWR); ARM MapObject *MapObjectProfileUnkMTWR::Create() { return new(HeapIndex_2) MapObjectUnkMTWR(); diff --git a/src/026_Train/MapObject/MapObjectUnkPLFA.cpp b/src/026_Train/MapObject/MapObjectUnkPLFA.cpp index cc8a32f5..780f04f7 100644 --- a/src/026_Train/MapObject/MapObjectUnkPLFA.cpp +++ b/src/026_Train/MapObject/MapObjectUnkPLFA.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkPLFA.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkPLFA sMapObjectProfileUnkPLFA; - -ARM MapObjectProfileUnkPLFA *MapObjectProfileUnkPLFA::GetProfile() { - return &sMapObjectProfileUnkPLFA; -} +ARM DECL_PROFILE(MapObjectProfileUnkPLFA); ARM MapObject *MapObjectProfileUnkPLFA::Create() { return new(HeapIndex_2) MapObjectUnkPLFA(); diff --git a/src/026_Train/MapObject/MapObjectUnkPLFM.cpp b/src/026_Train/MapObject/MapObjectUnkPLFM.cpp index 06db001b..45e5e64b 100644 --- a/src/026_Train/MapObject/MapObjectUnkPLFM.cpp +++ b/src/026_Train/MapObject/MapObjectUnkPLFM.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkPLFM.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkPLFM sMapObjectProfileUnkPLFM; - -ARM MapObjectProfileUnkPLFM *MapObjectProfileUnkPLFM::GetProfile() { - return &sMapObjectProfileUnkPLFM; -} +ARM DECL_PROFILE(MapObjectProfileUnkPLFM); ARM MapObject *MapObjectProfileUnkPLFM::Create() { return new(HeapIndex_2) MapObjectUnkPLFM(); diff --git a/src/026_Train/MapObject/MapObjectUnkTBSF.cpp b/src/026_Train/MapObject/MapObjectUnkTBSF.cpp index bdf2812b..14168e6c 100644 --- a/src/026_Train/MapObject/MapObjectUnkTBSF.cpp +++ b/src/026_Train/MapObject/MapObjectUnkTBSF.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkTBSF.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkTBSF sMapObjectProfileUnkTBSF; - -ARM MapObjectProfileUnkTBSF *MapObjectProfileUnkTBSF::GetProfile() { - return &sMapObjectProfileUnkTBSF; -} +ARM DECL_PROFILE(MapObjectProfileUnkTBSF); ARM MapObject *MapObjectProfileUnkTBSF::Create() { return new(HeapIndex_2) MapObjectUnkTBSF(); diff --git a/src/026_Train/MapObject/MapObjectUnkTRET.cpp b/src/026_Train/MapObject/MapObjectUnkTRET.cpp index 25fc8562..b7824cc1 100644 --- a/src/026_Train/MapObject/MapObjectUnkTRET.cpp +++ b/src/026_Train/MapObject/MapObjectUnkTRET.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkTRET.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkTRET sMapObjectProfileUnkTRET; - -ARM MapObjectProfileUnkTRET *MapObjectProfileUnkTRET::GetProfile() { - return &sMapObjectProfileUnkTRET; -} +ARM DECL_PROFILE(MapObjectProfileUnkTRET); ARM MapObject *MapObjectProfileUnkTRET::Create() { return new(HeapIndex_2) MapObjectUnkTRET(); diff --git a/src/026_Train/MapObject/MapObjectUnkTRPT.cpp b/src/026_Train/MapObject/MapObjectUnkTRPT.cpp index fdee05a1..6b7fdf5f 100644 --- a/src/026_Train/MapObject/MapObjectUnkTRPT.cpp +++ b/src/026_Train/MapObject/MapObjectUnkTRPT.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkTRPT.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkTRPT sMapObjectProfileUnkTRPT; - -ARM MapObjectProfileUnkTRPT *MapObjectProfileUnkTRPT::GetProfile() { - return &sMapObjectProfileUnkTRPT; -} +ARM DECL_PROFILE(MapObjectProfileUnkTRPT); ARM MapObject *MapObjectProfileUnkTRPT::Create() { return new(HeapIndex_2) MapObjectUnkTRPT(); diff --git a/src/026_Train/MapObject/MapObjectUnkTRRC.cpp b/src/026_Train/MapObject/MapObjectUnkTRRC.cpp index 9f144369..e9ef46a2 100644 --- a/src/026_Train/MapObject/MapObjectUnkTRRC.cpp +++ b/src/026_Train/MapObject/MapObjectUnkTRRC.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkTRRC.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkTRRC sMapObjectProfileUnkTRRC; - -ARM MapObjectProfileUnkTRRC *MapObjectProfileUnkTRRC::GetProfile() { - return &sMapObjectProfileUnkTRRC; -} +ARM DECL_PROFILE(MapObjectProfileUnkTRRC); ARM MapObject *MapObjectProfileUnkTRRC::Create() { return new(HeapIndex_2) MapObjectUnkTRRC(); diff --git a/src/026_Train/MapObject/MapObjectUnkTRTF.cpp b/src/026_Train/MapObject/MapObjectUnkTRTF.cpp index ac17211f..9926356a 100644 --- a/src/026_Train/MapObject/MapObjectUnkTRTF.cpp +++ b/src/026_Train/MapObject/MapObjectUnkTRTF.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkTRTF.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkTRTF sMapObjectProfileUnkTRTF; - -ARM MapObjectProfileUnkTRTF *MapObjectProfileUnkTRTF::GetProfile() { - return &sMapObjectProfileUnkTRTF; -} +ARM DECL_PROFILE(MapObjectProfileUnkTRTF); ARM MapObject *MapObjectProfileUnkTRTF::Create() { return new(HeapIndex_2) MapObjectUnkTRTF(); diff --git a/src/027_TrainForest/Actor/ActorUnkFKTR.cpp b/src/027_TrainForest/Actor/ActorUnkFKTR.cpp index 6bddc2cf..e02312da 100644 --- a/src/027_TrainForest/Actor/ActorUnkFKTR.cpp +++ b/src/027_TrainForest/Actor/ActorUnkFKTR.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkFKTR.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkFKTR sActorProfileUnkFKTR; - -ARM ActorProfileUnkFKTR *ActorProfileUnkFKTR::GetProfile() { - return &sActorProfileUnkFKTR; -} +ARM DECL_PROFILE(ActorProfileUnkFKTR); ARM Actor *ActorProfileUnkFKTR::Create() { return new(HeapIndex_2) ActorUnkFKTR(); diff --git a/src/027_TrainForest/Actor/ActorUnkTRER.cpp b/src/027_TrainForest/Actor/ActorUnkTRER.cpp index df0b694d..081150b5 100644 --- a/src/027_TrainForest/Actor/ActorUnkTRER.cpp +++ b/src/027_TrainForest/Actor/ActorUnkTRER.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkTRER.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkTRER sActorProfileUnkTRER; - -ARM ActorProfileUnkTRER *ActorProfileUnkTRER::GetProfile() { - return &sActorProfileUnkTRER; -} +ARM DECL_PROFILE(ActorProfileUnkTRER); ARM Actor *ActorProfileUnkTRER::Create() { return new(HeapIndex_2) ActorUnkTRER(); diff --git a/src/027_TrainForest/MapObject/MapObjectUnkCSTL.cpp b/src/027_TrainForest/MapObject/MapObjectUnkCSTL.cpp index a1073548..b042c9cf 100644 --- a/src/027_TrainForest/MapObject/MapObjectUnkCSTL.cpp +++ b/src/027_TrainForest/MapObject/MapObjectUnkCSTL.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkCSTL.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkCSTL sMapObjectProfileUnkCSTL; - -ARM MapObjectProfileUnkCSTL *MapObjectProfileUnkCSTL::GetProfile() { - return &sMapObjectProfileUnkCSTL; -} +ARM DECL_PROFILE(MapObjectProfileUnkCSTL); ARM MapObject *MapObjectProfileUnkCSTL::Create() { return new(HeapIndex_2) MapObjectUnkCSTL(); diff --git a/src/027_TrainForest/MapObject/MapObjectUnkETDK.cpp b/src/027_TrainForest/MapObject/MapObjectUnkETDK.cpp index a4905903..93f816eb 100644 --- a/src/027_TrainForest/MapObject/MapObjectUnkETDK.cpp +++ b/src/027_TrainForest/MapObject/MapObjectUnkETDK.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkETDK.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkETDK sMapObjectProfileUnkETDK; - -ARM MapObjectProfileUnkETDK *MapObjectProfileUnkETDK::GetProfile() { - return &sMapObjectProfileUnkETDK; -} +ARM DECL_PROFILE(MapObjectProfileUnkETDK); ARM MapObject *MapObjectProfileUnkETDK::Create() { return new(HeapIndex_2) MapObjectUnkETDK(); diff --git a/src/027_TrainForest/MapObject/MapObjectUnkMBRG.cpp b/src/027_TrainForest/MapObject/MapObjectUnkMBRG.cpp index 0322869c..aa1592e4 100644 --- a/src/027_TrainForest/MapObject/MapObjectUnkMBRG.cpp +++ b/src/027_TrainForest/MapObject/MapObjectUnkMBRG.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkMBRG.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkMBRG sMapObjectProfileUnkMBRG; - -ARM MapObjectProfileUnkMBRG *MapObjectProfileUnkMBRG::GetProfile() { - return &sMapObjectProfileUnkMBRG; -} +ARM DECL_PROFILE(MapObjectProfileUnkMBRG); ARM MapObject *MapObjectProfileUnkMBRG::Create() { return new(HeapIndex_2) MapObjectUnkMBRG(); diff --git a/src/027_TrainForest/MapObject/MapObjectUnkMZFE.cpp b/src/027_TrainForest/MapObject/MapObjectUnkMZFE.cpp index ae67e17f..4e4918e9 100644 --- a/src/027_TrainForest/MapObject/MapObjectUnkMZFE.cpp +++ b/src/027_TrainForest/MapObject/MapObjectUnkMZFE.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkMZFE.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkMZFE sMapObjectProfileUnkMZFE; - -ARM MapObjectProfileUnkMZFE *MapObjectProfileUnkMZFE::GetProfile() { - return &sMapObjectProfileUnkMZFE; -} +ARM DECL_PROFILE(MapObjectProfileUnkMZFE); ARM MapObject *MapObjectProfileUnkMZFE::Create() { return new(HeapIndex_2) MapObjectUnkMZFE(); diff --git a/src/027_TrainForest/MapObject/MapObjectUnkTMFR.cpp b/src/027_TrainForest/MapObject/MapObjectUnkTMFR.cpp index 8e3aa1b8..242a08df 100644 --- a/src/027_TrainForest/MapObject/MapObjectUnkTMFR.cpp +++ b/src/027_TrainForest/MapObject/MapObjectUnkTMFR.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkTMFR.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkTMFR sMapObjectProfileUnkTMFR; - -ARM MapObjectProfileUnkTMFR *MapObjectProfileUnkTMFR::GetProfile() { - return &sMapObjectProfileUnkTMFR; -} +ARM DECL_PROFILE(MapObjectProfileUnkTMFR); ARM MapObject *MapObjectProfileUnkTMFR::Create() { return new(HeapIndex_2) MapObjectUnkTMFR(); diff --git a/src/027_TrainForest/MapObject/MapObjectUnkTRBR.cpp b/src/027_TrainForest/MapObject/MapObjectUnkTRBR.cpp index 3705529d..4df3e111 100644 --- a/src/027_TrainForest/MapObject/MapObjectUnkTRBR.cpp +++ b/src/027_TrainForest/MapObject/MapObjectUnkTRBR.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkTRBR.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkTRBR sMapObjectProfileUnkTRBR; - -ARM MapObjectProfileUnkTRBR *MapObjectProfileUnkTRBR::GetProfile() { - return &sMapObjectProfileUnkTRBR; -} +ARM DECL_PROFILE(MapObjectProfileUnkTRBR); ARM MapObject *MapObjectProfileUnkTRBR::Create() { return new(HeapIndex_2) MapObjectUnkTRBR(); diff --git a/src/027_TrainForest/MapObject/MapObjectUnkTRDA.cpp b/src/027_TrainForest/MapObject/MapObjectUnkTRDA.cpp index 0c7fb929..002fca72 100644 --- a/src/027_TrainForest/MapObject/MapObjectUnkTRDA.cpp +++ b/src/027_TrainForest/MapObject/MapObjectUnkTRDA.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkTRDA.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkTRDA sMapObjectProfileUnkTRDA; - -ARM MapObjectProfileUnkTRDA *MapObjectProfileUnkTRDA::GetProfile() { - return &sMapObjectProfileUnkTRDA; -} +ARM DECL_PROFILE(MapObjectProfileUnkTRDA); ARM MapObject *MapObjectProfileUnkTRDA::Create() { return new(HeapIndex_2) MapObjectUnkTRDA(); diff --git a/src/027_TrainForest/MapObject/MapObjectUnkTRFO.cpp b/src/027_TrainForest/MapObject/MapObjectUnkTRFO.cpp index d7cc10c4..71c5b925 100644 --- a/src/027_TrainForest/MapObject/MapObjectUnkTRFO.cpp +++ b/src/027_TrainForest/MapObject/MapObjectUnkTRFO.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkTRFO.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkTRFO sMapObjectProfileUnkTRFO; - -ARM MapObjectProfileUnkTRFO *MapObjectProfileUnkTRFO::GetProfile() { - return &sMapObjectProfileUnkTRFO; -} +ARM DECL_PROFILE(MapObjectProfileUnkTRFO); ARM MapObject *MapObjectProfileUnkTRFO::Create() { return new(HeapIndex_2) MapObjectUnkTRFO(); diff --git a/src/027_TrainForest/MapObject/MapObjectUnkTRFV.cpp b/src/027_TrainForest/MapObject/MapObjectUnkTRFV.cpp index 8695fabe..33c7ee1f 100644 --- a/src/027_TrainForest/MapObject/MapObjectUnkTRFV.cpp +++ b/src/027_TrainForest/MapObject/MapObjectUnkTRFV.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkTRFV.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkTRFV sMapObjectProfileUnkTRFV; - -ARM MapObjectProfileUnkTRFV *MapObjectProfileUnkTRFV::GetProfile() { - return &sMapObjectProfileUnkTRFV; -} +ARM DECL_PROFILE(MapObjectProfileUnkTRFV); ARM MapObject *MapObjectProfileUnkTRFV::Create() { return new(HeapIndex_2) MapObjectUnkTRFV(); diff --git a/src/027_TrainForest/MapObject/MapObjectUnkTRRA.cpp b/src/027_TrainForest/MapObject/MapObjectUnkTRRA.cpp index 09517f80..bed38e8b 100644 --- a/src/027_TrainForest/MapObject/MapObjectUnkTRRA.cpp +++ b/src/027_TrainForest/MapObject/MapObjectUnkTRRA.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkTRRA.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkTRRA sMapObjectProfileUnkTRRA; - -ARM MapObjectProfileUnkTRRA *MapObjectProfileUnkTRRA::GetProfile() { - return &sMapObjectProfileUnkTRRA; -} +ARM DECL_PROFILE(MapObjectProfileUnkTRRA); ARM MapObject *MapObjectProfileUnkTRRA::Create() { return new(HeapIndex_2) MapObjectUnkTRRA(); diff --git a/src/027_TrainForest/MapObject/MapObjectUnkTRSH.cpp b/src/027_TrainForest/MapObject/MapObjectUnkTRSH.cpp index 51550bcc..61bba961 100644 --- a/src/027_TrainForest/MapObject/MapObjectUnkTRSH.cpp +++ b/src/027_TrainForest/MapObject/MapObjectUnkTRSH.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkTRSH.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkTRSH sMapObjectProfileUnkTRSH; - -ARM MapObjectProfileUnkTRSH *MapObjectProfileUnkTRSH::GetProfile() { - return &sMapObjectProfileUnkTRSH; -} +ARM DECL_PROFILE(MapObjectProfileUnkTRSH); ARM MapObject *MapObjectProfileUnkTRSH::Create() { return new(HeapIndex_2) MapObjectUnkTRSH(); diff --git a/src/028_TrainSnow/Actor/ActorUnkSNMA.cpp b/src/028_TrainSnow/Actor/ActorUnkSNMA.cpp index 443b904b..d52c90ff 100644 --- a/src/028_TrainSnow/Actor/ActorUnkSNMA.cpp +++ b/src/028_TrainSnow/Actor/ActorUnkSNMA.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkSNMA.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkSNMA sActorProfileUnkSNMA; - -ARM ActorProfileUnkSNMA *ActorProfileUnkSNMA::GetProfile() { - return &sActorProfileUnkSNMA; -} +ARM DECL_PROFILE(ActorProfileUnkSNMA); ARM Actor *ActorProfileUnkSNMA::Create() { return new(HeapIndex_2) ActorUnkSNMA(); diff --git a/src/028_TrainSnow/Actor/ActorUnkSNMB.cpp b/src/028_TrainSnow/Actor/ActorUnkSNMB.cpp index e1e805df..5b3fe61a 100644 --- a/src/028_TrainSnow/Actor/ActorUnkSNMB.cpp +++ b/src/028_TrainSnow/Actor/ActorUnkSNMB.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkSNMB.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkSNMB sActorProfileUnkSNMB; - -ARM ActorProfileUnkSNMB *ActorProfileUnkSNMB::GetProfile() { - return &sActorProfileUnkSNMB; -} +ARM DECL_PROFILE(ActorProfileUnkSNMB); ARM Actor *ActorProfileUnkSNMB::Create() { return new(HeapIndex_2) ActorUnkSNMB(); diff --git a/src/028_TrainSnow/MapObject/MapObjectUnkEFRF.cpp b/src/028_TrainSnow/MapObject/MapObjectUnkEFRF.cpp index e444659c..20c44edc 100644 --- a/src/028_TrainSnow/MapObject/MapObjectUnkEFRF.cpp +++ b/src/028_TrainSnow/MapObject/MapObjectUnkEFRF.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkEFRF.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkEFRF sMapObjectProfileUnkEFRF; - -ARM MapObjectProfileUnkEFRF *MapObjectProfileUnkEFRF::GetProfile() { - return &sMapObjectProfileUnkEFRF; -} +ARM DECL_PROFILE(MapObjectProfileUnkEFRF); ARM MapObject *MapObjectProfileUnkEFRF::Create() { return new(HeapIndex_2) MapObjectUnkEFRF(); diff --git a/src/028_TrainSnow/MapObject/MapObjectUnkETNS.cpp b/src/028_TrainSnow/MapObject/MapObjectUnkETNS.cpp index e2526dd6..5f6c5294 100644 --- a/src/028_TrainSnow/MapObject/MapObjectUnkETNS.cpp +++ b/src/028_TrainSnow/MapObject/MapObjectUnkETNS.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkETNS.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkETNS sMapObjectProfileUnkETNS; - -ARM MapObjectProfileUnkETNS *MapObjectProfileUnkETNS::GetProfile() { - return &sMapObjectProfileUnkETNS; -} +ARM DECL_PROFILE(MapObjectProfileUnkETNS); ARM MapObject *MapObjectProfileUnkETNS::Create() { return new(HeapIndex_2) MapObjectUnkETNS(); diff --git a/src/028_TrainSnow/MapObject/MapObjectUnkETSW.cpp b/src/028_TrainSnow/MapObject/MapObjectUnkETSW.cpp index 8a3d6061..65f882e7 100644 --- a/src/028_TrainSnow/MapObject/MapObjectUnkETSW.cpp +++ b/src/028_TrainSnow/MapObject/MapObjectUnkETSW.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkETSW.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkETSW sMapObjectProfileUnkETSW; - -ARM MapObjectProfileUnkETSW *MapObjectProfileUnkETSW::GetProfile() { - return &sMapObjectProfileUnkETSW; -} +ARM DECL_PROFILE(MapObjectProfileUnkETSW); ARM MapObject *MapObjectProfileUnkETSW::Create() { return new(HeapIndex_2) MapObjectUnkETSW(); diff --git a/src/028_TrainSnow/MapObject/MapObjectUnkRBSR.cpp b/src/028_TrainSnow/MapObject/MapObjectUnkRBSR.cpp index d71f8bbd..67a16139 100644 --- a/src/028_TrainSnow/MapObject/MapObjectUnkRBSR.cpp +++ b/src/028_TrainSnow/MapObject/MapObjectUnkRBSR.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkRBSR.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkRBSR sMapObjectProfileUnkRBSR; - -ARM MapObjectProfileUnkRBSR *MapObjectProfileUnkRBSR::GetProfile() { - return &sMapObjectProfileUnkRBSR; -} +ARM DECL_PROFILE(MapObjectProfileUnkRBSR); ARM MapObject *MapObjectProfileUnkRBSR::Create() { return new(HeapIndex_2) MapObjectUnkRBSR(); diff --git a/src/028_TrainSnow/MapObject/MapObjectUnkRLPT.cpp b/src/028_TrainSnow/MapObject/MapObjectUnkRLPT.cpp index 96051366..459ae190 100644 --- a/src/028_TrainSnow/MapObject/MapObjectUnkRLPT.cpp +++ b/src/028_TrainSnow/MapObject/MapObjectUnkRLPT.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkRLPT.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkRLPT sMapObjectProfileUnkRLPT; - -ARM MapObjectProfileUnkRLPT *MapObjectProfileUnkRLPT::GetProfile() { - return &sMapObjectProfileUnkRLPT; -} +ARM DECL_PROFILE(MapObjectProfileUnkRLPT); ARM MapObject *MapObjectProfileUnkRLPT::Create() { return new(HeapIndex_2) MapObjectUnkRLPT(); diff --git a/src/028_TrainSnow/MapObject/MapObjectUnkTMSN.cpp b/src/028_TrainSnow/MapObject/MapObjectUnkTMSN.cpp index bc93056e..233fc25f 100644 --- a/src/028_TrainSnow/MapObject/MapObjectUnkTMSN.cpp +++ b/src/028_TrainSnow/MapObject/MapObjectUnkTMSN.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkTMSN.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkTMSN sMapObjectProfileUnkTMSN; - -ARM MapObjectProfileUnkTMSN *MapObjectProfileUnkTMSN::GetProfile() { - return &sMapObjectProfileUnkTMSN; -} +ARM DECL_PROFILE(MapObjectProfileUnkTMSN); ARM MapObject *MapObjectProfileUnkTMSN::Create() { return new(HeapIndex_2) MapObjectUnkTMSN(); diff --git a/src/028_TrainSnow/MapObject/MapObjectUnkTRBM.cpp b/src/028_TrainSnow/MapObject/MapObjectUnkTRBM.cpp index 758ad95c..7630df58 100644 --- a/src/028_TrainSnow/MapObject/MapObjectUnkTRBM.cpp +++ b/src/028_TrainSnow/MapObject/MapObjectUnkTRBM.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkTRBM.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkTRBM sMapObjectProfileUnkTRBM; - -ARM MapObjectProfileUnkTRBM *MapObjectProfileUnkTRBM::GetProfile() { - return &sMapObjectProfileUnkTRBM; -} +ARM DECL_PROFILE(MapObjectProfileUnkTRBM); ARM MapObject *MapObjectProfileUnkTRBM::Create() { return new(HeapIndex_2) MapObjectUnkTRBM(); diff --git a/src/028_TrainSnow/MapObject/MapObjectUnkTRFS.cpp b/src/028_TrainSnow/MapObject/MapObjectUnkTRFS.cpp index 30ae5d0f..5e3b9b0b 100644 --- a/src/028_TrainSnow/MapObject/MapObjectUnkTRFS.cpp +++ b/src/028_TrainSnow/MapObject/MapObjectUnkTRFS.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkTRFS.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkTRFS sMapObjectProfileUnkTRFS; - -ARM MapObjectProfileUnkTRFS *MapObjectProfileUnkTRFS::GetProfile() { - return &sMapObjectProfileUnkTRFS; -} +ARM DECL_PROFILE(MapObjectProfileUnkTRFS); ARM MapObject *MapObjectProfileUnkTRFS::Create() { return new(HeapIndex_2) MapObjectUnkTRFS(); diff --git a/src/028_TrainSnow/MapObject/MapObjectUnkTRH0.cpp b/src/028_TrainSnow/MapObject/MapObjectUnkTRH0.cpp index d4029323..71e63ff6 100644 --- a/src/028_TrainSnow/MapObject/MapObjectUnkTRH0.cpp +++ b/src/028_TrainSnow/MapObject/MapObjectUnkTRH0.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkTRH0.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkTRH0 sMapObjectProfileUnkTRH0; - -ARM MapObjectProfileUnkTRH0 *MapObjectProfileUnkTRH0::GetProfile() { - return &sMapObjectProfileUnkTRH0; -} +ARM DECL_PROFILE(MapObjectProfileUnkTRH0); ARM MapObject *MapObjectProfileUnkTRH0::Create() { return new(HeapIndex_2) MapObjectUnkTRH0(); diff --git a/src/028_TrainSnow/MapObject/MapObjectUnkTRMA.cpp b/src/028_TrainSnow/MapObject/MapObjectUnkTRMA.cpp index 57d099a1..2f99b8b5 100644 --- a/src/028_TrainSnow/MapObject/MapObjectUnkTRMA.cpp +++ b/src/028_TrainSnow/MapObject/MapObjectUnkTRMA.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkTRMA.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkTRMA sMapObjectProfileUnkTRMA; - -ARM MapObjectProfileUnkTRMA *MapObjectProfileUnkTRMA::GetProfile() { - return &sMapObjectProfileUnkTRMA; -} +ARM DECL_PROFILE(MapObjectProfileUnkTRMA); ARM MapObject *MapObjectProfileUnkTRMA::Create() { return new(HeapIndex_2) MapObjectUnkTRMA(); diff --git a/src/028_TrainSnow/MapObject/MapObjectUnkTRRS.cpp b/src/028_TrainSnow/MapObject/MapObjectUnkTRRS.cpp index 646b8082..cf7bb05e 100644 --- a/src/028_TrainSnow/MapObject/MapObjectUnkTRRS.cpp +++ b/src/028_TrainSnow/MapObject/MapObjectUnkTRRS.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkTRRS.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkTRRS sMapObjectProfileUnkTRRS; - -ARM MapObjectProfileUnkTRRS *MapObjectProfileUnkTRRS::GetProfile() { - return &sMapObjectProfileUnkTRRS; -} +ARM DECL_PROFILE(MapObjectProfileUnkTRRS); ARM MapObject *MapObjectProfileUnkTRRS::Create() { return new(HeapIndex_2) MapObjectUnkTRRS(); diff --git a/src/028_TrainSnow/MapObject/MapObjectUnkTRSR.cpp b/src/028_TrainSnow/MapObject/MapObjectUnkTRSR.cpp index 05481c6d..6b32ad20 100644 --- a/src/028_TrainSnow/MapObject/MapObjectUnkTRSR.cpp +++ b/src/028_TrainSnow/MapObject/MapObjectUnkTRSR.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkTRSR.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkTRSR sMapObjectProfileUnkTRSR; - -ARM MapObjectProfileUnkTRSR *MapObjectProfileUnkTRSR::GetProfile() { - return &sMapObjectProfileUnkTRSR; -} +ARM DECL_PROFILE(MapObjectProfileUnkTRSR); ARM MapObject *MapObjectProfileUnkTRSR::Create() { return new(HeapIndex_2) MapObjectUnkTRSR(); diff --git a/src/028_TrainSnow/MapObject/MapObjectUnkTRSS.cpp b/src/028_TrainSnow/MapObject/MapObjectUnkTRSS.cpp index 503be90d..09fa19bd 100644 --- a/src/028_TrainSnow/MapObject/MapObjectUnkTRSS.cpp +++ b/src/028_TrainSnow/MapObject/MapObjectUnkTRSS.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkTRSS.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkTRSS sMapObjectProfileUnkTRSS; - -ARM MapObjectProfileUnkTRSS *MapObjectProfileUnkTRSS::GetProfile() { - return &sMapObjectProfileUnkTRSS; -} +ARM DECL_PROFILE(MapObjectProfileUnkTRSS); ARM MapObject *MapObjectProfileUnkTRSS::Create() { return new(HeapIndex_2) MapObjectUnkTRSS(); diff --git a/src/028_TrainSnow/MapObject/MapObjectUnkTRTS.cpp b/src/028_TrainSnow/MapObject/MapObjectUnkTRTS.cpp index 3b34552e..cb31e8b4 100644 --- a/src/028_TrainSnow/MapObject/MapObjectUnkTRTS.cpp +++ b/src/028_TrainSnow/MapObject/MapObjectUnkTRTS.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkTRTS.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkTRTS sMapObjectProfileUnkTRTS; - -ARM MapObjectProfileUnkTRTS *MapObjectProfileUnkTRTS::GetProfile() { - return &sMapObjectProfileUnkTRTS; -} +ARM DECL_PROFILE(MapObjectProfileUnkTRTS); ARM MapObject *MapObjectProfileUnkTRTS::Create() { return new(HeapIndex_2) MapObjectUnkTRTS(); diff --git a/src/029_TrainWater/Actor/ActorUnkBLJF.cpp b/src/029_TrainWater/Actor/ActorUnkBLJF.cpp index b85a4186..d7c961a4 100644 --- a/src/029_TrainWater/Actor/ActorUnkBLJF.cpp +++ b/src/029_TrainWater/Actor/ActorUnkBLJF.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkBLJF.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkBLJF sActorProfileUnkBLJF; - -ARM ActorProfileUnkBLJF *ActorProfileUnkBLJF::GetProfile() { - return &sActorProfileUnkBLJF; -} +ARM DECL_PROFILE(ActorProfileUnkBLJF); ARM Actor *ActorProfileUnkBLJF::Create() { return new(HeapIndex_2) ActorUnkBLJF(); diff --git a/src/029_TrainWater/Actor/ActorUnkDLPN.cpp b/src/029_TrainWater/Actor/ActorUnkDLPN.cpp index b21c2fa3..95ed44ff 100644 --- a/src/029_TrainWater/Actor/ActorUnkDLPN.cpp +++ b/src/029_TrainWater/Actor/ActorUnkDLPN.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkDLPN.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkDLPN sActorProfileUnkDLPN; - -ARM ActorProfileUnkDLPN *ActorProfileUnkDLPN::GetProfile() { - return &sActorProfileUnkDLPN; -} +ARM DECL_PROFILE(ActorProfileUnkDLPN); ARM Actor *ActorProfileUnkDLPN::Create() { return new(HeapIndex_2) ActorUnkDLPN(); diff --git a/src/029_TrainWater/Actor/ActorUnkMDYG.cpp b/src/029_TrainWater/Actor/ActorUnkMDYG.cpp index c7a17d77..75700788 100644 --- a/src/029_TrainWater/Actor/ActorUnkMDYG.cpp +++ b/src/029_TrainWater/Actor/ActorUnkMDYG.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkMDYG.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkMDYG sActorProfileUnkMDYG; - -ARM ActorProfileUnkMDYG *ActorProfileUnkMDYG::GetProfile() { - return &sActorProfileUnkMDYG; -} +ARM DECL_PROFILE(ActorProfileUnkMDYG); ARM Actor *ActorProfileUnkMDYG::Create() { return new(HeapIndex_2) ActorUnkMDYG(); diff --git a/src/029_TrainWater/Actor/ActorUnkPRSP.cpp b/src/029_TrainWater/Actor/ActorUnkPRSP.cpp index 32c31d53..55ac3732 100644 --- a/src/029_TrainWater/Actor/ActorUnkPRSP.cpp +++ b/src/029_TrainWater/Actor/ActorUnkPRSP.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkPRSP.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkPRSP sActorProfileUnkPRSP; - -ARM ActorProfileUnkPRSP *ActorProfileUnkPRSP::GetProfile() { - return &sActorProfileUnkPRSP; -} +ARM DECL_PROFILE(ActorProfileUnkPRSP); ARM Actor *ActorProfileUnkPRSP::Create() { return new(HeapIndex_2) ActorUnkPRSP(); diff --git a/src/029_TrainWater/MapObject/MapObjectUnkRBBL.cpp b/src/029_TrainWater/MapObject/MapObjectUnkRBBL.cpp index 57a5d531..ef320f8c 100644 --- a/src/029_TrainWater/MapObject/MapObjectUnkRBBL.cpp +++ b/src/029_TrainWater/MapObject/MapObjectUnkRBBL.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkRBBL.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkRBBL sMapObjectProfileUnkRBBL; - -ARM MapObjectProfileUnkRBBL *MapObjectProfileUnkRBBL::GetProfile() { - return &sMapObjectProfileUnkRBBL; -} +ARM DECL_PROFILE(MapObjectProfileUnkRBBL); ARM MapObject *MapObjectProfileUnkRBBL::Create() { return new(HeapIndex_2) MapObjectUnkRBBL(); diff --git a/src/029_TrainWater/MapObject/MapObjectUnkSBDE.cpp b/src/029_TrainWater/MapObject/MapObjectUnkSBDE.cpp index 02906f61..2c9044b3 100644 --- a/src/029_TrainWater/MapObject/MapObjectUnkSBDE.cpp +++ b/src/029_TrainWater/MapObject/MapObjectUnkSBDE.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkSBDE.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkSBDE sMapObjectProfileUnkSBDE; - -ARM MapObjectProfileUnkSBDE *MapObjectProfileUnkSBDE::GetProfile() { - return &sMapObjectProfileUnkSBDE; -} +ARM DECL_PROFILE(MapObjectProfileUnkSBDE); ARM MapObject *MapObjectProfileUnkSBDE::Create() { return new(HeapIndex_2) MapObjectUnkSBDE(); diff --git a/src/029_TrainWater/MapObject/MapObjectUnkSTDE.cpp b/src/029_TrainWater/MapObject/MapObjectUnkSTDE.cpp index 20218de2..1d87f6ad 100644 --- a/src/029_TrainWater/MapObject/MapObjectUnkSTDE.cpp +++ b/src/029_TrainWater/MapObject/MapObjectUnkSTDE.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkSTDE.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkSTDE sMapObjectProfileUnkSTDE; - -ARM MapObjectProfileUnkSTDE *MapObjectProfileUnkSTDE::GetProfile() { - return &sMapObjectProfileUnkSTDE; -} +ARM DECL_PROFILE(MapObjectProfileUnkSTDE); ARM MapObject *MapObjectProfileUnkSTDE::Create() { return new(HeapIndex_2) MapObjectUnkSTDE(); diff --git a/src/029_TrainWater/MapObject/MapObjectUnkTBSS.cpp b/src/029_TrainWater/MapObject/MapObjectUnkTBSS.cpp index 9223dcc5..75db4143 100644 --- a/src/029_TrainWater/MapObject/MapObjectUnkTBSS.cpp +++ b/src/029_TrainWater/MapObject/MapObjectUnkTBSS.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkTBSS.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkTBSS sMapObjectProfileUnkTBSS; - -ARM MapObjectProfileUnkTBSS *MapObjectProfileUnkTBSS::GetProfile() { - return &sMapObjectProfileUnkTBSS; -} +ARM DECL_PROFILE(MapObjectProfileUnkTBSS); ARM MapObject *MapObjectProfileUnkTBSS::Create() { return new(HeapIndex_2) MapObjectUnkTBSS(); diff --git a/src/029_TrainWater/MapObject/MapObjectUnkTCBT.cpp b/src/029_TrainWater/MapObject/MapObjectUnkTCBT.cpp index eeb40a57..8d68effe 100644 --- a/src/029_TrainWater/MapObject/MapObjectUnkTCBT.cpp +++ b/src/029_TrainWater/MapObject/MapObjectUnkTCBT.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkTCBT.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkTCBT sMapObjectProfileUnkTCBT; - -ARM MapObjectProfileUnkTCBT *MapObjectProfileUnkTCBT::GetProfile() { - return &sMapObjectProfileUnkTCBT; -} +ARM DECL_PROFILE(MapObjectProfileUnkTCBT); ARM MapObject *MapObjectProfileUnkTCBT::Create() { return new(HeapIndex_2) MapObjectUnkTCBT(); diff --git a/src/029_TrainWater/MapObject/MapObjectUnkTMDE.cpp b/src/029_TrainWater/MapObject/MapObjectUnkTMDE.cpp index 14e3b72b..000a98b5 100644 --- a/src/029_TrainWater/MapObject/MapObjectUnkTMDE.cpp +++ b/src/029_TrainWater/MapObject/MapObjectUnkTMDE.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkTMDE.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkTMDE sMapObjectProfileUnkTMDE; - -ARM MapObjectProfileUnkTMDE *MapObjectProfileUnkTMDE::GetProfile() { - return &sMapObjectProfileUnkTMDE; -} +ARM DECL_PROFILE(MapObjectProfileUnkTMDE); ARM MapObject *MapObjectProfileUnkTMDE::Create() { return new(HeapIndex_2) MapObjectUnkTMDE(); diff --git a/src/029_TrainWater/MapObject/MapObjectUnkTMWT.cpp b/src/029_TrainWater/MapObject/MapObjectUnkTMWT.cpp index 6a32fa3d..96cf84c1 100644 --- a/src/029_TrainWater/MapObject/MapObjectUnkTMWT.cpp +++ b/src/029_TrainWater/MapObject/MapObjectUnkTMWT.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkTMWT.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkTMWT sMapObjectProfileUnkTMWT; - -ARM MapObjectProfileUnkTMWT *MapObjectProfileUnkTMWT::GetProfile() { - return &sMapObjectProfileUnkTMWT; -} +ARM DECL_PROFILE(MapObjectProfileUnkTMWT); ARM MapObject *MapObjectProfileUnkTMWT::Create() { return new(HeapIndex_2) MapObjectUnkTMWT(); diff --git a/src/029_TrainWater/MapObject/MapObjectUnkTRBL.cpp b/src/029_TrainWater/MapObject/MapObjectUnkTRBL.cpp index 5df3e39b..a5208499 100644 --- a/src/029_TrainWater/MapObject/MapObjectUnkTRBL.cpp +++ b/src/029_TrainWater/MapObject/MapObjectUnkTRBL.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkTRBL.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkTRBL sMapObjectProfileUnkTRBL; - -ARM MapObjectProfileUnkTRBL *MapObjectProfileUnkTRBL::GetProfile() { - return &sMapObjectProfileUnkTRBL; -} +ARM DECL_PROFILE(MapObjectProfileUnkTRBL); ARM MapObject *MapObjectProfileUnkTRBL::Create() { return new(HeapIndex_2) MapObjectUnkTRBL(); diff --git a/src/029_TrainWater/MapObject/MapObjectUnkTRH1.cpp b/src/029_TrainWater/MapObject/MapObjectUnkTRH1.cpp index 4f5296fc..0c57851b 100644 --- a/src/029_TrainWater/MapObject/MapObjectUnkTRH1.cpp +++ b/src/029_TrainWater/MapObject/MapObjectUnkTRH1.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkTRH1.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkTRH1 sMapObjectProfileUnkTRH1; - -ARM MapObjectProfileUnkTRH1 *MapObjectProfileUnkTRH1::GetProfile() { - return &sMapObjectProfileUnkTRH1; -} +ARM DECL_PROFILE(MapObjectProfileUnkTRH1); ARM MapObject *MapObjectProfileUnkTRH1::Create() { return new(HeapIndex_2) MapObjectUnkTRH1(); diff --git a/src/029_TrainWater/MapObject/MapObjectUnkTRPI.cpp b/src/029_TrainWater/MapObject/MapObjectUnkTRPI.cpp index 90b8d62b..02a5f411 100644 --- a/src/029_TrainWater/MapObject/MapObjectUnkTRPI.cpp +++ b/src/029_TrainWater/MapObject/MapObjectUnkTRPI.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkTRPI.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkTRPI sMapObjectProfileUnkTRPI; - -ARM MapObjectProfileUnkTRPI *MapObjectProfileUnkTRPI::GetProfile() { - return &sMapObjectProfileUnkTRPI; -} +ARM DECL_PROFILE(MapObjectProfileUnkTRPI); ARM MapObject *MapObjectProfileUnkTRPI::Create() { return new(HeapIndex_2) MapObjectUnkTRPI(); diff --git a/src/029_TrainWater/MapObject/MapObjectUnkTRRD.cpp b/src/029_TrainWater/MapObject/MapObjectUnkTRRD.cpp index df9eca4d..3f6cfc08 100644 --- a/src/029_TrainWater/MapObject/MapObjectUnkTRRD.cpp +++ b/src/029_TrainWater/MapObject/MapObjectUnkTRRD.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkTRRD.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkTRRD sMapObjectProfileUnkTRRD; - -ARM MapObjectProfileUnkTRRD *MapObjectProfileUnkTRRD::GetProfile() { - return &sMapObjectProfileUnkTRRD; -} +ARM DECL_PROFILE(MapObjectProfileUnkTRRD); ARM MapObject *MapObjectProfileUnkTRRD::Create() { return new(HeapIndex_2) MapObjectUnkTRRD(); diff --git a/src/029_TrainWater/MapObject/MapObjectUnkTRRW.cpp b/src/029_TrainWater/MapObject/MapObjectUnkTRRW.cpp index f89db371..1b438fd1 100644 --- a/src/029_TrainWater/MapObject/MapObjectUnkTRRW.cpp +++ b/src/029_TrainWater/MapObject/MapObjectUnkTRRW.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkTRRW.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkTRRW sMapObjectProfileUnkTRRW; - -ARM MapObjectProfileUnkTRRW *MapObjectProfileUnkTRRW::GetProfile() { - return &sMapObjectProfileUnkTRRW; -} +ARM DECL_PROFILE(MapObjectProfileUnkTRRW); ARM MapObject *MapObjectProfileUnkTRRW::Create() { return new(HeapIndex_2) MapObjectUnkTRRW(); diff --git a/src/029_TrainWater/MapObject/MapObjectUnkTRSA.cpp b/src/029_TrainWater/MapObject/MapObjectUnkTRSA.cpp index 3488cfb2..b8c33c42 100644 --- a/src/029_TrainWater/MapObject/MapObjectUnkTRSA.cpp +++ b/src/029_TrainWater/MapObject/MapObjectUnkTRSA.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkTRSA.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkTRSA sMapObjectProfileUnkTRSA; - -ARM MapObjectProfileUnkTRSA *MapObjectProfileUnkTRSA::GetProfile() { - return &sMapObjectProfileUnkTRSA; -} +ARM DECL_PROFILE(MapObjectProfileUnkTRSA); ARM MapObject *MapObjectProfileUnkTRSA::Create() { return new(HeapIndex_2) MapObjectUnkTRSA(); diff --git a/src/029_TrainWater/MapObject/MapObjectUnkTRWA.cpp b/src/029_TrainWater/MapObject/MapObjectUnkTRWA.cpp index 045fa56d..5377c292 100644 --- a/src/029_TrainWater/MapObject/MapObjectUnkTRWA.cpp +++ b/src/029_TrainWater/MapObject/MapObjectUnkTRWA.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkTRWA.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkTRWA sMapObjectProfileUnkTRWA; - -ARM MapObjectProfileUnkTRWA *MapObjectProfileUnkTRWA::GetProfile() { - return &sMapObjectProfileUnkTRWA; -} +ARM DECL_PROFILE(MapObjectProfileUnkTRWA); ARM MapObject *MapObjectProfileUnkTRWA::Create() { return new(HeapIndex_2) MapObjectUnkTRWA(); diff --git a/src/029_TrainWater/MapObject/MapObjectUnkWHSW.cpp b/src/029_TrainWater/MapObject/MapObjectUnkWHSW.cpp index 156d4619..6c988532 100644 --- a/src/029_TrainWater/MapObject/MapObjectUnkWHSW.cpp +++ b/src/029_TrainWater/MapObject/MapObjectUnkWHSW.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkWHSW.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkWHSW sMapObjectProfileUnkWHSW; - -ARM MapObjectProfileUnkWHSW *MapObjectProfileUnkWHSW::GetProfile() { - return &sMapObjectProfileUnkWHSW; -} +ARM DECL_PROFILE(MapObjectProfileUnkWHSW); ARM MapObject *MapObjectProfileUnkWHSW::Create() { return new(HeapIndex_2) MapObjectUnkWHSW(); diff --git a/src/030_TrainFlame/Actor/ActorUnkFDKY.cpp b/src/030_TrainFlame/Actor/ActorUnkFDKY.cpp index 8d252cb5..a68b2e4e 100644 --- a/src/030_TrainFlame/Actor/ActorUnkFDKY.cpp +++ b/src/030_TrainFlame/Actor/ActorUnkFDKY.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkFDKY.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkFDKY sActorProfileUnkFDKY; - -ARM ActorProfileUnkFDKY *ActorProfileUnkFDKY::GetProfile() { - return &sActorProfileUnkFDKY; -} +ARM DECL_PROFILE(ActorProfileUnkFDKY); ARM Actor *ActorProfileUnkFDKY::Create() { return new(HeapIndex_2) ActorUnkFDKY(); diff --git a/src/030_TrainFlame/Actor/ActorUnkGOVT.cpp b/src/030_TrainFlame/Actor/ActorUnkGOVT.cpp index d5fb5c86..9a078532 100644 --- a/src/030_TrainFlame/Actor/ActorUnkGOVT.cpp +++ b/src/030_TrainFlame/Actor/ActorUnkGOVT.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkGOVT.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkGOVT sActorProfileUnkGOVT; - -ARM ActorProfileUnkGOVT *ActorProfileUnkGOVT::GetProfile() { - return &sActorProfileUnkGOVT; -} +ARM DECL_PROFILE(ActorProfileUnkGOVT); ARM Actor *ActorProfileUnkGOVT::Create() { return new(HeapIndex_2) ActorUnkGOVT(); diff --git a/src/030_TrainFlame/Actor/ActorUnkHELA.cpp b/src/030_TrainFlame/Actor/ActorUnkHELA.cpp index 18b269aa..3e8a4e5a 100644 --- a/src/030_TrainFlame/Actor/ActorUnkHELA.cpp +++ b/src/030_TrainFlame/Actor/ActorUnkHELA.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkHELA.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkHELA sActorProfileUnkHELA; - -ARM ActorProfileUnkHELA *ActorProfileUnkHELA::GetProfile() { - return &sActorProfileUnkHELA; -} +ARM DECL_PROFILE(ActorProfileUnkHELA); ARM Actor *ActorProfileUnkHELA::Create() { return new(HeapIndex_2) ActorUnkHELA(); diff --git a/src/030_TrainFlame/Actor/ActorUnkHLMG.cpp b/src/030_TrainFlame/Actor/ActorUnkHLMG.cpp index 026fb24f..83d6e789 100644 --- a/src/030_TrainFlame/Actor/ActorUnkHLMG.cpp +++ b/src/030_TrainFlame/Actor/ActorUnkHLMG.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkHLMG.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkHLMG sActorProfileUnkHLMG; - -ARM ActorProfileUnkHLMG *ActorProfileUnkHLMG::GetProfile() { - return &sActorProfileUnkHLMG; -} +ARM DECL_PROFILE(ActorProfileUnkHLMG); ARM Actor *ActorProfileUnkHLMG::Create() { return new(HeapIndex_2) ActorUnkHLMG(); diff --git a/src/030_TrainFlame/Actor/ActorUnkSGMG.cpp b/src/030_TrainFlame/Actor/ActorUnkSGMG.cpp index 08e6d95f..e308fb37 100644 --- a/src/030_TrainFlame/Actor/ActorUnkSGMG.cpp +++ b/src/030_TrainFlame/Actor/ActorUnkSGMG.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkSGMG.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkSGMG sActorProfileUnkSGMG; - -ARM ActorProfileUnkSGMG *ActorProfileUnkSGMG::GetProfile() { - return &sActorProfileUnkSGMG; -} +ARM DECL_PROFILE(ActorProfileUnkSGMG); ARM Actor *ActorProfileUnkSGMG::Create() { return new(HeapIndex_2) ActorUnkSGMG(); diff --git a/src/030_TrainFlame/Actor/ActorUnkTTFT.cpp b/src/030_TrainFlame/Actor/ActorUnkTTFT.cpp index 2a7786f0..edcbf179 100644 --- a/src/030_TrainFlame/Actor/ActorUnkTTFT.cpp +++ b/src/030_TrainFlame/Actor/ActorUnkTTFT.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkTTFT.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkTTFT sActorProfileUnkTTFT; - -ARM ActorProfileUnkTTFT *ActorProfileUnkTTFT::GetProfile() { - return &sActorProfileUnkTTFT; -} +ARM DECL_PROFILE(ActorProfileUnkTTFT); ARM Actor *ActorProfileUnkTTFT::Create() { return new(HeapIndex_2) ActorUnkTTFT(); diff --git a/src/030_TrainFlame/Actor/ActorUnkWKTR.cpp b/src/030_TrainFlame/Actor/ActorUnkWKTR.cpp index 69acb5cc..6dbac3b5 100644 --- a/src/030_TrainFlame/Actor/ActorUnkWKTR.cpp +++ b/src/030_TrainFlame/Actor/ActorUnkWKTR.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkWKTR.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkWKTR sActorProfileUnkWKTR; - -ARM ActorProfileUnkWKTR *ActorProfileUnkWKTR::GetProfile() { - return &sActorProfileUnkWKTR; -} +ARM DECL_PROFILE(ActorProfileUnkWKTR); ARM Actor *ActorProfileUnkWKTR::Create() { return new(HeapIndex_2) ActorUnkWKTR(); diff --git a/src/030_TrainFlame/MapObject/MapObjectUnkETTV.cpp b/src/030_TrainFlame/MapObject/MapObjectUnkETTV.cpp index a6b9e708..8b9f920c 100644 --- a/src/030_TrainFlame/MapObject/MapObjectUnkETTV.cpp +++ b/src/030_TrainFlame/MapObject/MapObjectUnkETTV.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkETTV.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkETTV sMapObjectProfileUnkETTV; - -ARM MapObjectProfileUnkETTV *MapObjectProfileUnkETTV::GetProfile() { - return &sMapObjectProfileUnkETTV; -} +ARM DECL_PROFILE(MapObjectProfileUnkETTV); ARM MapObject *MapObjectProfileUnkETTV::Create() { return new(HeapIndex_2) MapObjectUnkETTV(); diff --git a/src/030_TrainFlame/MapObject/MapObjectUnkTRFI.cpp b/src/030_TrainFlame/MapObject/MapObjectUnkTRFI.cpp index 8af01a81..a3af1bc7 100644 --- a/src/030_TrainFlame/MapObject/MapObjectUnkTRFI.cpp +++ b/src/030_TrainFlame/MapObject/MapObjectUnkTRFI.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkTRFI.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkTRFI sMapObjectProfileUnkTRFI; - -ARM MapObjectProfileUnkTRFI *MapObjectProfileUnkTRFI::GetProfile() { - return &sMapObjectProfileUnkTRFI; -} +ARM DECL_PROFILE(MapObjectProfileUnkTRFI); ARM MapObject *MapObjectProfileUnkTRFI::Create() { return new(HeapIndex_2) MapObjectUnkTRFI(); diff --git a/src/030_TrainFlame/MapObject/MapObjectUnkTRGM.cpp b/src/030_TrainFlame/MapObject/MapObjectUnkTRGM.cpp index 778dffd3..966bc83f 100644 --- a/src/030_TrainFlame/MapObject/MapObjectUnkTRGM.cpp +++ b/src/030_TrainFlame/MapObject/MapObjectUnkTRGM.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkTRGM.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkTRGM sMapObjectProfileUnkTRGM; - -ARM MapObjectProfileUnkTRGM *MapObjectProfileUnkTRGM::GetProfile() { - return &sMapObjectProfileUnkTRGM; -} +ARM DECL_PROFILE(MapObjectProfileUnkTRGM); ARM MapObject *MapObjectProfileUnkTRGM::Create() { return new(HeapIndex_2) MapObjectUnkTRGM(); diff --git a/src/030_TrainFlame/MapObject/MapObjectUnkTRH2.cpp b/src/030_TrainFlame/MapObject/MapObjectUnkTRH2.cpp index c7d74a0b..a5d99f70 100644 --- a/src/030_TrainFlame/MapObject/MapObjectUnkTRH2.cpp +++ b/src/030_TrainFlame/MapObject/MapObjectUnkTRH2.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkTRH2.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkTRH2 sMapObjectProfileUnkTRH2; - -ARM MapObjectProfileUnkTRH2 *MapObjectProfileUnkTRH2::GetProfile() { - return &sMapObjectProfileUnkTRH2; -} +ARM DECL_PROFILE(MapObjectProfileUnkTRH2); ARM MapObject *MapObjectProfileUnkTRH2::Create() { return new(HeapIndex_2) MapObjectUnkTRH2(); diff --git a/src/030_TrainFlame/MapObject/MapObjectUnkTRH3.cpp b/src/030_TrainFlame/MapObject/MapObjectUnkTRH3.cpp index 1181ba1c..3bc11f3d 100644 --- a/src/030_TrainFlame/MapObject/MapObjectUnkTRH3.cpp +++ b/src/030_TrainFlame/MapObject/MapObjectUnkTRH3.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkTRH3.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkTRH3 sMapObjectProfileUnkTRH3; - -ARM MapObjectProfileUnkTRH3 *MapObjectProfileUnkTRH3::GetProfile() { - return &sMapObjectProfileUnkTRH3; -} +ARM DECL_PROFILE(MapObjectProfileUnkTRH3); ARM MapObject *MapObjectProfileUnkTRH3::Create() { return new(HeapIndex_2) MapObjectUnkTRH3(); diff --git a/src/030_TrainFlame/MapObject/MapObjectUnkTRST.cpp b/src/030_TrainFlame/MapObject/MapObjectUnkTRST.cpp index 660a50b8..41d81ba4 100644 --- a/src/030_TrainFlame/MapObject/MapObjectUnkTRST.cpp +++ b/src/030_TrainFlame/MapObject/MapObjectUnkTRST.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkTRST.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkTRST sMapObjectProfileUnkTRST; - -ARM MapObjectProfileUnkTRST *MapObjectProfileUnkTRST::GetProfile() { - return &sMapObjectProfileUnkTRST; -} +ARM DECL_PROFILE(MapObjectProfileUnkTRST); ARM MapObject *MapObjectProfileUnkTRST::Create() { return new(HeapIndex_2) MapObjectUnkTRST(); diff --git a/src/031_Land/Actor/ActorRupee.cpp b/src/031_Land/Actor/ActorRupee.cpp index 9a0d547d..5e639126 100644 --- a/src/031_Land/Actor/ActorRupee.cpp +++ b/src/031_Land/Actor/ActorRupee.cpp @@ -16,13 +16,10 @@ extern "C" unk32 func_ov031_0210af50(u16, unk32 *); extern void func_ov031_0210b0e4(u16, unk32); extern "C" unk32 func_ov031_020d9834(unk32 *); -static ActorProfileRupee sActorProfileRupee; extern unk32 *data_027e0d34; extern Cylinder data_ov031_02113478; -ARM ActorProfileRupee *ActorProfileRupee::GetProfile() { - return &sActorProfileRupee; -} +ARM DECL_PROFILE(ActorProfileRupee); ARM Actor *ActorProfileRupee::Create() { return new(HeapIndex_2) ActorRupee(); diff --git a/src/031_Land/Actor/ActorUnkAROW.cpp b/src/031_Land/Actor/ActorUnkAROW.cpp index dcd56869..e870f4f4 100644 --- a/src/031_Land/Actor/ActorUnkAROW.cpp +++ b/src/031_Land/Actor/ActorUnkAROW.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkAROW.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkAROW sActorProfileUnkAROW; - -ARM ActorProfileUnkAROW *ActorProfileUnkAROW::GetProfile() { - return &sActorProfileUnkAROW; -} +ARM DECL_PROFILE(ActorProfileUnkAROW); ARM Actor *ActorProfileUnkAROW::Create() { return new(HeapIndex_2) ActorUnkAROW(); diff --git a/src/031_Land/Actor/ActorUnkATTG.cpp b/src/031_Land/Actor/ActorUnkATTG.cpp index 45d4f8b8..3e633176 100644 --- a/src/031_Land/Actor/ActorUnkATTG.cpp +++ b/src/031_Land/Actor/ActorUnkATTG.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkATTG.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkATTG sActorProfileUnkATTG; - -ARM ActorProfileUnkATTG *ActorProfileUnkATTG::GetProfile() { - return &sActorProfileUnkATTG; -} +ARM DECL_PROFILE(ActorProfileUnkATTG); ARM Actor *ActorProfileUnkATTG::Create() { return new(HeapIndex_2) ActorUnkATTG(); diff --git a/src/031_Land/Actor/ActorUnkBLST.cpp b/src/031_Land/Actor/ActorUnkBLST.cpp index fe229745..3e305aca 100644 --- a/src/031_Land/Actor/ActorUnkBLST.cpp +++ b/src/031_Land/Actor/ActorUnkBLST.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkBLST.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkBLST sActorProfileUnkBLST; - -ARM ActorProfileUnkBLST *ActorProfileUnkBLST::GetProfile() { - return &sActorProfileUnkBLST; -} +ARM DECL_PROFILE(ActorProfileUnkBLST); ARM Actor *ActorProfileUnkBLST::Create() { return new(HeapIndex_2) ActorUnkBLST(); diff --git a/src/031_Land/Actor/ActorUnkBOMB.cpp b/src/031_Land/Actor/ActorUnkBOMB.cpp index 7240733f..5991c2e4 100644 --- a/src/031_Land/Actor/ActorUnkBOMB.cpp +++ b/src/031_Land/Actor/ActorUnkBOMB.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkBOMB.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkBOMB sActorProfileUnkBOMB; - -ARM ActorProfileUnkBOMB *ActorProfileUnkBOMB::GetProfile() { - return &sActorProfileUnkBOMB; -} +ARM DECL_PROFILE(ActorProfileUnkBOMB); ARM Actor *ActorProfileUnkBOMB::Create() { return new(HeapIndex_2) ActorUnkBOMB(); diff --git a/src/031_Land/Actor/ActorUnkCLLT.cpp b/src/031_Land/Actor/ActorUnkCLLT.cpp index 4fd43c6a..49bb427a 100644 --- a/src/031_Land/Actor/ActorUnkCLLT.cpp +++ b/src/031_Land/Actor/ActorUnkCLLT.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkCLLT.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkCLLT sActorProfileUnkCLLT; - -ARM ActorProfileUnkCLLT *ActorProfileUnkCLLT::GetProfile() { - return &sActorProfileUnkCLLT; -} +ARM DECL_PROFILE(ActorProfileUnkCLLT); ARM Actor *ActorProfileUnkCLLT::Create() { return new(HeapIndex_2) ActorUnkCLLT(); diff --git a/src/031_Land/Actor/ActorUnkEFSB.cpp b/src/031_Land/Actor/ActorUnkEFSB.cpp index 2affec8b..2cac0bc4 100644 --- a/src/031_Land/Actor/ActorUnkEFSB.cpp +++ b/src/031_Land/Actor/ActorUnkEFSB.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkEFSB.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkEFSB sActorProfileUnkEFSB; - -ARM ActorProfileUnkEFSB *ActorProfileUnkEFSB::GetProfile() { - return &sActorProfileUnkEFSB; -} +ARM DECL_PROFILE(ActorProfileUnkEFSB); ARM Actor *ActorProfileUnkEFSB::Create() { return new(HeapIndex_2) ActorUnkEFSB(); diff --git a/src/031_Land/Actor/ActorUnkFLEN.cpp b/src/031_Land/Actor/ActorUnkFLEN.cpp index 07b1fafc..da53c3bf 100644 --- a/src/031_Land/Actor/ActorUnkFLEN.cpp +++ b/src/031_Land/Actor/ActorUnkFLEN.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkFLEN.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkFLEN sActorProfileUnkFLEN; - -ARM ActorProfileUnkFLEN *ActorProfileUnkFLEN::GetProfile() { - return &sActorProfileUnkFLEN; -} +ARM DECL_PROFILE(ActorProfileUnkFLEN); ARM Actor *ActorProfileUnkFLEN::Create() { return new(HeapIndex_2) ActorUnkFLEN(); diff --git a/src/031_Land/Actor/ActorUnkHERT.cpp b/src/031_Land/Actor/ActorUnkHERT.cpp index a0c01c73..a8e95079 100644 --- a/src/031_Land/Actor/ActorUnkHERT.cpp +++ b/src/031_Land/Actor/ActorUnkHERT.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkHERT.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkHERT sActorProfileUnkHERT; - -ARM ActorProfileUnkHERT *ActorProfileUnkHERT::GetProfile() { - return &sActorProfileUnkHERT; -} +ARM DECL_PROFILE(ActorProfileUnkHERT); ARM Actor *ActorProfileUnkHERT::Create() { return new(HeapIndex_2) ActorUnkHERT(); diff --git a/src/031_Land/Actor/ActorUnkITBM.cpp b/src/031_Land/Actor/ActorUnkITBM.cpp index 54562d52..173f8714 100644 --- a/src/031_Land/Actor/ActorUnkITBM.cpp +++ b/src/031_Land/Actor/ActorUnkITBM.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkITBM.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkITBM sActorProfileUnkITBM; - -ARM ActorProfileUnkITBM *ActorProfileUnkITBM::GetProfile() { - return &sActorProfileUnkITBM; -} +ARM DECL_PROFILE(ActorProfileUnkITBM); ARM Actor *ActorProfileUnkITBM::Create() { return new(HeapIndex_2) ActorUnkITBM(); diff --git a/src/031_Land/Actor/ActorUnkITTD.cpp b/src/031_Land/Actor/ActorUnkITTD.cpp index 9bc5345d..2cd0cc10 100644 --- a/src/031_Land/Actor/ActorUnkITTD.cpp +++ b/src/031_Land/Actor/ActorUnkITTD.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkITTD.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkITTD sActorProfileUnkITTD; - -ARM ActorProfileUnkITTD *ActorProfileUnkITTD::GetProfile() { - return &sActorProfileUnkITTD; -} +ARM DECL_PROFILE(ActorProfileUnkITTD); ARM Actor *ActorProfileUnkITTD::Create() { return new(HeapIndex_2) ActorUnkITTD(); diff --git a/src/031_Land/Actor/ActorUnkMLCK.cpp b/src/031_Land/Actor/ActorUnkMLCK.cpp index 150e2b22..5159c6ee 100644 --- a/src/031_Land/Actor/ActorUnkMLCK.cpp +++ b/src/031_Land/Actor/ActorUnkMLCK.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkMLCK.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkMLCK sActorProfileUnkMLCK; - -ARM ActorProfileUnkMLCK *ActorProfileUnkMLCK::GetProfile() { - return &sActorProfileUnkMLCK; -} +ARM DECL_PROFILE(ActorProfileUnkMLCK); ARM Actor *ActorProfileUnkMLCK::Create() { return new(HeapIndex_2) ActorUnkMLCK(); diff --git a/src/031_Land/Actor/ActorUnkNFSP.cpp b/src/031_Land/Actor/ActorUnkNFSP.cpp index 21f71d05..eed574bd 100644 --- a/src/031_Land/Actor/ActorUnkNFSP.cpp +++ b/src/031_Land/Actor/ActorUnkNFSP.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkNFSP.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkNFSP sActorProfileUnkNFSP; - -ARM ActorProfileUnkNFSP *ActorProfileUnkNFSP::GetProfile() { - return &sActorProfileUnkNFSP; -} +ARM DECL_PROFILE(ActorProfileUnkNFSP); ARM Actor *ActorProfileUnkNFSP::Create() { return new(HeapIndex_2) ActorUnkNFSP(); diff --git a/src/031_Land/Actor/ActorUnkNITF.cpp b/src/031_Land/Actor/ActorUnkNITF.cpp index d4cea24e..4b64984e 100644 --- a/src/031_Land/Actor/ActorUnkNITF.cpp +++ b/src/031_Land/Actor/ActorUnkNITF.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkNITF.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkNITF sActorProfileUnkNITF; - -ARM ActorProfileUnkNITF *ActorProfileUnkNITF::GetProfile() { - return &sActorProfileUnkNITF; -} +ARM DECL_PROFILE(ActorProfileUnkNITF); ARM Actor *ActorProfileUnkNITF::Create() { return new(HeapIndex_2) ActorUnkNITF(); diff --git a/src/031_Land/Actor/ActorUnkNORE.cpp b/src/031_Land/Actor/ActorUnkNORE.cpp index 8d4cadc0..e5f7d20d 100644 --- a/src/031_Land/Actor/ActorUnkNORE.cpp +++ b/src/031_Land/Actor/ActorUnkNORE.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkNORE.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkNORE sActorProfileUnkNORE; - -ARM ActorProfileUnkNORE *ActorProfileUnkNORE::GetProfile() { - return &sActorProfileUnkNORE; -} +ARM DECL_PROFILE(ActorProfileUnkNORE); ARM Actor *ActorProfileUnkNORE::Create() { return new(HeapIndex_2) ActorUnkNORE(); diff --git a/src/031_Land/Actor/ActorUnkNTTZ.cpp b/src/031_Land/Actor/ActorUnkNTTZ.cpp index 88317a90..0457effe 100644 --- a/src/031_Land/Actor/ActorUnkNTTZ.cpp +++ b/src/031_Land/Actor/ActorUnkNTTZ.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkNTTZ.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkNTTZ sActorProfileUnkNTTZ; - -ARM ActorProfileUnkNTTZ *ActorProfileUnkNTTZ::GetProfile() { - return &sActorProfileUnkNTTZ; -} +ARM DECL_PROFILE(ActorProfileUnkNTTZ); ARM Actor *ActorProfileUnkNTTZ::Create() { return new(HeapIndex_2) ActorUnkNTTZ(); diff --git a/src/031_Land/Actor/ActorUnkNTUB.cpp b/src/031_Land/Actor/ActorUnkNTUB.cpp index 5162ea55..8602790a 100644 --- a/src/031_Land/Actor/ActorUnkNTUB.cpp +++ b/src/031_Land/Actor/ActorUnkNTUB.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkNTUB.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkNTUB sActorProfileUnkNTUB; - -ARM ActorProfileUnkNTUB *ActorProfileUnkNTUB::GetProfile() { - return &sActorProfileUnkNTUB; -} +ARM DECL_PROFILE(ActorProfileUnkNTUB); ARM Actor *ActorProfileUnkNTUB::Create() { return new(HeapIndex_2) ActorUnkNTUB(); diff --git a/src/031_Land/Actor/ActorUnkRLST.cpp b/src/031_Land/Actor/ActorUnkRLST.cpp index 3d25d8a8..fc001b3a 100644 --- a/src/031_Land/Actor/ActorUnkRLST.cpp +++ b/src/031_Land/Actor/ActorUnkRLST.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkRLST.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkRLST sActorProfileUnkRLST; - -ARM ActorProfileUnkRLST *ActorProfileUnkRLST::GetProfile() { - return &sActorProfileUnkRLST; -} +ARM DECL_PROFILE(ActorProfileUnkRLST); ARM Actor *ActorProfileUnkRLST::Create() { return new(HeapIndex_2) ActorUnkRLST(); diff --git a/src/031_Land/Actor/ActorUnkRMTG.cpp b/src/031_Land/Actor/ActorUnkRMTG.cpp index 8d85bc6d..30693e1b 100644 --- a/src/031_Land/Actor/ActorUnkRMTG.cpp +++ b/src/031_Land/Actor/ActorUnkRMTG.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkRMTG.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkRMTG sActorProfileUnkRMTG; - -ARM ActorProfileUnkRMTG *ActorProfileUnkRMTG::GetProfile() { - return &sActorProfileUnkRMTG; -} +ARM DECL_PROFILE(ActorProfileUnkRMTG); ARM Actor *ActorProfileUnkRMTG::Create() { return new(HeapIndex_2) ActorUnkRMTG(); diff --git a/src/031_Land/Actor/ActorUnkROCK.cpp b/src/031_Land/Actor/ActorUnkROCK.cpp index f37b08a5..e4cc8293 100644 --- a/src/031_Land/Actor/ActorUnkROCK.cpp +++ b/src/031_Land/Actor/ActorUnkROCK.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkROCK.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkROCK sActorProfileUnkROCK; - -ARM ActorProfileUnkROCK *ActorProfileUnkROCK::GetProfile() { - return &sActorProfileUnkROCK; -} +ARM DECL_PROFILE(ActorProfileUnkROCK); ARM Actor *ActorProfileUnkROCK::Create() { return new(HeapIndex_2) ActorUnkROCK(); diff --git a/src/031_Land/Actor/ActorUnkSCCN.cpp b/src/031_Land/Actor/ActorUnkSCCN.cpp index d8a0ceda..a240e4e7 100644 --- a/src/031_Land/Actor/ActorUnkSCCN.cpp +++ b/src/031_Land/Actor/ActorUnkSCCN.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkSCCN.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkSCCN sActorProfileUnkSCCN; - -ARM ActorProfileUnkSCCN *ActorProfileUnkSCCN::GetProfile() { - return &sActorProfileUnkSCCN; -} +ARM DECL_PROFILE(ActorProfileUnkSCCN); ARM Actor *ActorProfileUnkSCCN::Create() { return new(HeapIndex_2) ActorUnkSCCN(); diff --git a/src/031_Land/Actor/ActorUnkSKDO.cpp b/src/031_Land/Actor/ActorUnkSKDO.cpp index f2699bbf..519aef8b 100644 --- a/src/031_Land/Actor/ActorUnkSKDO.cpp +++ b/src/031_Land/Actor/ActorUnkSKDO.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkSKDO.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkSKDO sActorProfileUnkSKDO; - -ARM ActorProfileUnkSKDO *ActorProfileUnkSKDO::GetProfile() { - return &sActorProfileUnkSKDO; -} +ARM DECL_PROFILE(ActorProfileUnkSKDO); ARM Actor *ActorProfileUnkSKDO::Create() { return new(HeapIndex_2) ActorUnkSKDO(); diff --git a/src/031_Land/Actor/ActorUnkSPAR_SPBM_SPDR_SPTR.cpp b/src/031_Land/Actor/ActorUnkSPAR_SPBM_SPDR_SPTR.cpp index 3af2bfed..2624de3e 100644 --- a/src/031_Land/Actor/ActorUnkSPAR_SPBM_SPDR_SPTR.cpp +++ b/src/031_Land/Actor/ActorUnkSPAR_SPBM_SPDR_SPTR.cpp @@ -5,11 +5,7 @@ // --- Actor SPAR --- -static ActorProfileUnkSPAR sActorProfileUnkSPAR; - -ARM ActorProfileUnkSPAR *ActorProfileUnkSPAR::GetProfile() { - return &sActorProfileUnkSPAR; -} +ARM DECL_PROFILE(ActorProfileUnkSPAR); ARM Actor *ActorProfileUnkSPAR::Create() { return new(HeapIndex_2) ActorUnkSPAR(); @@ -22,11 +18,7 @@ ARM ActorUnkSPAR::ActorUnkSPAR() {} // --- Actor SPBM --- -static ActorProfileUnkSPBM sActorProfileUnkSPBM; - -ARM ActorProfileUnkSPBM *ActorProfileUnkSPBM::GetProfile() { - return &sActorProfileUnkSPBM; -} +ARM DECL_PROFILE(ActorProfileUnkSPBM); ARM Actor *ActorProfileUnkSPBM::Create() { return new(HeapIndex_2) ActorUnkSPBM(); @@ -39,11 +31,7 @@ ARM ActorUnkSPBM::ActorUnkSPBM() {} // --- Actor SPDR --- -static ActorProfileUnkSPDR sActorProfileUnkSPDR; - -ARM ActorProfileUnkSPDR *ActorProfileUnkSPDR::GetProfile() { - return &sActorProfileUnkSPDR; -} +ARM DECL_PROFILE(ActorProfileUnkSPDR); ARM Actor *ActorProfileUnkSPDR::Create() { return new(HeapIndex_2) ActorUnkSPDR(); @@ -56,11 +44,7 @@ ARM ActorUnkSPDR::ActorUnkSPDR() {} // --- Actor SPTR --- -static ActorProfileUnkSPTR sActorProfileUnkSPTR; - -ARM ActorProfileUnkSPTR *ActorProfileUnkSPTR::GetProfile() { - return &sActorProfileUnkSPTR; -} +ARM DECL_PROFILE(ActorProfileUnkSPTR); ARM Actor *ActorProfileUnkSPTR::Create() { return new(HeapIndex_2) ActorUnkSPTR(); diff --git a/src/031_Land/Actor/ActorUnkSWBM.cpp b/src/031_Land/Actor/ActorUnkSWBM.cpp index 3345613c..83b2d127 100644 --- a/src/031_Land/Actor/ActorUnkSWBM.cpp +++ b/src/031_Land/Actor/ActorUnkSWBM.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkSWBM.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkSWBM sActorProfileUnkSWBM; - -ARM ActorProfileUnkSWBM *ActorProfileUnkSWBM::GetProfile() { - return &sActorProfileUnkSWBM; -} +ARM DECL_PROFILE(ActorProfileUnkSWBM); ARM Actor *ActorProfileUnkSWBM::Create() { return new(HeapIndex_2) ActorUnkSWBM(); diff --git a/src/031_Land/Actor/ActorUnkSWCH.cpp b/src/031_Land/Actor/ActorUnkSWCH.cpp index a417adae..0fb1ade5 100644 --- a/src/031_Land/Actor/ActorUnkSWCH.cpp +++ b/src/031_Land/Actor/ActorUnkSWCH.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkSWCH.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkSWCH sActorProfileUnkSWCH; - -ARM ActorProfileUnkSWCH *ActorProfileUnkSWCH::GetProfile() { - return &sActorProfileUnkSWCH; -} +ARM DECL_PROFILE(ActorProfileUnkSWCH); ARM Actor *ActorProfileUnkSWCH::Create() { return new(HeapIndex_2) ActorUnkSWCH(); diff --git a/src/031_Land/Actor/ActorUnkSWON.cpp b/src/031_Land/Actor/ActorUnkSWON.cpp index 03b7bdea..14b1e37d 100644 --- a/src/031_Land/Actor/ActorUnkSWON.cpp +++ b/src/031_Land/Actor/ActorUnkSWON.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkSWON.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkSWON sActorProfileUnkSWON; - -ARM ActorProfileUnkSWON *ActorProfileUnkSWON::GetProfile() { - return &sActorProfileUnkSWON; -} +ARM DECL_PROFILE(ActorProfileUnkSWON); ARM Actor *ActorProfileUnkSWON::Create() { return new(HeapIndex_2) ActorUnkSWON(); diff --git a/src/031_Land/Actor/ActorUnkTGTZ.cpp b/src/031_Land/Actor/ActorUnkTGTZ.cpp index 7f5ae0da..309e1ee7 100644 --- a/src/031_Land/Actor/ActorUnkTGTZ.cpp +++ b/src/031_Land/Actor/ActorUnkTGTZ.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkTGTZ.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkTGTZ sActorProfileUnkTGTZ; - -ARM ActorProfileUnkTGTZ *ActorProfileUnkTGTZ::GetProfile() { - return &sActorProfileUnkTGTZ; -} +ARM DECL_PROFILE(ActorProfileUnkTGTZ); ARM Actor *ActorProfileUnkTGTZ::Create() { return new(HeapIndex_2) ActorUnkTGTZ(); diff --git a/src/031_Land/Actor/ActorUnkTLKT.cpp b/src/031_Land/Actor/ActorUnkTLKT.cpp index 5de2728c..f81cf13b 100644 --- a/src/031_Land/Actor/ActorUnkTLKT.cpp +++ b/src/031_Land/Actor/ActorUnkTLKT.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkTLKT.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkTLKT sActorProfileUnkTLKT; - -ARM ActorProfileUnkTLKT *ActorProfileUnkTLKT::GetProfile() { - return &sActorProfileUnkTLKT; -} +ARM DECL_PROFILE(ActorProfileUnkTLKT); ARM Actor *ActorProfileUnkTLKT::Create() { return new(HeapIndex_2) ActorUnkTLKT(); diff --git a/src/031_Land/Actor/ActorUnkZLSL_ZSRS.cpp b/src/031_Land/Actor/ActorUnkZLSL_ZSRS.cpp index d6019180..d208066f 100644 --- a/src/031_Land/Actor/ActorUnkZLSL_ZSRS.cpp +++ b/src/031_Land/Actor/ActorUnkZLSL_ZSRS.cpp @@ -5,11 +5,7 @@ // --- Actor ZSRS --- -static ActorProfileUnkZSRS sActorProfileUnkZSRS; - -THUMB ActorProfileUnkZSRS *ActorProfileUnkZSRS::GetProfile() { - return &sActorProfileUnkZSRS; -} +THUMB DECL_PROFILE(ActorProfileUnkZSRS); THUMB Actor *ActorProfileUnkZSRS::Create() { return NULL; @@ -22,11 +18,7 @@ THUMB ActorUnkZSRS::ActorUnkZSRS() {} // --- Actor ZLSL --- -static ActorProfileUnkZLSL sActorProfileUnkZLSL; - -THUMB ActorProfileUnkZLSL *ActorProfileUnkZLSL::GetProfile() { - return &sActorProfileUnkZLSL; -} +THUMB DECL_PROFILE(ActorProfileUnkZLSL); THUMB Actor *ActorProfileUnkZLSL::Create() { return new(HeapIndex_2) ActorUnkZLSL(); diff --git a/src/031_Land/MapObject/MapObjectUnkBLCC.cpp b/src/031_Land/MapObject/MapObjectUnkBLCC.cpp index 34902b05..ad380290 100644 --- a/src/031_Land/MapObject/MapObjectUnkBLCC.cpp +++ b/src/031_Land/MapObject/MapObjectUnkBLCC.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkBLCC.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkBLCC sMapObjectProfileUnkBLCC; - -ARM MapObjectProfileUnkBLCC *MapObjectProfileUnkBLCC::GetProfile() { - return &sMapObjectProfileUnkBLCC; -} +ARM DECL_PROFILE(MapObjectProfileUnkBLCC); ARM MapObject *MapObjectProfileUnkBLCC::Create() { return new(HeapIndex_2) MapObjectUnkBLCC(); diff --git a/src/031_Land/MapObject/MapObjectUnkBMFL.cpp b/src/031_Land/MapObject/MapObjectUnkBMFL.cpp index 421dbf98..63634da3 100644 --- a/src/031_Land/MapObject/MapObjectUnkBMFL.cpp +++ b/src/031_Land/MapObject/MapObjectUnkBMFL.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkBMFL.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkBMFL sMapObjectProfileUnkBMFL; - -ARM MapObjectProfileUnkBMFL *MapObjectProfileUnkBMFL::GetProfile() { - return &sMapObjectProfileUnkBMFL; -} +ARM DECL_PROFILE(MapObjectProfileUnkBMFL); ARM MapObject *MapObjectProfileUnkBMFL::Create() { return new(HeapIndex_2) MapObjectUnkBMFL(); diff --git a/src/031_Land/MapObject/MapObjectUnkBREX.cpp b/src/031_Land/MapObject/MapObjectUnkBREX.cpp index 8cb7c1c1..feba9e98 100644 --- a/src/031_Land/MapObject/MapObjectUnkBREX.cpp +++ b/src/031_Land/MapObject/MapObjectUnkBREX.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkBREX.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkBREX sMapObjectProfileUnkBREX; - -ARM MapObjectProfileUnkBREX *MapObjectProfileUnkBREX::GetProfile() { - return &sMapObjectProfileUnkBREX; -} +ARM DECL_PROFILE(MapObjectProfileUnkBREX); ARM MapObject *MapObjectProfileUnkBREX::Create() { return new(HeapIndex_2) MapObjectUnkBREX(); diff --git a/src/031_Land/MapObject/MapObjectUnkCRWL.cpp b/src/031_Land/MapObject/MapObjectUnkCRWL.cpp index 9fa7c489..3ab0ff76 100644 --- a/src/031_Land/MapObject/MapObjectUnkCRWL.cpp +++ b/src/031_Land/MapObject/MapObjectUnkCRWL.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkCRWL.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkCRWL sMapObjectProfileUnkCRWL; - -ARM MapObjectProfileUnkCRWL *MapObjectProfileUnkCRWL::GetProfile() { - return &sMapObjectProfileUnkCRWL; -} +ARM DECL_PROFILE(MapObjectProfileUnkCRWL); ARM MapObject *MapObjectProfileUnkCRWL::Create() { return new(HeapIndex_2) MapObjectUnkCRWL(); diff --git a/src/031_Land/MapObject/MapObjectUnkDRCK.cpp b/src/031_Land/MapObject/MapObjectUnkDRCK.cpp index 87dd660d..7fa881ab 100644 --- a/src/031_Land/MapObject/MapObjectUnkDRCK.cpp +++ b/src/031_Land/MapObject/MapObjectUnkDRCK.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkDRCK.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkDRCK sMapObjectProfileUnkDRCK; - -ARM MapObjectProfileUnkDRCK *MapObjectProfileUnkDRCK::GetProfile() { - return &sMapObjectProfileUnkDRCK; -} +ARM DECL_PROFILE(MapObjectProfileUnkDRCK); ARM MapObject *MapObjectProfileUnkDRCK::Create() { return new(HeapIndex_2) MapObjectUnkDRCK(); diff --git a/src/031_Land/MapObject/MapObjectUnkDRDS.cpp b/src/031_Land/MapObject/MapObjectUnkDRDS.cpp index 0da07299..61830768 100644 --- a/src/031_Land/MapObject/MapObjectUnkDRDS.cpp +++ b/src/031_Land/MapObject/MapObjectUnkDRDS.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkDRDS.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkDRDS sMapObjectProfileUnkDRDS; - -ARM MapObjectProfileUnkDRDS *MapObjectProfileUnkDRDS::GetProfile() { - return &sMapObjectProfileUnkDRDS; -} +ARM DECL_PROFILE(MapObjectProfileUnkDRDS); ARM MapObject *MapObjectProfileUnkDRDS::Create() { return new(HeapIndex_2) MapObjectUnkDRDS(); diff --git a/src/031_Land/MapObject/MapObjectUnkDRKY.cpp b/src/031_Land/MapObject/MapObjectUnkDRKY.cpp index a649cd76..27321ed0 100644 --- a/src/031_Land/MapObject/MapObjectUnkDRKY.cpp +++ b/src/031_Land/MapObject/MapObjectUnkDRKY.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkDRKY.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkDRKY sMapObjectProfileUnkDRKY; - -ARM MapObjectProfileUnkDRKY *MapObjectProfileUnkDRKY::GetProfile() { - return &sMapObjectProfileUnkDRKY; -} +ARM DECL_PROFILE(MapObjectProfileUnkDRKY); ARM MapObject *MapObjectProfileUnkDRKY::Create() { return new(HeapIndex_2) MapObjectUnkDRKY(); diff --git a/src/031_Land/MapObject/MapObjectUnkDRSW.cpp b/src/031_Land/MapObject/MapObjectUnkDRSW.cpp index a73b382d..e15a72c8 100644 --- a/src/031_Land/MapObject/MapObjectUnkDRSW.cpp +++ b/src/031_Land/MapObject/MapObjectUnkDRSW.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkDRSW.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkDRSW sMapObjectProfileUnkDRSW; - -ARM MapObjectProfileUnkDRSW *MapObjectProfileUnkDRSW::GetProfile() { - return &sMapObjectProfileUnkDRSW; -} +ARM DECL_PROFILE(MapObjectProfileUnkDRSW); ARM MapObject *MapObjectProfileUnkDRSW::Create() { return new(HeapIndex_2) MapObjectUnkDRSW(); diff --git a/src/031_Land/MapObject/MapObjectUnkDRTC.cpp b/src/031_Land/MapObject/MapObjectUnkDRTC.cpp index 15bdac09..76f426c6 100644 --- a/src/031_Land/MapObject/MapObjectUnkDRTC.cpp +++ b/src/031_Land/MapObject/MapObjectUnkDRTC.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkDRTC.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkDRTC sMapObjectProfileUnkDRTC; - -ARM MapObjectProfileUnkDRTC *MapObjectProfileUnkDRTC::GetProfile() { - return &sMapObjectProfileUnkDRTC; -} +ARM DECL_PROFILE(MapObjectProfileUnkDRTC); ARM MapObject *MapObjectProfileUnkDRTC::Create() { return new(HeapIndex_2) MapObjectUnkDRTC(); diff --git a/src/031_Land/MapObject/MapObjectUnkEXIT.cpp b/src/031_Land/MapObject/MapObjectUnkEXIT.cpp index 18233a89..ca591ef8 100644 --- a/src/031_Land/MapObject/MapObjectUnkEXIT.cpp +++ b/src/031_Land/MapObject/MapObjectUnkEXIT.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkEXIT.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkEXIT sMapObjectProfileUnkEXIT; - -ARM MapObjectProfileUnkEXIT *MapObjectProfileUnkEXIT::GetProfile() { - return &sMapObjectProfileUnkEXIT; -} +ARM DECL_PROFILE(MapObjectProfileUnkEXIT); ARM MapObject *MapObjectProfileUnkEXIT::Create() { return new(HeapIndex_2) MapObjectUnkEXIT(); diff --git a/src/031_Land/MapObject/MapObjectUnkGATE.cpp b/src/031_Land/MapObject/MapObjectUnkGATE.cpp index 29feca09..5c94d9ce 100644 --- a/src/031_Land/MapObject/MapObjectUnkGATE.cpp +++ b/src/031_Land/MapObject/MapObjectUnkGATE.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkGATE.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkGATE sMapObjectProfileUnkGATE; - -ARM MapObjectProfileUnkGATE *MapObjectProfileUnkGATE::GetProfile() { - return &sMapObjectProfileUnkGATE; -} +ARM DECL_PROFILE(MapObjectProfileUnkGATE); ARM MapObject *MapObjectProfileUnkGATE::Create() { return new(HeapIndex_2) MapObjectUnkGATE(); diff --git a/src/031_Land/MapObject/MapObjectUnkGRSS.cpp b/src/031_Land/MapObject/MapObjectUnkGRSS.cpp index a97b3332..cd336d7f 100644 --- a/src/031_Land/MapObject/MapObjectUnkGRSS.cpp +++ b/src/031_Land/MapObject/MapObjectUnkGRSS.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkGRSS.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkGRSS sMapObjectProfileUnkGRSS; - -ARM MapObjectProfileUnkGRSS *MapObjectProfileUnkGRSS::GetProfile() { - return &sMapObjectProfileUnkGRSS; -} +ARM DECL_PROFILE(MapObjectProfileUnkGRSS); ARM MapObject *MapObjectProfileUnkGRSS::Create() { return new(HeapIndex_2) MapObjectUnkGRSS(); diff --git a/src/031_Land/MapObject/MapObjectUnkGSST.cpp b/src/031_Land/MapObject/MapObjectUnkGSST.cpp index ccda8ffe..6ea32392 100644 --- a/src/031_Land/MapObject/MapObjectUnkGSST.cpp +++ b/src/031_Land/MapObject/MapObjectUnkGSST.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkGSST.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkGSST sMapObjectProfileUnkGSST; - -ARM MapObjectProfileUnkGSST *MapObjectProfileUnkGSST::GetProfile() { - return &sMapObjectProfileUnkGSST; -} +ARM DECL_PROFILE(MapObjectProfileUnkGSST); ARM MapObject *MapObjectProfileUnkGSST::Create() { return new(HeapIndex_2) MapObjectUnkGSST(); diff --git a/src/031_Land/MapObject/MapObjectUnkITFL.cpp b/src/031_Land/MapObject/MapObjectUnkITFL.cpp index 1ead1f89..7f6ea829 100644 --- a/src/031_Land/MapObject/MapObjectUnkITFL.cpp +++ b/src/031_Land/MapObject/MapObjectUnkITFL.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkITFL.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkITFL sMapObjectProfileUnkITFL; - -ARM MapObjectProfileUnkITFL *MapObjectProfileUnkITFL::GetProfile() { - return &sMapObjectProfileUnkITFL; -} +ARM DECL_PROFILE(MapObjectProfileUnkITFL); ARM MapObject *MapObjectProfileUnkITFL::Create() { return new(HeapIndex_2) MapObjectUnkITFL(); diff --git a/src/031_Land/MapObject/MapObjectUnkRLSG.cpp b/src/031_Land/MapObject/MapObjectUnkRLSG.cpp index c60d754f..e161ca8f 100644 --- a/src/031_Land/MapObject/MapObjectUnkRLSG.cpp +++ b/src/031_Land/MapObject/MapObjectUnkRLSG.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkRLSG.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkRLSG sMapObjectProfileUnkRLSG; - -ARM MapObjectProfileUnkRLSG *MapObjectProfileUnkRLSG::GetProfile() { - return &sMapObjectProfileUnkRLSG; -} +ARM DECL_PROFILE(MapObjectProfileUnkRLSG); ARM MapObject *MapObjectProfileUnkRLSG::Create() { return new(HeapIndex_2) MapObjectUnkRLSG(); diff --git a/src/031_Land/MapObject/MapObjectUnkSAND.cpp b/src/031_Land/MapObject/MapObjectUnkSAND.cpp index 512dc22a..c535cc43 100644 --- a/src/031_Land/MapObject/MapObjectUnkSAND.cpp +++ b/src/031_Land/MapObject/MapObjectUnkSAND.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkSAND.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkSAND sMapObjectProfileUnkSAND; - -ARM MapObjectProfileUnkSAND *MapObjectProfileUnkSAND::GetProfile() { - return &sMapObjectProfileUnkSAND; -} +ARM DECL_PROFILE(MapObjectProfileUnkSAND); ARM MapObject *MapObjectProfileUnkSAND::Create() { return new(HeapIndex_2) MapObjectUnkSAND(); diff --git a/src/031_Land/MapObject/MapObjectUnkSKBN.cpp b/src/031_Land/MapObject/MapObjectUnkSKBN.cpp index 6f26bee3..9b846741 100644 --- a/src/031_Land/MapObject/MapObjectUnkSKBN.cpp +++ b/src/031_Land/MapObject/MapObjectUnkSKBN.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkSKBN.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkSKBN sMapObjectProfileUnkSKBN; - -ARM MapObjectProfileUnkSKBN *MapObjectProfileUnkSKBN::GetProfile() { - return &sMapObjectProfileUnkSKBN; -} +ARM DECL_PROFILE(MapObjectProfileUnkSKBN); ARM MapObject *MapObjectProfileUnkSKBN::Create() { return new(HeapIndex_2) MapObjectUnkSKBN(); diff --git a/src/031_Land/MapObject/MapObjectUnkSKDI.cpp b/src/031_Land/MapObject/MapObjectUnkSKDI.cpp index fc0a9ddd..34439dde 100644 --- a/src/031_Land/MapObject/MapObjectUnkSKDI.cpp +++ b/src/031_Land/MapObject/MapObjectUnkSKDI.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkSKDI.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkSKDI sMapObjectProfileUnkSKDI; - -ARM MapObjectProfileUnkSKDI *MapObjectProfileUnkSKDI::GetProfile() { - return &sMapObjectProfileUnkSKDI; -} +ARM DECL_PROFILE(MapObjectProfileUnkSKDI); ARM MapObject *MapObjectProfileUnkSKDI::Create() { return new(HeapIndex_2) MapObjectUnkSKDI(); diff --git a/src/031_Land/MapObject/MapObjectUnkSPTB.cpp b/src/031_Land/MapObject/MapObjectUnkSPTB.cpp index db7e86a6..c6c7ba56 100644 --- a/src/031_Land/MapObject/MapObjectUnkSPTB.cpp +++ b/src/031_Land/MapObject/MapObjectUnkSPTB.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkSPTB.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkSPTB sMapObjectProfileUnkSPTB; - -ARM MapObjectProfileUnkSPTB *MapObjectProfileUnkSPTB::GetProfile() { - return &sMapObjectProfileUnkSPTB; -} +ARM DECL_PROFILE(MapObjectProfileUnkSPTB); ARM MapObject *MapObjectProfileUnkSPTB::Create() { return new(HeapIndex_2) MapObjectUnkSPTB(); diff --git a/src/031_Land/MapObject/MapObjectUnkSTIR.cpp b/src/031_Land/MapObject/MapObjectUnkSTIR.cpp index cbe64796..d2bb7893 100644 --- a/src/031_Land/MapObject/MapObjectUnkSTIR.cpp +++ b/src/031_Land/MapObject/MapObjectUnkSTIR.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkSTIR.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkSTIR sMapObjectProfileUnkSTIR; - -ARM MapObjectProfileUnkSTIR *MapObjectProfileUnkSTIR::GetProfile() { - return &sMapObjectProfileUnkSTIR; -} +ARM DECL_PROFILE(MapObjectProfileUnkSTIR); ARM MapObject *MapObjectProfileUnkSTIR::Create() { return new(HeapIndex_2) MapObjectUnkSTIR(); diff --git a/src/031_Land/MapObject/MapObjectUnkSTSP.cpp b/src/031_Land/MapObject/MapObjectUnkSTSP.cpp index 18cada99..f9c61478 100644 --- a/src/031_Land/MapObject/MapObjectUnkSTSP.cpp +++ b/src/031_Land/MapObject/MapObjectUnkSTSP.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkSTSP.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkSTSP sMapObjectProfileUnkSTSP; - -ARM MapObjectProfileUnkSTSP *MapObjectProfileUnkSTSP::GetProfile() { - return &sMapObjectProfileUnkSTSP; -} +ARM DECL_PROFILE(MapObjectProfileUnkSTSP); ARM MapObject *MapObjectProfileUnkSTSP::Create() { return new(HeapIndex_2) MapObjectUnkSTSP(); diff --git a/src/031_Land/MapObject/MapObjectUnkSWFS.cpp b/src/031_Land/MapObject/MapObjectUnkSWFS.cpp index eba35d46..3057eda0 100644 --- a/src/031_Land/MapObject/MapObjectUnkSWFS.cpp +++ b/src/031_Land/MapObject/MapObjectUnkSWFS.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkSWFS.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkSWFS sMapObjectProfileUnkSWFS; - -ARM MapObjectProfileUnkSWFS *MapObjectProfileUnkSWFS::GetProfile() { - return &sMapObjectProfileUnkSWFS; -} +ARM DECL_PROFILE(MapObjectProfileUnkSWFS); ARM MapObject *MapObjectProfileUnkSWFS::Create() { return new(HeapIndex_2) MapObjectUnkSWFS(); diff --git a/src/031_Land/MapObject/MapObjectUnkSWHT.cpp b/src/031_Land/MapObject/MapObjectUnkSWHT.cpp index 7936066e..30c71eb2 100644 --- a/src/031_Land/MapObject/MapObjectUnkSWHT.cpp +++ b/src/031_Land/MapObject/MapObjectUnkSWHT.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkSWHT.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkSWHT sMapObjectProfileUnkSWHT; - -ARM MapObjectProfileUnkSWHT *MapObjectProfileUnkSWHT::GetProfile() { - return &sMapObjectProfileUnkSWHT; -} +ARM DECL_PROFILE(MapObjectProfileUnkSWHT); ARM MapObject *MapObjectProfileUnkSWHT::Create() { return new(HeapIndex_2) MapObjectUnkSWHT(); diff --git a/src/031_Land/MapObject/MapObjectUnkTATZ.cpp b/src/031_Land/MapObject/MapObjectUnkTATZ.cpp index 7be695c6..be6e5b68 100644 --- a/src/031_Land/MapObject/MapObjectUnkTATZ.cpp +++ b/src/031_Land/MapObject/MapObjectUnkTATZ.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkTATZ.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkTATZ sMapObjectProfileUnkTATZ; - -ARM MapObjectProfileUnkTATZ *MapObjectProfileUnkTATZ::GetProfile() { - return &sMapObjectProfileUnkTATZ; -} +ARM DECL_PROFILE(MapObjectProfileUnkTATZ); ARM MapObject *MapObjectProfileUnkTATZ::Create() { return new(HeapIndex_2) MapObjectUnkTATZ(); diff --git a/src/031_Land/MapObject/MapObjectUnkTRED.cpp b/src/031_Land/MapObject/MapObjectUnkTRED.cpp index 2bf9d3d7..4b12d35c 100644 --- a/src/031_Land/MapObject/MapObjectUnkTRED.cpp +++ b/src/031_Land/MapObject/MapObjectUnkTRED.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkTRED.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkTRED sMapObjectProfileUnkTRED; - -ARM MapObjectProfileUnkTRED *MapObjectProfileUnkTRED::GetProfile() { - return &sMapObjectProfileUnkTRED; -} +ARM DECL_PROFILE(MapObjectProfileUnkTRED); ARM MapObject *MapObjectProfileUnkTRED::Create() { return new(HeapIndex_2) MapObjectUnkTRED(); diff --git a/src/031_Land/MapObject/MapObjectUnkTREN.cpp b/src/031_Land/MapObject/MapObjectUnkTREN.cpp index b0e971b9..e80daeca 100644 --- a/src/031_Land/MapObject/MapObjectUnkTREN.cpp +++ b/src/031_Land/MapObject/MapObjectUnkTREN.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkTREN.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkTREN sMapObjectProfileUnkTREN; - -ARM MapObjectProfileUnkTREN *MapObjectProfileUnkTREN::GetProfile() { - return &sMapObjectProfileUnkTREN; -} +ARM DECL_PROFILE(MapObjectProfileUnkTREN); ARM MapObject *MapObjectProfileUnkTREN::Create() { return new(HeapIndex_2) MapObjectUnkTREN(); diff --git a/src/031_Land/MapObject/MapObjectUnkTRES.cpp b/src/031_Land/MapObject/MapObjectUnkTRES.cpp index 54604cab..d2bd4f20 100644 --- a/src/031_Land/MapObject/MapObjectUnkTRES.cpp +++ b/src/031_Land/MapObject/MapObjectUnkTRES.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkTRES.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkTRES sMapObjectProfileUnkTRES; - -ARM MapObjectProfileUnkTRES *MapObjectProfileUnkTRES::GetProfile() { - return &sMapObjectProfileUnkTRES; -} +ARM DECL_PROFILE(MapObjectProfileUnkTRES); ARM MapObject *MapObjectProfileUnkTRES::Create() { return new(HeapIndex_2) MapObjectUnkTRES(); diff --git a/src/031_Land/MapObject/MapObjectUnkTREW.cpp b/src/031_Land/MapObject/MapObjectUnkTREW.cpp index d0136311..e0d047e9 100644 --- a/src/031_Land/MapObject/MapObjectUnkTREW.cpp +++ b/src/031_Land/MapObject/MapObjectUnkTREW.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkTREW.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkTREW sMapObjectProfileUnkTREW; - -ARM MapObjectProfileUnkTREW *MapObjectProfileUnkTREW::GetProfile() { - return &sMapObjectProfileUnkTREW; -} +ARM DECL_PROFILE(MapObjectProfileUnkTREW); ARM MapObject *MapObjectProfileUnkTREW::Create() { return new(HeapIndex_2) MapObjectUnkTREW(); diff --git a/src/031_Land/MapObject/MapObjectUnkTRWS.cpp b/src/031_Land/MapObject/MapObjectUnkTRWS.cpp index 582abed7..d3f4152b 100644 --- a/src/031_Land/MapObject/MapObjectUnkTRWS.cpp +++ b/src/031_Land/MapObject/MapObjectUnkTRWS.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkTRWS.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkTRWS sMapObjectProfileUnkTRWS; - -ARM MapObjectProfileUnkTRWS *MapObjectProfileUnkTRWS::GetProfile() { - return &sMapObjectProfileUnkTRWS; -} +ARM DECL_PROFILE(MapObjectProfileUnkTRWS); ARM MapObject *MapObjectProfileUnkTRWS::Create() { return new(HeapIndex_2) MapObjectUnkTRWS(); diff --git a/src/031_Land/MapObject/MapObjectUnkTSUB.cpp b/src/031_Land/MapObject/MapObjectUnkTSUB.cpp index ab6292b0..fe02bbbd 100644 --- a/src/031_Land/MapObject/MapObjectUnkTSUB.cpp +++ b/src/031_Land/MapObject/MapObjectUnkTSUB.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkTSUB.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkTSUB sMapObjectProfileUnkTSUB; - -ARM MapObjectProfileUnkTSUB *MapObjectProfileUnkTSUB::GetProfile() { - return &sMapObjectProfileUnkTSUB; -} +ARM DECL_PROFILE(MapObjectProfileUnkTSUB); ARM MapObject *MapObjectProfileUnkTSUB::Create() { return new(HeapIndex_2) MapObjectUnkTSUB(); diff --git a/src/032_MapA1/Actor/ActorUnkKETH.cpp b/src/032_MapA1/Actor/ActorUnkKETH.cpp index b996112b..3a73ef3e 100644 --- a/src/032_MapA1/Actor/ActorUnkKETH.cpp +++ b/src/032_MapA1/Actor/ActorUnkKETH.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkKETH.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkKETH sActorProfileUnkKETH; - -ARM ActorProfileUnkKETH *ActorProfileUnkKETH::GetProfile() { - return &sActorProfileUnkKETH; -} +ARM DECL_PROFILE(ActorProfileUnkKETH); ARM Actor *ActorProfileUnkKETH::Create() { return new(HeapIndex_2) ActorUnkKETH(); diff --git a/src/032_MapA1/Actor/ActorUnkKURI.cpp b/src/032_MapA1/Actor/ActorUnkKURI.cpp index e2672be1..a4c77026 100644 --- a/src/032_MapA1/Actor/ActorUnkKURI.cpp +++ b/src/032_MapA1/Actor/ActorUnkKURI.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkKURI.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkKURI sActorProfileUnkKURI; - -ARM ActorProfileUnkKURI *ActorProfileUnkKURI::GetProfile() { - return &sActorProfileUnkKURI; -} +ARM DECL_PROFILE(ActorProfileUnkKURI); ARM Actor *ActorProfileUnkKURI::Create() { return new(HeapIndex_2) ActorUnkKURI(); diff --git a/src/032_MapA1/Actor/ActorUnkMKUR.cpp b/src/032_MapA1/Actor/ActorUnkMKUR.cpp index b8d49d16..c44b04b0 100644 --- a/src/032_MapA1/Actor/ActorUnkMKUR.cpp +++ b/src/032_MapA1/Actor/ActorUnkMKUR.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkMKUR.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkMKUR sActorProfileUnkMKUR; - -ARM ActorProfileUnkMKUR *ActorProfileUnkMKUR::GetProfile() { - return &sActorProfileUnkMKUR; -} +ARM DECL_PROFILE(ActorProfileUnkMKUR); ARM Actor *ActorProfileUnkMKUR::Create() { return new(HeapIndex_2) ActorUnkMKUR(); diff --git a/src/032_MapA1/Actor/ActorUnkNSSW.cpp b/src/032_MapA1/Actor/ActorUnkNSSW.cpp index f6e519a5..3424ecfd 100644 --- a/src/032_MapA1/Actor/ActorUnkNSSW.cpp +++ b/src/032_MapA1/Actor/ActorUnkNSSW.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkNSSW.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkNSSW sActorProfileUnkNSSW; - -ARM ActorProfileUnkNSSW *ActorProfileUnkNSSW::GetProfile() { - return &sActorProfileUnkNSSW; -} +ARM DECL_PROFILE(ActorProfileUnkNSSW); ARM Actor *ActorProfileUnkNSSW::Create() { return new(HeapIndex_2) ActorUnkNSSW(); diff --git a/src/032_MapA1/MapObject/MapObjectUnkSWSW.cpp b/src/032_MapA1/MapObject/MapObjectUnkSWSW.cpp index 6d33443b..35c191e3 100644 --- a/src/032_MapA1/MapObject/MapObjectUnkSWSW.cpp +++ b/src/032_MapA1/MapObject/MapObjectUnkSWSW.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkSWSW.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkSWSW sMapObjectProfileUnkSWSW; - -ARM MapObjectProfileUnkSWSW *MapObjectProfileUnkSWSW::GetProfile() { - return &sMapObjectProfileUnkSWSW; -} +ARM DECL_PROFILE(MapObjectProfileUnkSWSW); ARM MapObject *MapObjectProfileUnkSWSW::Create() { return new(HeapIndex_2) MapObjectUnkSWSW(); diff --git a/src/033_MapA2/Actor/ActorUnkRCFO.cpp b/src/033_MapA2/Actor/ActorUnkRCFO.cpp index bb487876..704f164d 100644 --- a/src/033_MapA2/Actor/ActorUnkRCFO.cpp +++ b/src/033_MapA2/Actor/ActorUnkRCFO.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkRCFO.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkRCFO sActorProfileUnkRCFO; - -ARM ActorProfileUnkRCFO *ActorProfileUnkRCFO::GetProfile() { - return &sActorProfileUnkRCFO; -} +ARM DECL_PROFILE(ActorProfileUnkRCFO); ARM Actor *ActorProfileUnkRCFO::Create() { return new(HeapIndex_2) ActorUnkRCFO(); diff --git a/src/033_MapA2/MapObject/MapObjectUnkDOPA.cpp b/src/033_MapA2/MapObject/MapObjectUnkDOPA.cpp index 938b6d48..1bc450e1 100644 --- a/src/033_MapA2/MapObject/MapObjectUnkDOPA.cpp +++ b/src/033_MapA2/MapObject/MapObjectUnkDOPA.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkDOPA.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkDOPA sMapObjectProfileUnkDOPA; - -ARM MapObjectProfileUnkDOPA *MapObjectProfileUnkDOPA::GetProfile() { - return &sMapObjectProfileUnkDOPA; -} +ARM DECL_PROFILE(MapObjectProfileUnkDOPA); ARM MapObject *MapObjectProfileUnkDOPA::Create() { return new(HeapIndex_2) MapObjectUnkDOPA(); diff --git a/src/033_MapA2/MapObject/MapObjectUnkRCFL.cpp b/src/033_MapA2/MapObject/MapObjectUnkRCFL.cpp index 5b6b9d28..8be9a40c 100644 --- a/src/033_MapA2/MapObject/MapObjectUnkRCFL.cpp +++ b/src/033_MapA2/MapObject/MapObjectUnkRCFL.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkRCFL.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkRCFL sMapObjectProfileUnkRCFL; - -ARM MapObjectProfileUnkRCFL *MapObjectProfileUnkRCFL::GetProfile() { - return &sMapObjectProfileUnkRCFL; -} +ARM DECL_PROFILE(MapObjectProfileUnkRCFL); ARM MapObject *MapObjectProfileUnkRCFL::Create() { return new(HeapIndex_2) MapObjectUnkRCFL(); diff --git a/src/034_MapA3/Actor/ActorUnkBSFC.cpp b/src/034_MapA3/Actor/ActorUnkBSFC.cpp index 53d8402c..4ecc235f 100644 --- a/src/034_MapA3/Actor/ActorUnkBSFC.cpp +++ b/src/034_MapA3/Actor/ActorUnkBSFC.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkBSFC.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkBSFC sActorProfileUnkBSFC; - -ARM ActorProfileUnkBSFC *ActorProfileUnkBSFC::GetProfile() { - return &sActorProfileUnkBSFC; -} +ARM DECL_PROFILE(ActorProfileUnkBSFC); ARM Actor *ActorProfileUnkBSFC::Create() { return new(HeapIndex_2) ActorUnkBSFC(); diff --git a/src/034_MapA3/Actor/ActorUnkFCHL.cpp b/src/034_MapA3/Actor/ActorUnkFCHL.cpp index 0763a3ff..c54f45e4 100644 --- a/src/034_MapA3/Actor/ActorUnkFCHL.cpp +++ b/src/034_MapA3/Actor/ActorUnkFCHL.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkFCHL.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkFCHL sActorProfileUnkFCHL; - -ARM ActorProfileUnkFCHL *ActorProfileUnkFCHL::GetProfile() { - return &sActorProfileUnkFCHL; -} +ARM DECL_PROFILE(ActorProfileUnkFCHL); ARM Actor *ActorProfileUnkFCHL::Create() { return new(HeapIndex_2) ActorUnkFCHL(); diff --git a/src/034_MapA3/Actor/ActorUnkRMM1.cpp b/src/034_MapA3/Actor/ActorUnkRMM1.cpp index ef174c41..83128956 100644 --- a/src/034_MapA3/Actor/ActorUnkRMM1.cpp +++ b/src/034_MapA3/Actor/ActorUnkRMM1.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkRMM1.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkRMM1 sActorProfileUnkRMM1; - -ARM ActorProfileUnkRMM1 *ActorProfileUnkRMM1::GetProfile() { - return &sActorProfileUnkRMM1; -} +ARM DECL_PROFILE(ActorProfileUnkRMM1); ARM Actor *ActorProfileUnkRMM1::Create() { return new(HeapIndex_2) ActorUnkRMM1(); diff --git a/src/034_MapA3/Actor/ActorUnkTRLY.cpp b/src/034_MapA3/Actor/ActorUnkTRLY.cpp index 15c4a396..a4da5096 100644 --- a/src/034_MapA3/Actor/ActorUnkTRLY.cpp +++ b/src/034_MapA3/Actor/ActorUnkTRLY.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkTRLY.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkTRLY sActorProfileUnkTRLY; - -ARM ActorProfileUnkTRLY *ActorProfileUnkTRLY::GetProfile() { - return &sActorProfileUnkTRLY; -} +ARM DECL_PROFILE(ActorProfileUnkTRLY); ARM Actor *ActorProfileUnkTRLY::Create() { return new(HeapIndex_2) ActorUnkTRLY(); diff --git a/src/034_MapA3/Actor/ActorUnkTRRL.cpp b/src/034_MapA3/Actor/ActorUnkTRRL.cpp index bf98d858..c01b71a7 100644 --- a/src/034_MapA3/Actor/ActorUnkTRRL.cpp +++ b/src/034_MapA3/Actor/ActorUnkTRRL.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkTRRL.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkTRRL sActorProfileUnkTRRL; - -ARM ActorProfileUnkTRRL *ActorProfileUnkTRRL::GetProfile() { - return &sActorProfileUnkTRRL; -} +ARM DECL_PROFILE(ActorProfileUnkTRRL); ARM Actor *ActorProfileUnkTRRL::Create() { return new(HeapIndex_2) ActorUnkTRRL(); diff --git a/src/034_MapA3/MapObject/MapObjectUnkGELG.cpp b/src/034_MapA3/MapObject/MapObjectUnkGELG.cpp index dbbf61c3..d3460ff9 100644 --- a/src/034_MapA3/MapObject/MapObjectUnkGELG.cpp +++ b/src/034_MapA3/MapObject/MapObjectUnkGELG.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkGELG.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkGELG sMapObjectProfileUnkGELG; - -ARM MapObjectProfileUnkGELG *MapObjectProfileUnkGELG::GetProfile() { - return &sMapObjectProfileUnkGELG; -} +ARM DECL_PROFILE(MapObjectProfileUnkGELG); ARM MapObject *MapObjectProfileUnkGELG::Create() { return new(HeapIndex_2) MapObjectUnkGELG(); diff --git a/src/034_MapA3/MapObject/MapObjectUnkTRSW.cpp b/src/034_MapA3/MapObject/MapObjectUnkTRSW.cpp index aac1db5b..98731d0f 100644 --- a/src/034_MapA3/MapObject/MapObjectUnkTRSW.cpp +++ b/src/034_MapA3/MapObject/MapObjectUnkTRSW.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkTRSW.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkTRSW sMapObjectProfileUnkTRSW; - -ARM MapObjectProfileUnkTRSW *MapObjectProfileUnkTRSW::GetProfile() { - return &sMapObjectProfileUnkTRSW; -} +ARM DECL_PROFILE(MapObjectProfileUnkTRSW); ARM MapObject *MapObjectProfileUnkTRSW::Create() { return new(HeapIndex_2) MapObjectUnkTRSW(); diff --git a/src/034_MapA3/MapObject/MapObjectUnkWPHL.cpp b/src/034_MapA3/MapObject/MapObjectUnkWPHL.cpp index 14b528c9..402b30ba 100644 --- a/src/034_MapA3/MapObject/MapObjectUnkWPHL.cpp +++ b/src/034_MapA3/MapObject/MapObjectUnkWPHL.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkWPHL.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkWPHL sMapObjectProfileUnkWPHL; - -ARM MapObjectProfileUnkWPHL *MapObjectProfileUnkWPHL::GetProfile() { - return &sMapObjectProfileUnkWPHL; -} +ARM DECL_PROFILE(MapObjectProfileUnkWPHL); ARM MapObject *MapObjectProfileUnkWPHL::Create() { return new(HeapIndex_2) MapObjectUnkWPHL(); diff --git a/src/035_MapA4/Actor/ActorUnkFIFI.cpp b/src/035_MapA4/Actor/ActorUnkFIFI.cpp index b6fd2a39..6396ca79 100644 --- a/src/035_MapA4/Actor/ActorUnkFIFI.cpp +++ b/src/035_MapA4/Actor/ActorUnkFIFI.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkFIFI.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkFIFI sActorProfileUnkFIFI; - -ARM ActorProfileUnkFIFI *ActorProfileUnkFIFI::GetProfile() { - return &sActorProfileUnkFIFI; -} +ARM DECL_PROFILE(ActorProfileUnkFIFI); ARM Actor *ActorProfileUnkFIFI::Create() { return new(HeapIndex_2) ActorUnkFIFI(); diff --git a/src/035_MapA4/Actor/ActorUnkFIMA.cpp b/src/035_MapA4/Actor/ActorUnkFIMA.cpp index c279e1e3..1cdf10ee 100644 --- a/src/035_MapA4/Actor/ActorUnkFIMA.cpp +++ b/src/035_MapA4/Actor/ActorUnkFIMA.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkFIMA.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkFIMA sActorProfileUnkFIMA; - -ARM ActorProfileUnkFIMA *ActorProfileUnkFIMA::GetProfile() { - return &sActorProfileUnkFIMA; -} +ARM DECL_PROFILE(ActorProfileUnkFIMA); ARM Actor *ActorProfileUnkFIMA::Create() { return new(HeapIndex_2) ActorUnkFIMA(); diff --git a/src/035_MapA4/Actor/ActorUnkFIML.cpp b/src/035_MapA4/Actor/ActorUnkFIML.cpp index 00be4bc9..c88bfbe3 100644 --- a/src/035_MapA4/Actor/ActorUnkFIML.cpp +++ b/src/035_MapA4/Actor/ActorUnkFIML.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkFIML.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkFIML sActorProfileUnkFIML; - -ARM ActorProfileUnkFIML *ActorProfileUnkFIML::GetProfile() { - return &sActorProfileUnkFIML; -} +ARM DECL_PROFILE(ActorProfileUnkFIML); ARM Actor *ActorProfileUnkFIML::Create() { return new(HeapIndex_2) ActorUnkFIML(); diff --git a/src/035_MapA4/Actor/ActorUnkFMAS_FMLS.cpp b/src/035_MapA4/Actor/ActorUnkFMAS_FMLS.cpp index 8fbe382b..bfa211cb 100644 --- a/src/035_MapA4/Actor/ActorUnkFMAS_FMLS.cpp +++ b/src/035_MapA4/Actor/ActorUnkFMAS_FMLS.cpp @@ -5,11 +5,7 @@ // --- Actor FMAS --- -static ActorProfileUnkFMAS sActorProfileUnkFMAS; - -ARM ActorProfileUnkFMAS *ActorProfileUnkFMAS::GetProfile() { - return &sActorProfileUnkFMAS; -} +ARM DECL_PROFILE(ActorProfileUnkFMAS); ARM Actor *ActorProfileUnkFMAS::Create() { return new(HeapIndex_2) ActorUnkFMAS(); @@ -22,11 +18,7 @@ ARM ActorUnkFMAS::ActorUnkFMAS() {} // --- Actor FMLS --- -static ActorProfileUnkFMLS sActorProfileUnkFMLS; - -ARM ActorProfileUnkFMLS *ActorProfileUnkFMLS::GetProfile() { - return &sActorProfileUnkFMLS; -} +ARM DECL_PROFILE(ActorProfileUnkFMLS); ARM Actor *ActorProfileUnkFMLS::Create() { return new(HeapIndex_2) ActorUnkFMLS(); diff --git a/src/036_MapA5/Actor/ActorUnkCAMY.cpp b/src/036_MapA5/Actor/ActorUnkCAMY.cpp index 15bfdfc9..9a595b31 100644 --- a/src/036_MapA5/Actor/ActorUnkCAMY.cpp +++ b/src/036_MapA5/Actor/ActorUnkCAMY.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkCAMY.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkCAMY sActorProfileUnkCAMY; - -ARM ActorProfileUnkCAMY *ActorProfileUnkCAMY::GetProfile() { - return &sActorProfileUnkCAMY; -} +ARM DECL_PROFILE(ActorProfileUnkCAMY); ARM Actor *ActorProfileUnkCAMY::Create() { return new(HeapIndex_2) ActorUnkCAMY(); diff --git a/src/036_MapA5/Actor/ActorUnkFOMY.cpp b/src/036_MapA5/Actor/ActorUnkFOMY.cpp index 0025236e..2300040f 100644 --- a/src/036_MapA5/Actor/ActorUnkFOMY.cpp +++ b/src/036_MapA5/Actor/ActorUnkFOMY.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkFOMY.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkFOMY sActorProfileUnkFOMY; - -ARM ActorProfileUnkFOMY *ActorProfileUnkFOMY::GetProfile() { - return &sActorProfileUnkFOMY; -} +ARM DECL_PROFILE(ActorProfileUnkFOMY); ARM Actor *ActorProfileUnkFOMY::Create() { return new(HeapIndex_2) ActorUnkFOMY(); diff --git a/src/036_MapA5/Actor/ActorUnkGORY.cpp b/src/036_MapA5/Actor/ActorUnkGORY.cpp index 8d3b27c1..9b6e669d 100644 --- a/src/036_MapA5/Actor/ActorUnkGORY.cpp +++ b/src/036_MapA5/Actor/ActorUnkGORY.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkGORY.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkGORY sActorProfileUnkGORY; - -ARM ActorProfileUnkGORY *ActorProfileUnkGORY::GetProfile() { - return &sActorProfileUnkGORY; -} +ARM DECL_PROFILE(ActorProfileUnkGORY); ARM Actor *ActorProfileUnkGORY::Create() { return new(HeapIndex_2) ActorUnkGORY(); diff --git a/src/036_MapA5/Actor/ActorUnkRMST.cpp b/src/036_MapA5/Actor/ActorUnkRMST.cpp index 2e4a722c..0e7e014f 100644 --- a/src/036_MapA5/Actor/ActorUnkRMST.cpp +++ b/src/036_MapA5/Actor/ActorUnkRMST.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkRMST.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkRMST sActorProfileUnkRMST; - -ARM ActorProfileUnkRMST *ActorProfileUnkRMST::GetProfile() { - return &sActorProfileUnkRMST; -} +ARM DECL_PROFILE(ActorProfileUnkRMST); ARM Actor *ActorProfileUnkRMST::Create() { return new(HeapIndex_2) ActorUnkRMST(); diff --git a/src/036_MapA5/Actor/ActorUnkSHIT.cpp b/src/036_MapA5/Actor/ActorUnkSHIT.cpp index 8f034436..426fbc0c 100644 --- a/src/036_MapA5/Actor/ActorUnkSHIT.cpp +++ b/src/036_MapA5/Actor/ActorUnkSHIT.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkSHIT.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkSHIT sActorProfileUnkSHIT; - -ARM ActorProfileUnkSHIT *ActorProfileUnkSHIT::GetProfile() { - return &sActorProfileUnkSHIT; -} +ARM DECL_PROFILE(ActorProfileUnkSHIT); ARM Actor *ActorProfileUnkSHIT::Create() { return new(HeapIndex_2) ActorUnkSHIT(); diff --git a/src/036_MapA5/Actor/ActorUnkTEHT.cpp b/src/036_MapA5/Actor/ActorUnkTEHT.cpp index 085cf5a9..855fd454 100644 --- a/src/036_MapA5/Actor/ActorUnkTEHT.cpp +++ b/src/036_MapA5/Actor/ActorUnkTEHT.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkTEHT.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkTEHT sActorProfileUnkTEHT; - -ARM ActorProfileUnkTEHT *ActorProfileUnkTEHT::GetProfile() { - return &sActorProfileUnkTEHT; -} +ARM DECL_PROFILE(ActorProfileUnkTEHT); ARM Actor *ActorProfileUnkTEHT::Create() { return new(HeapIndex_2) ActorUnkTEHT(); diff --git a/src/036_MapA5/Actor/ActorUnkTERY.cpp b/src/036_MapA5/Actor/ActorUnkTERY.cpp index ae53636d..119dd606 100644 --- a/src/036_MapA5/Actor/ActorUnkTERY.cpp +++ b/src/036_MapA5/Actor/ActorUnkTERY.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkTERY.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkTERY sActorProfileUnkTERY; - -ARM ActorProfileUnkTERY *ActorProfileUnkTERY::GetProfile() { - return &sActorProfileUnkTERY; -} +ARM DECL_PROFILE(ActorProfileUnkTERY); ARM Actor *ActorProfileUnkTERY::Create() { return new(HeapIndex_2) ActorUnkTERY(); diff --git a/src/036_MapA5/Actor/ActorUnkWAWY.cpp b/src/036_MapA5/Actor/ActorUnkWAWY.cpp index 80249d14..df471224 100644 --- a/src/036_MapA5/Actor/ActorUnkWAWY.cpp +++ b/src/036_MapA5/Actor/ActorUnkWAWY.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkWAWY.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkWAWY sActorProfileUnkWAWY; - -ARM ActorProfileUnkWAWY *ActorProfileUnkWAWY::GetProfile() { - return &sActorProfileUnkWAWY; -} +ARM DECL_PROFILE(ActorProfileUnkWAWY); ARM Actor *ActorProfileUnkWAWY::Create() { return new(HeapIndex_2) ActorUnkWAWY(); diff --git a/src/036_MapA5/Actor/ActorUnkYUKY.cpp b/src/036_MapA5/Actor/ActorUnkYUKY.cpp index 20281334..fd18a110 100644 --- a/src/036_MapA5/Actor/ActorUnkYUKY.cpp +++ b/src/036_MapA5/Actor/ActorUnkYUKY.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkYUKY.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkYUKY sActorProfileUnkYUKY; - -ARM ActorProfileUnkYUKY *ActorProfileUnkYUKY::GetProfile() { - return &sActorProfileUnkYUKY; -} +ARM DECL_PROFILE(ActorProfileUnkYUKY); ARM Actor *ActorProfileUnkYUKY::Create() { return new(HeapIndex_2) ActorUnkYUKY(); diff --git a/src/037_MapA6/Actor/ActorUnkSOLF.cpp b/src/037_MapA6/Actor/ActorUnkSOLF.cpp index 4084ea94..ca7cbd5b 100644 --- a/src/037_MapA6/Actor/ActorUnkSOLF.cpp +++ b/src/037_MapA6/Actor/ActorUnkSOLF.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkSOLF.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkSOLF sActorProfileUnkSOLF; - -ARM ActorProfileUnkSOLF *ActorProfileUnkSOLF::GetProfile() { - return &sActorProfileUnkSOLF; -} +ARM DECL_PROFILE(ActorProfileUnkSOLF); ARM Actor *ActorProfileUnkSOLF::Create() { return new(HeapIndex_2) ActorUnkSOLF(); diff --git a/src/037_MapA6/Actor/ActorUnkSOLT.cpp b/src/037_MapA6/Actor/ActorUnkSOLT.cpp index 0e81282a..86ea3dea 100644 --- a/src/037_MapA6/Actor/ActorUnkSOLT.cpp +++ b/src/037_MapA6/Actor/ActorUnkSOLT.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkSOLT.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkSOLT sActorProfileUnkSOLT; - -ARM ActorProfileUnkSOLT *ActorProfileUnkSOLT::GetProfile() { - return &sActorProfileUnkSOLT; -} +ARM DECL_PROFILE(ActorProfileUnkSOLT); ARM Actor *ActorProfileUnkSOLT::Create() { return new(HeapIndex_2) ActorUnkSOLT(); diff --git a/src/037_MapA6/Actor/ActorUnkTUTO.cpp b/src/037_MapA6/Actor/ActorUnkTUTO.cpp index c35d138e..845c33b9 100644 --- a/src/037_MapA6/Actor/ActorUnkTUTO.cpp +++ b/src/037_MapA6/Actor/ActorUnkTUTO.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkTUTO.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkTUTO sActorProfileUnkTUTO; - -ARM ActorProfileUnkTUTO *ActorProfileUnkTUTO::GetProfile() { - return &sActorProfileUnkTUTO; -} +ARM DECL_PROFILE(ActorProfileUnkTUTO); ARM Actor *ActorProfileUnkTUTO::Create() { return new(HeapIndex_2) ActorUnkTUTO(); diff --git a/src/038_MapA7/Actor/ActorUnkBLBL.cpp b/src/038_MapA7/Actor/ActorUnkBLBL.cpp index ce8337dd..c140ef25 100644 --- a/src/038_MapA7/Actor/ActorUnkBLBL.cpp +++ b/src/038_MapA7/Actor/ActorUnkBLBL.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkBLBL.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkBLBL sActorProfileUnkBLBL; - -ARM ActorProfileUnkBLBL *ActorProfileUnkBLBL::GetProfile() { - return &sActorProfileUnkBLBL; -} +ARM DECL_PROFILE(ActorProfileUnkBLBL); ARM Actor *ActorProfileUnkBLBL::Create() { return new(HeapIndex_2) ActorUnkBLBL(); diff --git a/src/038_MapA7/Actor/ActorUnkBLBR.cpp b/src/038_MapA7/Actor/ActorUnkBLBR.cpp index 58f36411..e6ed510d 100644 --- a/src/038_MapA7/Actor/ActorUnkBLBR.cpp +++ b/src/038_MapA7/Actor/ActorUnkBLBR.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkBLBR.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkBLBR sActorProfileUnkBLBR; - -ARM ActorProfileUnkBLBR *ActorProfileUnkBLBR::GetProfile() { - return &sActorProfileUnkBLBR; -} +ARM DECL_PROFILE(ActorProfileUnkBLBR); ARM Actor *ActorProfileUnkBLBR::Create() { return new(HeapIndex_2) ActorUnkBLBR(); diff --git a/src/038_MapA7/Actor/ActorUnkGRCF.cpp b/src/038_MapA7/Actor/ActorUnkGRCF.cpp index 8b50f8e4..39b21768 100644 --- a/src/038_MapA7/Actor/ActorUnkGRCF.cpp +++ b/src/038_MapA7/Actor/ActorUnkGRCF.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkGRCF.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkGRCF sActorProfileUnkGRCF; - -ARM ActorProfileUnkGRCF *ActorProfileUnkGRCF::GetProfile() { - return &sActorProfileUnkGRCF; -} +ARM DECL_PROFILE(ActorProfileUnkGRCF); ARM Actor *ActorProfileUnkGRCF::Create() { return new(HeapIndex_2) ActorUnkGRCF(); diff --git a/src/038_MapA7/Actor/ActorUnkPLSR.cpp b/src/038_MapA7/Actor/ActorUnkPLSR.cpp index b1482235..ce7e9eb6 100644 --- a/src/038_MapA7/Actor/ActorUnkPLSR.cpp +++ b/src/038_MapA7/Actor/ActorUnkPLSR.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkPLSR.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkPLSR sActorProfileUnkPLSR; - -ARM ActorProfileUnkPLSR *ActorProfileUnkPLSR::GetProfile() { - return &sActorProfileUnkPLSR; -} +ARM DECL_PROFILE(ActorProfileUnkPLSR); ARM Actor *ActorProfileUnkPLSR::Create() { return new(HeapIndex_2) ActorUnkPLSR(); diff --git a/src/038_MapA7/Actor/ActorUnkWWFS.cpp b/src/038_MapA7/Actor/ActorUnkWWFS.cpp index fe69bb86..c9f9850d 100644 --- a/src/038_MapA7/Actor/ActorUnkWWFS.cpp +++ b/src/038_MapA7/Actor/ActorUnkWWFS.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkWWFS.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkWWFS sActorProfileUnkWWFS; - -ARM ActorProfileUnkWWFS *ActorProfileUnkWWFS::GetProfile() { - return &sActorProfileUnkWWFS; -} +ARM DECL_PROFILE(ActorProfileUnkWWFS); ARM Actor *ActorProfileUnkWWFS::Create() { return new(HeapIndex_2) ActorUnkWWFS(); diff --git a/src/038_MapA7/MapObject/MapObjectUnkBLSR.cpp b/src/038_MapA7/MapObject/MapObjectUnkBLSR.cpp index 37b00ff9..b2d449f4 100644 --- a/src/038_MapA7/MapObject/MapObjectUnkBLSR.cpp +++ b/src/038_MapA7/MapObject/MapObjectUnkBLSR.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkBLSR.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkBLSR sMapObjectProfileUnkBLSR; - -ARM MapObjectProfileUnkBLSR *MapObjectProfileUnkBLSR::GetProfile() { - return &sMapObjectProfileUnkBLSR; -} +ARM DECL_PROFILE(MapObjectProfileUnkBLSR); ARM MapObject *MapObjectProfileUnkBLSR::Create() { return new(HeapIndex_2) MapObjectUnkBLSR(); diff --git a/src/038_MapA7/MapObject/MapObjectUnkFSSN.cpp b/src/038_MapA7/MapObject/MapObjectUnkFSSN.cpp index f58a10b6..1e85cf35 100644 --- a/src/038_MapA7/MapObject/MapObjectUnkFSSN.cpp +++ b/src/038_MapA7/MapObject/MapObjectUnkFSSN.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkFSSN.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkFSSN sMapObjectProfileUnkFSSN; - -ARM MapObjectProfileUnkFSSN *MapObjectProfileUnkFSSN::GetProfile() { - return &sMapObjectProfileUnkFSSN; -} +ARM DECL_PROFILE(MapObjectProfileUnkFSSN); ARM MapObject *MapObjectProfileUnkFSSN::Create() { return new(HeapIndex_2) MapObjectUnkFSSN(); diff --git a/src/038_MapA7/MapObject/MapObjectUnkSWBR.cpp b/src/038_MapA7/MapObject/MapObjectUnkSWBR.cpp index 72cc9d54..033e2694 100644 --- a/src/038_MapA7/MapObject/MapObjectUnkSWBR.cpp +++ b/src/038_MapA7/MapObject/MapObjectUnkSWBR.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkSWBR.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkSWBR sMapObjectProfileUnkSWBR; - -ARM MapObjectProfileUnkSWBR *MapObjectProfileUnkSWBR::GetProfile() { - return &sMapObjectProfileUnkSWBR; -} +ARM DECL_PROFILE(MapObjectProfileUnkSWBR); ARM MapObject *MapObjectProfileUnkSWBR::Create() { return new(HeapIndex_2) MapObjectUnkSWBR(); diff --git a/src/039_MapA8/Actor/ActorUnkRMM4.cpp b/src/039_MapA8/Actor/ActorUnkRMM4.cpp index 59188045..c38906ec 100644 --- a/src/039_MapA8/Actor/ActorUnkRMM4.cpp +++ b/src/039_MapA8/Actor/ActorUnkRMM4.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkRMM4.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkRMM4 sActorProfileUnkRMM4; - -ARM ActorProfileUnkRMM4 *ActorProfileUnkRMM4::GetProfile() { - return &sActorProfileUnkRMM4; -} +ARM DECL_PROFILE(ActorProfileUnkRMM4); ARM Actor *ActorProfileUnkRMM4::Create() { return new(HeapIndex_2) ActorUnkRMM4(); diff --git a/src/039_MapA8/Actor/ActorUnkSIRO_SIRS_SRNM_SRSL.cpp b/src/039_MapA8/Actor/ActorUnkSIRO_SIRS_SRNM_SRSL.cpp index 5c4f578f..d06c60ff 100644 --- a/src/039_MapA8/Actor/ActorUnkSIRO_SIRS_SRNM_SRSL.cpp +++ b/src/039_MapA8/Actor/ActorUnkSIRO_SIRS_SRNM_SRSL.cpp @@ -5,11 +5,7 @@ // --- Actor SIRO --- -static ActorProfileUnkSIRO sActorProfileUnkSIRO; - -ARM ActorProfileUnkSIRO *ActorProfileUnkSIRO::GetProfile() { - return &sActorProfileUnkSIRO; -} +ARM DECL_PROFILE(ActorProfileUnkSIRO); ARM Actor *ActorProfileUnkSIRO::Create() { return new(HeapIndex_2) ActorUnkSIRO(); @@ -22,11 +18,7 @@ ARM ActorUnkSIRO::ActorUnkSIRO() {} // --- Actor SIRS --- -static ActorProfileUnkSIRS sActorProfileUnkSIRS; - -ARM ActorProfileUnkSIRS *ActorProfileUnkSIRS::GetProfile() { - return &sActorProfileUnkSIRS; -} +ARM DECL_PROFILE(ActorProfileUnkSIRS); ARM Actor *ActorProfileUnkSIRS::Create() { return new(HeapIndex_2) ActorUnkSIRS(); @@ -39,11 +31,7 @@ ARM ActorUnkSIRS::ActorUnkSIRS() {} // --- Actor SRNM --- -static ActorProfileUnkSRNM sActorProfileUnkSRNM; - -ARM ActorProfileUnkSRNM *ActorProfileUnkSRNM::GetProfile() { - return &sActorProfileUnkSRNM; -} +ARM DECL_PROFILE(ActorProfileUnkSRNM); ARM Actor *ActorProfileUnkSRNM::Create() { return new(HeapIndex_2) ActorUnkSRNM(); @@ -56,11 +44,7 @@ ARM ActorUnkSRNM::ActorUnkSRNM() {} // --- Actor SRSL --- -static ActorProfileUnkSRSL sActorProfileUnkSRSL; - -ARM ActorProfileUnkSRSL *ActorProfileUnkSRSL::GetProfile() { - return &sActorProfileUnkSRSL; -} +ARM DECL_PROFILE(ActorProfileUnkSRSL); ARM Actor *ActorProfileUnkSRSL::Create() { return new(HeapIndex_2) ActorUnkSRSL(); diff --git a/src/039_MapA8/Actor/ActorUnkZELD.cpp b/src/039_MapA8/Actor/ActorUnkZELD.cpp index d3a6cd6b..642817d0 100644 --- a/src/039_MapA8/Actor/ActorUnkZELD.cpp +++ b/src/039_MapA8/Actor/ActorUnkZELD.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkZELD.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkZELD sActorProfileUnkZELD; - -ARM ActorProfileUnkZELD *ActorProfileUnkZELD::GetProfile() { - return &sActorProfileUnkZELD; -} +ARM DECL_PROFILE(ActorProfileUnkZELD); ARM Actor *ActorProfileUnkZELD::Create() { return new(HeapIndex_2) ActorUnkZELD(); diff --git a/src/039_MapA8/Actor/ActorUnkZLSS.cpp b/src/039_MapA8/Actor/ActorUnkZLSS.cpp index dc964a95..f89abec9 100644 --- a/src/039_MapA8/Actor/ActorUnkZLSS.cpp +++ b/src/039_MapA8/Actor/ActorUnkZLSS.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkZLSS.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkZLSS sActorProfileUnkZLSS; - -ARM ActorProfileUnkZLSS *ActorProfileUnkZLSS::GetProfile() { - return &sActorProfileUnkZLSS; -} +ARM DECL_PROFILE(ActorProfileUnkZLSS); ARM Actor *ActorProfileUnkZLSS::Create() { return new(HeapIndex_2) ActorUnkZLSS(); diff --git a/src/039_MapA8/MapObject/MapObjectUnkGTAT.cpp b/src/039_MapA8/MapObject/MapObjectUnkGTAT.cpp index 60f74395..a0c87bd4 100644 --- a/src/039_MapA8/MapObject/MapObjectUnkGTAT.cpp +++ b/src/039_MapA8/MapObject/MapObjectUnkGTAT.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkGTAT.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkGTAT sMapObjectProfileUnkGTAT; - -ARM MapObjectProfileUnkGTAT *MapObjectProfileUnkGTAT::GetProfile() { - return &sMapObjectProfileUnkGTAT; -} +ARM DECL_PROFILE(MapObjectProfileUnkGTAT); ARM MapObject *MapObjectProfileUnkGTAT::Create() { return new(HeapIndex_2) MapObjectUnkGTAT(); diff --git a/src/040_MapB1/Actor/ActorUnkCAWB_CRFP_FOMA_FOMB_FOMC_FOMR_FOMS_FOPD_GOCP_GORP_NCCA_NCCS_WAMA.cpp b/src/040_MapB1/Actor/ActorUnkCAWB_CRFP_FOMA_FOMB_FOMC_FOMR_FOMS_FOPD_GOCP_GORP_NCCA_NCCS_WAMA.cpp index 8bd877a9..4a4f7959 100644 --- a/src/040_MapB1/Actor/ActorUnkCAWB_CRFP_FOMA_FOMB_FOMC_FOMR_FOMS_FOPD_GOCP_GORP_NCCA_NCCS_WAMA.cpp +++ b/src/040_MapB1/Actor/ActorUnkCAWB_CRFP_FOMA_FOMB_FOMC_FOMR_FOMS_FOPD_GOCP_GORP_NCCA_NCCS_WAMA.cpp @@ -3,14 +3,22 @@ #include "Actor/ActorUnkCAWB_CRFP_FOMA_FOMB_FOMC_FOMR_FOMS_FOPD_GOCP_GORP_NCCA_NCCS_WAMA.hpp" #include "System/SysNew.hpp" +OV040_ARM DECL_PROFILE(ActorProfileUnkNCCS); +OV040_ARM DECL_PROFILE(ActorProfileUnkFOMS); +OV040_ARM DECL_PROFILE(ActorProfileUnkNCCA); +OV040_ARM DECL_PROFILE(ActorProfileUnkWAMA); +OV040_ARM DECL_PROFILE(ActorProfileUnkGORP); +OV040_ARM DECL_PROFILE(ActorProfileUnkGOCP); +OV040_ARM DECL_PROFILE(ActorProfileUnkCAWB); +OV040_ARM DECL_PROFILE(ActorProfileUnkFOPD); +OV040_ARM DECL_PROFILE(ActorProfileUnkFOMA); +OV040_ARM DECL_PROFILE(ActorProfileUnkFOMB); +OV040_ARM DECL_PROFILE(ActorProfileUnkFOMC); +OV040_ARM DECL_PROFILE(ActorProfileUnkFOMR); +OV040_ARM DECL_PROFILE(ActorProfileUnkCRFP); + // --- Actor NCCS --- -static ActorProfileUnkNCCS sActorProfileUnkNCCS; - -OV040_ARM ActorProfileUnkNCCS *ActorProfileUnkNCCS::GetProfile() { - return &sActorProfileUnkNCCS; -} - OV040_ARM Actor *ActorProfileUnkNCCS::Create() { return NULL; } @@ -22,12 +30,6 @@ OV040_ARM ActorUnkNCCS::ActorUnkNCCS() {} // --- Actor FOMS --- -static ActorProfileUnkFOMS sActorProfileUnkFOMS; - -OV040_ARM ActorProfileUnkFOMS *ActorProfileUnkFOMS::GetProfile() { - return &sActorProfileUnkFOMS; -} - OV040_ARM Actor *ActorProfileUnkFOMS::Create() { return NULL; } @@ -39,12 +41,6 @@ OV040_ARM ActorUnkFOMS::ActorUnkFOMS() {} // --- Actor NCCA --- -static ActorProfileUnkNCCA sActorProfileUnkNCCA; - -OV040_ARM ActorProfileUnkNCCA *ActorProfileUnkNCCA::GetProfile() { - return &sActorProfileUnkNCCA; -} - OV040_ARM Actor *ActorProfileUnkNCCA::Create() { return new(HeapIndex_2) ActorUnkNCCA(); } @@ -56,12 +52,6 @@ OV040_ARM ActorUnkNCCA::ActorUnkNCCA() {} // --- Actor WAMA --- -static ActorProfileUnkWAMA sActorProfileUnkWAMA; - -OV040_ARM ActorProfileUnkWAMA *ActorProfileUnkWAMA::GetProfile() { - return &sActorProfileUnkWAMA; -} - OV040_ARM Actor *ActorProfileUnkWAMA::Create() { return new(HeapIndex_2) ActorUnkWAMA(); } @@ -73,12 +63,6 @@ OV040_ARM ActorUnkWAMA::ActorUnkWAMA() {} // --- Actor GORP --- -static ActorProfileUnkGORP sActorProfileUnkGORP; - -OV040_ARM ActorProfileUnkGORP *ActorProfileUnkGORP::GetProfile() { - return &sActorProfileUnkGORP; -} - OV040_ARM Actor *ActorProfileUnkGORP::Create() { return new(HeapIndex_2) ActorUnkGORP(); } @@ -90,12 +74,6 @@ OV040_ARM ActorUnkGORP::ActorUnkGORP() {} // --- Actor GOCP --- -static ActorProfileUnkGOCP sActorProfileUnkGOCP; - -OV040_ARM ActorProfileUnkGOCP *ActorProfileUnkGOCP::GetProfile() { - return &sActorProfileUnkGOCP; -} - OV040_ARM Actor *ActorProfileUnkGOCP::Create() { return new(HeapIndex_2) ActorUnkGOCP(); } @@ -107,12 +85,6 @@ OV040_ARM ActorUnkGOCP::ActorUnkGOCP() {} // --- Actor CAWB --- -static ActorProfileUnkCAWB sActorProfileUnkCAWB; - -OV040_ARM ActorProfileUnkCAWB *ActorProfileUnkCAWB::GetProfile() { - return &sActorProfileUnkCAWB; -} - OV040_ARM Actor *ActorProfileUnkCAWB::Create() { return new(HeapIndex_2) ActorUnkCAWB(); } @@ -124,12 +96,6 @@ OV040_ARM ActorUnkCAWB::ActorUnkCAWB() {} // --- Actor FOPD --- -static ActorProfileUnkFOPD sActorProfileUnkFOPD; - -OV040_ARM ActorProfileUnkFOPD *ActorProfileUnkFOPD::GetProfile() { - return &sActorProfileUnkFOPD; -} - OV040_ARM Actor *ActorProfileUnkFOPD::Create() { return new(HeapIndex_2) ActorUnkFOPD(); } @@ -141,12 +107,6 @@ OV040_ARM ActorUnkFOPD::ActorUnkFOPD() {} // --- Actor FOMA --- -static ActorProfileUnkFOMA sActorProfileUnkFOMA; - -OV040_ARM ActorProfileUnkFOMA *ActorProfileUnkFOMA::GetProfile() { - return &sActorProfileUnkFOMA; -} - OV040_ARM Actor *ActorProfileUnkFOMA::Create() { return new(HeapIndex_2) ActorUnkFOMA(); } @@ -158,12 +118,6 @@ OV040_ARM ActorUnkFOMA::ActorUnkFOMA() {} // --- Actor FOMB --- -static ActorProfileUnkFOMB sActorProfileUnkFOMB; - -OV040_ARM ActorProfileUnkFOMB *ActorProfileUnkFOMB::GetProfile() { - return &sActorProfileUnkFOMB; -} - OV040_ARM Actor *ActorProfileUnkFOMB::Create() { return new(HeapIndex_2) ActorUnkFOMB(); } @@ -175,12 +129,6 @@ OV040_ARM ActorUnkFOMB::ActorUnkFOMB() {} // --- Actor FOMC --- -static ActorProfileUnkFOMC sActorProfileUnkFOMC; - -OV040_ARM ActorProfileUnkFOMC *ActorProfileUnkFOMC::GetProfile() { - return &sActorProfileUnkFOMC; -} - OV040_ARM Actor *ActorProfileUnkFOMC::Create() { return new(HeapIndex_2) ActorUnkFOMC(); } @@ -192,12 +140,6 @@ OV040_ARM ActorUnkFOMC::ActorUnkFOMC() {} // --- Actor FOMR --- -static ActorProfileUnkFOMR sActorProfileUnkFOMR; - -OV040_ARM ActorProfileUnkFOMR *ActorProfileUnkFOMR::GetProfile() { - return &sActorProfileUnkFOMR; -} - OV040_ARM Actor *ActorProfileUnkFOMR::Create() { return new(HeapIndex_2) ActorUnkFOMR(); } @@ -209,12 +151,6 @@ OV040_ARM ActorUnkFOMR::ActorUnkFOMR() {} // --- Actor CRFP --- -static ActorProfileUnkCRFP sActorProfileUnkCRFP; - -OV040_ARM ActorProfileUnkCRFP *ActorProfileUnkCRFP::GetProfile() { - return &sActorProfileUnkCRFP; -} - OV040_ARM Actor *ActorProfileUnkCRFP::Create() { return new(HeapIndex_2) ActorUnkCRFP(); } diff --git a/src/040_MapB1/Actor/ActorUnkFTRN.cpp b/src/040_MapB1/Actor/ActorUnkFTRN.cpp index 6460dd68..9cbe3dc4 100644 --- a/src/040_MapB1/Actor/ActorUnkFTRN.cpp +++ b/src/040_MapB1/Actor/ActorUnkFTRN.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkFTRN.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkFTRN sActorProfileUnkFTRN; - -OV040_ARM ActorProfileUnkFTRN *ActorProfileUnkFTRN::GetProfile() { - return &sActorProfileUnkFTRN; -} +OV040_ARM DECL_PROFILE(ActorProfileUnkFTRN); OV040_ARM Actor *ActorProfileUnkFTRN::Create() { return new(HeapIndex_2) ActorUnkFTRN(); diff --git a/src/040_MapB1/Actor/ActorUnkOLDS.cpp b/src/040_MapB1/Actor/ActorUnkOLDS.cpp index 7b0e1189..d2607926 100644 --- a/src/040_MapB1/Actor/ActorUnkOLDS.cpp +++ b/src/040_MapB1/Actor/ActorUnkOLDS.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkOLDS.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkOLDS sActorProfileUnkOLDS; - -ARM ActorProfileUnkOLDS *ActorProfileUnkOLDS::GetProfile() { - return &sActorProfileUnkOLDS; -} +ARM DECL_PROFILE(ActorProfileUnkOLDS); ARM Actor *ActorProfileUnkOLDS::Create() { return new(HeapIndex_2) ActorUnkOLDS(); diff --git a/src/040_MapB1/Actor/ActorUnkTMNP.cpp b/src/040_MapB1/Actor/ActorUnkTMNP.cpp index 70483ac6..3e68cbec 100644 --- a/src/040_MapB1/Actor/ActorUnkTMNP.cpp +++ b/src/040_MapB1/Actor/ActorUnkTMNP.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkTMNP.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkTMNP sActorProfileUnkTMNP; - -ARM ActorProfileUnkTMNP *ActorProfileUnkTMNP::GetProfile() { - return &sActorProfileUnkTMNP; -} +ARM DECL_PROFILE(ActorProfileUnkTMNP); ARM Actor *ActorProfileUnkTMNP::Create() { return new(HeapIndex_2) ActorUnkTMNP(); diff --git a/src/040_MapB1/Actor/ActorUnkYKAP_YKCP_YKEP.cpp b/src/040_MapB1/Actor/ActorUnkYKAP_YKCP_YKEP.cpp index 4c985095..b0ff85a3 100644 --- a/src/040_MapB1/Actor/ActorUnkYKAP_YKCP_YKEP.cpp +++ b/src/040_MapB1/Actor/ActorUnkYKAP_YKCP_YKEP.cpp @@ -5,11 +5,7 @@ // --- Actor YKAP --- -static ActorProfileUnkYKAP sActorProfileUnkYKAP; - -ARM ActorProfileUnkYKAP *ActorProfileUnkYKAP::GetProfile() { - return &sActorProfileUnkYKAP; -} +ARM DECL_PROFILE(ActorProfileUnkYKAP); ARM Actor *ActorProfileUnkYKAP::Create() { return new(HeapIndex_2) ActorUnkYKAP(); @@ -22,11 +18,7 @@ ARM ActorUnkYKAP::ActorUnkYKAP() {} // --- Actor YKCP --- -static ActorProfileUnkYKCP sActorProfileUnkYKCP; - -ARM ActorProfileUnkYKCP *ActorProfileUnkYKCP::GetProfile() { - return &sActorProfileUnkYKCP; -} +ARM DECL_PROFILE(ActorProfileUnkYKCP); ARM Actor *ActorProfileUnkYKCP::Create() { return new(HeapIndex_2) ActorUnkYKCP(); @@ -39,11 +31,7 @@ ARM ActorUnkYKCP::ActorUnkYKCP() {} // --- Actor YKEP --- -static ActorProfileUnkYKEP sActorProfileUnkYKEP; - -ARM ActorProfileUnkYKEP *ActorProfileUnkYKEP::GetProfile() { - return &sActorProfileUnkYKEP; -} +ARM DECL_PROFILE(ActorProfileUnkYKEP); ARM Actor *ActorProfileUnkYKEP::Create() { return new(HeapIndex_2) ActorUnkYKEP(); diff --git a/src/040_MapB1/Actor/ActorUnkZSTG.cpp b/src/040_MapB1/Actor/ActorUnkZSTG.cpp index 24a4c192..6882b392 100644 --- a/src/040_MapB1/Actor/ActorUnkZSTG.cpp +++ b/src/040_MapB1/Actor/ActorUnkZSTG.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkZSTG.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkZSTG sActorProfileUnkZSTG; - -ARM ActorProfileUnkZSTG *ActorProfileUnkZSTG::GetProfile() { - return &sActorProfileUnkZSTG; -} +ARM DECL_PROFILE(ActorProfileUnkZSTG); ARM Actor *ActorProfileUnkZSTG::Create() { return new(HeapIndex_2) ActorUnkZSTG(); diff --git a/src/040_MapB1/MapObject/MapObjectUnkFRAI.cpp b/src/040_MapB1/MapObject/MapObjectUnkFRAI.cpp index 6cbdb915..7e202a35 100644 --- a/src/040_MapB1/MapObject/MapObjectUnkFRAI.cpp +++ b/src/040_MapB1/MapObject/MapObjectUnkFRAI.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkFRAI.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkFRAI sMapObjectProfileUnkFRAI; - -ARM MapObjectProfileUnkFRAI *MapObjectProfileUnkFRAI::GetProfile() { - return &sMapObjectProfileUnkFRAI; -} +ARM DECL_PROFILE(MapObjectProfileUnkFRAI); ARM MapObject *MapObjectProfileUnkFRAI::Create() { return new(HeapIndex_2) MapObjectUnkFRAI(); diff --git a/src/040_MapB1/MapObject/MapObjectUnkFSTA.cpp b/src/040_MapB1/MapObject/MapObjectUnkFSTA.cpp index af2dff44..b1a6d513 100644 --- a/src/040_MapB1/MapObject/MapObjectUnkFSTA.cpp +++ b/src/040_MapB1/MapObject/MapObjectUnkFSTA.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkFSTA.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkFSTA sMapObjectProfileUnkFSTA; - -ARM MapObjectProfileUnkFSTA *MapObjectProfileUnkFSTA::GetProfile() { - return &sMapObjectProfileUnkFSTA; -} +ARM DECL_PROFILE(MapObjectProfileUnkFSTA); ARM MapObject *MapObjectProfileUnkFSTA::Create() { return new(HeapIndex_2) MapObjectUnkFSTA(); diff --git a/src/041_MapB2/Actor/ActorUnkKEYB.cpp b/src/041_MapB2/Actor/ActorUnkKEYB.cpp index 6e484ea8..504ebaff 100644 --- a/src/041_MapB2/Actor/ActorUnkKEYB.cpp +++ b/src/041_MapB2/Actor/ActorUnkKEYB.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkKEYB.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkKEYB sActorProfileUnkKEYB; - -ARM ActorProfileUnkKEYB *ActorProfileUnkKEYB::GetProfile() { - return &sActorProfileUnkKEYB; -} +ARM DECL_PROFILE(ActorProfileUnkKEYB); ARM Actor *ActorProfileUnkKEYB::Create() { return new(HeapIndex_2) ActorUnkKEYB(); diff --git a/src/041_MapB2/Actor/ActorUnkKEYT.cpp b/src/041_MapB2/Actor/ActorUnkKEYT.cpp index 7bcd5b62..efb4ee01 100644 --- a/src/041_MapB2/Actor/ActorUnkKEYT.cpp +++ b/src/041_MapB2/Actor/ActorUnkKEYT.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkKEYT.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkKEYT sActorProfileUnkKEYT; - -ARM ActorProfileUnkKEYT *ActorProfileUnkKEYT::GetProfile() { - return &sActorProfileUnkKEYT; -} +ARM DECL_PROFILE(ActorProfileUnkKEYT); ARM Actor *ActorProfileUnkKEYT::Create() { return new(HeapIndex_2) ActorUnkKEYT(); diff --git a/src/041_MapB2/Actor/ActorUnkKGDB.cpp b/src/041_MapB2/Actor/ActorUnkKGDB.cpp index 3dfa5b1c..9eb01c59 100644 --- a/src/041_MapB2/Actor/ActorUnkKGDB.cpp +++ b/src/041_MapB2/Actor/ActorUnkKGDB.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkKGDB.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkKGDB sActorProfileUnkKGDB; - -ARM ActorProfileUnkKGDB *ActorProfileUnkKGDB::GetProfile() { - return &sActorProfileUnkKGDB; -} +ARM DECL_PROFILE(ActorProfileUnkKGDB); ARM Actor *ActorProfileUnkKGDB::Create() { return new(HeapIndex_2) ActorUnkKGDB(); diff --git a/src/041_MapB2/Actor/ActorUnkKGDN.cpp b/src/041_MapB2/Actor/ActorUnkKGDN.cpp index b662b1ba..78ee4e76 100644 --- a/src/041_MapB2/Actor/ActorUnkKGDN.cpp +++ b/src/041_MapB2/Actor/ActorUnkKGDN.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkKGDN.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkKGDN sActorProfileUnkKGDN; - -ARM ActorProfileUnkKGDN *ActorProfileUnkKGDN::GetProfile() { - return &sActorProfileUnkKGDN; -} +ARM DECL_PROFILE(ActorProfileUnkKGDN); ARM Actor *ActorProfileUnkKGDN::Create() { return new(HeapIndex_2) ActorUnkKGDN(); diff --git a/src/041_MapB2/Actor/ActorUnkRPMT.cpp b/src/041_MapB2/Actor/ActorUnkRPMT.cpp index bca10bf2..00c3cf06 100644 --- a/src/041_MapB2/Actor/ActorUnkRPMT.cpp +++ b/src/041_MapB2/Actor/ActorUnkRPMT.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkRPMT.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkRPMT sActorProfileUnkRPMT; - -ARM ActorProfileUnkRPMT *ActorProfileUnkRPMT::GetProfile() { - return &sActorProfileUnkRPMT; -} +ARM DECL_PROFILE(ActorProfileUnkRPMT); ARM Actor *ActorProfileUnkRPMT::Create() { return new(HeapIndex_2) ActorUnkRPMT(); diff --git a/src/041_MapB2/MapObject/MapObjectUnkDRBK.cpp b/src/041_MapB2/MapObject/MapObjectUnkDRBK.cpp index be317ee0..575efe60 100644 --- a/src/041_MapB2/MapObject/MapObjectUnkDRBK.cpp +++ b/src/041_MapB2/MapObject/MapObjectUnkDRBK.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkDRBK.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkDRBK sMapObjectProfileUnkDRBK; - -ARM MapObjectProfileUnkDRBK *MapObjectProfileUnkDRBK::GetProfile() { - return &sMapObjectProfileUnkDRBK; -} +ARM DECL_PROFILE(MapObjectProfileUnkDRBK); ARM MapObject *MapObjectProfileUnkDRBK::Create() { return new(HeapIndex_2) MapObjectUnkDRBK(); diff --git a/src/041_MapB2/MapObject/MapObjectUnkDRMC.cpp b/src/041_MapB2/MapObject/MapObjectUnkDRMC.cpp index 9dac0165..823c478f 100644 --- a/src/041_MapB2/MapObject/MapObjectUnkDRMC.cpp +++ b/src/041_MapB2/MapObject/MapObjectUnkDRMC.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkDRMC.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkDRMC sMapObjectProfileUnkDRMC; - -ARM MapObjectProfileUnkDRMC *MapObjectProfileUnkDRMC::GetProfile() { - return &sMapObjectProfileUnkDRMC; -} +ARM DECL_PROFILE(MapObjectProfileUnkDRMC); ARM MapObject *MapObjectProfileUnkDRMC::Create() { return new(HeapIndex_2) MapObjectUnkDRMC(); diff --git a/src/041_MapB2/MapObject/MapObjectUnkDRTK.cpp b/src/041_MapB2/MapObject/MapObjectUnkDRTK.cpp index d64178dc..bdee81c6 100644 --- a/src/041_MapB2/MapObject/MapObjectUnkDRTK.cpp +++ b/src/041_MapB2/MapObject/MapObjectUnkDRTK.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkDRTK.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkDRTK sMapObjectProfileUnkDRTK; - -ARM MapObjectProfileUnkDRTK *MapObjectProfileUnkDRTK::GetProfile() { - return &sMapObjectProfileUnkDRTK; -} +ARM DECL_PROFILE(MapObjectProfileUnkDRTK); ARM MapObject *MapObjectProfileUnkDRTK::Create() { return new(HeapIndex_2) MapObjectUnkDRTK(); diff --git a/src/042_MapB3/Actor/ActorUnkMIFR.cpp b/src/042_MapB3/Actor/ActorUnkMIFR.cpp index 183a43e2..dd0bfb27 100644 --- a/src/042_MapB3/Actor/ActorUnkMIFR.cpp +++ b/src/042_MapB3/Actor/ActorUnkMIFR.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkMIFR.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkMIFR sActorProfileUnkMIFR; - -ARM ActorProfileUnkMIFR *ActorProfileUnkMIFR::GetProfile() { - return &sActorProfileUnkMIFR; -} +ARM DECL_PROFILE(ActorProfileUnkMIFR); ARM Actor *ActorProfileUnkMIFR::Create() { return new(HeapIndex_2) ActorUnkMIFR(); diff --git a/src/042_MapB3/Actor/ActorUnkOCTA.cpp b/src/042_MapB3/Actor/ActorUnkOCTA.cpp index 64176f02..1c31e9ca 100644 --- a/src/042_MapB3/Actor/ActorUnkOCTA.cpp +++ b/src/042_MapB3/Actor/ActorUnkOCTA.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkOCTA.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkOCTA sActorProfileUnkOCTA; - -ARM ActorProfileUnkOCTA *ActorProfileUnkOCTA::GetProfile() { - return &sActorProfileUnkOCTA; -} +ARM DECL_PROFILE(ActorProfileUnkOCTA); ARM Actor *ActorProfileUnkOCTA::Create() { return new(HeapIndex_2) ActorUnkOCTA(); diff --git a/src/042_MapB3/Actor/ActorUnkOCTS.cpp b/src/042_MapB3/Actor/ActorUnkOCTS.cpp index d91b3493..ecdbd979 100644 --- a/src/042_MapB3/Actor/ActorUnkOCTS.cpp +++ b/src/042_MapB3/Actor/ActorUnkOCTS.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkOCTS.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkOCTS sActorProfileUnkOCTS; - -ARM ActorProfileUnkOCTS *ActorProfileUnkOCTS::GetProfile() { - return &sActorProfileUnkOCTS; -} +ARM DECL_PROFILE(ActorProfileUnkOCTS); ARM Actor *ActorProfileUnkOCTS::Create() { return new(HeapIndex_2) ActorUnkOCTS(); diff --git a/src/042_MapB3/Actor/ActorUnkPHEY.cpp b/src/042_MapB3/Actor/ActorUnkPHEY.cpp index afabc563..f95c154b 100644 --- a/src/042_MapB3/Actor/ActorUnkPHEY.cpp +++ b/src/042_MapB3/Actor/ActorUnkPHEY.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkPHEY.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkPHEY sActorProfileUnkPHEY; - -ARM ActorProfileUnkPHEY *ActorProfileUnkPHEY::GetProfile() { - return &sActorProfileUnkPHEY; -} +ARM DECL_PROFILE(ActorProfileUnkPHEY); ARM Actor *ActorProfileUnkPHEY::Create() { return new(HeapIndex_2) ActorUnkPHEY(); diff --git a/src/042_MapB3/Actor/ActorUnkPMTT.cpp b/src/042_MapB3/Actor/ActorUnkPMTT.cpp index 9ea0897d..c13c9b0f 100644 --- a/src/042_MapB3/Actor/ActorUnkPMTT.cpp +++ b/src/042_MapB3/Actor/ActorUnkPMTT.cpp @@ -6,11 +6,7 @@ #if IS_JP -static ActorProfileUnkPMTT sActorProfileUnkPMTT; - -ARM ActorProfileUnkPMTT *ActorProfileUnkPMTT::GetProfile() { - return &sActorProfileUnkPMTT; -} +ARM DECL_PROFILE(ActorProfileUnkPMTT); ARM Actor *ActorProfileUnkPMTT::Create() { return new(HeapIndex_2) ActorUnkPMTT(); diff --git a/src/042_MapB3/MapObject/MapObjectUnkSWRA.cpp b/src/042_MapB3/MapObject/MapObjectUnkSWRA.cpp index b3806dd2..9e5475c0 100644 --- a/src/042_MapB3/MapObject/MapObjectUnkSWRA.cpp +++ b/src/042_MapB3/MapObject/MapObjectUnkSWRA.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkSWRA.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkSWRA sMapObjectProfileUnkSWRA; - -ARM MapObjectProfileUnkSWRA *MapObjectProfileUnkSWRA::GetProfile() { - return &sMapObjectProfileUnkSWRA; -} +ARM DECL_PROFILE(MapObjectProfileUnkSWRA); ARM MapObject *MapObjectProfileUnkSWRA::Create() { return new(HeapIndex_2) MapObjectUnkSWRA(); diff --git a/src/043_MapB4/Actor/ActorUnkSHDL.cpp b/src/043_MapB4/Actor/ActorUnkSHDL.cpp index d8224042..4bf7c65b 100644 --- a/src/043_MapB4/Actor/ActorUnkSHDL.cpp +++ b/src/043_MapB4/Actor/ActorUnkSHDL.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkSHDL.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkSHDL sActorProfileUnkSHDL; - -THUMB ActorProfileUnkSHDL *ActorProfileUnkSHDL::GetProfile() { - return &sActorProfileUnkSHDL; -} +THUMB DECL_PROFILE(ActorProfileUnkSHDL); THUMB Actor *ActorProfileUnkSHDL::Create() { return new(HeapIndex_2) ActorUnkSHDL(); diff --git a/src/043_MapB4/Actor/ActorUnkSTFB.cpp b/src/043_MapB4/Actor/ActorUnkSTFB.cpp index b3b5aa98..1812adef 100644 --- a/src/043_MapB4/Actor/ActorUnkSTFB.cpp +++ b/src/043_MapB4/Actor/ActorUnkSTFB.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkSTFB.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkSTFB sActorProfileUnkSTFB; - -ARM ActorProfileUnkSTFB *ActorProfileUnkSTFB::GetProfile() { - return &sActorProfileUnkSTFB; -} +ARM DECL_PROFILE(ActorProfileUnkSTFB); ARM Actor *ActorProfileUnkSTFB::Create() { return new(HeapIndex_2) ActorUnkSTFB(); diff --git a/src/043_MapB4/Actor/ActorUnkSTFH.cpp b/src/043_MapB4/Actor/ActorUnkSTFH.cpp index bc0f7325..53c92726 100644 --- a/src/043_MapB4/Actor/ActorUnkSTFH.cpp +++ b/src/043_MapB4/Actor/ActorUnkSTFH.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkSTFH.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkSTFH sActorProfileUnkSTFH; - -ARM ActorProfileUnkSTFH *ActorProfileUnkSTFH::GetProfile() { - return &sActorProfileUnkSTFH; -} +ARM DECL_PROFILE(ActorProfileUnkSTFH); ARM Actor *ActorProfileUnkSTFH::Create() { return new(HeapIndex_2) ActorUnkSTFH(); diff --git a/src/043_MapB4/Actor/ActorUnkSTLF.cpp b/src/043_MapB4/Actor/ActorUnkSTLF.cpp index 2536622b..000e3830 100644 --- a/src/043_MapB4/Actor/ActorUnkSTLF.cpp +++ b/src/043_MapB4/Actor/ActorUnkSTLF.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkSTLF.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkSTLF sActorProfileUnkSTLF; - -ARM ActorProfileUnkSTLF *ActorProfileUnkSTLF::GetProfile() { - return &sActorProfileUnkSTLF; -} +ARM DECL_PROFILE(ActorProfileUnkSTLF); ARM Actor *ActorProfileUnkSTLF::Create() { return new(HeapIndex_2) ActorUnkSTLF(); diff --git a/src/044_MapB5/Actor/ActorUnkIBBA.cpp b/src/044_MapB5/Actor/ActorUnkIBBA.cpp index 173cd35c..e28b3856 100644 --- a/src/044_MapB5/Actor/ActorUnkIBBA.cpp +++ b/src/044_MapB5/Actor/ActorUnkIBBA.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkIBBA.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkIBBA sActorProfileUnkIBBA; - -ARM ActorProfileUnkIBBA *ActorProfileUnkIBBA::GetProfile() { - return &sActorProfileUnkIBBA; -} +ARM DECL_PROFILE(ActorProfileUnkIBBA); ARM Actor *ActorProfileUnkIBBA::Create() { return new(HeapIndex_2) ActorUnkIBBA(); diff --git a/src/044_MapB5/Actor/ActorUnkIBSP.cpp b/src/044_MapB5/Actor/ActorUnkIBSP.cpp index f7a09a91..d0149383 100644 --- a/src/044_MapB5/Actor/ActorUnkIBSP.cpp +++ b/src/044_MapB5/Actor/ActorUnkIBSP.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkIBSP.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkIBSP sActorProfileUnkIBSP; - -ARM ActorProfileUnkIBSP *ActorProfileUnkIBSP::GetProfile() { - return &sActorProfileUnkIBSP; -} +ARM DECL_PROFILE(ActorProfileUnkIBSP); ARM Actor *ActorProfileUnkIBSP::Create() { return new(HeapIndex_2) ActorUnkIBSP(); diff --git a/src/044_MapB5/Actor/ActorUnkICBB.cpp b/src/044_MapB5/Actor/ActorUnkICBB.cpp index 4c142c5d..c15f1fed 100644 --- a/src/044_MapB5/Actor/ActorUnkICBB.cpp +++ b/src/044_MapB5/Actor/ActorUnkICBB.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkICBB.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkICBB sActorProfileUnkICBB; - -ARM ActorProfileUnkICBB *ActorProfileUnkICBB::GetProfile() { - return &sActorProfileUnkICBB; -} +ARM DECL_PROFILE(ActorProfileUnkICBB); ARM Actor *ActorProfileUnkICBB::Create() { return new(HeapIndex_2) ActorUnkICBB(); diff --git a/src/044_MapB5/Actor/ActorUnkL2MT.cpp b/src/044_MapB5/Actor/ActorUnkL2MT.cpp index cf9b581a..b49048a0 100644 --- a/src/044_MapB5/Actor/ActorUnkL2MT.cpp +++ b/src/044_MapB5/Actor/ActorUnkL2MT.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkL2MT.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkL2MT sActorProfileUnkL2MT; - -ARM ActorProfileUnkL2MT *ActorProfileUnkL2MT::GetProfile() { - return &sActorProfileUnkL2MT; -} +ARM DECL_PROFILE(ActorProfileUnkL2MT); ARM Actor *ActorProfileUnkL2MT::Create() { return new(HeapIndex_2) ActorUnkL2MT(); diff --git a/src/044_MapB5/Actor/ActorUnkL2V1.cpp b/src/044_MapB5/Actor/ActorUnkL2V1.cpp index a1014cca..30d372e6 100644 --- a/src/044_MapB5/Actor/ActorUnkL2V1.cpp +++ b/src/044_MapB5/Actor/ActorUnkL2V1.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkL2V1.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkL2V1 sActorProfileUnkL2V1; - -ARM ActorProfileUnkL2V1 *ActorProfileUnkL2V1::GetProfile() { - return &sActorProfileUnkL2V1; -} +ARM DECL_PROFILE(ActorProfileUnkL2V1); ARM Actor *ActorProfileUnkL2V1::Create() { return new(HeapIndex_2) ActorUnkL2V1(); diff --git a/src/044_MapB5/Actor/ActorUnkL2V2.cpp b/src/044_MapB5/Actor/ActorUnkL2V2.cpp index a8d0f1f9..8f8c8427 100644 --- a/src/044_MapB5/Actor/ActorUnkL2V2.cpp +++ b/src/044_MapB5/Actor/ActorUnkL2V2.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkL2V2.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkL2V2 sActorProfileUnkL2V2; - -ARM ActorProfileUnkL2V2 *ActorProfileUnkL2V2::GetProfile() { - return &sActorProfileUnkL2V2; -} +ARM DECL_PROFILE(ActorProfileUnkL2V2); ARM Actor *ActorProfileUnkL2V2::Create() { return new(HeapIndex_2) ActorUnkL2V2(); diff --git a/src/044_MapB5/Actor/ActorUnkRBL2.cpp b/src/044_MapB5/Actor/ActorUnkRBL2.cpp index ca6be796..0ffb1252 100644 --- a/src/044_MapB5/Actor/ActorUnkRBL2.cpp +++ b/src/044_MapB5/Actor/ActorUnkRBL2.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkRBL2.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkRBL2 sActorProfileUnkRBL2; - -ARM ActorProfileUnkRBL2 *ActorProfileUnkRBL2::GetProfile() { - return &sActorProfileUnkRBL2; -} +ARM DECL_PROFILE(ActorProfileUnkRBL2); ARM Actor *ActorProfileUnkRBL2::Create() { return new(HeapIndex_2) ActorUnkRBL2(); diff --git a/src/045_MapB6/Actor/ActorUnkBDBA.cpp b/src/045_MapB6/Actor/ActorUnkBDBA.cpp index 708d561e..c0a66b9a 100644 --- a/src/045_MapB6/Actor/ActorUnkBDBA.cpp +++ b/src/045_MapB6/Actor/ActorUnkBDBA.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkBDBA.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkBDBA sActorProfileUnkBDBA; - -ARM ActorProfileUnkBDBA *ActorProfileUnkBDBA::GetProfile() { - return &sActorProfileUnkBDBA; -} +ARM DECL_PROFILE(ActorProfileUnkBDBA); ARM Actor *ActorProfileUnkBDBA::Create() { return new(HeapIndex_2) ActorUnkBDBA(); diff --git a/src/045_MapB6/Actor/ActorUnkBDGA.cpp b/src/045_MapB6/Actor/ActorUnkBDGA.cpp index 0a866829..0cabf20a 100644 --- a/src/045_MapB6/Actor/ActorUnkBDGA.cpp +++ b/src/045_MapB6/Actor/ActorUnkBDGA.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkBDGA.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkBDGA sActorProfileUnkBDGA; - -ARM ActorProfileUnkBDGA *ActorProfileUnkBDGA::GetProfile() { - return &sActorProfileUnkBDGA; -} +ARM DECL_PROFILE(ActorProfileUnkBDGA); ARM Actor *ActorProfileUnkBDGA::Create() { return new(HeapIndex_2) ActorUnkBDGA(); diff --git a/src/045_MapB6/Actor/ActorUnkBDLB.cpp b/src/045_MapB6/Actor/ActorUnkBDLB.cpp index f61189d8..c936faf4 100644 --- a/src/045_MapB6/Actor/ActorUnkBDLB.cpp +++ b/src/045_MapB6/Actor/ActorUnkBDLB.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkBDLB.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkBDLB sActorProfileUnkBDLB; - -ARM ActorProfileUnkBDLB *ActorProfileUnkBDLB::GetProfile() { - return &sActorProfileUnkBDLB; -} +ARM DECL_PROFILE(ActorProfileUnkBDLB); ARM Actor *ActorProfileUnkBDLB::Create() { return new(HeapIndex_2) ActorUnkBDLB(); diff --git a/src/045_MapB6/Actor/ActorUnkRMBD.cpp b/src/045_MapB6/Actor/ActorUnkRMBD.cpp index a4e39d85..1da56e0e 100644 --- a/src/045_MapB6/Actor/ActorUnkRMBD.cpp +++ b/src/045_MapB6/Actor/ActorUnkRMBD.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkRMBD.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkRMBD sActorProfileUnkRMBD; - -ARM ActorProfileUnkRMBD *ActorProfileUnkRMBD::GetProfile() { - return &sActorProfileUnkRMBD; -} +ARM DECL_PROFILE(ActorProfileUnkRMBD); ARM Actor *ActorProfileUnkRMBD::Create() { return new(HeapIndex_2) ActorUnkRMBD(); diff --git a/src/045_MapB6/Actor/ActorUnkWPCL.cpp b/src/045_MapB6/Actor/ActorUnkWPCL.cpp index f78b42b4..b725a903 100644 --- a/src/045_MapB6/Actor/ActorUnkWPCL.cpp +++ b/src/045_MapB6/Actor/ActorUnkWPCL.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkWPCL.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkWPCL sActorProfileUnkWPCL; - -ARM ActorProfileUnkWPCL *ActorProfileUnkWPCL::GetProfile() { - return &sActorProfileUnkWPCL; -} +ARM DECL_PROFILE(ActorProfileUnkWPCL); ARM Actor *ActorProfileUnkWPCL::Create() { return new(HeapIndex_2) ActorUnkWPCL(); diff --git a/src/045_MapB6/MapObject/MapObjectUnkRDSD.cpp b/src/045_MapB6/MapObject/MapObjectUnkRDSD.cpp index a688378e..a7ecc5a9 100644 --- a/src/045_MapB6/MapObject/MapObjectUnkRDSD.cpp +++ b/src/045_MapB6/MapObject/MapObjectUnkRDSD.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkRDSD.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkRDSD sMapObjectProfileUnkRDSD; - -ARM MapObjectProfileUnkRDSD *MapObjectProfileUnkRDSD::GetProfile() { - return &sMapObjectProfileUnkRDSD; -} +ARM DECL_PROFILE(MapObjectProfileUnkRDSD); ARM MapObject *MapObjectProfileUnkRDSD::Create() { return new(HeapIndex_2) MapObjectUnkRDSD(); diff --git a/src/046_MapB7/Actor/ActorUnkWBN2.cpp b/src/046_MapB7/Actor/ActorUnkWBN2.cpp index 2198ad98..19ba7d44 100644 --- a/src/046_MapB7/Actor/ActorUnkWBN2.cpp +++ b/src/046_MapB7/Actor/ActorUnkWBN2.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkWBN2.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkWBN2 sActorProfileUnkWBN2; - -ARM ActorProfileUnkWBN2 *ActorProfileUnkWBN2::GetProfile() { - return &sActorProfileUnkWBN2; -} +ARM DECL_PROFILE(ActorProfileUnkWBN2); ARM Actor *ActorProfileUnkWBN2::Create() { return new(HeapIndex_2) ActorUnkWBN2(); diff --git a/src/046_MapB7/Actor/ActorUnkWBTN.cpp b/src/046_MapB7/Actor/ActorUnkWBTN.cpp index e8601499..8a7024cd 100644 --- a/src/046_MapB7/Actor/ActorUnkWBTN.cpp +++ b/src/046_MapB7/Actor/ActorUnkWBTN.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkWBTN.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkWBTN sActorProfileUnkWBTN; - -ARM ActorProfileUnkWBTN *ActorProfileUnkWBTN::GetProfile() { - return &sActorProfileUnkWBTN; -} +ARM DECL_PROFILE(ActorProfileUnkWBTN); ARM Actor *ActorProfileUnkWBTN::Create() { return new(HeapIndex_2) ActorUnkWBTN(); diff --git a/src/046_MapB7/Actor/ActorUnkWTH2.cpp b/src/046_MapB7/Actor/ActorUnkWTH2.cpp index abb4ac65..715187bc 100644 --- a/src/046_MapB7/Actor/ActorUnkWTH2.cpp +++ b/src/046_MapB7/Actor/ActorUnkWTH2.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkWTH2.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkWTH2 sActorProfileUnkWTH2; - -ARM ActorProfileUnkWTH2 *ActorProfileUnkWTH2::GetProfile() { - return &sActorProfileUnkWTH2; -} +ARM DECL_PROFILE(ActorProfileUnkWTH2); ARM Actor *ActorProfileUnkWTH2::Create() { return new(HeapIndex_2) ActorUnkWTH2(); diff --git a/src/046_MapB7/Actor/ActorUnkWTH3.cpp b/src/046_MapB7/Actor/ActorUnkWTH3.cpp index eeefdd5a..17db9f89 100644 --- a/src/046_MapB7/Actor/ActorUnkWTH3.cpp +++ b/src/046_MapB7/Actor/ActorUnkWTH3.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkWTH3.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkWTH3 sActorProfileUnkWTH3; - -ARM ActorProfileUnkWTH3 *ActorProfileUnkWTH3::GetProfile() { - return &sActorProfileUnkWTH3; -} +ARM DECL_PROFILE(ActorProfileUnkWTH3); ARM Actor *ActorProfileUnkWTH3::Create() { return new(HeapIndex_2) ActorUnkWTH3(); diff --git a/src/046_MapB7/Actor/ActorUnkWTTH.cpp b/src/046_MapB7/Actor/ActorUnkWTTH.cpp index a695eb49..a3923262 100644 --- a/src/046_MapB7/Actor/ActorUnkWTTH.cpp +++ b/src/046_MapB7/Actor/ActorUnkWTTH.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkWTTH.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkWTTH sActorProfileUnkWTTH; - -ARM ActorProfileUnkWTTH *ActorProfileUnkWTTH::GetProfile() { - return &sActorProfileUnkWTTH; -} +ARM DECL_PROFILE(ActorProfileUnkWTTH); ARM Actor *ActorProfileUnkWTTH::Create() { return new(HeapIndex_2) ActorUnkWTTH(); diff --git a/src/047_MapC1/Actor/ActorUnkDLTG.cpp b/src/047_MapC1/Actor/ActorUnkDLTG.cpp index ec3dccd1..690f59c3 100644 --- a/src/047_MapC1/Actor/ActorUnkDLTG.cpp +++ b/src/047_MapC1/Actor/ActorUnkDLTG.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkDLTG.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkDLTG sActorProfileUnkDLTG; - -ARM ActorProfileUnkDLTG *ActorProfileUnkDLTG::GetProfile() { - return &sActorProfileUnkDLTG; -} +ARM DECL_PROFILE(ActorProfileUnkDLTG); ARM Actor *ActorProfileUnkDLTG::Create() { return new(HeapIndex_2) ActorUnkDLTG(); diff --git a/src/047_MapC1/Actor/ActorUnkEVCH.cpp b/src/047_MapC1/Actor/ActorUnkEVCH.cpp index e9d3b57d..335d8fb0 100644 --- a/src/047_MapC1/Actor/ActorUnkEVCH.cpp +++ b/src/047_MapC1/Actor/ActorUnkEVCH.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkEVCH.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkEVCH sActorProfileUnkEVCH; - -ARM ActorProfileUnkEVCH *ActorProfileUnkEVCH::GetProfile() { - return &sActorProfileUnkEVCH; -} +ARM DECL_PROFILE(ActorProfileUnkEVCH); ARM Actor *ActorProfileUnkEVCH::Create() { return new(HeapIndex_2) ActorUnkEVCH(); diff --git a/src/047_MapC1/Actor/ActorUnkFLDK.cpp b/src/047_MapC1/Actor/ActorUnkFLDK.cpp index 91441e64..55622644 100644 --- a/src/047_MapC1/Actor/ActorUnkFLDK.cpp +++ b/src/047_MapC1/Actor/ActorUnkFLDK.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkFLDK.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkFLDK sActorProfileUnkFLDK; - -ARM ActorProfileUnkFLDK *ActorProfileUnkFLDK::GetProfile() { - return &sActorProfileUnkFLDK; -} +ARM DECL_PROFILE(ActorProfileUnkFLDK); ARM Actor *ActorProfileUnkFLDK::Create() { return new(HeapIndex_2) ActorUnkFLDK(); diff --git a/src/047_MapC1/Actor/ActorUnkGHOS.cpp b/src/047_MapC1/Actor/ActorUnkGHOS.cpp index a8d5cb15..40899a50 100644 --- a/src/047_MapC1/Actor/ActorUnkGHOS.cpp +++ b/src/047_MapC1/Actor/ActorUnkGHOS.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkGHOS.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkGHOS sActorProfileUnkGHOS; - -ARM ActorProfileUnkGHOS *ActorProfileUnkGHOS::GetProfile() { - return &sActorProfileUnkGHOS; -} +ARM DECL_PROFILE(ActorProfileUnkGHOS); ARM Actor *ActorProfileUnkGHOS::Create() { return new(HeapIndex_2) ActorUnkGHOS(); diff --git a/src/048_MapC2/Actor/ActorUnkPBK2.cpp b/src/048_MapC2/Actor/ActorUnkPBK2.cpp index 306381e7..1d15de4a 100644 --- a/src/048_MapC2/Actor/ActorUnkPBK2.cpp +++ b/src/048_MapC2/Actor/ActorUnkPBK2.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkPBK2.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkPBK2 sActorProfileUnkPBK2; - -ARM ActorProfileUnkPBK2 *ActorProfileUnkPBK2::GetProfile() { - return &sActorProfileUnkPBK2; -} +ARM DECL_PROFILE(ActorProfileUnkPBK2); ARM Actor *ActorProfileUnkPBK2::Create() { return new(HeapIndex_2) ActorUnkPBK2(); diff --git a/src/048_MapC2/Actor/ActorUnkPSBK.cpp b/src/048_MapC2/Actor/ActorUnkPSBK.cpp index 0049bf0b..f5f096e8 100644 --- a/src/048_MapC2/Actor/ActorUnkPSBK.cpp +++ b/src/048_MapC2/Actor/ActorUnkPSBK.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkPSBK.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkPSBK sActorProfileUnkPSBK; - -ARM ActorProfileUnkPSBK *ActorProfileUnkPSBK::GetProfile() { - return &sActorProfileUnkPSBK; -} +ARM DECL_PROFILE(ActorProfileUnkPSBK); ARM Actor *ActorProfileUnkPSBK::Create() { return new(HeapIndex_2) ActorUnkPSBK(); diff --git a/src/048_MapC2/MapObject/MapObjectUnkDRTW.cpp b/src/048_MapC2/MapObject/MapObjectUnkDRTW.cpp index f49b867f..f02646f6 100644 --- a/src/048_MapC2/MapObject/MapObjectUnkDRTW.cpp +++ b/src/048_MapC2/MapObject/MapObjectUnkDRTW.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkDRTW.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkDRTW sMapObjectProfileUnkDRTW; - -ARM MapObjectProfileUnkDRTW *MapObjectProfileUnkDRTW::GetProfile() { - return &sMapObjectProfileUnkDRTW; -} +ARM DECL_PROFILE(MapObjectProfileUnkDRTW); ARM MapObject *MapObjectProfileUnkDRTW::Create() { return new(HeapIndex_2) MapObjectUnkDRTW(); diff --git a/src/049_MapC3/Actor/ActorUnkBEEE.cpp b/src/049_MapC3/Actor/ActorUnkBEEE.cpp index e1bec79d..f0ff7044 100644 --- a/src/049_MapC3/Actor/ActorUnkBEEE.cpp +++ b/src/049_MapC3/Actor/ActorUnkBEEE.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkBEEE.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkBEEE sActorProfileUnkBEEE; - -ARM ActorProfileUnkBEEE *ActorProfileUnkBEEE::GetProfile() { - return &sActorProfileUnkBEEE; -} +ARM DECL_PROFILE(ActorProfileUnkBEEE); ARM Actor *ActorProfileUnkBEEE::Create() { return new(HeapIndex_2) ActorUnkBEEE(); diff --git a/src/049_MapC3/Actor/ActorUnkBEEH.cpp b/src/049_MapC3/Actor/ActorUnkBEEH.cpp index 920de0ca..72536ef5 100644 --- a/src/049_MapC3/Actor/ActorUnkBEEH.cpp +++ b/src/049_MapC3/Actor/ActorUnkBEEH.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkBEEH.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkBEEH sActorProfileUnkBEEH; - -ARM ActorProfileUnkBEEH *ActorProfileUnkBEEH::GetProfile() { - return &sActorProfileUnkBEEH; -} +ARM DECL_PROFILE(ActorProfileUnkBEEH); ARM Actor *ActorProfileUnkBEEH::Create() { return new(HeapIndex_2) ActorUnkBEEH(); diff --git a/src/049_MapC3/Actor/ActorUnkCRCH.cpp b/src/049_MapC3/Actor/ActorUnkCRCH.cpp index b5c82069..80bd317e 100644 --- a/src/049_MapC3/Actor/ActorUnkCRCH.cpp +++ b/src/049_MapC3/Actor/ActorUnkCRCH.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkCRCH.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkCRCH sActorProfileUnkCRCH; - -ARM ActorProfileUnkCRCH *ActorProfileUnkCRCH::GetProfile() { - return &sActorProfileUnkCRCH; -} +ARM DECL_PROFILE(ActorProfileUnkCRCH); ARM Actor *ActorProfileUnkCRCH::Create() { return new(HeapIndex_2) ActorUnkCRCH(); diff --git a/src/049_MapC3/Actor/ActorUnkCROW.cpp b/src/049_MapC3/Actor/ActorUnkCROW.cpp index ef68140d..0457d1fb 100644 --- a/src/049_MapC3/Actor/ActorUnkCROW.cpp +++ b/src/049_MapC3/Actor/ActorUnkCROW.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkCROW.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkCROW sActorProfileUnkCROW; - -ARM ActorProfileUnkCROW *ActorProfileUnkCROW::GetProfile() { - return &sActorProfileUnkCROW; -} +ARM DECL_PROFILE(ActorProfileUnkCROW); ARM Actor *ActorProfileUnkCROW::Create() { return new(HeapIndex_2) ActorUnkCROW(); diff --git a/src/049_MapC3/Actor/ActorUnkPOST.cpp b/src/049_MapC3/Actor/ActorUnkPOST.cpp index 043c88b0..5309f830 100644 --- a/src/049_MapC3/Actor/ActorUnkPOST.cpp +++ b/src/049_MapC3/Actor/ActorUnkPOST.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkPOST.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkPOST sActorProfileUnkPOST; - -ARM ActorProfileUnkPOST *ActorProfileUnkPOST::GetProfile() { - return &sActorProfileUnkPOST; -} +ARM DECL_PROFILE(ActorProfileUnkPOST); ARM Actor *ActorProfileUnkPOST::Create() { return new(HeapIndex_2) ActorUnkPOST(); diff --git a/src/049_MapC3/Actor/ActorUnkPTMN.cpp b/src/049_MapC3/Actor/ActorUnkPTMN.cpp index 40e8667e..ab47768b 100644 --- a/src/049_MapC3/Actor/ActorUnkPTMN.cpp +++ b/src/049_MapC3/Actor/ActorUnkPTMN.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkPTMN.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkPTMN sActorProfileUnkPTMN; - -ARM ActorProfileUnkPTMN *ActorProfileUnkPTMN::GetProfile() { - return &sActorProfileUnkPTMN; -} +ARM DECL_PROFILE(ActorProfileUnkPTMN); ARM Actor *ActorProfileUnkPTMN::Create() { return new(HeapIndex_2) ActorUnkPTMN(); diff --git a/src/050_MapC4/Actor/ActorUnkFRTN.cpp b/src/050_MapC4/Actor/ActorUnkFRTN.cpp index c4ea4644..1ea34aaa 100644 --- a/src/050_MapC4/Actor/ActorUnkFRTN.cpp +++ b/src/050_MapC4/Actor/ActorUnkFRTN.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkFRTN.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkFRTN sActorProfileUnkFRTN; - -ARM ActorProfileUnkFRTN *ActorProfileUnkFRTN::GetProfile() { - return &sActorProfileUnkFRTN; -} +ARM DECL_PROFILE(ActorProfileUnkFRTN); ARM Actor *ActorProfileUnkFRTN::Create() { return new(HeapIndex_2) ActorUnkFRTN(); diff --git a/src/050_MapC4/Actor/ActorUnkKMOH.cpp b/src/050_MapC4/Actor/ActorUnkKMOH.cpp index b1f349c6..3d209466 100644 --- a/src/050_MapC4/Actor/ActorUnkKMOH.cpp +++ b/src/050_MapC4/Actor/ActorUnkKMOH.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkKMOH.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkKMOH sActorProfileUnkKMOH; - -ARM ActorProfileUnkKMOH *ActorProfileUnkKMOH::GetProfile() { - return &sActorProfileUnkKMOH; -} +ARM DECL_PROFILE(ActorProfileUnkKMOH); ARM Actor *ActorProfileUnkKMOH::Create() { return new(HeapIndex_2) ActorUnkKMOH(); diff --git a/src/050_MapC4/Actor/ActorUnkKMOS.cpp b/src/050_MapC4/Actor/ActorUnkKMOS.cpp index 91a1ac92..9c50f398 100644 --- a/src/050_MapC4/Actor/ActorUnkKMOS.cpp +++ b/src/050_MapC4/Actor/ActorUnkKMOS.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkKMOS.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkKMOS sActorProfileUnkKMOS; - -ARM ActorProfileUnkKMOS *ActorProfileUnkKMOS::GetProfile() { - return &sActorProfileUnkKMOS; -} +ARM DECL_PROFILE(ActorProfileUnkKMOS); ARM Actor *ActorProfileUnkKMOS::Create() { return new(HeapIndex_2) ActorUnkKMOS(); diff --git a/src/050_MapC4/MapObject/MapObjectUnkGTTN.cpp b/src/050_MapC4/MapObject/MapObjectUnkGTTN.cpp index 0dff683e..5d91753c 100644 --- a/src/050_MapC4/MapObject/MapObjectUnkGTTN.cpp +++ b/src/050_MapC4/MapObject/MapObjectUnkGTTN.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkGTTN.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkGTTN sMapObjectProfileUnkGTTN; - -ARM MapObjectProfileUnkGTTN *MapObjectProfileUnkGTTN::GetProfile() { - return &sMapObjectProfileUnkGTTN; -} +ARM DECL_PROFILE(MapObjectProfileUnkGTTN); ARM MapObject *MapObjectProfileUnkGTTN::Create() { return new(HeapIndex_2) MapObjectUnkGTTN(); diff --git a/src/051_MapC5/Actor/ActorUnkGYAM.cpp b/src/051_MapC5/Actor/ActorUnkGYAM.cpp index ed37897d..fa65e143 100644 --- a/src/051_MapC5/Actor/ActorUnkGYAM.cpp +++ b/src/051_MapC5/Actor/ActorUnkGYAM.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkGYAM.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkGYAM sActorProfileUnkGYAM; - -ARM ActorProfileUnkGYAM *ActorProfileUnkGYAM::GetProfile() { - return &sActorProfileUnkGYAM; -} +ARM DECL_PROFILE(ActorProfileUnkGYAM); ARM Actor *ActorProfileUnkGYAM::Create() { return new(HeapIndex_2) ActorUnkGYAM(); diff --git a/src/052_MapC6/Actor/ActorUnkNAVI.cpp b/src/052_MapC6/Actor/ActorUnkNAVI.cpp index f97b28b2..c07a3cd6 100644 --- a/src/052_MapC6/Actor/ActorUnkNAVI.cpp +++ b/src/052_MapC6/Actor/ActorUnkNAVI.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkNAVI.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkNAVI sActorProfileUnkNAVI; - -ARM ActorProfileUnkNAVI *ActorProfileUnkNAVI::GetProfile() { - return &sActorProfileUnkNAVI; -} +ARM DECL_PROFILE(ActorProfileUnkNAVI); ARM Actor *ActorProfileUnkNAVI::Create() { return new(HeapIndex_2) ActorUnkNAVI(); diff --git a/src/052_MapC6/Actor/ActorUnkPTSW.cpp b/src/052_MapC6/Actor/ActorUnkPTSW.cpp index 1c7a46f8..0e16d42a 100644 --- a/src/052_MapC6/Actor/ActorUnkPTSW.cpp +++ b/src/052_MapC6/Actor/ActorUnkPTSW.cpp @@ -6,11 +6,7 @@ #if IS_JP -static ActorProfileUnkPTSW sActorProfileUnkPTSW; - -ARM ActorProfileUnkPTSW *ActorProfileUnkPTSW::GetProfile() { - return &sActorProfileUnkPTSW; -} +ARM DECL_PROFILE(ActorProfileUnkPTSW); ARM Actor *ActorProfileUnkPTSW::Create() { return new(HeapIndex_2) ActorUnkPTSW(); diff --git a/src/052_MapC6/Actor/ActorUnkSTLW.cpp b/src/052_MapC6/Actor/ActorUnkSTLW.cpp index 61544ffa..ef1eb2b1 100644 --- a/src/052_MapC6/Actor/ActorUnkSTLW.cpp +++ b/src/052_MapC6/Actor/ActorUnkSTLW.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkSTLW.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkSTLW sActorProfileUnkSTLW; - -ARM ActorProfileUnkSTLW *ActorProfileUnkSTLW::GetProfile() { - return &sActorProfileUnkSTLW; -} +ARM DECL_PROFILE(ActorProfileUnkSTLW); ARM Actor *ActorProfileUnkSTLW::Create() { return new(HeapIndex_2) ActorUnkSTLW(); diff --git a/src/052_MapC6/Actor/ActorUnkSTWH.cpp b/src/052_MapC6/Actor/ActorUnkSTWH.cpp index 32fc3369..627ffec2 100644 --- a/src/052_MapC6/Actor/ActorUnkSTWH.cpp +++ b/src/052_MapC6/Actor/ActorUnkSTWH.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkSTWH.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkSTWH sActorProfileUnkSTWH; - -ARM ActorProfileUnkSTWH *ActorProfileUnkSTWH::GetProfile() { - return &sActorProfileUnkSTWH; -} +ARM DECL_PROFILE(ActorProfileUnkSTWH); ARM Actor *ActorProfileUnkSTWH::Create() { return new(HeapIndex_2) ActorUnkSTWH(); diff --git a/src/053_MapD1/Actor/ActorUnkLIKE.cpp b/src/053_MapD1/Actor/ActorUnkLIKE.cpp index 22d16d2b..f2878172 100644 --- a/src/053_MapD1/Actor/ActorUnkLIKE.cpp +++ b/src/053_MapD1/Actor/ActorUnkLIKE.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkLIKE.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkLIKE sActorProfileUnkLIKE; - -ARM ActorProfileUnkLIKE *ActorProfileUnkLIKE::GetProfile() { - return &sActorProfileUnkLIKE; -} +ARM DECL_PROFILE(ActorProfileUnkLIKE); ARM Actor *ActorProfileUnkLIKE::Create() { return new(HeapIndex_2) ActorUnkLIKE(); diff --git a/src/053_MapD1/Actor/ActorUnkRAT0.cpp b/src/053_MapD1/Actor/ActorUnkRAT0.cpp index d37c2711..25f21a82 100644 --- a/src/053_MapD1/Actor/ActorUnkRAT0.cpp +++ b/src/053_MapD1/Actor/ActorUnkRAT0.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkRAT0.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkRAT0 sActorProfileUnkRAT0; - -ARM ActorProfileUnkRAT0 *ActorProfileUnkRAT0::GetProfile() { - return &sActorProfileUnkRAT0; -} +ARM DECL_PROFILE(ActorProfileUnkRAT0); ARM Actor *ActorProfileUnkRAT0::Create() { return new(HeapIndex_2) ActorUnkRAT0(); diff --git a/src/054_MapD2/Actor/ActorUnkFBBF.cpp b/src/054_MapD2/Actor/ActorUnkFBBF.cpp index 84f078b7..fac8f547 100644 --- a/src/054_MapD2/Actor/ActorUnkFBBF.cpp +++ b/src/054_MapD2/Actor/ActorUnkFBBF.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkFBBF.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkFBBF sActorProfileUnkFBBF; - -ARM ActorProfileUnkFBBF *ActorProfileUnkFBBF::GetProfile() { - return &sActorProfileUnkFBBF; -} +ARM DECL_PROFILE(ActorProfileUnkFBBF); ARM Actor *ActorProfileUnkFBBF::Create() { return new(HeapIndex_2) ActorUnkFBBF(); diff --git a/src/054_MapD2/Actor/ActorUnkFBBH.cpp b/src/054_MapD2/Actor/ActorUnkFBBH.cpp index fea14ba5..2536f63c 100644 --- a/src/054_MapD2/Actor/ActorUnkFBBH.cpp +++ b/src/054_MapD2/Actor/ActorUnkFBBH.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkFBBH.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkFBBH sActorProfileUnkFBBH; - -ARM ActorProfileUnkFBBH *ActorProfileUnkFBBH::GetProfile() { - return &sActorProfileUnkFBBH; -} +ARM DECL_PROFILE(ActorProfileUnkFBBH); ARM Actor *ActorProfileUnkFBBH::Create() { return new(HeapIndex_2) ActorUnkFBBH(); diff --git a/src/054_MapD2/Actor/ActorUnkFIBB.cpp b/src/054_MapD2/Actor/ActorUnkFIBB.cpp index 2af248ca..56b706e8 100644 --- a/src/054_MapD2/Actor/ActorUnkFIBB.cpp +++ b/src/054_MapD2/Actor/ActorUnkFIBB.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkFIBB.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkFIBB sActorProfileUnkFIBB; - -ARM ActorProfileUnkFIBB *ActorProfileUnkFIBB::GetProfile() { - return &sActorProfileUnkFIBB; -} +ARM DECL_PROFILE(ActorProfileUnkFIBB); ARM Actor *ActorProfileUnkFIBB::Create() { return new(HeapIndex_2) ActorUnkFIBB(); diff --git a/src/055_MapD3/Actor/ActorUnkCHUC.cpp b/src/055_MapD3/Actor/ActorUnkCHUC.cpp index 1540b0f2..dc40fb28 100644 --- a/src/055_MapD3/Actor/ActorUnkCHUC.cpp +++ b/src/055_MapD3/Actor/ActorUnkCHUC.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkCHUC.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkCHUC sActorProfileUnkCHUC; - -ARM ActorProfileUnkCHUC *ActorProfileUnkCHUC::GetProfile() { - return &sActorProfileUnkCHUC; -} +ARM DECL_PROFILE(ActorProfileUnkCHUC); ARM Actor *ActorProfileUnkCHUC::Create() { return new(HeapIndex_2) ActorUnkCHUC(); diff --git a/src/055_MapD3/Actor/ActorUnkRCHU.cpp b/src/055_MapD3/Actor/ActorUnkRCHU.cpp index 6946971f..c5d289b3 100644 --- a/src/055_MapD3/Actor/ActorUnkRCHU.cpp +++ b/src/055_MapD3/Actor/ActorUnkRCHU.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkRCHU.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkRCHU sActorProfileUnkRCHU; - -ARM ActorProfileUnkRCHU *ActorProfileUnkRCHU::GetProfile() { - return &sActorProfileUnkRCHU; -} +ARM DECL_PROFILE(ActorProfileUnkRCHU); ARM Actor *ActorProfileUnkRCHU::Create() { return new(HeapIndex_2) ActorUnkRCHU(); diff --git a/src/055_MapD3/Actor/ActorUnkRCMS.cpp b/src/055_MapD3/Actor/ActorUnkRCMS.cpp index 2e011f7c..5110f921 100644 --- a/src/055_MapD3/Actor/ActorUnkRCMS.cpp +++ b/src/055_MapD3/Actor/ActorUnkRCMS.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkRCMS.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkRCMS sActorProfileUnkRCMS; - -ARM ActorProfileUnkRCMS *ActorProfileUnkRCMS::GetProfile() { - return &sActorProfileUnkRCMS; -} +ARM DECL_PROFILE(ActorProfileUnkRCMS); ARM Actor *ActorProfileUnkRCMS::Create() { return new(HeapIndex_2) ActorUnkRCMS(); diff --git a/src/056_MapD4/Actor/ActorUnkFSIR.cpp b/src/056_MapD4/Actor/ActorUnkFSIR.cpp index fe382d59..164018e7 100644 --- a/src/056_MapD4/Actor/ActorUnkFSIR.cpp +++ b/src/056_MapD4/Actor/ActorUnkFSIR.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkFSIR.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkFSIR sActorProfileUnkFSIR; - -ARM ActorProfileUnkFSIR *ActorProfileUnkFSIR::GetProfile() { - return &sActorProfileUnkFSIR; -} +ARM DECL_PROFILE(ActorProfileUnkFSIR); ARM Actor *ActorProfileUnkFSIR::Create() { return new(HeapIndex_2) ActorUnkFSIR(); diff --git a/src/056_MapD4/Actor/ActorUnkPASS.cpp b/src/056_MapD4/Actor/ActorUnkPASS.cpp index 66932f06..8c68a130 100644 --- a/src/056_MapD4/Actor/ActorUnkPASS.cpp +++ b/src/056_MapD4/Actor/ActorUnkPASS.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkPASS.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkPASS sActorProfileUnkPASS; - -ARM ActorProfileUnkPASS *ActorProfileUnkPASS::GetProfile() { - return &sActorProfileUnkPASS; -} +ARM DECL_PROFILE(ActorProfileUnkPASS); ARM Actor *ActorProfileUnkPASS::Create() { return new(HeapIndex_2) ActorUnkPASS(); diff --git a/src/056_MapD4/MapObject/MapObjectUnkFSVC.cpp b/src/056_MapD4/MapObject/MapObjectUnkFSVC.cpp index 79c67da0..75b0b88d 100644 --- a/src/056_MapD4/MapObject/MapObjectUnkFSVC.cpp +++ b/src/056_MapD4/MapObject/MapObjectUnkFSVC.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkFSVC.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkFSVC sMapObjectProfileUnkFSVC; - -ARM MapObjectProfileUnkFSVC *MapObjectProfileUnkFSVC::GetProfile() { - return &sMapObjectProfileUnkFSVC; -} +ARM DECL_PROFILE(MapObjectProfileUnkFSVC); ARM MapObject *MapObjectProfileUnkFSVC::Create() { return new(HeapIndex_2) MapObjectUnkFSVC(); diff --git a/src/057_MapD5/Actor/ActorUnkELVT.cpp b/src/057_MapD5/Actor/ActorUnkELVT.cpp index ee508b95..83b9dddb 100644 --- a/src/057_MapD5/Actor/ActorUnkELVT.cpp +++ b/src/057_MapD5/Actor/ActorUnkELVT.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkELVT.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkELVT sActorProfileUnkELVT; - -ARM ActorProfileUnkELVT *ActorProfileUnkELVT::GetProfile() { - return &sActorProfileUnkELVT; -} +ARM DECL_PROFILE(ActorProfileUnkELVT); ARM Actor *ActorProfileUnkELVT::Create() { return new(HeapIndex_2) ActorUnkELVT(); diff --git a/src/057_MapD5/Actor/ActorUnkFSSF.cpp b/src/057_MapD5/Actor/ActorUnkFSSF.cpp index 999e4bde..623cf27a 100644 --- a/src/057_MapD5/Actor/ActorUnkFSSF.cpp +++ b/src/057_MapD5/Actor/ActorUnkFSSF.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkFSSF.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkFSSF sActorProfileUnkFSSF; - -ARM ActorProfileUnkFSSF *ActorProfileUnkFSSF::GetProfile() { - return &sActorProfileUnkFSSF; -} +ARM DECL_PROFILE(ActorProfileUnkFSSF); ARM Actor *ActorProfileUnkFSSF::Create() { return new(HeapIndex_2) ActorUnkFSSF(); diff --git a/src/057_MapD5/Actor/ActorUnkFSST.cpp b/src/057_MapD5/Actor/ActorUnkFSST.cpp index 5dbdc2e3..c652ccc0 100644 --- a/src/057_MapD5/Actor/ActorUnkFSST.cpp +++ b/src/057_MapD5/Actor/ActorUnkFSST.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkFSST.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkFSST sActorProfileUnkFSST; - -ARM ActorProfileUnkFSST *ActorProfileUnkFSST::GetProfile() { - return &sActorProfileUnkFSST; -} +ARM DECL_PROFILE(ActorProfileUnkFSST); ARM Actor *ActorProfileUnkFSST::Create() { return new(HeapIndex_2) ActorUnkFSST(); diff --git a/src/057_MapD5/Actor/ActorUnkGTTG.cpp b/src/057_MapD5/Actor/ActorUnkGTTG.cpp index 30c40194..736286be 100644 --- a/src/057_MapD5/Actor/ActorUnkGTTG.cpp +++ b/src/057_MapD5/Actor/ActorUnkGTTG.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkGTTG.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkGTTG sActorProfileUnkGTTG; - -ARM ActorProfileUnkGTTG *ActorProfileUnkGTTG::GetProfile() { - return &sActorProfileUnkGTTG; -} +ARM DECL_PROFILE(ActorProfileUnkGTTG); ARM Actor *ActorProfileUnkGTTG::Create() { return new(HeapIndex_2) ActorUnkGTTG(); diff --git a/src/057_MapD5/Actor/ActorUnkHYSW.cpp b/src/057_MapD5/Actor/ActorUnkHYSW.cpp index 72bf345a..300b0716 100644 --- a/src/057_MapD5/Actor/ActorUnkHYSW.cpp +++ b/src/057_MapD5/Actor/ActorUnkHYSW.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkHYSW.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkHYSW sActorProfileUnkHYSW; - -ARM ActorProfileUnkHYSW *ActorProfileUnkHYSW::GetProfile() { - return &sActorProfileUnkHYSW; -} +ARM DECL_PROFILE(ActorProfileUnkHYSW); ARM Actor *ActorProfileUnkHYSW::Create() { return new(HeapIndex_2) ActorUnkHYSW(); diff --git a/src/057_MapD5/Actor/ActorUnkRMFK.cpp b/src/057_MapD5/Actor/ActorUnkRMFK.cpp index e037c1ad..64ee970b 100644 --- a/src/057_MapD5/Actor/ActorUnkRMFK.cpp +++ b/src/057_MapD5/Actor/ActorUnkRMFK.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkRMFK.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkRMFK sActorProfileUnkRMFK; - -ARM ActorProfileUnkRMFK *ActorProfileUnkRMFK::GetProfile() { - return &sActorProfileUnkRMFK; -} +ARM DECL_PROFILE(ActorProfileUnkRMFK); ARM Actor *ActorProfileUnkRMFK::Create() { return new(HeapIndex_2) ActorUnkRMFK(); diff --git a/src/057_MapD5/MapObject/MapObjectUnkTRLN.cpp b/src/057_MapD5/MapObject/MapObjectUnkTRLN.cpp index 23bc198e..10901fe1 100644 --- a/src/057_MapD5/MapObject/MapObjectUnkTRLN.cpp +++ b/src/057_MapD5/MapObject/MapObjectUnkTRLN.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkTRLN.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkTRLN sMapObjectProfileUnkTRLN; - -ARM MapObjectProfileUnkTRLN *MapObjectProfileUnkTRLN::GetProfile() { - return &sMapObjectProfileUnkTRLN; -} +ARM DECL_PROFILE(MapObjectProfileUnkTRLN); ARM MapObject *MapObjectProfileUnkTRLN::Create() { return new(HeapIndex_2) MapObjectUnkTRLN(); diff --git a/src/058_Field/Actor/ActorUnkBSTG.cpp b/src/058_Field/Actor/ActorUnkBSTG.cpp index 0a35eabf..07a89a02 100644 --- a/src/058_Field/Actor/ActorUnkBSTG.cpp +++ b/src/058_Field/Actor/ActorUnkBSTG.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkBSTG.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkBSTG sActorProfileUnkBSTG; - -ARM ActorProfileUnkBSTG *ActorProfileUnkBSTG::GetProfile() { - return &sActorProfileUnkBSTG; -} +ARM DECL_PROFILE(ActorProfileUnkBSTG); ARM Actor *ActorProfileUnkBSTG::Create() { return new(HeapIndex_2) ActorUnkBSTG(); diff --git a/src/058_Field/Actor/ActorUnkCRFT.cpp b/src/058_Field/Actor/ActorUnkCRFT.cpp index 50998796..083c042c 100644 --- a/src/058_Field/Actor/ActorUnkCRFT.cpp +++ b/src/058_Field/Actor/ActorUnkCRFT.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkCRFT.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkCRFT sActorProfileUnkCRFT; - -ARM ActorProfileUnkCRFT *ActorProfileUnkCRFT::GetProfile() { - return &sActorProfileUnkCRFT; -} +ARM DECL_PROFILE(ActorProfileUnkCRFT); ARM Actor *ActorProfileUnkCRFT::Create() { return new(HeapIndex_2) ActorUnkCRFT(); diff --git a/src/058_Field/Actor/ActorUnkFBRD.cpp b/src/058_Field/Actor/ActorUnkFBRD.cpp index 794f5531..6309a29a 100644 --- a/src/058_Field/Actor/ActorUnkFBRD.cpp +++ b/src/058_Field/Actor/ActorUnkFBRD.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkFBRD.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkFBRD sActorProfileUnkFBRD; - -ARM ActorProfileUnkFBRD *ActorProfileUnkFBRD::GetProfile() { - return &sActorProfileUnkFBRD; -} +ARM DECL_PROFILE(ActorProfileUnkFBRD); ARM Actor *ActorProfileUnkFBRD::Create() { return new(HeapIndex_2) ActorUnkFBRD(); diff --git a/src/058_Field/Actor/ActorUnkFBSC.cpp b/src/058_Field/Actor/ActorUnkFBSC.cpp index 24962c6d..1ae572a7 100644 --- a/src/058_Field/Actor/ActorUnkFBSC.cpp +++ b/src/058_Field/Actor/ActorUnkFBSC.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkFBSC.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkFBSC sActorProfileUnkFBSC; - -ARM ActorProfileUnkFBSC *ActorProfileUnkFBSC::GetProfile() { - return &sActorProfileUnkFBSC; -} +ARM DECL_PROFILE(ActorProfileUnkFBSC); ARM Actor *ActorProfileUnkFBSC::Create() { return new(HeapIndex_2) ActorUnkFBSC(); diff --git a/src/058_Field/Actor/ActorUnkKOAT.cpp b/src/058_Field/Actor/ActorUnkKOAT.cpp index 545187da..ad1fb888 100644 --- a/src/058_Field/Actor/ActorUnkKOAT.cpp +++ b/src/058_Field/Actor/ActorUnkKOAT.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkKOAT.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkKOAT sActorProfileUnkKOAT; - -ARM ActorProfileUnkKOAT *ActorProfileUnkKOAT::GetProfile() { - return &sActorProfileUnkKOAT; -} +ARM DECL_PROFILE(ActorProfileUnkKOAT); ARM Actor *ActorProfileUnkKOAT::Create() { return new(HeapIndex_2) ActorUnkKOAT(); diff --git a/src/058_Field/Actor/ActorUnkKOCH.cpp b/src/058_Field/Actor/ActorUnkKOCH.cpp index 55253b18..e8ef9e7f 100644 --- a/src/058_Field/Actor/ActorUnkKOCH.cpp +++ b/src/058_Field/Actor/ActorUnkKOCH.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkKOCH.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkKOCH sActorProfileUnkKOCH; - -ARM ActorProfileUnkKOCH *ActorProfileUnkKOCH::GetProfile() { - return &sActorProfileUnkKOCH; -} +ARM DECL_PROFILE(ActorProfileUnkKOCH); ARM Actor *ActorProfileUnkKOCH::Create() { return new(HeapIndex_2) ActorUnkKOCH(); diff --git a/src/058_Field/Actor/ActorUnkKOKO.cpp b/src/058_Field/Actor/ActorUnkKOKO.cpp index bf601910..e205d96a 100644 --- a/src/058_Field/Actor/ActorUnkKOKO.cpp +++ b/src/058_Field/Actor/ActorUnkKOKO.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkKOKO.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkKOKO sActorProfileUnkKOKO; - -ARM ActorProfileUnkKOKO *ActorProfileUnkKOKO::GetProfile() { - return &sActorProfileUnkKOKO; -} +ARM DECL_PROFILE(ActorProfileUnkKOKO); ARM Actor *ActorProfileUnkKOKO::Create() { return new(HeapIndex_2) ActorUnkKOKO(); diff --git a/src/058_Field/Actor/ActorUnkNSTN.cpp b/src/058_Field/Actor/ActorUnkNSTN.cpp index 19ccc9f4..20e9785f 100644 --- a/src/058_Field/Actor/ActorUnkNSTN.cpp +++ b/src/058_Field/Actor/ActorUnkNSTN.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkNSTN.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkNSTN sActorProfileUnkNSTN; - -ARM ActorProfileUnkNSTN *ActorProfileUnkNSTN::GetProfile() { - return &sActorProfileUnkNSTN; -} +ARM DECL_PROFILE(ActorProfileUnkNSTN); ARM Actor *ActorProfileUnkNSTN::Create() { return new(HeapIndex_2) ActorUnkNSTN(); diff --git a/src/058_Field/Actor/ActorUnkSYDE_SYDL_SYDS_SYFI_SYFO_SYIL_SYIS_SYOL_SYOS_SYSL_SYSN_SYSS_SYWA_SYWL_SYWS.cpp b/src/058_Field/Actor/ActorUnkSYDE_SYDL_SYDS_SYFI_SYFO_SYIL_SYIS_SYOL_SYOS_SYSL_SYSN_SYSS_SYWA_SYWL_SYWS.cpp index bf49f03b..600f84e8 100644 --- a/src/058_Field/Actor/ActorUnkSYDE_SYDL_SYDS_SYFI_SYFO_SYIL_SYIS_SYOL_SYOS_SYSL_SYSN_SYSS_SYWA_SYWL_SYWS.cpp +++ b/src/058_Field/Actor/ActorUnkSYDE_SYDL_SYDS_SYFI_SYFO_SYIL_SYIS_SYOL_SYOS_SYSL_SYSN_SYSS_SYWA_SYWL_SYWS.cpp @@ -3,14 +3,24 @@ #include "Actor/ActorUnkSYDE_SYDL_SYDS_SYFI_SYFO_SYIL_SYIS_SYOL_SYOS_SYSL_SYSN_SYSS_SYWA_SYWL_SYWS.hpp" #include "System/SysNew.hpp" +ARM DECL_PROFILE(ActorProfileUnkSYOS); +ARM DECL_PROFILE(ActorProfileUnkSYSS); +ARM DECL_PROFILE(ActorProfileUnkSYWS); +ARM DECL_PROFILE(ActorProfileUnkSYIS); +ARM DECL_PROFILE(ActorProfileUnkSYDS); +ARM DECL_PROFILE(ActorProfileUnkSYOL); +ARM DECL_PROFILE(ActorProfileUnkSYSL); +ARM DECL_PROFILE(ActorProfileUnkSYWL); +ARM DECL_PROFILE(ActorProfileUnkSYIL); +ARM DECL_PROFILE(ActorProfileUnkSYDL); +ARM DECL_PROFILE(ActorProfileUnkSYFO); +ARM DECL_PROFILE(ActorProfileUnkSYSN); +ARM DECL_PROFILE(ActorProfileUnkSYWA); +ARM DECL_PROFILE(ActorProfileUnkSYFI); +ARM DECL_PROFILE(ActorProfileUnkSYDE); + // --- Actor SYDE --- -static ActorProfileUnkSYDE sActorProfileUnkSYDE; - -ARM ActorProfileUnkSYDE *ActorProfileUnkSYDE::GetProfile() { - return &sActorProfileUnkSYDE; -} - ARM Actor *ActorProfileUnkSYDE::Create() { return new(HeapIndex_2) ActorUnkSYDE(); } @@ -22,12 +32,6 @@ ARM ActorUnkSYDE::ActorUnkSYDE() {} // --- Actor SYDL --- -static ActorProfileUnkSYDL sActorProfileUnkSYDL; - -ARM ActorProfileUnkSYDL *ActorProfileUnkSYDL::GetProfile() { - return &sActorProfileUnkSYDL; -} - ARM Actor *ActorProfileUnkSYDL::Create() { return new(HeapIndex_2) ActorUnkSYDL(); } @@ -39,12 +43,6 @@ ARM ActorUnkSYDL::ActorUnkSYDL() {} // --- Actor SYDS --- -static ActorProfileUnkSYDS sActorProfileUnkSYDS; - -ARM ActorProfileUnkSYDS *ActorProfileUnkSYDS::GetProfile() { - return &sActorProfileUnkSYDS; -} - ARM Actor *ActorProfileUnkSYDS::Create() { return new(HeapIndex_2) ActorUnkSYDS(); } @@ -56,12 +54,6 @@ ARM ActorUnkSYDS::ActorUnkSYDS() {} // --- Actor SYFI --- -static ActorProfileUnkSYFI sActorProfileUnkSYFI; - -ARM ActorProfileUnkSYFI *ActorProfileUnkSYFI::GetProfile() { - return &sActorProfileUnkSYFI; -} - ARM Actor *ActorProfileUnkSYFI::Create() { return new(HeapIndex_2) ActorUnkSYFI(); } @@ -73,12 +65,6 @@ ARM ActorUnkSYFI::ActorUnkSYFI() {} // --- Actor SYFO --- -static ActorProfileUnkSYFO sActorProfileUnkSYFO; - -ARM ActorProfileUnkSYFO *ActorProfileUnkSYFO::GetProfile() { - return &sActorProfileUnkSYFO; -} - ARM Actor *ActorProfileUnkSYFO::Create() { return new(HeapIndex_2) ActorUnkSYFO(); } @@ -90,12 +76,6 @@ ARM ActorUnkSYFO::ActorUnkSYFO() {} // --- Actor SYIL --- -static ActorProfileUnkSYIL sActorProfileUnkSYIL; - -ARM ActorProfileUnkSYIL *ActorProfileUnkSYIL::GetProfile() { - return &sActorProfileUnkSYIL; -} - ARM Actor *ActorProfileUnkSYIL::Create() { return new(HeapIndex_2) ActorUnkSYIL(); } @@ -107,12 +87,6 @@ ARM ActorUnkSYIL::ActorUnkSYIL() {} // --- Actor SYIS --- -static ActorProfileUnkSYIS sActorProfileUnkSYIS; - -ARM ActorProfileUnkSYIS *ActorProfileUnkSYIS::GetProfile() { - return &sActorProfileUnkSYIS; -} - ARM Actor *ActorProfileUnkSYIS::Create() { return new(HeapIndex_2) ActorUnkSYIS(); } @@ -124,12 +98,6 @@ ARM ActorUnkSYIS::ActorUnkSYIS() {} // --- Actor SYOL --- -static ActorProfileUnkSYOL sActorProfileUnkSYOL; - -ARM ActorProfileUnkSYOL *ActorProfileUnkSYOL::GetProfile() { - return &sActorProfileUnkSYOL; -} - ARM Actor *ActorProfileUnkSYOL::Create() { return new(HeapIndex_2) ActorUnkSYOL(); } @@ -141,12 +109,6 @@ ARM ActorUnkSYOL::ActorUnkSYOL() {} // --- Actor SYOS --- -static ActorProfileUnkSYOS sActorProfileUnkSYOS; - -ARM ActorProfileUnkSYOS *ActorProfileUnkSYOS::GetProfile() { - return &sActorProfileUnkSYOS; -} - ARM Actor *ActorProfileUnkSYOS::Create() { return new(HeapIndex_2) ActorUnkSYOS(); } @@ -158,12 +120,6 @@ ARM ActorUnkSYOS::ActorUnkSYOS() {} // --- Actor SYSL --- -static ActorProfileUnkSYSL sActorProfileUnkSYSL; - -ARM ActorProfileUnkSYSL *ActorProfileUnkSYSL::GetProfile() { - return &sActorProfileUnkSYSL; -} - ARM Actor *ActorProfileUnkSYSL::Create() { return new(HeapIndex_2) ActorUnkSYSL(); } @@ -175,12 +131,6 @@ ARM ActorUnkSYSL::ActorUnkSYSL() {} // --- Actor SYSN --- -static ActorProfileUnkSYSN sActorProfileUnkSYSN; - -ARM ActorProfileUnkSYSN *ActorProfileUnkSYSN::GetProfile() { - return &sActorProfileUnkSYSN; -} - ARM Actor *ActorProfileUnkSYSN::Create() { return new(HeapIndex_2) ActorUnkSYSN(); } @@ -192,12 +142,6 @@ ARM ActorUnkSYSN::ActorUnkSYSN() {} // --- Actor SYSS --- -static ActorProfileUnkSYSS sActorProfileUnkSYSS; - -ARM ActorProfileUnkSYSS *ActorProfileUnkSYSS::GetProfile() { - return &sActorProfileUnkSYSS; -} - ARM Actor *ActorProfileUnkSYSS::Create() { return new(HeapIndex_2) ActorUnkSYSS(); } @@ -209,12 +153,6 @@ ARM ActorUnkSYSS::ActorUnkSYSS() {} // --- Actor SYWA --- -static ActorProfileUnkSYWA sActorProfileUnkSYWA; - -ARM ActorProfileUnkSYWA *ActorProfileUnkSYWA::GetProfile() { - return &sActorProfileUnkSYWA; -} - ARM Actor *ActorProfileUnkSYWA::Create() { return new(HeapIndex_2) ActorUnkSYWA(); } @@ -226,12 +164,6 @@ ARM ActorUnkSYWA::ActorUnkSYWA() {} // --- Actor SYWL --- -static ActorProfileUnkSYWL sActorProfileUnkSYWL; - -ARM ActorProfileUnkSYWL *ActorProfileUnkSYWL::GetProfile() { - return &sActorProfileUnkSYWL; -} - ARM Actor *ActorProfileUnkSYWL::Create() { return new(HeapIndex_2) ActorUnkSYWL(); } @@ -243,12 +175,6 @@ ARM ActorUnkSYWL::ActorUnkSYWL() {} // --- Actor SYWS --- -static ActorProfileUnkSYWS sActorProfileUnkSYWS; - -ARM ActorProfileUnkSYWS *ActorProfileUnkSYWS::GetProfile() { - return &sActorProfileUnkSYWS; -} - ARM Actor *ActorProfileUnkSYWS::Create() { return new(HeapIndex_2) ActorUnkSYWS(); } diff --git a/src/058_Field/Actor/ActorUnkTMNA.cpp b/src/058_Field/Actor/ActorUnkTMNA.cpp index a91635c2..f6bbf47d 100644 --- a/src/058_Field/Actor/ActorUnkTMNA.cpp +++ b/src/058_Field/Actor/ActorUnkTMNA.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkTMNA.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkTMNA sActorProfileUnkTMNA; - -ARM ActorProfileUnkTMNA *ActorProfileUnkTMNA::GetProfile() { - return &sActorProfileUnkTMNA; -} +ARM DECL_PROFILE(ActorProfileUnkTMNA); ARM Actor *ActorProfileUnkTMNA::Create() { return new(HeapIndex_2) ActorUnkTMNA(); diff --git a/src/058_Field/Actor/ActorUnkTMNC.cpp b/src/058_Field/Actor/ActorUnkTMNC.cpp index 33a9fcb4..70a37da6 100644 --- a/src/058_Field/Actor/ActorUnkTMNC.cpp +++ b/src/058_Field/Actor/ActorUnkTMNC.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkTMNC.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkTMNC sActorProfileUnkTMNC; - -ARM ActorProfileUnkTMNC *ActorProfileUnkTMNC::GetProfile() { - return &sActorProfileUnkTMNC; -} +ARM DECL_PROFILE(ActorProfileUnkTMNC); ARM Actor *ActorProfileUnkTMNC::Create() { return new(HeapIndex_2) ActorUnkTMNC(); diff --git a/src/058_Field/Actor/ActorUnkWPBD.cpp b/src/058_Field/Actor/ActorUnkWPBD.cpp index 6c9f53e8..1e985dd1 100644 --- a/src/058_Field/Actor/ActorUnkWPBD.cpp +++ b/src/058_Field/Actor/ActorUnkWPBD.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkWPBD.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkWPBD sActorProfileUnkWPBD; - -ARM ActorProfileUnkWPBD *ActorProfileUnkWPBD::GetProfile() { - return &sActorProfileUnkWPBD; -} +ARM DECL_PROFILE(ActorProfileUnkWPBD); ARM Actor *ActorProfileUnkWPBD::Create() { return new(HeapIndex_2) ActorUnkWPBD(); diff --git a/src/058_Field/Actor/ActorUnkWPCH.cpp b/src/058_Field/Actor/ActorUnkWPCH.cpp index 49d16e70..faa5621b 100644 --- a/src/058_Field/Actor/ActorUnkWPCH.cpp +++ b/src/058_Field/Actor/ActorUnkWPCH.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkWPCH.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkWPCH sActorProfileUnkWPCH; - -ARM ActorProfileUnkWPCH *ActorProfileUnkWPCH::GetProfile() { - return &sActorProfileUnkWPCH; -} +ARM DECL_PROFILE(ActorProfileUnkWPCH); ARM Actor *ActorProfileUnkWPCH::Create() { return new(HeapIndex_2) ActorUnkWPCH(); diff --git a/src/058_Field/MapObject/MapObjectUnkBBFL.cpp b/src/058_Field/MapObject/MapObjectUnkBBFL.cpp index dcd7289a..3b43787f 100644 --- a/src/058_Field/MapObject/MapObjectUnkBBFL.cpp +++ b/src/058_Field/MapObject/MapObjectUnkBBFL.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkBBFL.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkBBFL sMapObjectProfileUnkBBFL; - -ARM MapObjectProfileUnkBBFL *MapObjectProfileUnkBBFL::GetProfile() { - return &sMapObjectProfileUnkBBFL; -} +ARM DECL_PROFILE(MapObjectProfileUnkBBFL); ARM MapObject *MapObjectProfileUnkBBFL::Create() { return new(HeapIndex_2) MapObjectUnkBBFL(); diff --git a/src/058_Field/MapObject/MapObjectUnkDRHS.cpp b/src/058_Field/MapObject/MapObjectUnkDRHS.cpp index 525ba473..3d3ebd8d 100644 --- a/src/058_Field/MapObject/MapObjectUnkDRHS.cpp +++ b/src/058_Field/MapObject/MapObjectUnkDRHS.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkDRHS.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkDRHS sMapObjectProfileUnkDRHS; - -ARM MapObjectProfileUnkDRHS *MapObjectProfileUnkDRHS::GetProfile() { - return &sMapObjectProfileUnkDRHS; -} +ARM DECL_PROFILE(MapObjectProfileUnkDRHS); ARM MapObject *MapObjectProfileUnkDRHS::Create() { return new(HeapIndex_2) MapObjectUnkDRHS(); diff --git a/src/058_Field/MapObject/MapObjectUnkEXHS.cpp b/src/058_Field/MapObject/MapObjectUnkEXHS.cpp index 446f7ec6..baa87163 100644 --- a/src/058_Field/MapObject/MapObjectUnkEXHS.cpp +++ b/src/058_Field/MapObject/MapObjectUnkEXHS.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkEXHS.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkEXHS sMapObjectProfileUnkEXHS; - -ARM MapObjectProfileUnkEXHS *MapObjectProfileUnkEXHS::GetProfile() { - return &sMapObjectProfileUnkEXHS; -} +ARM DECL_PROFILE(MapObjectProfileUnkEXHS); ARM MapObject *MapObjectProfileUnkEXHS::Create() { return new(HeapIndex_2) MapObjectUnkEXHS(); diff --git a/src/058_Field/MapObject/MapObjectUnkGRSV.cpp b/src/058_Field/MapObject/MapObjectUnkGRSV.cpp index 6abf6649..1ad14146 100644 --- a/src/058_Field/MapObject/MapObjectUnkGRSV.cpp +++ b/src/058_Field/MapObject/MapObjectUnkGRSV.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkGRSV.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkGRSV sMapObjectProfileUnkGRSV; - -ARM MapObjectProfileUnkGRSV *MapObjectProfileUnkGRSV::GetProfile() { - return &sMapObjectProfileUnkGRSV; -} +ARM DECL_PROFILE(MapObjectProfileUnkGRSV); ARM MapObject *MapObjectProfileUnkGRSV::Create() { return new(HeapIndex_2) MapObjectUnkGRSV(); diff --git a/src/058_Field/MapObject/MapObjectUnkHOST.cpp b/src/058_Field/MapObject/MapObjectUnkHOST.cpp index 0410b129..b4d93671 100644 --- a/src/058_Field/MapObject/MapObjectUnkHOST.cpp +++ b/src/058_Field/MapObject/MapObjectUnkHOST.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkHOST.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkHOST sMapObjectProfileUnkHOST; - -ARM MapObjectProfileUnkHOST *MapObjectProfileUnkHOST::GetProfile() { - return &sMapObjectProfileUnkHOST; -} +ARM DECL_PROFILE(MapObjectProfileUnkHOST); ARM MapObject *MapObjectProfileUnkHOST::Create() { return new(HeapIndex_2) MapObjectUnkHOST(); diff --git a/src/058_Field/MapObject/MapObjectUnkHOUS.cpp b/src/058_Field/MapObject/MapObjectUnkHOUS.cpp index 16714a82..324b837d 100644 --- a/src/058_Field/MapObject/MapObjectUnkHOUS.cpp +++ b/src/058_Field/MapObject/MapObjectUnkHOUS.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkHOUS.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkHOUS sMapObjectProfileUnkHOUS; - -ARM MapObjectProfileUnkHOUS *MapObjectProfileUnkHOUS::GetProfile() { - return &sMapObjectProfileUnkHOUS; -} +ARM DECL_PROFILE(MapObjectProfileUnkHOUS); ARM MapObject *MapObjectProfileUnkHOUS::Create() { return new(HeapIndex_2) MapObjectUnkHOUS(); diff --git a/src/058_Field/MapObject/MapObjectUnkKNBN.cpp b/src/058_Field/MapObject/MapObjectUnkKNBN.cpp index 8b3f32c6..1ce45b3b 100644 --- a/src/058_Field/MapObject/MapObjectUnkKNBN.cpp +++ b/src/058_Field/MapObject/MapObjectUnkKNBN.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkKNBN.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkKNBN sMapObjectProfileUnkKNBN; - -ARM MapObjectProfileUnkKNBN *MapObjectProfileUnkKNBN::GetProfile() { - return &sMapObjectProfileUnkKNBN; -} +ARM DECL_PROFILE(MapObjectProfileUnkKNBN); ARM MapObject *MapObjectProfileUnkKNBN::Create() { return new(HeapIndex_2) MapObjectUnkKNBN(); diff --git a/src/058_Field/MapObject/MapObjectUnkLEVS.cpp b/src/058_Field/MapObject/MapObjectUnkLEVS.cpp index eb8e7946..bb9ce44a 100644 --- a/src/058_Field/MapObject/MapObjectUnkLEVS.cpp +++ b/src/058_Field/MapObject/MapObjectUnkLEVS.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkLEVS.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkLEVS sMapObjectProfileUnkLEVS; - -ARM MapObjectProfileUnkLEVS *MapObjectProfileUnkLEVS::GetProfile() { - return &sMapObjectProfileUnkLEVS; -} +ARM DECL_PROFILE(MapObjectProfileUnkLEVS); ARM MapObject *MapObjectProfileUnkLEVS::Create() { return new(HeapIndex_2) MapObjectUnkLEVS(); diff --git a/src/058_Field/MapObject/MapObjectUnkMSCL.cpp b/src/058_Field/MapObject/MapObjectUnkMSCL.cpp index 7a6f00e6..f7a79c1d 100644 --- a/src/058_Field/MapObject/MapObjectUnkMSCL.cpp +++ b/src/058_Field/MapObject/MapObjectUnkMSCL.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkMSCL.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkMSCL sMapObjectProfileUnkMSCL; - -ARM MapObjectProfileUnkMSCL *MapObjectProfileUnkMSCL::GetProfile() { - return &sMapObjectProfileUnkMSCL; -} +ARM DECL_PROFILE(MapObjectProfileUnkMSCL); ARM MapObject *MapObjectProfileUnkMSCL::Create() { return new(HeapIndex_2) MapObjectUnkMSCL(); diff --git a/src/058_Field/MapObject/MapObjectUnkSTNE.cpp b/src/058_Field/MapObject/MapObjectUnkSTNE.cpp index 8156f379..15b78990 100644 --- a/src/058_Field/MapObject/MapObjectUnkSTNE.cpp +++ b/src/058_Field/MapObject/MapObjectUnkSTNE.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkSTNE.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkSTNE sMapObjectProfileUnkSTNE; - -ARM MapObjectProfileUnkSTNE *MapObjectProfileUnkSTNE::GetProfile() { - return &sMapObjectProfileUnkSTNE; -} +ARM DECL_PROFILE(MapObjectProfileUnkSTNE); ARM MapObject *MapObjectProfileUnkSTNE::Create() { return new(HeapIndex_2) MapObjectUnkSTNE(); diff --git a/src/058_Field/MapObject/MapObjectUnkSWCB.cpp b/src/058_Field/MapObject/MapObjectUnkSWCB.cpp index ab45a4bd..dda7cd5c 100644 --- a/src/058_Field/MapObject/MapObjectUnkSWCB.cpp +++ b/src/058_Field/MapObject/MapObjectUnkSWCB.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkSWCB.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkSWCB sMapObjectProfileUnkSWCB; - -ARM MapObjectProfileUnkSWCB *MapObjectProfileUnkSWCB::GetProfile() { - return &sMapObjectProfileUnkSWCB; -} +ARM DECL_PROFILE(MapObjectProfileUnkSWCB); ARM MapObject *MapObjectProfileUnkSWCB::Create() { return new(HeapIndex_2) MapObjectUnkSWCB(); diff --git a/src/058_Field/MapObject/MapObjectUnkTREE.cpp b/src/058_Field/MapObject/MapObjectUnkTREE.cpp index 8e32e51e..b38afaed 100644 --- a/src/058_Field/MapObject/MapObjectUnkTREE.cpp +++ b/src/058_Field/MapObject/MapObjectUnkTREE.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkTREE.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkTREE sMapObjectProfileUnkTREE; - -ARM MapObjectProfileUnkTREE *MapObjectProfileUnkTREE::GetProfile() { - return &sMapObjectProfileUnkTREE; -} +ARM DECL_PROFILE(MapObjectProfileUnkTREE); ARM MapObject *MapObjectProfileUnkTREE::Create() { return new(HeapIndex_2) MapObjectUnkTREE(); diff --git a/src/059_InTrain/Actor/ActorUnkCAGE.cpp b/src/059_InTrain/Actor/ActorUnkCAGE.cpp index da105c29..02c4edfc 100644 --- a/src/059_InTrain/Actor/ActorUnkCAGE.cpp +++ b/src/059_InTrain/Actor/ActorUnkCAGE.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkCAGE.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkCAGE sActorProfileUnkCAGE; - -ARM ActorProfileUnkCAGE *ActorProfileUnkCAGE::GetProfile() { - return &sActorProfileUnkCAGE; -} +ARM DECL_PROFILE(ActorProfileUnkCAGE); ARM Actor *ActorProfileUnkCAGE::Create() { return new(HeapIndex_2) ActorUnkCAGE(); diff --git a/src/059_InTrain/Actor/ActorUnkPBSP.cpp b/src/059_InTrain/Actor/ActorUnkPBSP.cpp index 20f2809c..758684c9 100644 --- a/src/059_InTrain/Actor/ActorUnkPBSP.cpp +++ b/src/059_InTrain/Actor/ActorUnkPBSP.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkPBSP.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkPBSP sActorProfileUnkPBSP; - -ARM ActorProfileUnkPBSP *ActorProfileUnkPBSP::GetProfile() { - return &sActorProfileUnkPBSP; -} +ARM DECL_PROFILE(ActorProfileUnkPBSP); ARM Actor *ActorProfileUnkPBSP::Create() { return new(HeapIndex_2) ActorUnkPBSP(); diff --git a/src/059_InTrain/Actor/ActorUnkPSBS.cpp b/src/059_InTrain/Actor/ActorUnkPSBS.cpp index 7f345f5b..71c163db 100644 --- a/src/059_InTrain/Actor/ActorUnkPSBS.cpp +++ b/src/059_InTrain/Actor/ActorUnkPSBS.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkPSBS.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkPSBS sActorProfileUnkPSBS; - -ARM ActorProfileUnkPSBS *ActorProfileUnkPSBS::GetProfile() { - return &sActorProfileUnkPSBS; -} +ARM DECL_PROFILE(ActorProfileUnkPSBS); ARM Actor *ActorProfileUnkPSBS::Create() { return new(HeapIndex_2) ActorUnkPSBS(); diff --git a/src/059_InTrain/Actor/ActorUnkPSEM.cpp b/src/059_InTrain/Actor/ActorUnkPSEM.cpp index 39e988d0..0bda44cd 100644 --- a/src/059_InTrain/Actor/ActorUnkPSEM.cpp +++ b/src/059_InTrain/Actor/ActorUnkPSEM.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkPSEM.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkPSEM sActorProfileUnkPSEM; - -ARM ActorProfileUnkPSEM *ActorProfileUnkPSEM::GetProfile() { - return &sActorProfileUnkPSEM; -} +ARM DECL_PROFILE(ActorProfileUnkPSEM); ARM Actor *ActorProfileUnkPSEM::Create() { return new(HeapIndex_2) ActorUnkPSEM(); diff --git a/src/059_InTrain/Actor/ActorUnkPSNP.cpp b/src/059_InTrain/Actor/ActorUnkPSNP.cpp index 3ef8e377..c30cf87f 100644 --- a/src/059_InTrain/Actor/ActorUnkPSNP.cpp +++ b/src/059_InTrain/Actor/ActorUnkPSNP.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkPSNP.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkPSNP sActorProfileUnkPSNP; - -THUMB ActorProfileUnkPSNP *ActorProfileUnkPSNP::GetProfile() { - return &sActorProfileUnkPSNP; -} +THUMB DECL_PROFILE(ActorProfileUnkPSNP); THUMB Actor *ActorProfileUnkPSNP::Create() { return new(HeapIndex_2) ActorUnkPSNP(); diff --git a/src/059_InTrain/Actor/ActorUnkRMTB.cpp b/src/059_InTrain/Actor/ActorUnkRMTB.cpp index 5cfe7224..36c306d0 100644 --- a/src/059_InTrain/Actor/ActorUnkRMTB.cpp +++ b/src/059_InTrain/Actor/ActorUnkRMTB.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkRMTB.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkRMTB sActorProfileUnkRMTB; - -ARM ActorProfileUnkRMTB *ActorProfileUnkRMTB::GetProfile() { - return &sActorProfileUnkRMTB; -} +ARM DECL_PROFILE(ActorProfileUnkRMTB); ARM Actor *ActorProfileUnkRMTB::Create() { return new(HeapIndex_2) ActorUnkRMTB(); diff --git a/src/059_InTrain/Actor/ActorUnkRMTR.cpp b/src/059_InTrain/Actor/ActorUnkRMTR.cpp index 5860223f..52c3ae74 100644 --- a/src/059_InTrain/Actor/ActorUnkRMTR.cpp +++ b/src/059_InTrain/Actor/ActorUnkRMTR.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkRMTR.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkRMTR sActorProfileUnkRMTR; - -ARM ActorProfileUnkRMTR *ActorProfileUnkRMTR::GetProfile() { - return &sActorProfileUnkRMTR; -} +ARM DECL_PROFILE(ActorProfileUnkRMTR); ARM Actor *ActorProfileUnkRMTR::Create() { return new(HeapIndex_2) ActorUnkRMTR(); diff --git a/src/059_InTrain/Actor/ActorUnkRMVD.cpp b/src/059_InTrain/Actor/ActorUnkRMVD.cpp index 91cfb780..ed091be1 100644 --- a/src/059_InTrain/Actor/ActorUnkRMVD.cpp +++ b/src/059_InTrain/Actor/ActorUnkRMVD.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkRMVD.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkRMVD sActorProfileUnkRMVD; - -ARM ActorProfileUnkRMVD *ActorProfileUnkRMVD::GetProfile() { - return &sActorProfileUnkRMVD; -} +ARM DECL_PROFILE(ActorProfileUnkRMVD); ARM Actor *ActorProfileUnkRMVD::Create() { return new(HeapIndex_2) ActorUnkRMVD(); diff --git a/src/059_InTrain/Actor/ActorUnkRMVF.cpp b/src/059_InTrain/Actor/ActorUnkRMVF.cpp index ac818123..7708c98d 100644 --- a/src/059_InTrain/Actor/ActorUnkRMVF.cpp +++ b/src/059_InTrain/Actor/ActorUnkRMVF.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkRMVF.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkRMVF sActorProfileUnkRMVF; - -ARM ActorProfileUnkRMVF *ActorProfileUnkRMVF::GetProfile() { - return &sActorProfileUnkRMVF; -} +ARM DECL_PROFILE(ActorProfileUnkRMVF); ARM Actor *ActorProfileUnkRMVF::Create() { return new(HeapIndex_2) ActorUnkRMVF(); diff --git a/src/059_InTrain/Actor/ActorUnkRMVS.cpp b/src/059_InTrain/Actor/ActorUnkRMVS.cpp index 7cfb7873..c0ead1e9 100644 --- a/src/059_InTrain/Actor/ActorUnkRMVS.cpp +++ b/src/059_InTrain/Actor/ActorUnkRMVS.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkRMVS.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkRMVS sActorProfileUnkRMVS; - -ARM ActorProfileUnkRMVS *ActorProfileUnkRMVS::GetProfile() { - return &sActorProfileUnkRMVS; -} +ARM DECL_PROFILE(ActorProfileUnkRMVS); ARM Actor *ActorProfileUnkRMVS::Create() { return new(HeapIndex_2) ActorUnkRMVS(); diff --git a/src/059_InTrain/Actor/ActorUnkRMVT.cpp b/src/059_InTrain/Actor/ActorUnkRMVT.cpp index 0004ddec..9e5416ea 100644 --- a/src/059_InTrain/Actor/ActorUnkRMVT.cpp +++ b/src/059_InTrain/Actor/ActorUnkRMVT.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkRMVT.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkRMVT sActorProfileUnkRMVT; - -ARM ActorProfileUnkRMVT *ActorProfileUnkRMVT::GetProfile() { - return &sActorProfileUnkRMVT; -} +ARM DECL_PROFILE(ActorProfileUnkRMVT); ARM Actor *ActorProfileUnkRMVT::Create() { return new(HeapIndex_2) ActorUnkRMVT(); diff --git a/src/059_InTrain/Actor/ActorUnkRMVV.cpp b/src/059_InTrain/Actor/ActorUnkRMVV.cpp index 941bf94b..4683f022 100644 --- a/src/059_InTrain/Actor/ActorUnkRMVV.cpp +++ b/src/059_InTrain/Actor/ActorUnkRMVV.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkRMVV.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkRMVV sActorProfileUnkRMVV; - -ARM ActorProfileUnkRMVV *ActorProfileUnkRMVV::GetProfile() { - return &sActorProfileUnkRMVV; -} +ARM DECL_PROFILE(ActorProfileUnkRMVV); ARM Actor *ActorProfileUnkRMVV::Create() { return new(HeapIndex_2) ActorUnkRMVV(); diff --git a/src/059_InTrain/Actor/ActorUnkRMVW.cpp b/src/059_InTrain/Actor/ActorUnkRMVW.cpp index 1673c6ca..32b0f277 100644 --- a/src/059_InTrain/Actor/ActorUnkRMVW.cpp +++ b/src/059_InTrain/Actor/ActorUnkRMVW.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkRMVW.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkRMVW sActorProfileUnkRMVW; - -ARM ActorProfileUnkRMVW *ActorProfileUnkRMVW::GetProfile() { - return &sActorProfileUnkRMVW; -} +ARM DECL_PROFILE(ActorProfileUnkRMVW); ARM Actor *ActorProfileUnkRMVW::Create() { return new(HeapIndex_2) ActorUnkRMVW(); diff --git a/src/059_InTrain/MapObject/MapObjectUnkEXTR.cpp b/src/059_InTrain/MapObject/MapObjectUnkEXTR.cpp index 6d1d1ef7..a6f78c9f 100644 --- a/src/059_InTrain/MapObject/MapObjectUnkEXTR.cpp +++ b/src/059_InTrain/MapObject/MapObjectUnkEXTR.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkEXTR.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkEXTR sMapObjectProfileUnkEXTR; - -ARM MapObjectProfileUnkEXTR *MapObjectProfileUnkEXTR::GetProfile() { - return &sMapObjectProfileUnkEXTR; -} +ARM DECL_PROFILE(MapObjectProfileUnkEXTR); ARM MapObject *MapObjectProfileUnkEXTR::Create() { return new(HeapIndex_2) MapObjectUnkEXTR(); diff --git a/src/060_Castle/Actor/ActorUnkCASL.cpp b/src/060_Castle/Actor/ActorUnkCASL.cpp index f4e72395..9d33b241 100644 --- a/src/060_Castle/Actor/ActorUnkCASL.cpp +++ b/src/060_Castle/Actor/ActorUnkCASL.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkCASL.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkCASL sActorProfileUnkCASL; - -ARM ActorProfileUnkCASL *ActorProfileUnkCASL::GetProfile() { - return &sActorProfileUnkCASL; -} +ARM DECL_PROFILE(ActorProfileUnkCASL); ARM Actor *ActorProfileUnkCASL::Create() { return new(HeapIndex_2) ActorUnkCASL(); diff --git a/src/060_Castle/Actor/ActorUnkCAST.cpp b/src/060_Castle/Actor/ActorUnkCAST.cpp index fe96d8f6..5617c3a3 100644 --- a/src/060_Castle/Actor/ActorUnkCAST.cpp +++ b/src/060_Castle/Actor/ActorUnkCAST.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkCAST.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkCAST sActorProfileUnkCAST; - -ARM ActorProfileUnkCAST *ActorProfileUnkCAST::GetProfile() { - return &sActorProfileUnkCAST; -} +ARM DECL_PROFILE(ActorProfileUnkCAST); ARM Actor *ActorProfileUnkCAST::Create() { return new(HeapIndex_2) ActorUnkCAST(); diff --git a/src/060_Castle/Actor/ActorUnkCOMM.cpp b/src/060_Castle/Actor/ActorUnkCOMM.cpp index e0131081..66c871d6 100644 --- a/src/060_Castle/Actor/ActorUnkCOMM.cpp +++ b/src/060_Castle/Actor/ActorUnkCOMM.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkCOMM.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkCOMM sActorProfileUnkCOMM; - -ARM ActorProfileUnkCOMM *ActorProfileUnkCOMM::GetProfile() { - return &sActorProfileUnkCOMM; -} +ARM DECL_PROFILE(ActorProfileUnkCOMM); ARM Actor *ActorProfileUnkCOMM::Create() { return new(HeapIndex_2) ActorUnkCOMM(); diff --git a/src/060_Castle/Actor/ActorUnkKIMA.cpp b/src/060_Castle/Actor/ActorUnkKIMA.cpp index b5e6eabb..fbb1a5df 100644 --- a/src/060_Castle/Actor/ActorUnkKIMA.cpp +++ b/src/060_Castle/Actor/ActorUnkKIMA.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkKIMA.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkKIMA sActorProfileUnkKIMA; - -ARM ActorProfileUnkKIMA *ActorProfileUnkKIMA::GetProfile() { - return &sActorProfileUnkKIMA; -} +ARM DECL_PROFILE(ActorProfileUnkKIMA); ARM Actor *ActorProfileUnkKIMA::Create() { return new(HeapIndex_2) ActorUnkKIMA(); diff --git a/src/060_Castle/Actor/ActorUnkOLDM.cpp b/src/060_Castle/Actor/ActorUnkOLDM.cpp index 3a192fae..cc6eb997 100644 --- a/src/060_Castle/Actor/ActorUnkOLDM.cpp +++ b/src/060_Castle/Actor/ActorUnkOLDM.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkOLDM.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkOLDM sActorProfileUnkOLDM; - -ARM ActorProfileUnkOLDM *ActorProfileUnkOLDM::GetProfile() { - return &sActorProfileUnkOLDM; -} +ARM DECL_PROFILE(ActorProfileUnkOLDM); ARM Actor *ActorProfileUnkOLDM::Create() { return new(HeapIndex_2) ActorUnkOLDM(); diff --git a/src/060_Castle/Actor/ActorUnkRMC0.cpp b/src/060_Castle/Actor/ActorUnkRMC0.cpp index b9b67844..4292b921 100644 --- a/src/060_Castle/Actor/ActorUnkRMC0.cpp +++ b/src/060_Castle/Actor/ActorUnkRMC0.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkRMC0.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkRMC0 sActorProfileUnkRMC0; - -ARM ActorProfileUnkRMC0 *ActorProfileUnkRMC0::GetProfile() { - return &sActorProfileUnkRMC0; -} +ARM DECL_PROFILE(ActorProfileUnkRMC0); ARM Actor *ActorProfileUnkRMC0::Create() { return new(HeapIndex_2) ActorUnkRMC0(); diff --git a/src/060_Castle/Actor/ActorUnkRMC1.cpp b/src/060_Castle/Actor/ActorUnkRMC1.cpp index fd38f66e..f23a7583 100644 --- a/src/060_Castle/Actor/ActorUnkRMC1.cpp +++ b/src/060_Castle/Actor/ActorUnkRMC1.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkRMC1.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkRMC1 sActorProfileUnkRMC1; - -ARM ActorProfileUnkRMC1 *ActorProfileUnkRMC1::GetProfile() { - return &sActorProfileUnkRMC1; -} +ARM DECL_PROFILE(ActorProfileUnkRMC1); ARM Actor *ActorProfileUnkRMC1::Create() { return new(HeapIndex_2) ActorUnkRMC1(); diff --git a/src/060_Castle/Actor/ActorUnkRMC2.cpp b/src/060_Castle/Actor/ActorUnkRMC2.cpp index 55dd56fd..e2eedad9 100644 --- a/src/060_Castle/Actor/ActorUnkRMC2.cpp +++ b/src/060_Castle/Actor/ActorUnkRMC2.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkRMC2.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkRMC2 sActorProfileUnkRMC2; - -ARM ActorProfileUnkRMC2 *ActorProfileUnkRMC2::GetProfile() { - return &sActorProfileUnkRMC2; -} +ARM DECL_PROFILE(ActorProfileUnkRMC2); ARM Actor *ActorProfileUnkRMC2::Create() { return new(HeapIndex_2) ActorUnkRMC2(); diff --git a/src/060_Castle/Actor/ActorUnkRMC3.cpp b/src/060_Castle/Actor/ActorUnkRMC3.cpp index 285d6f4d..1bae51ee 100644 --- a/src/060_Castle/Actor/ActorUnkRMC3.cpp +++ b/src/060_Castle/Actor/ActorUnkRMC3.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkRMC3.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkRMC3 sActorProfileUnkRMC3; - -ARM ActorProfileUnkRMC3 *ActorProfileUnkRMC3::GetProfile() { - return &sActorProfileUnkRMC3; -} +ARM DECL_PROFILE(ActorProfileUnkRMC3); ARM Actor *ActorProfileUnkRMC3::Create() { return new(HeapIndex_2) ActorUnkRMC3(); diff --git a/src/060_Castle/Actor/ActorUnkRMC4.cpp b/src/060_Castle/Actor/ActorUnkRMC4.cpp index c0cc7716..958e0112 100644 --- a/src/060_Castle/Actor/ActorUnkRMC4.cpp +++ b/src/060_Castle/Actor/ActorUnkRMC4.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkRMC4.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkRMC4 sActorProfileUnkRMC4; - -ARM ActorProfileUnkRMC4 *ActorProfileUnkRMC4::GetProfile() { - return &sActorProfileUnkRMC4; -} +ARM DECL_PROFILE(ActorProfileUnkRMC4); ARM Actor *ActorProfileUnkRMC4::Create() { return new(HeapIndex_2) ActorUnkRMC4(); diff --git a/src/060_Castle/Actor/ActorUnkRMC5.cpp b/src/060_Castle/Actor/ActorUnkRMC5.cpp index ec4d5f63..40985994 100644 --- a/src/060_Castle/Actor/ActorUnkRMC5.cpp +++ b/src/060_Castle/Actor/ActorUnkRMC5.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkRMC5.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkRMC5 sActorProfileUnkRMC5; - -ARM ActorProfileUnkRMC5 *ActorProfileUnkRMC5::GetProfile() { - return &sActorProfileUnkRMC5; -} +ARM DECL_PROFILE(ActorProfileUnkRMC5); ARM Actor *ActorProfileUnkRMC5::Create() { return new(HeapIndex_2) ActorUnkRMC5(); diff --git a/src/060_Castle/Actor/ActorUnkRMC6.cpp b/src/060_Castle/Actor/ActorUnkRMC6.cpp index a55d2f66..69aadf12 100644 --- a/src/060_Castle/Actor/ActorUnkRMC6.cpp +++ b/src/060_Castle/Actor/ActorUnkRMC6.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkRMC6.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkRMC6 sActorProfileUnkRMC6; - -ARM ActorProfileUnkRMC6 *ActorProfileUnkRMC6::GetProfile() { - return &sActorProfileUnkRMC6; -} +ARM DECL_PROFILE(ActorProfileUnkRMC6); ARM Actor *ActorProfileUnkRMC6::Create() { return new(HeapIndex_2) ActorUnkRMC6(); diff --git a/src/060_Castle/Actor/ActorUnkSOGB_SOGC_SOLG.cpp b/src/060_Castle/Actor/ActorUnkSOGB_SOGC_SOLG.cpp index c3b4fee8..07bd8d2c 100644 --- a/src/060_Castle/Actor/ActorUnkSOGB_SOGC_SOLG.cpp +++ b/src/060_Castle/Actor/ActorUnkSOGB_SOGC_SOLG.cpp @@ -5,11 +5,7 @@ // --- Actor SOGB --- -static ActorProfileUnkSOGB sActorProfileUnkSOGB; - -ARM ActorProfileUnkSOGB *ActorProfileUnkSOGB::GetProfile() { - return &sActorProfileUnkSOGB; -} +ARM DECL_PROFILE(ActorProfileUnkSOGB); ARM Actor *ActorProfileUnkSOGB::Create() { return new(HeapIndex_2) ActorUnkSOGB(); @@ -22,11 +18,7 @@ ARM ActorUnkSOGB::ActorUnkSOGB() {} // --- Actor SOGC --- -static ActorProfileUnkSOGC sActorProfileUnkSOGC; - -ARM ActorProfileUnkSOGC *ActorProfileUnkSOGC::GetProfile() { - return &sActorProfileUnkSOGC; -} +ARM DECL_PROFILE(ActorProfileUnkSOGC); ARM Actor *ActorProfileUnkSOGC::Create() { return new(HeapIndex_2) ActorUnkSOGC(); @@ -39,11 +31,7 @@ ARM ActorUnkSOGC::ActorUnkSOGC() {} // --- Actor SOLG --- -static ActorProfileUnkSOLG sActorProfileUnkSOLG; - -ARM ActorProfileUnkSOLG *ActorProfileUnkSOLG::GetProfile() { - return &sActorProfileUnkSOLG; -} +ARM DECL_PROFILE(ActorProfileUnkSOLG); ARM Actor *ActorProfileUnkSOLG::Create() { return new(HeapIndex_2) ActorUnkSOLG(); diff --git a/src/060_Castle/Actor/ActorUnkSOLB_SOLC_SOLD.cpp b/src/060_Castle/Actor/ActorUnkSOLB_SOLC_SOLD.cpp index 39aac965..75494893 100644 --- a/src/060_Castle/Actor/ActorUnkSOLB_SOLC_SOLD.cpp +++ b/src/060_Castle/Actor/ActorUnkSOLB_SOLC_SOLD.cpp @@ -5,11 +5,7 @@ // --- Actor SOLB --- -static ActorProfileUnkSOLB sActorProfileUnkSOLB; - -ARM ActorProfileUnkSOLB *ActorProfileUnkSOLB::GetProfile() { - return &sActorProfileUnkSOLB; -} +ARM DECL_PROFILE(ActorProfileUnkSOLB); ARM Actor *ActorProfileUnkSOLB::Create() { return new(HeapIndex_2) ActorUnkSOLB(); @@ -22,11 +18,7 @@ ARM ActorUnkSOLB::ActorUnkSOLB() {} // --- Actor SOLC --- -static ActorProfileUnkSOLC sActorProfileUnkSOLC; - -ARM ActorProfileUnkSOLC *ActorProfileUnkSOLC::GetProfile() { - return &sActorProfileUnkSOLC; -} +ARM DECL_PROFILE(ActorProfileUnkSOLC); ARM Actor *ActorProfileUnkSOLC::Create() { return new(HeapIndex_2) ActorUnkSOLC(); @@ -39,11 +31,7 @@ ARM ActorUnkSOLC::ActorUnkSOLC() {} // --- Actor SOLD --- -static ActorProfileUnkSOLD sActorProfileUnkSOLD; - -ARM ActorProfileUnkSOLD *ActorProfileUnkSOLD::GetProfile() { - return &sActorProfileUnkSOLD; -} +ARM DECL_PROFILE(ActorProfileUnkSOLD); ARM Actor *ActorProfileUnkSOLD::Create() { return new(HeapIndex_2) ActorUnkSOLD(); diff --git a/src/060_Castle/Actor/ActorUnkZLSN.cpp b/src/060_Castle/Actor/ActorUnkZLSN.cpp index 8bce3987..efe8cd3b 100644 --- a/src/060_Castle/Actor/ActorUnkZLSN.cpp +++ b/src/060_Castle/Actor/ActorUnkZLSN.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkZLSN.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkZLSN sActorProfileUnkZLSN; - -ARM ActorProfileUnkZLSN *ActorProfileUnkZLSN::GetProfile() { - return &sActorProfileUnkZLSN; -} +ARM DECL_PROFILE(ActorProfileUnkZLSN); ARM Actor *ActorProfileUnkZLSN::Create() { return new(HeapIndex_2) ActorUnkZLSN(); diff --git a/src/060_Castle/MapObject/MapObjectUnkDFNC.cpp b/src/060_Castle/MapObject/MapObjectUnkDFNC.cpp index 363f0cc2..07336219 100644 --- a/src/060_Castle/MapObject/MapObjectUnkDFNC.cpp +++ b/src/060_Castle/MapObject/MapObjectUnkDFNC.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkDFNC.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkDFNC sMapObjectProfileUnkDFNC; - -ARM MapObjectProfileUnkDFNC *MapObjectProfileUnkDFNC::GetProfile() { - return &sMapObjectProfileUnkDFNC; -} +ARM DECL_PROFILE(MapObjectProfileUnkDFNC); ARM MapObject *MapObjectProfileUnkDFNC::Create() { return new(HeapIndex_2) MapObjectUnkDFNC(); diff --git a/src/060_Castle/MapObject/MapObjectUnkEXCT.cpp b/src/060_Castle/MapObject/MapObjectUnkEXCT.cpp index 50b43cd2..e1784e24 100644 --- a/src/060_Castle/MapObject/MapObjectUnkEXCT.cpp +++ b/src/060_Castle/MapObject/MapObjectUnkEXCT.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkEXCT.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkEXCT sMapObjectProfileUnkEXCT; - -ARM MapObjectProfileUnkEXCT *MapObjectProfileUnkEXCT::GetProfile() { - return &sMapObjectProfileUnkEXCT; -} +ARM DECL_PROFILE(MapObjectProfileUnkEXCT); ARM MapObject *MapObjectProfileUnkEXCT::Create() { return new(HeapIndex_2) MapObjectUnkEXCT(); diff --git a/src/060_Castle/MapObject/MapObjectUnkPLCT.cpp b/src/060_Castle/MapObject/MapObjectUnkPLCT.cpp index e7a7246a..8d88cd22 100644 --- a/src/060_Castle/MapObject/MapObjectUnkPLCT.cpp +++ b/src/060_Castle/MapObject/MapObjectUnkPLCT.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkPLCT.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkPLCT sMapObjectProfileUnkPLCT; - -ARM MapObjectProfileUnkPLCT *MapObjectProfileUnkPLCT::GetProfile() { - return &sMapObjectProfileUnkPLCT; -} +ARM DECL_PROFILE(MapObjectProfileUnkPLCT); ARM MapObject *MapObjectProfileUnkPLCT::Create() { return new(HeapIndex_2) MapObjectUnkPLCT(); diff --git a/src/061_CastleTown/Actor/ActorUnkCAMA_CAMB_CAMS.cpp b/src/061_CastleTown/Actor/ActorUnkCAMA_CAMB_CAMS.cpp index 2115e730..e73c2097 100644 --- a/src/061_CastleTown/Actor/ActorUnkCAMA_CAMB_CAMS.cpp +++ b/src/061_CastleTown/Actor/ActorUnkCAMA_CAMB_CAMS.cpp @@ -5,11 +5,7 @@ // --- Actor CAMA --- -static ActorProfileUnkCAMA sActorProfileUnkCAMA; - -ARM ActorProfileUnkCAMA *ActorProfileUnkCAMA::GetProfile() { - return &sActorProfileUnkCAMA; -} +ARM DECL_PROFILE(ActorProfileUnkCAMA); ARM Actor *ActorProfileUnkCAMA::Create() { return new(HeapIndex_2) ActorUnkCAMA(); @@ -22,11 +18,7 @@ ARM ActorUnkCAMA::ActorUnkCAMA() {} // --- Actor CAMB --- -static ActorProfileUnkCAMB sActorProfileUnkCAMB; - -ARM ActorProfileUnkCAMB *ActorProfileUnkCAMB::GetProfile() { - return &sActorProfileUnkCAMB; -} +ARM DECL_PROFILE(ActorProfileUnkCAMB); ARM Actor *ActorProfileUnkCAMB::Create() { return new(HeapIndex_2) ActorUnkCAMB(); @@ -39,11 +31,7 @@ ARM ActorUnkCAMB::ActorUnkCAMB() {} // --- Actor CAMS --- -static ActorProfileUnkCAMS sActorProfileUnkCAMS; - -ARM ActorProfileUnkCAMS *ActorProfileUnkCAMS::GetProfile() { - return &sActorProfileUnkCAMS; -} +ARM DECL_PROFILE(ActorProfileUnkCAMS); ARM Actor *ActorProfileUnkCAMS::Create() { return new(HeapIndex_2) ActorUnkCAMS(); diff --git a/src/061_CastleTown/Actor/ActorUnkCAWA.cpp b/src/061_CastleTown/Actor/ActorUnkCAWA.cpp index 333c8cbe..e3ff8855 100644 --- a/src/061_CastleTown/Actor/ActorUnkCAWA.cpp +++ b/src/061_CastleTown/Actor/ActorUnkCAWA.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkCAWA.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkCAWA sActorProfileUnkCAWA; - -ARM ActorProfileUnkCAWA *ActorProfileUnkCAWA::GetProfile() { - return &sActorProfileUnkCAWA; -} +ARM DECL_PROFILE(ActorProfileUnkCAWA); ARM Actor *ActorProfileUnkCAWA::Create() { return new(HeapIndex_2) ActorUnkCAWA(); diff --git a/src/061_CastleTown/Actor/ActorUnkFLCT.cpp b/src/061_CastleTown/Actor/ActorUnkFLCT.cpp index 79b14b48..c75b6786 100644 --- a/src/061_CastleTown/Actor/ActorUnkFLCT.cpp +++ b/src/061_CastleTown/Actor/ActorUnkFLCT.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkFLCT.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkFLCT sActorProfileUnkFLCT; - -ARM ActorProfileUnkFLCT *ActorProfileUnkFLCT::GetProfile() { - return &sActorProfileUnkFLCT; -} +ARM DECL_PROFILE(ActorProfileUnkFLCT); ARM Actor *ActorProfileUnkFLCT::Create() { return new(HeapIndex_2) ActorUnkFLCT(); diff --git a/src/061_CastleTown/Actor/ActorUnkJOLN.cpp b/src/061_CastleTown/Actor/ActorUnkJOLN.cpp index 7e8ecb64..9374098a 100644 --- a/src/061_CastleTown/Actor/ActorUnkJOLN.cpp +++ b/src/061_CastleTown/Actor/ActorUnkJOLN.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkJOLN.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkJOLN sActorProfileUnkJOLN; - -ARM ActorProfileUnkJOLN *ActorProfileUnkJOLN::GetProfile() { - return &sActorProfileUnkJOLN; -} +ARM DECL_PROFILE(ActorProfileUnkJOLN); ARM Actor *ActorProfileUnkJOLN::Create() { return new(HeapIndex_2) ActorUnkJOLN(); diff --git a/src/061_CastleTown/Actor/ActorUnkRMT0.cpp b/src/061_CastleTown/Actor/ActorUnkRMT0.cpp index 67dfe2ad..30083dc1 100644 --- a/src/061_CastleTown/Actor/ActorUnkRMT0.cpp +++ b/src/061_CastleTown/Actor/ActorUnkRMT0.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkRMT0.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkRMT0 sActorProfileUnkRMT0; - -ARM ActorProfileUnkRMT0 *ActorProfileUnkRMT0::GetProfile() { - return &sActorProfileUnkRMT0; -} +ARM DECL_PROFILE(ActorProfileUnkRMT0); ARM Actor *ActorProfileUnkRMT0::Create() { return new(HeapIndex_2) ActorUnkRMT0(); diff --git a/src/061_CastleTown/Actor/ActorUnkRMT1.cpp b/src/061_CastleTown/Actor/ActorUnkRMT1.cpp index a655bdd8..2f79920f 100644 --- a/src/061_CastleTown/Actor/ActorUnkRMT1.cpp +++ b/src/061_CastleTown/Actor/ActorUnkRMT1.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkRMT1.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkRMT1 sActorProfileUnkRMT1; - -ARM ActorProfileUnkRMT1 *ActorProfileUnkRMT1::GetProfile() { - return &sActorProfileUnkRMT1; -} +ARM DECL_PROFILE(ActorProfileUnkRMT1); ARM Actor *ActorProfileUnkRMT1::Create() { return new(HeapIndex_2) ActorUnkRMT1(); diff --git a/src/061_CastleTown/Actor/ActorUnkRMT2.cpp b/src/061_CastleTown/Actor/ActorUnkRMT2.cpp index c45392e6..e7c3cc40 100644 --- a/src/061_CastleTown/Actor/ActorUnkRMT2.cpp +++ b/src/061_CastleTown/Actor/ActorUnkRMT2.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkRMT2.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkRMT2 sActorProfileUnkRMT2; - -ARM ActorProfileUnkRMT2 *ActorProfileUnkRMT2::GetProfile() { - return &sActorProfileUnkRMT2; -} +ARM DECL_PROFILE(ActorProfileUnkRMT2); ARM Actor *ActorProfileUnkRMT2::Create() { return new(HeapIndex_2) ActorUnkRMT2(); diff --git a/src/061_CastleTown/Actor/ActorUnkRMT3.cpp b/src/061_CastleTown/Actor/ActorUnkRMT3.cpp index 9573d513..92a420cb 100644 --- a/src/061_CastleTown/Actor/ActorUnkRMT3.cpp +++ b/src/061_CastleTown/Actor/ActorUnkRMT3.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkRMT3.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkRMT3 sActorProfileUnkRMT3; - -ARM ActorProfileUnkRMT3 *ActorProfileUnkRMT3::GetProfile() { - return &sActorProfileUnkRMT3; -} +ARM DECL_PROFILE(ActorProfileUnkRMT3); ARM Actor *ActorProfileUnkRMT3::Create() { return new(HeapIndex_2) ActorUnkRMT3(); diff --git a/src/061_CastleTown/Actor/ActorUnkRMT4.cpp b/src/061_CastleTown/Actor/ActorUnkRMT4.cpp index 7a4d175a..ba16c3ea 100644 --- a/src/061_CastleTown/Actor/ActorUnkRMT4.cpp +++ b/src/061_CastleTown/Actor/ActorUnkRMT4.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkRMT4.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkRMT4 sActorProfileUnkRMT4; - -ARM ActorProfileUnkRMT4 *ActorProfileUnkRMT4::GetProfile() { - return &sActorProfileUnkRMT4; -} +ARM DECL_PROFILE(ActorProfileUnkRMT4); ARM Actor *ActorProfileUnkRMT4::Create() { return new(HeapIndex_2) ActorUnkRMT4(); diff --git a/src/061_CastleTown/MapObject/MapObjectUnkDRTY.cpp b/src/061_CastleTown/MapObject/MapObjectUnkDRTY.cpp index ed9a5283..47289ad5 100644 --- a/src/061_CastleTown/MapObject/MapObjectUnkDRTY.cpp +++ b/src/061_CastleTown/MapObject/MapObjectUnkDRTY.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkDRTY.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkDRTY sMapObjectProfileUnkDRTY; - -ARM MapObjectProfileUnkDRTY *MapObjectProfileUnkDRTY::GetProfile() { - return &sMapObjectProfileUnkDRTY; -} +ARM DECL_PROFILE(MapObjectProfileUnkDRTY); ARM MapObject *MapObjectProfileUnkDRTY::Create() { return new(HeapIndex_2) MapObjectUnkDRTY(); diff --git a/src/061_CastleTown/MapObject/MapObjectUnkFSCT.cpp b/src/061_CastleTown/MapObject/MapObjectUnkFSCT.cpp index e5dfac21..f1be529d 100644 --- a/src/061_CastleTown/MapObject/MapObjectUnkFSCT.cpp +++ b/src/061_CastleTown/MapObject/MapObjectUnkFSCT.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkFSCT.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkFSCT sMapObjectProfileUnkFSCT; - -ARM MapObjectProfileUnkFSCT *MapObjectProfileUnkFSCT::GetProfile() { - return &sMapObjectProfileUnkFSCT; -} +ARM DECL_PROFILE(MapObjectProfileUnkFSCT); ARM MapObject *MapObjectProfileUnkFSCT::Create() { return new(HeapIndex_2) MapObjectUnkFSCT(); diff --git a/src/062_Village/Actor/ActorUnkFBCH.cpp b/src/062_Village/Actor/ActorUnkFBCH.cpp index 2122cda9..b84f8455 100644 --- a/src/062_Village/Actor/ActorUnkFBCH.cpp +++ b/src/062_Village/Actor/ActorUnkFBCH.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkFBCH.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkFBCH sActorProfileUnkFBCH; - -ARM ActorProfileUnkFBCH *ActorProfileUnkFBCH::GetProfile() { - return &sActorProfileUnkFBCH; -} +ARM DECL_PROFILE(ActorProfileUnkFBCH); ARM Actor *ActorProfileUnkFBCH::Create() { return new(HeapIndex_2) ActorUnkFBCH(); diff --git a/src/062_Village/Actor/ActorUnkLBCK.cpp b/src/062_Village/Actor/ActorUnkLBCK.cpp index bf921102..341cb3c3 100644 --- a/src/062_Village/Actor/ActorUnkLBCK.cpp +++ b/src/062_Village/Actor/ActorUnkLBCK.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkLBCK.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkLBCK sActorProfileUnkLBCK; - -ARM ActorProfileUnkLBCK *ActorProfileUnkLBCK::GetProfile() { - return &sActorProfileUnkLBCK; -} +ARM DECL_PROFILE(ActorProfileUnkLBCK); ARM Actor *ActorProfileUnkLBCK::Create() { return new(HeapIndex_2) ActorUnkLBCK(); diff --git a/src/062_Village/Actor/ActorUnkMOCT.cpp b/src/062_Village/Actor/ActorUnkMOCT.cpp index caf2389e..d5050188 100644 --- a/src/062_Village/Actor/ActorUnkMOCT.cpp +++ b/src/062_Village/Actor/ActorUnkMOCT.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkMOCT.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkMOCT sActorProfileUnkMOCT; - -ARM ActorProfileUnkMOCT *ActorProfileUnkMOCT::GetProfile() { - return &sActorProfileUnkMOCT; -} +ARM DECL_PROFILE(ActorProfileUnkMOCT); ARM Actor *ActorProfileUnkMOCT::Create() { return new(HeapIndex_2) ActorUnkMOCT(); diff --git a/src/062_Village/Actor/ActorUnkNCCB_NCMB.cpp b/src/062_Village/Actor/ActorUnkNCCB_NCMB.cpp index 781508ea..83f2c007 100644 --- a/src/062_Village/Actor/ActorUnkNCCB_NCMB.cpp +++ b/src/062_Village/Actor/ActorUnkNCCB_NCMB.cpp @@ -5,11 +5,7 @@ // --- Actor NCCB --- -static ActorProfileUnkNCCB sActorProfileUnkNCCB; - -ARM ActorProfileUnkNCCB *ActorProfileUnkNCCB::GetProfile() { - return &sActorProfileUnkNCCB; -} +ARM DECL_PROFILE(ActorProfileUnkNCCB); ARM Actor *ActorProfileUnkNCCB::Create() { return new(HeapIndex_2) ActorUnkNCCB(); @@ -22,11 +18,7 @@ ARM ActorUnkNCCB::ActorUnkNCCB() {} // --- Actor NCMB --- -static ActorProfileUnkNCMB sActorProfileUnkNCMB; - -ARM ActorProfileUnkNCMB *ActorProfileUnkNCMB::GetProfile() { - return &sActorProfileUnkNCMB; -} +ARM DECL_PROFILE(ActorProfileUnkNCMB); ARM Actor *ActorProfileUnkNCMB::Create() { return new(HeapIndex_2) ActorUnkNCMB(); diff --git a/src/062_Village/Actor/ActorUnkNCWA.cpp b/src/062_Village/Actor/ActorUnkNCWA.cpp index c0350aa8..95027eec 100644 --- a/src/062_Village/Actor/ActorUnkNCWA.cpp +++ b/src/062_Village/Actor/ActorUnkNCWA.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkNCWA.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkNCWA sActorProfileUnkNCWA; - -ARM ActorProfileUnkNCWA *ActorProfileUnkNCWA::GetProfile() { - return &sActorProfileUnkNCWA; -} +ARM DECL_PROFILE(ActorProfileUnkNCWA); ARM Actor *ActorProfileUnkNCWA::Create() { return new(HeapIndex_2) ActorUnkNCWA(); diff --git a/src/062_Village/Actor/ActorUnkNICO.cpp b/src/062_Village/Actor/ActorUnkNICO.cpp index dd95d1b3..457a0922 100644 --- a/src/062_Village/Actor/ActorUnkNICO.cpp +++ b/src/062_Village/Actor/ActorUnkNICO.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkNICO.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkNICO sActorProfileUnkNICO; - -ARM ActorProfileUnkNICO *ActorProfileUnkNICO::GetProfile() { - return &sActorProfileUnkNICO; -} +ARM DECL_PROFILE(ActorProfileUnkNICO); ARM Actor *ActorProfileUnkNICO::Create() { return new(HeapIndex_2) ActorUnkNICO(); diff --git a/src/062_Village/Actor/ActorUnkNSHD.cpp b/src/062_Village/Actor/ActorUnkNSHD.cpp index a8f08e5f..1ed6ff2b 100644 --- a/src/062_Village/Actor/ActorUnkNSHD.cpp +++ b/src/062_Village/Actor/ActorUnkNSHD.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkNSHD.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkNSHD sActorProfileUnkNSHD; - -ARM ActorProfileUnkNSHD *ActorProfileUnkNSHD::GetProfile() { - return &sActorProfileUnkNSHD; -} +ARM DECL_PROFILE(ActorProfileUnkNSHD); ARM Actor *ActorProfileUnkNSHD::Create() { return new(HeapIndex_2) ActorUnkNSHD(); diff --git a/src/062_Village/Actor/ActorUnkRMBC.cpp b/src/062_Village/Actor/ActorUnkRMBC.cpp index f453e693..48966500 100644 --- a/src/062_Village/Actor/ActorUnkRMBC.cpp +++ b/src/062_Village/Actor/ActorUnkRMBC.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkRMBC.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkRMBC sActorProfileUnkRMBC; - -ARM ActorProfileUnkRMBC *ActorProfileUnkRMBC::GetProfile() { - return &sActorProfileUnkRMBC; -} +ARM DECL_PROFILE(ActorProfileUnkRMBC); ARM Actor *ActorProfileUnkRMBC::Create() { return new(HeapIndex_2) ActorUnkRMBC(); diff --git a/src/062_Village/Actor/ActorUnkRML0.cpp b/src/062_Village/Actor/ActorUnkRML0.cpp index 779813b5..2ebad5d3 100644 --- a/src/062_Village/Actor/ActorUnkRML0.cpp +++ b/src/062_Village/Actor/ActorUnkRML0.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkRML0.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkRML0 sActorProfileUnkRML0; - -ARM ActorProfileUnkRML0 *ActorProfileUnkRML0::GetProfile() { - return &sActorProfileUnkRML0; -} +ARM DECL_PROFILE(ActorProfileUnkRML0); ARM Actor *ActorProfileUnkRML0::Create() { return new(HeapIndex_2) ActorUnkRML0(); diff --git a/src/062_Village/Actor/ActorUnkRML1.cpp b/src/062_Village/Actor/ActorUnkRML1.cpp index b2c8fd02..65a20580 100644 --- a/src/062_Village/Actor/ActorUnkRML1.cpp +++ b/src/062_Village/Actor/ActorUnkRML1.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkRML1.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkRML1 sActorProfileUnkRML1; - -ARM ActorProfileUnkRML1 *ActorProfileUnkRML1::GetProfile() { - return &sActorProfileUnkRML1; -} +ARM DECL_PROFILE(ActorProfileUnkRML1); ARM Actor *ActorProfileUnkRML1::Create() { return new(HeapIndex_2) ActorUnkRML1(); diff --git a/src/062_Village/Actor/ActorUnkRML2.cpp b/src/062_Village/Actor/ActorUnkRML2.cpp index af9361a9..9d3b638b 100644 --- a/src/062_Village/Actor/ActorUnkRML2.cpp +++ b/src/062_Village/Actor/ActorUnkRML2.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkRML2.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkRML2 sActorProfileUnkRML2; - -ARM ActorProfileUnkRML2 *ActorProfileUnkRML2::GetProfile() { - return &sActorProfileUnkRML2; -} +ARM DECL_PROFILE(ActorProfileUnkRML2); ARM Actor *ActorProfileUnkRML2::Create() { return new(HeapIndex_2) ActorUnkRML2(); diff --git a/src/062_Village/Actor/ActorUnkRML3.cpp b/src/062_Village/Actor/ActorUnkRML3.cpp index 8dfe7709..245fa340 100644 --- a/src/062_Village/Actor/ActorUnkRML3.cpp +++ b/src/062_Village/Actor/ActorUnkRML3.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkRML3.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkRML3 sActorProfileUnkRML3; - -ARM ActorProfileUnkRML3 *ActorProfileUnkRML3::GetProfile() { - return &sActorProfileUnkRML3; -} +ARM DECL_PROFILE(ActorProfileUnkRML3); ARM Actor *ActorProfileUnkRML3::Create() { return new(HeapIndex_2) ActorUnkRML3(); diff --git a/src/062_Village/Actor/ActorUnkRMLF.cpp b/src/062_Village/Actor/ActorUnkRMLF.cpp index 8fef74ea..ddb11241 100644 --- a/src/062_Village/Actor/ActorUnkRMLF.cpp +++ b/src/062_Village/Actor/ActorUnkRMLF.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkRMLF.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkRMLF sActorProfileUnkRMLF; - -ARM ActorProfileUnkRMLF *ActorProfileUnkRMLF::GetProfile() { - return &sActorProfileUnkRMLF; -} +ARM DECL_PROFILE(ActorProfileUnkRMLF); ARM Actor *ActorProfileUnkRMLF::Create() { return new(HeapIndex_2) ActorUnkRMLF(); diff --git a/src/062_Village/Actor/ActorUnkTSLB.cpp b/src/062_Village/Actor/ActorUnkTSLB.cpp index 7607d0ec..535ec4e0 100644 --- a/src/062_Village/Actor/ActorUnkTSLB.cpp +++ b/src/062_Village/Actor/ActorUnkTSLB.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkTSLB.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkTSLB sActorProfileUnkTSLB; - -ARM ActorProfileUnkTSLB *ActorProfileUnkTSLB::GetProfile() { - return &sActorProfileUnkTSLB; -} +ARM DECL_PROFILE(ActorProfileUnkTSLB); ARM Actor *ActorProfileUnkTSLB::Create() { return new(HeapIndex_2) ActorUnkTSLB(); diff --git a/src/062_Village/MapObject/MapObjectUnkFSFS.cpp b/src/062_Village/MapObject/MapObjectUnkFSFS.cpp index 1aebabab..f18199d0 100644 --- a/src/062_Village/MapObject/MapObjectUnkFSFS.cpp +++ b/src/062_Village/MapObject/MapObjectUnkFSFS.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkFSFS.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkFSFS sMapObjectProfileUnkFSFS; - -ARM MapObjectProfileUnkFSFS *MapObjectProfileUnkFSFS::GetProfile() { - return &sMapObjectProfileUnkFSFS; -} +ARM DECL_PROFILE(MapObjectProfileUnkFSFS); ARM MapObject *MapObjectProfileUnkFSFS::Create() { return new(HeapIndex_2) MapObjectUnkFSFS(); diff --git a/src/062_Village/MapObject/MapObjectUnkGBDR.cpp b/src/062_Village/MapObject/MapObjectUnkGBDR.cpp index a0cb6f39..32d80de3 100644 --- a/src/062_Village/MapObject/MapObjectUnkGBDR.cpp +++ b/src/062_Village/MapObject/MapObjectUnkGBDR.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkGBDR.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkGBDR sMapObjectProfileUnkGBDR; - -ARM MapObjectProfileUnkGBDR *MapObjectProfileUnkGBDR::GetProfile() { - return &sMapObjectProfileUnkGBDR; -} +ARM DECL_PROFILE(MapObjectProfileUnkGBDR); ARM MapObject *MapObjectProfileUnkGBDR::Create() { return new(HeapIndex_2) MapObjectUnkGBDR(); diff --git a/src/062_Village/MapObject/MapObjectUnkHOL0.cpp b/src/062_Village/MapObject/MapObjectUnkHOL0.cpp index d419f48e..c6c79277 100644 --- a/src/062_Village/MapObject/MapObjectUnkHOL0.cpp +++ b/src/062_Village/MapObject/MapObjectUnkHOL0.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkHOL0.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkHOL0 sMapObjectProfileUnkHOL0; - -ARM MapObjectProfileUnkHOL0 *MapObjectProfileUnkHOL0::GetProfile() { - return &sMapObjectProfileUnkHOL0; -} +ARM DECL_PROFILE(MapObjectProfileUnkHOL0); ARM MapObject *MapObjectProfileUnkHOL0::Create() { return new(HeapIndex_2) MapObjectUnkHOL0(); diff --git a/src/062_Village/MapObject/MapObjectUnkHOL1.cpp b/src/062_Village/MapObject/MapObjectUnkHOL1.cpp index 0835296c..2019b29e 100644 --- a/src/062_Village/MapObject/MapObjectUnkHOL1.cpp +++ b/src/062_Village/MapObject/MapObjectUnkHOL1.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkHOL1.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkHOL1 sMapObjectProfileUnkHOL1; - -ARM MapObjectProfileUnkHOL1 *MapObjectProfileUnkHOL1::GetProfile() { - return &sMapObjectProfileUnkHOL1; -} +ARM DECL_PROFILE(MapObjectProfileUnkHOL1); ARM MapObject *MapObjectProfileUnkHOL1::Create() { return new(HeapIndex_2) MapObjectUnkHOL1(); diff --git a/src/062_Village/MapObject/MapObjectUnkHOL2.cpp b/src/062_Village/MapObject/MapObjectUnkHOL2.cpp index 01865fc6..25f877ea 100644 --- a/src/062_Village/MapObject/MapObjectUnkHOL2.cpp +++ b/src/062_Village/MapObject/MapObjectUnkHOL2.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkHOL2.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkHOL2 sMapObjectProfileUnkHOL2; - -ARM MapObjectProfileUnkHOL2 *MapObjectProfileUnkHOL2::GetProfile() { - return &sMapObjectProfileUnkHOL2; -} +ARM DECL_PROFILE(MapObjectProfileUnkHOL2); ARM MapObject *MapObjectProfileUnkHOL2::Create() { return new(HeapIndex_2) MapObjectUnkHOL2(); diff --git a/src/062_Village/MapObject/MapObjectUnkHOLB.cpp b/src/062_Village/MapObject/MapObjectUnkHOLB.cpp index 518d17c6..e718172e 100644 --- a/src/062_Village/MapObject/MapObjectUnkHOLB.cpp +++ b/src/062_Village/MapObject/MapObjectUnkHOLB.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkHOLB.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkHOLB sMapObjectProfileUnkHOLB; - -ARM MapObjectProfileUnkHOLB *MapObjectProfileUnkHOLB::GetProfile() { - return &sMapObjectProfileUnkHOLB; -} +ARM DECL_PROFILE(MapObjectProfileUnkHOLB); ARM MapObject *MapObjectProfileUnkHOLB::Create() { return new(HeapIndex_2) MapObjectUnkHOLB(); diff --git a/src/062_Village/MapObject/MapObjectUnkHOSB.cpp b/src/062_Village/MapObject/MapObjectUnkHOSB.cpp index 6b60142a..fac891d2 100644 --- a/src/062_Village/MapObject/MapObjectUnkHOSB.cpp +++ b/src/062_Village/MapObject/MapObjectUnkHOSB.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkHOSB.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkHOSB sMapObjectProfileUnkHOSB; - -ARM MapObjectProfileUnkHOSB *MapObjectProfileUnkHOSB::GetProfile() { - return &sMapObjectProfileUnkHOSB; -} +ARM DECL_PROFILE(MapObjectProfileUnkHOSB); ARM MapObject *MapObjectProfileUnkHOSB::Create() { return new(HeapIndex_2) MapObjectUnkHOSB(); diff --git a/src/063_Shrine/Actor/ActorUnkCANS.cpp b/src/063_Shrine/Actor/ActorUnkCANS.cpp index ea455810..cf269a46 100644 --- a/src/063_Shrine/Actor/ActorUnkCANS.cpp +++ b/src/063_Shrine/Actor/ActorUnkCANS.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkCANS.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkCANS sActorProfileUnkCANS; - -ARM ActorProfileUnkCANS *ActorProfileUnkCANS::GetProfile() { - return &sActorProfileUnkCANS; -} +ARM DECL_PROFILE(ActorProfileUnkCANS); ARM Actor *ActorProfileUnkCANS::Create() { return new(HeapIndex_2) ActorUnkCANS(); diff --git a/src/063_Shrine/Actor/ActorUnkCASE.cpp b/src/063_Shrine/Actor/ActorUnkCASE.cpp index 44683459..58ca40df 100644 --- a/src/063_Shrine/Actor/ActorUnkCASE.cpp +++ b/src/063_Shrine/Actor/ActorUnkCASE.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkCASE.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkCASE sActorProfileUnkCASE; - -ARM ActorProfileUnkCASE *ActorProfileUnkCASE::GetProfile() { - return &sActorProfileUnkCASE; -} +ARM DECL_PROFILE(ActorProfileUnkCASE); ARM Actor *ActorProfileUnkCASE::Create() { return new(HeapIndex_2) ActorUnkCASE(); diff --git a/src/063_Shrine/Actor/ActorUnkRBLS.cpp b/src/063_Shrine/Actor/ActorUnkRBLS.cpp index 39887f3b..1c2b881b 100644 --- a/src/063_Shrine/Actor/ActorUnkRBLS.cpp +++ b/src/063_Shrine/Actor/ActorUnkRBLS.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkRBLS.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkRBLS sActorProfileUnkRBLS; - -ARM ActorProfileUnkRBLS *ActorProfileUnkRBLS::GetProfile() { - return &sActorProfileUnkRBLS; -} +ARM DECL_PROFILE(ActorProfileUnkRBLS); ARM Actor *ActorProfileUnkRBLS::Create() { return new(HeapIndex_2) ActorUnkRBLS(); diff --git a/src/063_Shrine/Actor/ActorUnkRMSD.cpp b/src/063_Shrine/Actor/ActorUnkRMSD.cpp index fbbfe461..33ca5929 100644 --- a/src/063_Shrine/Actor/ActorUnkRMSD.cpp +++ b/src/063_Shrine/Actor/ActorUnkRMSD.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkRMSD.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkRMSD sActorProfileUnkRMSD; - -ARM ActorProfileUnkRMSD *ActorProfileUnkRMSD::GetProfile() { - return &sActorProfileUnkRMSD; -} +ARM DECL_PROFILE(ActorProfileUnkRMSD); ARM Actor *ActorProfileUnkRMSD::Create() { return new(HeapIndex_2) ActorUnkRMSD(); diff --git a/src/063_Shrine/Actor/ActorUnkRMSF.cpp b/src/063_Shrine/Actor/ActorUnkRMSF.cpp index 940d75b7..671c16da 100644 --- a/src/063_Shrine/Actor/ActorUnkRMSF.cpp +++ b/src/063_Shrine/Actor/ActorUnkRMSF.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkRMSF.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkRMSF sActorProfileUnkRMSF; - -ARM ActorProfileUnkRMSF *ActorProfileUnkRMSF::GetProfile() { - return &sActorProfileUnkRMSF; -} +ARM DECL_PROFILE(ActorProfileUnkRMSF); ARM Actor *ActorProfileUnkRMSF::Create() { return new(HeapIndex_2) ActorUnkRMSF(); diff --git a/src/063_Shrine/Actor/ActorUnkRMSS.cpp b/src/063_Shrine/Actor/ActorUnkRMSS.cpp index 9d01bc45..84e61259 100644 --- a/src/063_Shrine/Actor/ActorUnkRMSS.cpp +++ b/src/063_Shrine/Actor/ActorUnkRMSS.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkRMSS.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkRMSS sActorProfileUnkRMSS; - -ARM ActorProfileUnkRMSS *ActorProfileUnkRMSS::GetProfile() { - return &sActorProfileUnkRMSS; -} +ARM DECL_PROFILE(ActorProfileUnkRMSS); ARM Actor *ActorProfileUnkRMSS::Create() { return new(HeapIndex_2) ActorUnkRMSS(); diff --git a/src/063_Shrine/Actor/ActorUnkRMSV.cpp b/src/063_Shrine/Actor/ActorUnkRMSV.cpp index 71886f4f..e9e459dc 100644 --- a/src/063_Shrine/Actor/ActorUnkRMSV.cpp +++ b/src/063_Shrine/Actor/ActorUnkRMSV.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkRMSV.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkRMSV sActorProfileUnkRMSV; - -ARM ActorProfileUnkRMSV *ActorProfileUnkRMSV::GetProfile() { - return &sActorProfileUnkRMSV; -} +ARM DECL_PROFILE(ActorProfileUnkRMSV); ARM Actor *ActorProfileUnkRMSV::Create() { return new(HeapIndex_2) ActorUnkRMSV(); diff --git a/src/063_Shrine/Actor/ActorUnkRMSW.cpp b/src/063_Shrine/Actor/ActorUnkRMSW.cpp index 7aac7d18..6a9af036 100644 --- a/src/063_Shrine/Actor/ActorUnkRMSW.cpp +++ b/src/063_Shrine/Actor/ActorUnkRMSW.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkRMSW.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkRMSW sActorProfileUnkRMSW; - -ARM ActorProfileUnkRMSW *ActorProfileUnkRMSW::GetProfile() { - return &sActorProfileUnkRMSW; -} +ARM DECL_PROFILE(ActorProfileUnkRMSW); ARM Actor *ActorProfileUnkRMSW::Create() { return new(HeapIndex_2) ActorUnkRMSW(); diff --git a/src/063_Shrine/MapObject/MapObjectUnkLTRW.cpp b/src/063_Shrine/MapObject/MapObjectUnkLTRW.cpp index 0a3f738e..eed0157d 100644 --- a/src/063_Shrine/MapObject/MapObjectUnkLTRW.cpp +++ b/src/063_Shrine/MapObject/MapObjectUnkLTRW.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkLTRW.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkLTRW sMapObjectProfileUnkLTRW; - -ARM MapObjectProfileUnkLTRW *MapObjectProfileUnkLTRW::GetProfile() { - return &sMapObjectProfileUnkLTRW; -} +ARM DECL_PROFILE(MapObjectProfileUnkLTRW); ARM MapObject *MapObjectProfileUnkLTRW::Create() { return new(HeapIndex_2) MapObjectUnkLTRW(); diff --git a/src/063_Shrine/MapObject/MapObjectUnkMTJR.cpp b/src/063_Shrine/MapObject/MapObjectUnkMTJR.cpp index 034fe397..c1a4eb98 100644 --- a/src/063_Shrine/MapObject/MapObjectUnkMTJR.cpp +++ b/src/063_Shrine/MapObject/MapObjectUnkMTJR.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkMTJR.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkMTJR sMapObjectProfileUnkMTJR; - -ARM MapObjectProfileUnkMTJR *MapObjectProfileUnkMTJR::GetProfile() { - return &sMapObjectProfileUnkMTJR; -} +ARM DECL_PROFILE(MapObjectProfileUnkMTJR); ARM MapObject *MapObjectProfileUnkMTJR::Create() { return new(HeapIndex_2) MapObjectUnkMTJR(); diff --git a/src/063_Shrine/MapObject/MapObjectUnkSTAT.cpp b/src/063_Shrine/MapObject/MapObjectUnkSTAT.cpp index a97dfcfc..3b5d3a52 100644 --- a/src/063_Shrine/MapObject/MapObjectUnkSTAT.cpp +++ b/src/063_Shrine/MapObject/MapObjectUnkSTAT.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkSTAT.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkSTAT sMapObjectProfileUnkSTAT; - -ARM MapObjectProfileUnkSTAT *MapObjectProfileUnkSTAT::GetProfile() { - return &sMapObjectProfileUnkSTAT; -} +ARM DECL_PROFILE(MapObjectProfileUnkSTAT); ARM MapObject *MapObjectProfileUnkSTAT::Create() { return new(HeapIndex_2) MapObjectUnkSTAT(); diff --git a/src/063_Shrine/MapObject/MapObjectUnkSWCR.cpp b/src/063_Shrine/MapObject/MapObjectUnkSWCR.cpp index 3e6414f8..28b0ee52 100644 --- a/src/063_Shrine/MapObject/MapObjectUnkSWCR.cpp +++ b/src/063_Shrine/MapObject/MapObjectUnkSWCR.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkSWCR.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkSWCR sMapObjectProfileUnkSWCR; - -ARM MapObjectProfileUnkSWCR *MapObjectProfileUnkSWCR::GetProfile() { - return &sMapObjectProfileUnkSWCR; -} +ARM DECL_PROFILE(MapObjectProfileUnkSWCR); ARM MapObject *MapObjectProfileUnkSWCR::Create() { return new(HeapIndex_2) MapObjectUnkSWCR(); diff --git a/src/063_Shrine/MapObject/MapObjectUnkWLMS.cpp b/src/063_Shrine/MapObject/MapObjectUnkWLMS.cpp index 3dbc3df2..52b7ac8c 100644 --- a/src/063_Shrine/MapObject/MapObjectUnkWLMS.cpp +++ b/src/063_Shrine/MapObject/MapObjectUnkWLMS.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkWLMS.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkWLMS sMapObjectProfileUnkWLMS; - -ARM MapObjectProfileUnkWLMS *MapObjectProfileUnkWLMS::GetProfile() { - return &sMapObjectProfileUnkWLMS; -} +ARM DECL_PROFILE(MapObjectProfileUnkWLMS); ARM MapObject *MapObjectProfileUnkWLMS::Create() { return new(HeapIndex_2) MapObjectUnkWLMS(); diff --git a/src/064_FldForest/Actor/ActorUnkFOMD.cpp b/src/064_FldForest/Actor/ActorUnkFOMD.cpp index b372491b..98a6d9df 100644 --- a/src/064_FldForest/Actor/ActorUnkFOMD.cpp +++ b/src/064_FldForest/Actor/ActorUnkFOMD.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkFOMD.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkFOMD sActorProfileUnkFOMD; - -ARM ActorProfileUnkFOMD *ActorProfileUnkFOMD::GetProfile() { - return &sActorProfileUnkFOMD; -} +ARM DECL_PROFILE(ActorProfileUnkFOMD); ARM Actor *ActorProfileUnkFOMD::Create() { return new(HeapIndex_2) ActorUnkFOMD(); diff --git a/src/064_FldForest/Actor/ActorUnkRMF0.cpp b/src/064_FldForest/Actor/ActorUnkRMF0.cpp index 58bc4b35..753a869e 100644 --- a/src/064_FldForest/Actor/ActorUnkRMF0.cpp +++ b/src/064_FldForest/Actor/ActorUnkRMF0.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkRMF0.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkRMF0 sActorProfileUnkRMF0; - -ARM ActorProfileUnkRMF0 *ActorProfileUnkRMF0::GetProfile() { - return &sActorProfileUnkRMF0; -} +ARM DECL_PROFILE(ActorProfileUnkRMF0); ARM Actor *ActorProfileUnkRMF0::Create() { return new(HeapIndex_2) ActorUnkRMF0(); diff --git a/src/064_FldForest/Actor/ActorUnkRMF1.cpp b/src/064_FldForest/Actor/ActorUnkRMF1.cpp index 68b27ee7..866c9b04 100644 --- a/src/064_FldForest/Actor/ActorUnkRMF1.cpp +++ b/src/064_FldForest/Actor/ActorUnkRMF1.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkRMF1.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkRMF1 sActorProfileUnkRMF1; - -ARM ActorProfileUnkRMF1 *ActorProfileUnkRMF1::GetProfile() { - return &sActorProfileUnkRMF1; -} +ARM DECL_PROFILE(ActorProfileUnkRMF1); ARM Actor *ActorProfileUnkRMF1::Create() { return new(HeapIndex_2) ActorUnkRMF1(); diff --git a/src/064_FldForest/Actor/ActorUnkRMTZ.cpp b/src/064_FldForest/Actor/ActorUnkRMTZ.cpp index 1a306493..453dd349 100644 --- a/src/064_FldForest/Actor/ActorUnkRMTZ.cpp +++ b/src/064_FldForest/Actor/ActorUnkRMTZ.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkRMTZ.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkRMTZ sActorProfileUnkRMTZ; - -ARM ActorProfileUnkRMTZ *ActorProfileUnkRMTZ::GetProfile() { - return &sActorProfileUnkRMTZ; -} +ARM DECL_PROFILE(ActorProfileUnkRMTZ); ARM Actor *ActorProfileUnkRMTZ::Create() { return new(HeapIndex_2) ActorUnkRMTZ(); diff --git a/src/064_FldForest/MapObject/MapObjectUnkFSFR.cpp b/src/064_FldForest/MapObject/MapObjectUnkFSFR.cpp index fff585b0..831328e7 100644 --- a/src/064_FldForest/MapObject/MapObjectUnkFSFR.cpp +++ b/src/064_FldForest/MapObject/MapObjectUnkFSFR.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkFSFR.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkFSFR sMapObjectProfileUnkFSFR; - -ARM MapObjectProfileUnkFSFR *MapObjectProfileUnkFSFR::GetProfile() { - return &sMapObjectProfileUnkFSFR; -} +ARM DECL_PROFILE(MapObjectProfileUnkFSFR); ARM MapObject *MapObjectProfileUnkFSFR::Create() { return new(HeapIndex_2) MapObjectUnkFSFR(); diff --git a/src/064_FldForest/MapObject/MapObjectUnkHOF0.cpp b/src/064_FldForest/MapObject/MapObjectUnkHOF0.cpp index 8053d7d8..e9692aa0 100644 --- a/src/064_FldForest/MapObject/MapObjectUnkHOF0.cpp +++ b/src/064_FldForest/MapObject/MapObjectUnkHOF0.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkHOF0.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkHOF0 sMapObjectProfileUnkHOF0; - -ARM MapObjectProfileUnkHOF0 *MapObjectProfileUnkHOF0::GetProfile() { - return &sMapObjectProfileUnkHOF0; -} +ARM DECL_PROFILE(MapObjectProfileUnkHOF0); ARM MapObject *MapObjectProfileUnkHOF0::Create() { return new(HeapIndex_2) MapObjectUnkHOF0(); diff --git a/src/064_FldForest/MapObject/MapObjectUnkHOF1.cpp b/src/064_FldForest/MapObject/MapObjectUnkHOF1.cpp index 4092a28f..af3128d1 100644 --- a/src/064_FldForest/MapObject/MapObjectUnkHOF1.cpp +++ b/src/064_FldForest/MapObject/MapObjectUnkHOF1.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkHOF1.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkHOF1 sMapObjectProfileUnkHOF1; - -ARM MapObjectProfileUnkHOF1 *MapObjectProfileUnkHOF1::GetProfile() { - return &sMapObjectProfileUnkHOF1; -} +ARM DECL_PROFILE(MapObjectProfileUnkHOF1); ARM MapObject *MapObjectProfileUnkHOF1::Create() { return new(HeapIndex_2) MapObjectUnkHOF1(); diff --git a/src/064_FldForest/MapObject/MapObjectUnkLEVN.cpp b/src/064_FldForest/MapObject/MapObjectUnkLEVN.cpp index 8b40f05c..f3f7300c 100644 --- a/src/064_FldForest/MapObject/MapObjectUnkLEVN.cpp +++ b/src/064_FldForest/MapObject/MapObjectUnkLEVN.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkLEVN.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkLEVN sMapObjectProfileUnkLEVN; - -ARM MapObjectProfileUnkLEVN *MapObjectProfileUnkLEVN::GetProfile() { - return &sMapObjectProfileUnkLEVN; -} +ARM DECL_PROFILE(MapObjectProfileUnkLEVN); ARM MapObject *MapObjectProfileUnkLEVN::Create() { return new(HeapIndex_2) MapObjectUnkLEVN(); diff --git a/src/065_FldSnow/Actor/ActorUnkRMS0.cpp b/src/065_FldSnow/Actor/ActorUnkRMS0.cpp index 8c01d458..7ac817b2 100644 --- a/src/065_FldSnow/Actor/ActorUnkRMS0.cpp +++ b/src/065_FldSnow/Actor/ActorUnkRMS0.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkRMS0.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkRMS0 sActorProfileUnkRMS0; - -ARM ActorProfileUnkRMS0 *ActorProfileUnkRMS0::GetProfile() { - return &sActorProfileUnkRMS0; -} +ARM DECL_PROFILE(ActorProfileUnkRMS0); ARM Actor *ActorProfileUnkRMS0::Create() { return new(HeapIndex_2) ActorUnkRMS0(); diff --git a/src/065_FldSnow/Actor/ActorUnkRMS1.cpp b/src/065_FldSnow/Actor/ActorUnkRMS1.cpp index 36b72191..42e66d08 100644 --- a/src/065_FldSnow/Actor/ActorUnkRMS1.cpp +++ b/src/065_FldSnow/Actor/ActorUnkRMS1.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkRMS1.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkRMS1 sActorProfileUnkRMS1; - -ARM ActorProfileUnkRMS1 *ActorProfileUnkRMS1::GetProfile() { - return &sActorProfileUnkRMS1; -} +ARM DECL_PROFILE(ActorProfileUnkRMS1); ARM Actor *ActorProfileUnkRMS1::Create() { return new(HeapIndex_2) ActorUnkRMS1(); diff --git a/src/065_FldSnow/Actor/ActorUnkRMS2.cpp b/src/065_FldSnow/Actor/ActorUnkRMS2.cpp index 9fc00558..5585c9d2 100644 --- a/src/065_FldSnow/Actor/ActorUnkRMS2.cpp +++ b/src/065_FldSnow/Actor/ActorUnkRMS2.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkRMS2.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkRMS2 sActorProfileUnkRMS2; - -ARM ActorProfileUnkRMS2 *ActorProfileUnkRMS2::GetProfile() { - return &sActorProfileUnkRMS2; -} +ARM DECL_PROFILE(ActorProfileUnkRMS2); ARM Actor *ActorProfileUnkRMS2::Create() { return new(HeapIndex_2) ActorUnkRMS2(); diff --git a/src/065_FldSnow/Actor/ActorUnkRMS3.cpp b/src/065_FldSnow/Actor/ActorUnkRMS3.cpp index 91b5d538..093d3672 100644 --- a/src/065_FldSnow/Actor/ActorUnkRMS3.cpp +++ b/src/065_FldSnow/Actor/ActorUnkRMS3.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkRMS3.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkRMS3 sActorProfileUnkRMS3; - -ARM ActorProfileUnkRMS3 *ActorProfileUnkRMS3::GetProfile() { - return &sActorProfileUnkRMS3; -} +ARM DECL_PROFILE(ActorProfileUnkRMS3); ARM Actor *ActorProfileUnkRMS3::Create() { return new(HeapIndex_2) ActorUnkRMS3(); diff --git a/src/065_FldSnow/Actor/ActorUnkRMS4.cpp b/src/065_FldSnow/Actor/ActorUnkRMS4.cpp index ded2ffe7..5229a424 100644 --- a/src/065_FldSnow/Actor/ActorUnkRMS4.cpp +++ b/src/065_FldSnow/Actor/ActorUnkRMS4.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkRMS4.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkRMS4 sActorProfileUnkRMS4; - -ARM ActorProfileUnkRMS4 *ActorProfileUnkRMS4::GetProfile() { - return &sActorProfileUnkRMS4; -} +ARM DECL_PROFILE(ActorProfileUnkRMS4); ARM Actor *ActorProfileUnkRMS4::Create() { return new(HeapIndex_2) ActorUnkRMS4(); diff --git a/src/065_FldSnow/Actor/ActorUnkRMS5.cpp b/src/065_FldSnow/Actor/ActorUnkRMS5.cpp index 5a1d976a..ff4163d4 100644 --- a/src/065_FldSnow/Actor/ActorUnkRMS5.cpp +++ b/src/065_FldSnow/Actor/ActorUnkRMS5.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkRMS5.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkRMS5 sActorProfileUnkRMS5; - -ARM ActorProfileUnkRMS5 *ActorProfileUnkRMS5::GetProfile() { - return &sActorProfileUnkRMS5; -} +ARM DECL_PROFILE(ActorProfileUnkRMS5); ARM Actor *ActorProfileUnkRMS5::Create() { return new(HeapIndex_2) ActorUnkRMS5(); diff --git a/src/065_FldSnow/Actor/ActorUnkRMTE.cpp b/src/065_FldSnow/Actor/ActorUnkRMTE.cpp index c5588cf6..f7820c32 100644 --- a/src/065_FldSnow/Actor/ActorUnkRMTE.cpp +++ b/src/065_FldSnow/Actor/ActorUnkRMTE.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkRMTE.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkRMTE sActorProfileUnkRMTE; - -ARM ActorProfileUnkRMTE *ActorProfileUnkRMTE::GetProfile() { - return &sActorProfileUnkRMTE; -} +ARM DECL_PROFILE(ActorProfileUnkRMTE); ARM Actor *ActorProfileUnkRMTE::Create() { return new(HeapIndex_2) ActorUnkRMTE(); diff --git a/src/065_FldSnow/Actor/ActorUnkYUKI.cpp b/src/065_FldSnow/Actor/ActorUnkYUKI.cpp index d0506dd5..54d0f656 100644 --- a/src/065_FldSnow/Actor/ActorUnkYUKI.cpp +++ b/src/065_FldSnow/Actor/ActorUnkYUKI.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkYUKI.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkYUKI sActorProfileUnkYUKI; - -ARM ActorProfileUnkYUKI *ActorProfileUnkYUKI::GetProfile() { - return &sActorProfileUnkYUKI; -} +ARM DECL_PROFILE(ActorProfileUnkYUKI); ARM Actor *ActorProfileUnkYUKI::Create() { return new(HeapIndex_2) ActorUnkYUKI(); diff --git a/src/065_FldSnow/Actor/ActorUnkYWIS.cpp b/src/065_FldSnow/Actor/ActorUnkYWIS.cpp index 93c7257d..77667c03 100644 --- a/src/065_FldSnow/Actor/ActorUnkYWIS.cpp +++ b/src/065_FldSnow/Actor/ActorUnkYWIS.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkYWIS.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkYWIS sActorProfileUnkYWIS; - -ARM ActorProfileUnkYWIS *ActorProfileUnkYWIS::GetProfile() { - return &sActorProfileUnkYWIS; -} +ARM DECL_PROFILE(ActorProfileUnkYWIS); ARM Actor *ActorProfileUnkYWIS::Create() { return new(HeapIndex_2) ActorUnkYWIS(); diff --git a/src/065_FldSnow/MapObject/MapObjectUnkHOSO.cpp b/src/065_FldSnow/MapObject/MapObjectUnkHOSO.cpp index b4eadccb..485c3c17 100644 --- a/src/065_FldSnow/MapObject/MapObjectUnkHOSO.cpp +++ b/src/065_FldSnow/MapObject/MapObjectUnkHOSO.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkHOSO.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkHOSO sMapObjectProfileUnkHOSO; - -ARM MapObjectProfileUnkHOSO *MapObjectProfileUnkHOSO::GetProfile() { - return &sMapObjectProfileUnkHOSO; -} +ARM DECL_PROFILE(MapObjectProfileUnkHOSO); ARM MapObject *MapObjectProfileUnkHOSO::Create() { return new(HeapIndex_2) MapObjectUnkHOSO(); diff --git a/src/065_FldSnow/MapObject/MapObjectUnkMTIC.cpp b/src/065_FldSnow/MapObject/MapObjectUnkMTIC.cpp index 8cfeacb5..3d6ca271 100644 --- a/src/065_FldSnow/MapObject/MapObjectUnkMTIC.cpp +++ b/src/065_FldSnow/MapObject/MapObjectUnkMTIC.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkMTIC.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkMTIC sMapObjectProfileUnkMTIC; - -ARM MapObjectProfileUnkMTIC *MapObjectProfileUnkMTIC::GetProfile() { - return &sMapObjectProfileUnkMTIC; -} +ARM DECL_PROFILE(MapObjectProfileUnkMTIC); ARM MapObject *MapObjectProfileUnkMTIC::Create() { return new(HeapIndex_2) MapObjectUnkMTIC(); diff --git a/src/065_FldSnow/MapObject/MapObjectUnkTSGM.cpp b/src/065_FldSnow/MapObject/MapObjectUnkTSGM.cpp index fd853a25..c5c6f836 100644 --- a/src/065_FldSnow/MapObject/MapObjectUnkTSGM.cpp +++ b/src/065_FldSnow/MapObject/MapObjectUnkTSGM.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkTSGM.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkTSGM sMapObjectProfileUnkTSGM; - -ARM MapObjectProfileUnkTSGM *MapObjectProfileUnkTSGM::GetProfile() { - return &sMapObjectProfileUnkTSGM; -} +ARM DECL_PROFILE(MapObjectProfileUnkTSGM); ARM MapObject *MapObjectProfileUnkTSGM::Create() { return new(HeapIndex_2) MapObjectUnkTSGM(); diff --git a/src/066_FldWater/Actor/ActorUnkRMW0.cpp b/src/066_FldWater/Actor/ActorUnkRMW0.cpp index 149dbc22..5d7c61bb 100644 --- a/src/066_FldWater/Actor/ActorUnkRMW0.cpp +++ b/src/066_FldWater/Actor/ActorUnkRMW0.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkRMW0.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkRMW0 sActorProfileUnkRMW0; - -ARM ActorProfileUnkRMW0 *ActorProfileUnkRMW0::GetProfile() { - return &sActorProfileUnkRMW0; -} +ARM DECL_PROFILE(ActorProfileUnkRMW0); ARM Actor *ActorProfileUnkRMW0::Create() { return new(HeapIndex_2) ActorUnkRMW0(); diff --git a/src/066_FldWater/Actor/ActorUnkRMW1.cpp b/src/066_FldWater/Actor/ActorUnkRMW1.cpp index 3bac93fd..707bf77c 100644 --- a/src/066_FldWater/Actor/ActorUnkRMW1.cpp +++ b/src/066_FldWater/Actor/ActorUnkRMW1.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkRMW1.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkRMW1 sActorProfileUnkRMW1; - -ARM ActorProfileUnkRMW1 *ActorProfileUnkRMW1::GetProfile() { - return &sActorProfileUnkRMW1; -} +ARM DECL_PROFILE(ActorProfileUnkRMW1); ARM Actor *ActorProfileUnkRMW1::Create() { return new(HeapIndex_2) ActorUnkRMW1(); diff --git a/src/066_FldWater/Actor/ActorUnkSWHI.cpp b/src/066_FldWater/Actor/ActorUnkSWHI.cpp index 6db377a9..80b85a2e 100644 --- a/src/066_FldWater/Actor/ActorUnkSWHI.cpp +++ b/src/066_FldWater/Actor/ActorUnkSWHI.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkSWHI.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkSWHI sActorProfileUnkSWHI; - -ARM ActorProfileUnkSWHI *ActorProfileUnkSWHI::GetProfile() { - return &sActorProfileUnkSWHI; -} +ARM DECL_PROFILE(ActorProfileUnkSWHI); ARM Actor *ActorProfileUnkSWHI::Create() { return new(HeapIndex_2) ActorUnkSWHI(); diff --git a/src/066_FldWater/Actor/ActorUnkVCCH.cpp b/src/066_FldWater/Actor/ActorUnkVCCH.cpp index 4849e97f..75172e38 100644 --- a/src/066_FldWater/Actor/ActorUnkVCCH.cpp +++ b/src/066_FldWater/Actor/ActorUnkVCCH.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkVCCH.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkVCCH sActorProfileUnkVCCH; - -ARM ActorProfileUnkVCCH *ActorProfileUnkVCCH::GetProfile() { - return &sActorProfileUnkVCCH; -} +ARM DECL_PROFILE(ActorProfileUnkVCCH); ARM Actor *ActorProfileUnkVCCH::Create() { return new(HeapIndex_2) ActorUnkVCCH(); diff --git a/src/066_FldWater/Actor/ActorUnkVCFT.cpp b/src/066_FldWater/Actor/ActorUnkVCFT.cpp index d31c5905..48952616 100644 --- a/src/066_FldWater/Actor/ActorUnkVCFT.cpp +++ b/src/066_FldWater/Actor/ActorUnkVCFT.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkVCFT.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkVCFT sActorProfileUnkVCFT; - -ARM ActorProfileUnkVCFT *ActorProfileUnkVCFT::GetProfile() { - return &sActorProfileUnkVCFT; -} +ARM DECL_PROFILE(ActorProfileUnkVCFT); ARM Actor *ActorProfileUnkVCFT::Create() { return new(HeapIndex_2) ActorUnkVCFT(); diff --git a/src/066_FldWater/Actor/ActorUnkWAWA_WAWC.cpp b/src/066_FldWater/Actor/ActorUnkWAWA_WAWC.cpp index 3e8f0002..a0b200eb 100644 --- a/src/066_FldWater/Actor/ActorUnkWAWA_WAWC.cpp +++ b/src/066_FldWater/Actor/ActorUnkWAWA_WAWC.cpp @@ -5,11 +5,7 @@ // --- Actor WAWA --- -static ActorProfileUnkWAWA sActorProfileUnkWAWA; - -ARM ActorProfileUnkWAWA *ActorProfileUnkWAWA::GetProfile() { - return &sActorProfileUnkWAWA; -} +ARM DECL_PROFILE(ActorProfileUnkWAWA); ARM Actor *ActorProfileUnkWAWA::Create() { return new(HeapIndex_2) ActorUnkWAWA(); @@ -22,11 +18,7 @@ ARM ActorUnkWAWA::ActorUnkWAWA() {} // --- Actor WAWC --- -static ActorProfileUnkWAWC sActorProfileUnkWAWC; - -ARM ActorProfileUnkWAWC *ActorProfileUnkWAWC::GetProfile() { - return &sActorProfileUnkWAWC; -} +ARM DECL_PROFILE(ActorProfileUnkWAWC); ARM Actor *ActorProfileUnkWAWC::Create() { return new(HeapIndex_2) ActorUnkWAWC(); diff --git a/src/066_FldWater/Actor/ActorUnkWAWB_WAWS.cpp b/src/066_FldWater/Actor/ActorUnkWAWB_WAWS.cpp index 7f48f90f..67127b1e 100644 --- a/src/066_FldWater/Actor/ActorUnkWAWB_WAWS.cpp +++ b/src/066_FldWater/Actor/ActorUnkWAWB_WAWS.cpp @@ -5,11 +5,7 @@ // --- Actor WAWB --- -static ActorProfileUnkWAWB sActorProfileUnkWAWB; - -ARM ActorProfileUnkWAWB *ActorProfileUnkWAWB::GetProfile() { - return &sActorProfileUnkWAWB; -} +ARM DECL_PROFILE(ActorProfileUnkWAWB); ARM Actor *ActorProfileUnkWAWB::Create() { return new(HeapIndex_2) ActorUnkWAWB(); @@ -22,11 +18,7 @@ ARM ActorUnkWAWB::ActorUnkWAWB() {} // --- Actor WAWS --- -static ActorProfileUnkWAWS sActorProfileUnkWAWS; - -ARM ActorProfileUnkWAWS *ActorProfileUnkWAWS::GetProfile() { - return &sActorProfileUnkWAWS; -} +ARM DECL_PROFILE(ActorProfileUnkWAWS); ARM Actor *ActorProfileUnkWAWS::Create() { return new(HeapIndex_2) ActorUnkWAWS(); diff --git a/src/066_FldWater/MapObject/MapObjectUnkFSWT.cpp b/src/066_FldWater/MapObject/MapObjectUnkFSWT.cpp index 1e2b53f2..139009ea 100644 --- a/src/066_FldWater/MapObject/MapObjectUnkFSWT.cpp +++ b/src/066_FldWater/MapObject/MapObjectUnkFSWT.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkFSWT.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkFSWT sMapObjectProfileUnkFSWT; - -ARM MapObjectProfileUnkFSWT *MapObjectProfileUnkFSWT::GetProfile() { - return &sMapObjectProfileUnkFSWT; -} +ARM DECL_PROFILE(MapObjectProfileUnkFSWT); ARM MapObject *MapObjectProfileUnkFSWT::Create() { return new(HeapIndex_2) MapObjectUnkFSWT(); diff --git a/src/066_FldWater/MapObject/MapObjectUnkHOW0.cpp b/src/066_FldWater/MapObject/MapObjectUnkHOW0.cpp index 6311544e..ab262109 100644 --- a/src/066_FldWater/MapObject/MapObjectUnkHOW0.cpp +++ b/src/066_FldWater/MapObject/MapObjectUnkHOW0.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkHOW0.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkHOW0 sMapObjectProfileUnkHOW0; - -ARM MapObjectProfileUnkHOW0 *MapObjectProfileUnkHOW0::GetProfile() { - return &sMapObjectProfileUnkHOW0; -} +ARM DECL_PROFILE(MapObjectProfileUnkHOW0); ARM MapObject *MapObjectProfileUnkHOW0::Create() { return new(HeapIndex_2) MapObjectUnkHOW0(); diff --git a/src/066_FldWater/MapObject/MapObjectUnkHOW1.cpp b/src/066_FldWater/MapObject/MapObjectUnkHOW1.cpp index 2ddf076e..f2b86a29 100644 --- a/src/066_FldWater/MapObject/MapObjectUnkHOW1.cpp +++ b/src/066_FldWater/MapObject/MapObjectUnkHOW1.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkHOW1.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkHOW1 sMapObjectProfileUnkHOW1; - -ARM MapObjectProfileUnkHOW1 *MapObjectProfileUnkHOW1::GetProfile() { - return &sMapObjectProfileUnkHOW1; -} +ARM DECL_PROFILE(MapObjectProfileUnkHOW1); ARM MapObject *MapObjectProfileUnkHOW1::Create() { return new(HeapIndex_2) MapObjectUnkHOW1(); diff --git a/src/066_FldWater/MapObject/MapObjectUnkMTFS.cpp b/src/066_FldWater/MapObject/MapObjectUnkMTFS.cpp index 917bf48e..0655330f 100644 --- a/src/066_FldWater/MapObject/MapObjectUnkMTFS.cpp +++ b/src/066_FldWater/MapObject/MapObjectUnkMTFS.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkMTFS.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkMTFS sMapObjectProfileUnkMTFS; - -ARM MapObjectProfileUnkMTFS *MapObjectProfileUnkMTFS::GetProfile() { - return &sMapObjectProfileUnkMTFS; -} +ARM DECL_PROFILE(MapObjectProfileUnkMTFS); ARM MapObject *MapObjectProfileUnkMTFS::Create() { return new(HeapIndex_2) MapObjectUnkMTFS(); diff --git a/src/067_FldFlame/Actor/ActorUnkDMFT.cpp b/src/067_FldFlame/Actor/ActorUnkDMFT.cpp index d9abf96a..164da2e4 100644 --- a/src/067_FldFlame/Actor/ActorUnkDMFT.cpp +++ b/src/067_FldFlame/Actor/ActorUnkDMFT.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkDMFT.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkDMFT sActorProfileUnkDMFT; - -ARM ActorProfileUnkDMFT *ActorProfileUnkDMFT::GetProfile() { - return &sActorProfileUnkDMFT; -} +ARM DECL_PROFILE(ActorProfileUnkDMFT); ARM Actor *ActorProfileUnkDMFT::Create() { return new(HeapIndex_2) ActorUnkDMFT(); diff --git a/src/067_FldFlame/Actor/ActorUnkDMGN.cpp b/src/067_FldFlame/Actor/ActorUnkDMGN.cpp index 24ff28cb..4f71e88b 100644 --- a/src/067_FldFlame/Actor/ActorUnkDMGN.cpp +++ b/src/067_FldFlame/Actor/ActorUnkDMGN.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkDMGN.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkDMGN sActorProfileUnkDMGN; - -ARM ActorProfileUnkDMGN *ActorProfileUnkDMGN::GetProfile() { - return &sActorProfileUnkDMGN; -} +ARM DECL_PROFILE(ActorProfileUnkDMGN); ARM Actor *ActorProfileUnkDMGN::Create() { return new(HeapIndex_2) ActorUnkDMGN(); diff --git a/src/067_FldFlame/Actor/ActorUnkGOCA_GOCB_GORK_GORM.cpp b/src/067_FldFlame/Actor/ActorUnkGOCA_GOCB_GORK_GORM.cpp index 98661bae..3f167067 100644 --- a/src/067_FldFlame/Actor/ActorUnkGOCA_GOCB_GORK_GORM.cpp +++ b/src/067_FldFlame/Actor/ActorUnkGOCA_GOCB_GORK_GORM.cpp @@ -5,11 +5,7 @@ // --- Actor GOCA --- -static ActorProfileUnkGOCA sActorProfileUnkGOCA; - -ARM ActorProfileUnkGOCA *ActorProfileUnkGOCA::GetProfile() { - return &sActorProfileUnkGOCA; -} +ARM DECL_PROFILE(ActorProfileUnkGOCA); ARM Actor *ActorProfileUnkGOCA::Create() { return new(HeapIndex_2) ActorUnkGOCA(); @@ -22,11 +18,7 @@ ARM ActorUnkGOCA::ActorUnkGOCA() {} // --- Actor GOCB --- -static ActorProfileUnkGOCB sActorProfileUnkGOCB; - -ARM ActorProfileUnkGOCB *ActorProfileUnkGOCB::GetProfile() { - return &sActorProfileUnkGOCB; -} +ARM DECL_PROFILE(ActorProfileUnkGOCB); ARM Actor *ActorProfileUnkGOCB::Create() { return new(HeapIndex_2) ActorUnkGOCB(); @@ -39,11 +31,7 @@ ARM ActorUnkGOCB::ActorUnkGOCB() {} // --- Actor GORK --- -static ActorProfileUnkGORK sActorProfileUnkGORK; - -ARM ActorProfileUnkGORK *ActorProfileUnkGORK::GetProfile() { - return &sActorProfileUnkGORK; -} +ARM DECL_PROFILE(ActorProfileUnkGORK); ARM Actor *ActorProfileUnkGORK::Create() { return new(HeapIndex_2) ActorUnkGORK(); @@ -56,11 +44,7 @@ ARM ActorUnkGORK::ActorUnkGORK() {} // --- Actor GORM --- -static ActorProfileUnkGORM sActorProfileUnkGORM; - -ARM ActorProfileUnkGORM *ActorProfileUnkGORM::GetProfile() { - return &sActorProfileUnkGORM; -} +ARM DECL_PROFILE(ActorProfileUnkGORM); ARM Actor *ActorProfileUnkGORM::Create() { return new(HeapIndex_2) ActorUnkGORM(); diff --git a/src/067_FldFlame/Actor/ActorUnkGORS.cpp b/src/067_FldFlame/Actor/ActorUnkGORS.cpp index a63f5ebc..0e25ff23 100644 --- a/src/067_FldFlame/Actor/ActorUnkGORS.cpp +++ b/src/067_FldFlame/Actor/ActorUnkGORS.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkGORS.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkGORS sActorProfileUnkGORS; - -ARM ActorProfileUnkGORS *ActorProfileUnkGORS::GetProfile() { - return &sActorProfileUnkGORS; -} +ARM DECL_PROFILE(ActorProfileUnkGORS); ARM Actor *ActorProfileUnkGORS::Create() { return new(HeapIndex_2) ActorUnkGORS(); diff --git a/src/067_FldFlame/Actor/ActorUnkRMV0.cpp b/src/067_FldFlame/Actor/ActorUnkRMV0.cpp index 165b2a65..eaab4781 100644 --- a/src/067_FldFlame/Actor/ActorUnkRMV0.cpp +++ b/src/067_FldFlame/Actor/ActorUnkRMV0.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkRMV0.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkRMV0 sActorProfileUnkRMV0; - -ARM ActorProfileUnkRMV0 *ActorProfileUnkRMV0::GetProfile() { - return &sActorProfileUnkRMV0; -} +ARM DECL_PROFILE(ActorProfileUnkRMV0); ARM Actor *ActorProfileUnkRMV0::Create() { return new(HeapIndex_2) ActorUnkRMV0(); diff --git a/src/067_FldFlame/Actor/ActorUnkRMV1.cpp b/src/067_FldFlame/Actor/ActorUnkRMV1.cpp index 6d791bda..5faaa421 100644 --- a/src/067_FldFlame/Actor/ActorUnkRMV1.cpp +++ b/src/067_FldFlame/Actor/ActorUnkRMV1.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkRMV1.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkRMV1 sActorProfileUnkRMV1; - -ARM ActorProfileUnkRMV1 *ActorProfileUnkRMV1::GetProfile() { - return &sActorProfileUnkRMV1; -} +ARM DECL_PROFILE(ActorProfileUnkRMV1); ARM Actor *ActorProfileUnkRMV1::Create() { return new(HeapIndex_2) ActorUnkRMV1(); diff --git a/src/067_FldFlame/MapObject/MapObjectUnkBRGL.cpp b/src/067_FldFlame/MapObject/MapObjectUnkBRGL.cpp index 3c05510a..840bd527 100644 --- a/src/067_FldFlame/MapObject/MapObjectUnkBRGL.cpp +++ b/src/067_FldFlame/MapObject/MapObjectUnkBRGL.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkBRGL.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkBRGL sMapObjectProfileUnkBRGL; - -ARM MapObjectProfileUnkBRGL *MapObjectProfileUnkBRGL::GetProfile() { - return &sMapObjectProfileUnkBRGL; -} +ARM DECL_PROFILE(MapObjectProfileUnkBRGL); ARM MapObject *MapObjectProfileUnkBRGL::Create() { return new(HeapIndex_2) MapObjectUnkBRGL(); diff --git a/src/067_FldFlame/MapObject/MapObjectUnkDRGN.cpp b/src/067_FldFlame/MapObject/MapObjectUnkDRGN.cpp index 6196829d..80cca65a 100644 --- a/src/067_FldFlame/MapObject/MapObjectUnkDRGN.cpp +++ b/src/067_FldFlame/MapObject/MapObjectUnkDRGN.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkDRGN.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkDRGN sMapObjectProfileUnkDRGN; - -ARM MapObjectProfileUnkDRGN *MapObjectProfileUnkDRGN::GetProfile() { - return &sMapObjectProfileUnkDRGN; -} +ARM DECL_PROFILE(MapObjectProfileUnkDRGN); ARM MapObject *MapObjectProfileUnkDRGN::Create() { return new(HeapIndex_2) MapObjectUnkDRGN(); diff --git a/src/067_FldFlame/MapObject/MapObjectUnkDRVT.cpp b/src/067_FldFlame/MapObject/MapObjectUnkDRVT.cpp index 8c389a26..ac578fd9 100644 --- a/src/067_FldFlame/MapObject/MapObjectUnkDRVT.cpp +++ b/src/067_FldFlame/MapObject/MapObjectUnkDRVT.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkDRVT.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkDRVT sMapObjectProfileUnkDRVT; - -ARM MapObjectProfileUnkDRVT *MapObjectProfileUnkDRVT::GetProfile() { - return &sMapObjectProfileUnkDRVT; -} +ARM DECL_PROFILE(MapObjectProfileUnkDRVT); ARM MapObject *MapObjectProfileUnkDRVT::Create() { return new(HeapIndex_2) MapObjectUnkDRVT(); diff --git a/src/067_FldFlame/MapObject/MapObjectUnkLVVT.cpp b/src/067_FldFlame/MapObject/MapObjectUnkLVVT.cpp index ca9cb718..1eddb7e6 100644 --- a/src/067_FldFlame/MapObject/MapObjectUnkLVVT.cpp +++ b/src/067_FldFlame/MapObject/MapObjectUnkLVVT.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkLVVT.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkLVVT sMapObjectProfileUnkLVVT; - -ARM MapObjectProfileUnkLVVT *MapObjectProfileUnkLVVT::GetProfile() { - return &sMapObjectProfileUnkLVVT; -} +ARM DECL_PROFILE(MapObjectProfileUnkLVVT); ARM MapObject *MapObjectProfileUnkLVVT::Create() { return new(HeapIndex_2) MapObjectUnkLVVT(); diff --git a/src/067_FldFlame/MapObject/MapObjectUnkMTIR.cpp b/src/067_FldFlame/MapObject/MapObjectUnkMTIR.cpp index ab2bf310..eac4a888 100644 --- a/src/067_FldFlame/MapObject/MapObjectUnkMTIR.cpp +++ b/src/067_FldFlame/MapObject/MapObjectUnkMTIR.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkMTIR.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkMTIR sMapObjectProfileUnkMTIR; - -ARM MapObjectProfileUnkMTIR *MapObjectProfileUnkMTIR::GetProfile() { - return &sMapObjectProfileUnkMTIR; -} +ARM DECL_PROFILE(MapObjectProfileUnkMTIR); ARM MapObject *MapObjectProfileUnkMTIR::Create() { return new(HeapIndex_2) MapObjectUnkMTIR(); diff --git a/src/067_FldFlame/MapObject/MapObjectUnkMTOR.cpp b/src/067_FldFlame/MapObject/MapObjectUnkMTOR.cpp index 91f23853..2b03d579 100644 --- a/src/067_FldFlame/MapObject/MapObjectUnkMTOR.cpp +++ b/src/067_FldFlame/MapObject/MapObjectUnkMTOR.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkMTOR.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkMTOR sMapObjectProfileUnkMTOR; - -ARM MapObjectProfileUnkMTOR *MapObjectProfileUnkMTOR::GetProfile() { - return &sMapObjectProfileUnkMTOR; -} +ARM DECL_PROFILE(MapObjectProfileUnkMTOR); ARM MapObject *MapObjectProfileUnkMTOR::Create() { return new(HeapIndex_2) MapObjectUnkMTOR(); diff --git a/src/068_FldAjito/Actor/ActorUnkAJAI.cpp b/src/068_FldAjito/Actor/ActorUnkAJAI.cpp index df770c65..b302ccf5 100644 --- a/src/068_FldAjito/Actor/ActorUnkAJAI.cpp +++ b/src/068_FldAjito/Actor/ActorUnkAJAI.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkAJAI.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkAJAI sActorProfileUnkAJAI; - -ARM ActorProfileUnkAJAI *ActorProfileUnkAJAI::GetProfile() { - return &sActorProfileUnkAJAI; -} +ARM DECL_PROFILE(ActorProfileUnkAJAI); ARM Actor *ActorProfileUnkAJAI::Create() { return new(HeapIndex_2) ActorUnkAJAI(); diff --git a/src/068_FldAjito/Actor/ActorUnkAJBS.cpp b/src/068_FldAjito/Actor/ActorUnkAJBS.cpp index 296b55b0..b184e29b 100644 --- a/src/068_FldAjito/Actor/ActorUnkAJBS.cpp +++ b/src/068_FldAjito/Actor/ActorUnkAJBS.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkAJBS.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkAJBS sActorProfileUnkAJBS; - -ARM ActorProfileUnkAJBS *ActorProfileUnkAJBS::GetProfile() { - return &sActorProfileUnkAJBS; -} +ARM DECL_PROFILE(ActorProfileUnkAJBS); ARM Actor *ActorProfileUnkAJBS::Create() { return new(HeapIndex_2) ActorUnkAJBS(); diff --git a/src/068_FldAjito/Actor/ActorUnkAJCR.cpp b/src/068_FldAjito/Actor/ActorUnkAJCR.cpp index 5a70db27..2e7365fa 100644 --- a/src/068_FldAjito/Actor/ActorUnkAJCR.cpp +++ b/src/068_FldAjito/Actor/ActorUnkAJCR.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkAJCR.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkAJCR sActorProfileUnkAJCR; - -ARM ActorProfileUnkAJCR *ActorProfileUnkAJCR::GetProfile() { - return &sActorProfileUnkAJCR; -} +ARM DECL_PROFILE(ActorProfileUnkAJCR); ARM Actor *ActorProfileUnkAJCR::Create() { return new(HeapIndex_2) ActorUnkAJCR(); diff --git a/src/068_FldAjito/Actor/ActorUnkAJEM.cpp b/src/068_FldAjito/Actor/ActorUnkAJEM.cpp index ceda6e1c..bd77d49d 100644 --- a/src/068_FldAjito/Actor/ActorUnkAJEM.cpp +++ b/src/068_FldAjito/Actor/ActorUnkAJEM.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkAJEM.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkAJEM sActorProfileUnkAJEM; - -ARM ActorProfileUnkAJEM *ActorProfileUnkAJEM::GetProfile() { - return &sActorProfileUnkAJEM; -} +ARM DECL_PROFILE(ActorProfileUnkAJEM); ARM Actor *ActorProfileUnkAJEM::Create() { return new(HeapIndex_2) ActorUnkAJEM(); diff --git a/src/068_FldAjito/Actor/ActorUnkAJET.cpp b/src/068_FldAjito/Actor/ActorUnkAJET.cpp index 6a04ee19..8bc0288c 100644 --- a/src/068_FldAjito/Actor/ActorUnkAJET.cpp +++ b/src/068_FldAjito/Actor/ActorUnkAJET.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkAJET.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkAJET sActorProfileUnkAJET; - -ARM ActorProfileUnkAJET *ActorProfileUnkAJET::GetProfile() { - return &sActorProfileUnkAJET; -} +ARM DECL_PROFILE(ActorProfileUnkAJET); ARM Actor *ActorProfileUnkAJET::Create() { return new(HeapIndex_2) ActorUnkAJET(); diff --git a/src/068_FldAjito/Actor/ActorUnkAJMN.cpp b/src/068_FldAjito/Actor/ActorUnkAJMN.cpp index 9a5722e4..f9778644 100644 --- a/src/068_FldAjito/Actor/ActorUnkAJMN.cpp +++ b/src/068_FldAjito/Actor/ActorUnkAJMN.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkAJMN.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkAJMN sActorProfileUnkAJMN; - -ARM ActorProfileUnkAJMN *ActorProfileUnkAJMN::GetProfile() { - return &sActorProfileUnkAJMN; -} +ARM DECL_PROFILE(ActorProfileUnkAJMN); ARM Actor *ActorProfileUnkAJMN::Create() { return new(HeapIndex_2) ActorUnkAJMN(); diff --git a/src/068_FldAjito/Actor/ActorUnkAJNP.cpp b/src/068_FldAjito/Actor/ActorUnkAJNP.cpp index 3ea2d457..1ad6eb3e 100644 --- a/src/068_FldAjito/Actor/ActorUnkAJNP.cpp +++ b/src/068_FldAjito/Actor/ActorUnkAJNP.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkAJNP.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkAJNP sActorProfileUnkAJNP; - -THUMB ActorProfileUnkAJNP *ActorProfileUnkAJNP::GetProfile() { - return &sActorProfileUnkAJNP; -} +THUMB DECL_PROFILE(ActorProfileUnkAJNP); THUMB Actor *ActorProfileUnkAJNP::Create() { return new(HeapIndex_2) ActorUnkAJNP(); diff --git a/src/068_FldAjito/Actor/ActorUnkAJSP.cpp b/src/068_FldAjito/Actor/ActorUnkAJSP.cpp index ebf3fe4b..735d2e8a 100644 --- a/src/068_FldAjito/Actor/ActorUnkAJSP.cpp +++ b/src/068_FldAjito/Actor/ActorUnkAJSP.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkAJSP.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkAJSP sActorProfileUnkAJSP; - -ARM ActorProfileUnkAJSP *ActorProfileUnkAJSP::GetProfile() { - return &sActorProfileUnkAJSP; -} +ARM DECL_PROFILE(ActorProfileUnkAJSP); ARM Actor *ActorProfileUnkAJSP::Create() { return new(HeapIndex_2) ActorUnkAJSP(); diff --git a/src/068_FldAjito/Actor/ActorUnkAJTM.cpp b/src/068_FldAjito/Actor/ActorUnkAJTM.cpp index b1e2e843..4eb189c8 100644 --- a/src/068_FldAjito/Actor/ActorUnkAJTM.cpp +++ b/src/068_FldAjito/Actor/ActorUnkAJTM.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkAJTM.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkAJTM sActorProfileUnkAJTM; - -ARM ActorProfileUnkAJTM *ActorProfileUnkAJTM::GetProfile() { - return &sActorProfileUnkAJTM; -} +ARM DECL_PROFILE(ActorProfileUnkAJTM); ARM Actor *ActorProfileUnkAJTM::Create() { return new(HeapIndex_2) ActorUnkAJTM(); diff --git a/src/068_FldAjito/Actor/ActorUnkMGAJ.cpp b/src/068_FldAjito/Actor/ActorUnkMGAJ.cpp index 4f12fff9..831f9409 100644 --- a/src/068_FldAjito/Actor/ActorUnkMGAJ.cpp +++ b/src/068_FldAjito/Actor/ActorUnkMGAJ.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkMGAJ.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkMGAJ sActorProfileUnkMGAJ; - -ARM ActorProfileUnkMGAJ *ActorProfileUnkMGAJ::GetProfile() { - return &sActorProfileUnkMGAJ; -} +ARM DECL_PROFILE(ActorProfileUnkMGAJ); ARM Actor *ActorProfileUnkMGAJ::Create() { return new(HeapIndex_2) ActorUnkMGAJ(); diff --git a/src/068_FldAjito/Actor/ActorUnkRMA0.cpp b/src/068_FldAjito/Actor/ActorUnkRMA0.cpp index 4e36d02d..1ea49ff7 100644 --- a/src/068_FldAjito/Actor/ActorUnkRMA0.cpp +++ b/src/068_FldAjito/Actor/ActorUnkRMA0.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkRMA0.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkRMA0 sActorProfileUnkRMA0; - -ARM ActorProfileUnkRMA0 *ActorProfileUnkRMA0::GetProfile() { - return &sActorProfileUnkRMA0; -} +ARM DECL_PROFILE(ActorProfileUnkRMA0); ARM Actor *ActorProfileUnkRMA0::Create() { return new(HeapIndex_2) ActorUnkRMA0(); diff --git a/src/068_FldAjito/Actor/ActorUnkRMA1.cpp b/src/068_FldAjito/Actor/ActorUnkRMA1.cpp index f8db7c82..fe7d0483 100644 --- a/src/068_FldAjito/Actor/ActorUnkRMA1.cpp +++ b/src/068_FldAjito/Actor/ActorUnkRMA1.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkRMA1.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkRMA1 sActorProfileUnkRMA1; - -ARM ActorProfileUnkRMA1 *ActorProfileUnkRMA1::GetProfile() { - return &sActorProfileUnkRMA1; -} +ARM DECL_PROFILE(ActorProfileUnkRMA1); ARM Actor *ActorProfileUnkRMA1::Create() { return new(HeapIndex_2) ActorUnkRMA1(); diff --git a/src/068_FldAjito/Actor/ActorUnkRMA2.cpp b/src/068_FldAjito/Actor/ActorUnkRMA2.cpp index 1a21c57a..e1297f04 100644 --- a/src/068_FldAjito/Actor/ActorUnkRMA2.cpp +++ b/src/068_FldAjito/Actor/ActorUnkRMA2.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkRMA2.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkRMA2 sActorProfileUnkRMA2; - -ARM ActorProfileUnkRMA2 *ActorProfileUnkRMA2::GetProfile() { - return &sActorProfileUnkRMA2; -} +ARM DECL_PROFILE(ActorProfileUnkRMA2); ARM Actor *ActorProfileUnkRMA2::Create() { return new(HeapIndex_2) ActorUnkRMA2(); diff --git a/src/068_FldAjito/Actor/ActorUnkRMA3.cpp b/src/068_FldAjito/Actor/ActorUnkRMA3.cpp index fd5c6f33..84450106 100644 --- a/src/068_FldAjito/Actor/ActorUnkRMA3.cpp +++ b/src/068_FldAjito/Actor/ActorUnkRMA3.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkRMA3.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkRMA3 sActorProfileUnkRMA3; - -ARM ActorProfileUnkRMA3 *ActorProfileUnkRMA3::GetProfile() { - return &sActorProfileUnkRMA3; -} +ARM DECL_PROFILE(ActorProfileUnkRMA3); ARM Actor *ActorProfileUnkRMA3::Create() { return new(HeapIndex_2) ActorUnkRMA3(); diff --git a/src/068_FldAjito/Actor/ActorUnkRMAJ.cpp b/src/068_FldAjito/Actor/ActorUnkRMAJ.cpp index e96453d8..237fae5a 100644 --- a/src/068_FldAjito/Actor/ActorUnkRMAJ.cpp +++ b/src/068_FldAjito/Actor/ActorUnkRMAJ.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkRMAJ.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkRMAJ sActorProfileUnkRMAJ; - -ARM ActorProfileUnkRMAJ *ActorProfileUnkRMAJ::GetProfile() { - return &sActorProfileUnkRMAJ; -} +ARM DECL_PROFILE(ActorProfileUnkRMAJ); ARM Actor *ActorProfileUnkRMAJ::Create() { return new(HeapIndex_2) ActorUnkRMAJ(); diff --git a/src/068_FldAjito/Actor/ActorUnkTSCN.cpp b/src/068_FldAjito/Actor/ActorUnkTSCN.cpp index f0414a78..818897ba 100644 --- a/src/068_FldAjito/Actor/ActorUnkTSCN.cpp +++ b/src/068_FldAjito/Actor/ActorUnkTSCN.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkTSCN.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkTSCN sActorProfileUnkTSCN; - -ARM ActorProfileUnkTSCN *ActorProfileUnkTSCN::GetProfile() { - return &sActorProfileUnkTSCN; -} +ARM DECL_PROFILE(ActorProfileUnkTSCN); ARM Actor *ActorProfileUnkTSCN::Create() { return new(HeapIndex_2) ActorUnkTSCN(); diff --git a/src/068_FldAjito/MapObject/MapObjectUnkDRVC.cpp b/src/068_FldAjito/MapObject/MapObjectUnkDRVC.cpp index ac5ce71f..7a856a1b 100644 --- a/src/068_FldAjito/MapObject/MapObjectUnkDRVC.cpp +++ b/src/068_FldAjito/MapObject/MapObjectUnkDRVC.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkDRVC.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkDRVC sMapObjectProfileUnkDRVC; - -ARM MapObjectProfileUnkDRVC *MapObjectProfileUnkDRVC::GetProfile() { - return &sMapObjectProfileUnkDRVC; -} +ARM DECL_PROFILE(MapObjectProfileUnkDRVC); ARM MapObject *MapObjectProfileUnkDRVC::Create() { return new(HeapIndex_2) MapObjectUnkDRVC(); diff --git a/src/068_FldAjito/MapObject/MapObjectUnkRKAG.cpp b/src/068_FldAjito/MapObject/MapObjectUnkRKAG.cpp index 69c0ae09..ab78716c 100644 --- a/src/068_FldAjito/MapObject/MapObjectUnkRKAG.cpp +++ b/src/068_FldAjito/MapObject/MapObjectUnkRKAG.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkRKAG.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkRKAG sMapObjectProfileUnkRKAG; - -ARM MapObjectProfileUnkRKAG *MapObjectProfileUnkRKAG::GetProfile() { - return &sMapObjectProfileUnkRKAG; -} +ARM DECL_PROFILE(MapObjectProfileUnkRKAG); ARM MapObject *MapObjectProfileUnkRKAG::Create() { return new(HeapIndex_2) MapObjectUnkRKAG(); diff --git a/src/069_FldRabbit/Actor/ActorUnkBANI.cpp b/src/069_FldRabbit/Actor/ActorUnkBANI.cpp index 38834710..82a20641 100644 --- a/src/069_FldRabbit/Actor/ActorUnkBANI.cpp +++ b/src/069_FldRabbit/Actor/ActorUnkBANI.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkBANI.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkBANI sActorProfileUnkBANI; - -ARM ActorProfileUnkBANI *ActorProfileUnkBANI::GetProfile() { - return &sActorProfileUnkBANI; -} +ARM DECL_PROFILE(ActorProfileUnkBANI); ARM Actor *ActorProfileUnkBANI::Create() { return new(HeapIndex_2) ActorUnkBANI(); diff --git a/src/069_FldRabbit/Actor/ActorUnkRB1F.cpp b/src/069_FldRabbit/Actor/ActorUnkRB1F.cpp index 00a88e1e..389635bd 100644 --- a/src/069_FldRabbit/Actor/ActorUnkRB1F.cpp +++ b/src/069_FldRabbit/Actor/ActorUnkRB1F.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkRB1F.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkRB1F sActorProfileUnkRB1F; - -ARM ActorProfileUnkRB1F *ActorProfileUnkRB1F::GetProfile() { - return &sActorProfileUnkRB1F; -} +ARM DECL_PROFILE(ActorProfileUnkRB1F); ARM Actor *ActorProfileUnkRB1F::Create() { return new(HeapIndex_2) ActorUnkRB1F(); diff --git a/src/069_FldRabbit/Actor/ActorUnkRBRP.cpp b/src/069_FldRabbit/Actor/ActorUnkRBRP.cpp index 9fc3aa26..cce86c7d 100644 --- a/src/069_FldRabbit/Actor/ActorUnkRBRP.cpp +++ b/src/069_FldRabbit/Actor/ActorUnkRBRP.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkRBRP.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkRBRP sActorProfileUnkRBRP; - -ARM ActorProfileUnkRBRP *ActorProfileUnkRBRP::GetProfile() { - return &sActorProfileUnkRBRP; -} +ARM DECL_PROFILE(ActorProfileUnkRBRP); ARM Actor *ActorProfileUnkRBRP::Create() { return new(HeapIndex_2) ActorUnkRBRP(); diff --git a/src/069_FldRabbit/MapObject/MapObjectUnkGTRB.cpp b/src/069_FldRabbit/MapObject/MapObjectUnkGTRB.cpp index 9fe5ba07..f54cfed1 100644 --- a/src/069_FldRabbit/MapObject/MapObjectUnkGTRB.cpp +++ b/src/069_FldRabbit/MapObject/MapObjectUnkGTRB.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkGTRB.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkGTRB sMapObjectProfileUnkGTRB; - -ARM MapObjectProfileUnkGTRB *MapObjectProfileUnkGTRB::GetProfile() { - return &sMapObjectProfileUnkGTRB; -} +ARM DECL_PROFILE(MapObjectProfileUnkGTRB); ARM MapObject *MapObjectProfileUnkGTRB::Create() { return new(HeapIndex_2) MapObjectUnkGTRB(); diff --git a/src/070_Dungeon/Actor/ActorUnkALEV.cpp b/src/070_Dungeon/Actor/ActorUnkALEV.cpp index fea867ad..fbda2d34 100644 --- a/src/070_Dungeon/Actor/ActorUnkALEV.cpp +++ b/src/070_Dungeon/Actor/ActorUnkALEV.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkALEV.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkALEV sActorProfileUnkALEV; - -ARM ActorProfileUnkALEV *ActorProfileUnkALEV::GetProfile() { - return &sActorProfileUnkALEV; -} +ARM DECL_PROFILE(ActorProfileUnkALEV); ARM Actor *ActorProfileUnkALEV::Create() { return new(HeapIndex_2) ActorUnkALEV(); diff --git a/src/070_Dungeon/Actor/ActorUnkBMHN.cpp b/src/070_Dungeon/Actor/ActorUnkBMHN.cpp index db834b79..284e5658 100644 --- a/src/070_Dungeon/Actor/ActorUnkBMHN.cpp +++ b/src/070_Dungeon/Actor/ActorUnkBMHN.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkBMHN.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkBMHN sActorProfileUnkBMHN; - -ARM ActorProfileUnkBMHN *ActorProfileUnkBMHN::GetProfile() { - return &sActorProfileUnkBMHN; -} +ARM DECL_PROFILE(ActorProfileUnkBMHN); ARM Actor *ActorProfileUnkBMHN::Create() { return new(HeapIndex_2) ActorUnkBMHN(); diff --git a/src/070_Dungeon/Actor/ActorUnkBROW.cpp b/src/070_Dungeon/Actor/ActorUnkBROW.cpp index 34bb075b..8aae10a7 100644 --- a/src/070_Dungeon/Actor/ActorUnkBROW.cpp +++ b/src/070_Dungeon/Actor/ActorUnkBROW.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkBROW.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkBROW sActorProfileUnkBROW; - -ARM ActorProfileUnkBROW *ActorProfileUnkBROW::GetProfile() { - return &sActorProfileUnkBROW; -} +ARM DECL_PROFILE(ActorProfileUnkBROW); ARM Actor *ActorProfileUnkBROW::Create() { return new(HeapIndex_2) ActorUnkBROW(); diff --git a/src/070_Dungeon/Actor/ActorUnkENGE.cpp b/src/070_Dungeon/Actor/ActorUnkENGE.cpp index ceb39e9c..538f3173 100644 --- a/src/070_Dungeon/Actor/ActorUnkENGE.cpp +++ b/src/070_Dungeon/Actor/ActorUnkENGE.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkENGE.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkENGE sActorProfileUnkENGE; - -ARM ActorProfileUnkENGE *ActorProfileUnkENGE::GetProfile() { - return &sActorProfileUnkENGE; -} +ARM DECL_PROFILE(ActorProfileUnkENGE); ARM Actor *ActorProfileUnkENGE::Create() { return new(HeapIndex_2) ActorUnkENGE(); diff --git a/src/070_Dungeon/Actor/ActorUnkKEYN.cpp b/src/070_Dungeon/Actor/ActorUnkKEYN.cpp index a7454a89..7acb6c68 100644 --- a/src/070_Dungeon/Actor/ActorUnkKEYN.cpp +++ b/src/070_Dungeon/Actor/ActorUnkKEYN.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkKEYN.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkKEYN sActorProfileUnkKEYN; - -ARM ActorProfileUnkKEYN *ActorProfileUnkKEYN::GetProfile() { - return &sActorProfileUnkKEYN; -} +ARM DECL_PROFILE(ActorProfileUnkKEYN); ARM Actor *ActorProfileUnkKEYN::Create() { return new(HeapIndex_2) ActorUnkKEYN(); diff --git a/src/070_Dungeon/Actor/ActorUnkLIRA.cpp b/src/070_Dungeon/Actor/ActorUnkLIRA.cpp index b7716899..2b6cc7bc 100644 --- a/src/070_Dungeon/Actor/ActorUnkLIRA.cpp +++ b/src/070_Dungeon/Actor/ActorUnkLIRA.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkLIRA.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkLIRA sActorProfileUnkLIRA; - -ARM ActorProfileUnkLIRA *ActorProfileUnkLIRA::GetProfile() { - return &sActorProfileUnkLIRA; -} +ARM DECL_PROFILE(ActorProfileUnkLIRA); ARM Actor *ActorProfileUnkLIRA::Create() { return new(HeapIndex_2) ActorUnkLIRA(); diff --git a/src/070_Dungeon/Actor/ActorUnkRCSG.cpp b/src/070_Dungeon/Actor/ActorUnkRCSG.cpp index 57b30931..799cf50a 100644 --- a/src/070_Dungeon/Actor/ActorUnkRCSG.cpp +++ b/src/070_Dungeon/Actor/ActorUnkRCSG.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkRCSG.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkRCSG sActorProfileUnkRCSG; - -ARM ActorProfileUnkRCSG *ActorProfileUnkRCSG::GetProfile() { - return &sActorProfileUnkRCSG; -} +ARM DECL_PROFILE(ActorProfileUnkRCSG); ARM Actor *ActorProfileUnkRCSG::Create() { return new(HeapIndex_2) ActorUnkRCSG(); diff --git a/src/070_Dungeon/Actor/ActorUnkRYAW.cpp b/src/070_Dungeon/Actor/ActorUnkRYAW.cpp index dcfb316d..0e81cb12 100644 --- a/src/070_Dungeon/Actor/ActorUnkRYAW.cpp +++ b/src/070_Dungeon/Actor/ActorUnkRYAW.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkRYAW.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkRYAW sActorProfileUnkRYAW; - -ARM ActorProfileUnkRYAW *ActorProfileUnkRYAW::GetProfile() { - return &sActorProfileUnkRYAW; -} +ARM DECL_PROFILE(ActorProfileUnkRYAW); ARM Actor *ActorProfileUnkRYAW::Create() { return new(HeapIndex_2) ActorUnkRYAW(); diff --git a/src/070_Dungeon/Actor/ActorUnkSWDS.cpp b/src/070_Dungeon/Actor/ActorUnkSWDS.cpp index 80519eae..457a5ace 100644 --- a/src/070_Dungeon/Actor/ActorUnkSWDS.cpp +++ b/src/070_Dungeon/Actor/ActorUnkSWDS.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkSWDS.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkSWDS sActorProfileUnkSWDS; - -ARM ActorProfileUnkSWDS *ActorProfileUnkSWDS::GetProfile() { - return &sActorProfileUnkSWDS; -} +ARM DECL_PROFILE(ActorProfileUnkSWDS); ARM Actor *ActorProfileUnkSWDS::Create() { return new(HeapIndex_2) ActorUnkSWDS(); diff --git a/src/070_Dungeon/Actor/ActorUnkTRAP.cpp b/src/070_Dungeon/Actor/ActorUnkTRAP.cpp index c288d065..57528440 100644 --- a/src/070_Dungeon/Actor/ActorUnkTRAP.cpp +++ b/src/070_Dungeon/Actor/ActorUnkTRAP.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkTRAP.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkTRAP sActorProfileUnkTRAP; - -ARM ActorProfileUnkTRAP *ActorProfileUnkTRAP::GetProfile() { - return &sActorProfileUnkTRAP; -} +ARM DECL_PROFILE(ActorProfileUnkTRAP); ARM Actor *ActorProfileUnkTRAP::Create() { return new(HeapIndex_2) ActorUnkTRAP(); diff --git a/src/070_Dungeon/MapObject/MapObjectUnkARWL.cpp b/src/070_Dungeon/MapObject/MapObjectUnkARWL.cpp index 321aec0d..dc597ee1 100644 --- a/src/070_Dungeon/MapObject/MapObjectUnkARWL.cpp +++ b/src/070_Dungeon/MapObject/MapObjectUnkARWL.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkARWL.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkARWL sMapObjectProfileUnkARWL; - -ARM MapObjectProfileUnkARWL *MapObjectProfileUnkARWL::GetProfile() { - return &sMapObjectProfileUnkARWL; -} +ARM DECL_PROFILE(MapObjectProfileUnkARWL); ARM MapObject *MapObjectProfileUnkARWL::Create() { return new(HeapIndex_2) MapObjectUnkARWL(); diff --git a/src/070_Dungeon/MapObject/MapObjectUnkBLCK.cpp b/src/070_Dungeon/MapObject/MapObjectUnkBLCK.cpp index 01b58a7e..accb8a92 100644 --- a/src/070_Dungeon/MapObject/MapObjectUnkBLCK.cpp +++ b/src/070_Dungeon/MapObject/MapObjectUnkBLCK.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkBLCK.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkBLCK sMapObjectProfileUnkBLCK; - -ARM MapObjectProfileUnkBLCK *MapObjectProfileUnkBLCK::GetProfile() { - return &sMapObjectProfileUnkBLCK; -} +ARM DECL_PROFILE(MapObjectProfileUnkBLCK); ARM MapObject *MapObjectProfileUnkBLCK::Create() { return new(HeapIndex_2) MapObjectUnkBLCK(); diff --git a/src/070_Dungeon/MapObject/MapObjectUnkBLRB.cpp b/src/070_Dungeon/MapObject/MapObjectUnkBLRB.cpp index ce2f14ef..f7ebcee7 100644 --- a/src/070_Dungeon/MapObject/MapObjectUnkBLRB.cpp +++ b/src/070_Dungeon/MapObject/MapObjectUnkBLRB.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkBLRB.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkBLRB sMapObjectProfileUnkBLRB; - -ARM MapObjectProfileUnkBLRB *MapObjectProfileUnkBLRB::GetProfile() { - return &sMapObjectProfileUnkBLRB; -} +ARM DECL_PROFILE(MapObjectProfileUnkBLRB); ARM MapObject *MapObjectProfileUnkBLRB::Create() { return new(HeapIndex_2) MapObjectUnkBLRB(); diff --git a/src/070_Dungeon/MapObject/MapObjectUnkDRST.cpp b/src/070_Dungeon/MapObject/MapObjectUnkDRST.cpp index 33162e83..63203949 100644 --- a/src/070_Dungeon/MapObject/MapObjectUnkDRST.cpp +++ b/src/070_Dungeon/MapObject/MapObjectUnkDRST.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkDRST.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkDRST sMapObjectProfileUnkDRST; - -ARM MapObjectProfileUnkDRST *MapObjectProfileUnkDRST::GetProfile() { - return &sMapObjectProfileUnkDRST; -} +ARM DECL_PROFILE(MapObjectProfileUnkDRST); ARM MapObject *MapObjectProfileUnkDRST::Create() { return new(HeapIndex_2) MapObjectUnkDRST(); diff --git a/src/070_Dungeon/MapObject/MapObjectUnkFLSP.cpp b/src/070_Dungeon/MapObject/MapObjectUnkFLSP.cpp index 88600f7d..2f82db34 100644 --- a/src/070_Dungeon/MapObject/MapObjectUnkFLSP.cpp +++ b/src/070_Dungeon/MapObject/MapObjectUnkFLSP.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkFLSP.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkFLSP sMapObjectProfileUnkFLSP; - -ARM MapObjectProfileUnkFLSP *MapObjectProfileUnkFLSP::GetProfile() { - return &sMapObjectProfileUnkFLSP; -} +ARM DECL_PROFILE(MapObjectProfileUnkFLSP); ARM MapObject *MapObjectProfileUnkFLSP::Create() { return new(HeapIndex_2) MapObjectUnkFLSP(); diff --git a/src/070_Dungeon/MapObject/MapObjectUnkFRWL.cpp b/src/070_Dungeon/MapObject/MapObjectUnkFRWL.cpp index d9f41930..d4865939 100644 --- a/src/070_Dungeon/MapObject/MapObjectUnkFRWL.cpp +++ b/src/070_Dungeon/MapObject/MapObjectUnkFRWL.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkFRWL.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkFRWL sMapObjectProfileUnkFRWL; - -ARM MapObjectProfileUnkFRWL *MapObjectProfileUnkFRWL::GetProfile() { - return &sMapObjectProfileUnkFRWL; -} +ARM DECL_PROFILE(MapObjectProfileUnkFRWL); ARM MapObject *MapObjectProfileUnkFRWL::Create() { return new(HeapIndex_2) MapObjectUnkFRWL(); diff --git a/src/070_Dungeon/MapObject/MapObjectUnkFSPS.cpp b/src/070_Dungeon/MapObject/MapObjectUnkFSPS.cpp index 2f7f696f..60c94edd 100644 --- a/src/070_Dungeon/MapObject/MapObjectUnkFSPS.cpp +++ b/src/070_Dungeon/MapObject/MapObjectUnkFSPS.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkFSPS.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkFSPS sMapObjectProfileUnkFSPS; - -ARM MapObjectProfileUnkFSPS *MapObjectProfileUnkFSPS::GetProfile() { - return &sMapObjectProfileUnkFSPS; -} +ARM DECL_PROFILE(MapObjectProfileUnkFSPS); ARM MapObject *MapObjectProfileUnkFSPS::Create() { return new(HeapIndex_2) MapObjectUnkFSPS(); diff --git a/src/070_Dungeon/MapObject/MapObjectUnkPTFL.cpp b/src/070_Dungeon/MapObject/MapObjectUnkPTFL.cpp index a6af921d..4fec14f3 100644 --- a/src/070_Dungeon/MapObject/MapObjectUnkPTFL.cpp +++ b/src/070_Dungeon/MapObject/MapObjectUnkPTFL.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkPTFL.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkPTFL sMapObjectProfileUnkPTFL; - -ARM MapObjectProfileUnkPTFL *MapObjectProfileUnkPTFL::GetProfile() { - return &sMapObjectProfileUnkPTFL; -} +ARM DECL_PROFILE(MapObjectProfileUnkPTFL); ARM MapObject *MapObjectProfileUnkPTFL::Create() { return new(HeapIndex_2) MapObjectUnkPTFL(); diff --git a/src/070_Dungeon/MapObject/MapObjectUnkSTSH.cpp b/src/070_Dungeon/MapObject/MapObjectUnkSTSH.cpp index f7124f3d..6855aa33 100644 --- a/src/070_Dungeon/MapObject/MapObjectUnkSTSH.cpp +++ b/src/070_Dungeon/MapObject/MapObjectUnkSTSH.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkSTSH.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkSTSH sMapObjectProfileUnkSTSH; - -ARM MapObjectProfileUnkSTSH *MapObjectProfileUnkSTSH::GetProfile() { - return &sMapObjectProfileUnkSTSH; -} +ARM DECL_PROFILE(MapObjectProfileUnkSTSH); ARM MapObject *MapObjectProfileUnkSTSH::Create() { return new(HeapIndex_2) MapObjectUnkSTSH(); diff --git a/src/070_Dungeon/MapObject/MapObjectUnkSWEY.cpp b/src/070_Dungeon/MapObject/MapObjectUnkSWEY.cpp index f767a229..5d7699f3 100644 --- a/src/070_Dungeon/MapObject/MapObjectUnkSWEY.cpp +++ b/src/070_Dungeon/MapObject/MapObjectUnkSWEY.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkSWEY.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkSWEY sMapObjectProfileUnkSWEY; - -ARM MapObjectProfileUnkSWEY *MapObjectProfileUnkSWEY::GetProfile() { - return &sMapObjectProfileUnkSWEY; -} +ARM DECL_PROFILE(MapObjectProfileUnkSWEY); ARM MapObject *MapObjectProfileUnkSWEY::Create() { return new(HeapIndex_2) MapObjectUnkSWEY(); diff --git a/src/070_Dungeon/MapObject/MapObjectUnkSWRB.cpp b/src/070_Dungeon/MapObject/MapObjectUnkSWRB.cpp index 42bd2aaf..5b3915e0 100644 --- a/src/070_Dungeon/MapObject/MapObjectUnkSWRB.cpp +++ b/src/070_Dungeon/MapObject/MapObjectUnkSWRB.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkSWRB.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkSWRB sMapObjectProfileUnkSWRB; - -ARM MapObjectProfileUnkSWRB *MapObjectProfileUnkSWRB::GetProfile() { - return &sMapObjectProfileUnkSWRB; -} +ARM DECL_PROFILE(MapObjectProfileUnkSWRB); ARM MapObject *MapObjectProfileUnkSWRB::Create() { return new(HeapIndex_2) MapObjectUnkSWRB(); diff --git a/src/070_Dungeon/MapObject/MapObjectUnkSWWN.cpp b/src/070_Dungeon/MapObject/MapObjectUnkSWWN.cpp index 3529f4d3..c2c6a6bb 100644 --- a/src/070_Dungeon/MapObject/MapObjectUnkSWWN.cpp +++ b/src/070_Dungeon/MapObject/MapObjectUnkSWWN.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkSWWN.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkSWWN sMapObjectProfileUnkSWWN; - -ARM MapObjectProfileUnkSWWN *MapObjectProfileUnkSWWN::GetProfile() { - return &sMapObjectProfileUnkSWWN; -} +ARM DECL_PROFILE(MapObjectProfileUnkSWWN); ARM MapObject *MapObjectProfileUnkSWWN::Create() { return new(HeapIndex_2) MapObjectUnkSWWN(); diff --git a/src/070_Dungeon/MapObject/MapObjectUnkTRLD.cpp b/src/070_Dungeon/MapObject/MapObjectUnkTRLD.cpp index 30a5529f..e8bbde34 100644 --- a/src/070_Dungeon/MapObject/MapObjectUnkTRLD.cpp +++ b/src/070_Dungeon/MapObject/MapObjectUnkTRLD.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkTRLD.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkTRLD sMapObjectProfileUnkTRLD; - -ARM MapObjectProfileUnkTRLD *MapObjectProfileUnkTRLD::GetProfile() { - return &sMapObjectProfileUnkTRLD; -} +ARM DECL_PROFILE(MapObjectProfileUnkTRLD); ARM MapObject *MapObjectProfileUnkTRLD::Create() { return new(HeapIndex_2) MapObjectUnkTRLD(); diff --git a/src/070_Dungeon/MapObject/MapObjectUnkTRLS.cpp b/src/070_Dungeon/MapObject/MapObjectUnkTRLS.cpp index 28c28687..06c11e09 100644 --- a/src/070_Dungeon/MapObject/MapObjectUnkTRLS.cpp +++ b/src/070_Dungeon/MapObject/MapObjectUnkTRLS.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkTRLS.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkTRLS sMapObjectProfileUnkTRLS; - -ARM MapObjectProfileUnkTRLS *MapObjectProfileUnkTRLS::GetProfile() { - return &sMapObjectProfileUnkTRLS; -} +ARM DECL_PROFILE(MapObjectProfileUnkTRLS); ARM MapObject *MapObjectProfileUnkTRLS::Create() { return new(HeapIndex_2) MapObjectUnkTRLS(); diff --git a/src/070_Dungeon/MapObject/MapObjectUnkTRLW.cpp b/src/070_Dungeon/MapObject/MapObjectUnkTRLW.cpp index 5026841f..783b227d 100644 --- a/src/070_Dungeon/MapObject/MapObjectUnkTRLW.cpp +++ b/src/070_Dungeon/MapObject/MapObjectUnkTRLW.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkTRLW.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkTRLW sMapObjectProfileUnkTRLW; - -ARM MapObjectProfileUnkTRLW *MapObjectProfileUnkTRLW::GetProfile() { - return &sMapObjectProfileUnkTRLW; -} +ARM DECL_PROFILE(MapObjectProfileUnkTRLW); ARM MapObject *MapObjectProfileUnkTRLW::Create() { return new(HeapIndex_2) MapObjectUnkTRLW(); diff --git a/src/071_Tower/Actor/ActorUnkKMSO.cpp b/src/071_Tower/Actor/ActorUnkKMSO.cpp index d65dd35c..11833bfc 100644 --- a/src/071_Tower/Actor/ActorUnkKMSO.cpp +++ b/src/071_Tower/Actor/ActorUnkKMSO.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkKMSO.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkKMSO sActorProfileUnkKMSO; - -ARM ActorProfileUnkKMSO *ActorProfileUnkKMSO::GetProfile() { - return &sActorProfileUnkKMSO; -} +ARM DECL_PROFILE(ActorProfileUnkKMSO); ARM Actor *ActorProfileUnkKMSO::Create() { return new(HeapIndex_2) ActorUnkKMSO(); diff --git a/src/071_Tower/Actor/ActorUnkSZKU.cpp b/src/071_Tower/Actor/ActorUnkSZKU.cpp index b854cf24..a547f4a1 100644 --- a/src/071_Tower/Actor/ActorUnkSZKU.cpp +++ b/src/071_Tower/Actor/ActorUnkSZKU.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkSZKU.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkSZKU sActorProfileUnkSZKU; - -ARM ActorProfileUnkSZKU *ActorProfileUnkSZKU::GetProfile() { - return &sActorProfileUnkSZKU; -} +ARM DECL_PROFILE(ActorProfileUnkSZKU); ARM Actor *ActorProfileUnkSZKU::Create() { return new(HeapIndex_2) ActorUnkSZKU(); diff --git a/src/071_Tower/MapObject/MapObjectUnkBLCE.cpp b/src/071_Tower/MapObject/MapObjectUnkBLCE.cpp index 33e4a3f5..b76b2371 100644 --- a/src/071_Tower/MapObject/MapObjectUnkBLCE.cpp +++ b/src/071_Tower/MapObject/MapObjectUnkBLCE.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkBLCE.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkBLCE sMapObjectProfileUnkBLCE; - -ARM MapObjectProfileUnkBLCE *MapObjectProfileUnkBLCE::GetProfile() { - return &sMapObjectProfileUnkBLCE; -} +ARM DECL_PROFILE(MapObjectProfileUnkBLCE); ARM MapObject *MapObjectProfileUnkBLCE::Create() { return new(HeapIndex_2) MapObjectUnkBLCE(); diff --git a/src/071_Tower/MapObject/MapObjectUnkBLCT.cpp b/src/071_Tower/MapObject/MapObjectUnkBLCT.cpp index 3513d4ac..86fed461 100644 --- a/src/071_Tower/MapObject/MapObjectUnkBLCT.cpp +++ b/src/071_Tower/MapObject/MapObjectUnkBLCT.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkBLCT.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkBLCT sMapObjectProfileUnkBLCT; - -ARM MapObjectProfileUnkBLCT *MapObjectProfileUnkBLCT::GetProfile() { - return &sMapObjectProfileUnkBLCT; -} +ARM DECL_PROFILE(MapObjectProfileUnkBLCT); ARM MapObject *MapObjectProfileUnkBLCT::Create() { return new(HeapIndex_2) MapObjectUnkBLCT(); diff --git a/src/071_Tower/MapObject/MapObjectUnkBRGS.cpp b/src/071_Tower/MapObject/MapObjectUnkBRGS.cpp index d895b1a1..c434ced0 100644 --- a/src/071_Tower/MapObject/MapObjectUnkBRGS.cpp +++ b/src/071_Tower/MapObject/MapObjectUnkBRGS.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkBRGS.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkBRGS sMapObjectProfileUnkBRGS; - -ARM MapObjectProfileUnkBRGS *MapObjectProfileUnkBRGS::GetProfile() { - return &sMapObjectProfileUnkBRGS; -} +ARM DECL_PROFILE(MapObjectProfileUnkBRGS); ARM MapObject *MapObjectProfileUnkBRGS::Create() { return new(HeapIndex_2) MapObjectUnkBRGS(); diff --git a/src/071_Tower/MapObject/MapObjectUnkRNBO.cpp b/src/071_Tower/MapObject/MapObjectUnkRNBO.cpp index fd5fe5ff..3f172f7b 100644 --- a/src/071_Tower/MapObject/MapObjectUnkRNBO.cpp +++ b/src/071_Tower/MapObject/MapObjectUnkRNBO.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkRNBO.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkRNBO sMapObjectProfileUnkRNBO; - -ARM MapObjectProfileUnkRNBO *MapObjectProfileUnkRNBO::GetProfile() { - return &sMapObjectProfileUnkRNBO; -} +ARM DECL_PROFILE(MapObjectProfileUnkRNBO); ARM MapObject *MapObjectProfileUnkRNBO::Create() { return new(HeapIndex_2) MapObjectUnkRNBO(); diff --git a/src/071_Tower/MapObject/MapObjectUnkRPFL.cpp b/src/071_Tower/MapObject/MapObjectUnkRPFL.cpp index 2e2c6e82..fbfc349b 100644 --- a/src/071_Tower/MapObject/MapObjectUnkRPFL.cpp +++ b/src/071_Tower/MapObject/MapObjectUnkRPFL.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkRPFL.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkRPFL sMapObjectProfileUnkRPFL; - -ARM MapObjectProfileUnkRPFL *MapObjectProfileUnkRPFL::GetProfile() { - return &sMapObjectProfileUnkRPFL; -} +ARM DECL_PROFILE(MapObjectProfileUnkRPFL); ARM MapObject *MapObjectProfileUnkRPFL::Create() { return new(HeapIndex_2) MapObjectUnkRPFL(); diff --git a/src/071_Tower/MapObject/MapObjectUnkSTAL.cpp b/src/071_Tower/MapObject/MapObjectUnkSTAL.cpp index 30900ea8..c5e47c6e 100644 --- a/src/071_Tower/MapObject/MapObjectUnkSTAL.cpp +++ b/src/071_Tower/MapObject/MapObjectUnkSTAL.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkSTAL.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkSTAL sMapObjectProfileUnkSTAL; - -ARM MapObjectProfileUnkSTAL *MapObjectProfileUnkSTAL::GetProfile() { - return &sMapObjectProfileUnkSTAL; -} +ARM DECL_PROFILE(MapObjectProfileUnkSTAL); ARM MapObject *MapObjectProfileUnkSTAL::Create() { return new(HeapIndex_2) MapObjectUnkSTAL(); diff --git a/src/072_TowerLobby/Actor/ActorUnkRMM0.cpp b/src/072_TowerLobby/Actor/ActorUnkRMM0.cpp index 4a65413c..e2672633 100644 --- a/src/072_TowerLobby/Actor/ActorUnkRMM0.cpp +++ b/src/072_TowerLobby/Actor/ActorUnkRMM0.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkRMM0.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkRMM0 sActorProfileUnkRMM0; - -ARM ActorProfileUnkRMM0 *ActorProfileUnkRMM0::GetProfile() { - return &sActorProfileUnkRMM0; -} +ARM DECL_PROFILE(ActorProfileUnkRMM0); ARM Actor *ActorProfileUnkRMM0::Create() { return new(HeapIndex_2) ActorUnkRMM0(); diff --git a/src/072_TowerLobby/Actor/ActorUnkRMM3.cpp b/src/072_TowerLobby/Actor/ActorUnkRMM3.cpp index df47671a..5da7bb69 100644 --- a/src/072_TowerLobby/Actor/ActorUnkRMM3.cpp +++ b/src/072_TowerLobby/Actor/ActorUnkRMM3.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkRMM3.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkRMM3 sActorProfileUnkRMM3; - -ARM ActorProfileUnkRMM3 *ActorProfileUnkRMM3::GetProfile() { - return &sActorProfileUnkRMM3; -} +ARM DECL_PROFILE(ActorProfileUnkRMM3); ARM Actor *ActorProfileUnkRMM3::Create() { return new(HeapIndex_2) ActorUnkRMM3(); diff --git a/src/073_BossDeago/Actor/ActorUnkBDEA.cpp b/src/073_BossDeago/Actor/ActorUnkBDEA.cpp index 78715695..c98ce329 100644 --- a/src/073_BossDeago/Actor/ActorUnkBDEA.cpp +++ b/src/073_BossDeago/Actor/ActorUnkBDEA.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkBDEA.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkBDEA sActorProfileUnkBDEA; - -ARM ActorProfileUnkBDEA *ActorProfileUnkBDEA::GetProfile() { - return &sActorProfileUnkBDEA; -} +ARM DECL_PROFILE(ActorProfileUnkBDEA); ARM Actor *ActorProfileUnkBDEA::Create() { return new(HeapIndex_2) ActorUnkBDEA(); diff --git a/src/073_BossDeago/Actor/ActorUnkDGPC.cpp b/src/073_BossDeago/Actor/ActorUnkDGPC.cpp index 6326f383..72b2a59e 100644 --- a/src/073_BossDeago/Actor/ActorUnkDGPC.cpp +++ b/src/073_BossDeago/Actor/ActorUnkDGPC.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkDGPC.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkDGPC sActorProfileUnkDGPC; - -ARM ActorProfileUnkDGPC *ActorProfileUnkDGPC::GetProfile() { - return &sActorProfileUnkDGPC; -} +ARM DECL_PROFILE(ActorProfileUnkDGPC); ARM Actor *ActorProfileUnkDGPC::Create() { return new(HeapIndex_2) ActorUnkDGPC(); diff --git a/src/074_BossLast1/Actor/ActorUnkBKST.cpp b/src/074_BossLast1/Actor/ActorUnkBKST.cpp index 64890a16..0e211a16 100644 --- a/src/074_BossLast1/Actor/ActorUnkBKST.cpp +++ b/src/074_BossLast1/Actor/ActorUnkBKST.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkBKST.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkBKST sActorProfileUnkBKST; - -ARM ActorProfileUnkBKST *ActorProfileUnkBKST::GetProfile() { - return &sActorProfileUnkBKST; -} +ARM DECL_PROFILE(ActorProfileUnkBKST); ARM Actor *ActorProfileUnkBKST::Create() { return new(HeapIndex_2) ActorUnkBKST(); diff --git a/src/074_BossLast1/Actor/ActorUnkBSKM.cpp b/src/074_BossLast1/Actor/ActorUnkBSKM.cpp index fa059585..c4c7290b 100644 --- a/src/074_BossLast1/Actor/ActorUnkBSKM.cpp +++ b/src/074_BossLast1/Actor/ActorUnkBSKM.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkBSKM.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkBSKM sActorProfileUnkBSKM; - -ARM ActorProfileUnkBSKM *ActorProfileUnkBSKM::GetProfile() { - return &sActorProfileUnkBSKM; -} +ARM DECL_PROFILE(ActorProfileUnkBSKM); ARM Actor *ActorProfileUnkBSKM::Create() { return new(HeapIndex_2) ActorUnkBSKM(); diff --git a/src/074_BossLast1/Actor/ActorUnkKIMB.cpp b/src/074_BossLast1/Actor/ActorUnkKIMB.cpp index 65a0f86e..cc86a666 100644 --- a/src/074_BossLast1/Actor/ActorUnkKIMB.cpp +++ b/src/074_BossLast1/Actor/ActorUnkKIMB.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkKIMB.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkKIMB sActorProfileUnkKIMB; - -ARM ActorProfileUnkKIMB *ActorProfileUnkKIMB::GetProfile() { - return &sActorProfileUnkKIMB; -} +ARM DECL_PROFILE(ActorProfileUnkKIMB); ARM Actor *ActorProfileUnkKIMB::Create() { return new(HeapIndex_2) ActorUnkKIMB(); diff --git a/src/074_BossLast1/Actor/ActorUnkMAGR.cpp b/src/074_BossLast1/Actor/ActorUnkMAGR.cpp index 7261169d..866bdfc1 100644 --- a/src/074_BossLast1/Actor/ActorUnkMAGR.cpp +++ b/src/074_BossLast1/Actor/ActorUnkMAGR.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkMAGR.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkMAGR sActorProfileUnkMAGR; - -ARM ActorProfileUnkMAGR *ActorProfileUnkMAGR::GetProfile() { - return &sActorProfileUnkMAGR; -} +ARM DECL_PROFILE(ActorProfileUnkMAGR); ARM Actor *ActorProfileUnkMAGR::Create() { return new(HeapIndex_2) ActorUnkMAGR(); diff --git a/src/074_BossLast1/Actor/ActorUnkPPPM.cpp b/src/074_BossLast1/Actor/ActorUnkPPPM.cpp index bc5824e3..6eea4c93 100644 --- a/src/074_BossLast1/Actor/ActorUnkPPPM.cpp +++ b/src/074_BossLast1/Actor/ActorUnkPPPM.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkPPPM.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkPPPM sActorProfileUnkPPPM; - -ARM ActorProfileUnkPPPM *ActorProfileUnkPPPM::GetProfile() { - return &sActorProfileUnkPPPM; -} +ARM DECL_PROFILE(ActorProfileUnkPPPM); ARM Actor *ActorProfileUnkPPPM::Create() { return new(HeapIndex_2) ActorUnkPPPM(); diff --git a/src/074_BossLast1/Actor/ActorUnkRBL1.cpp b/src/074_BossLast1/Actor/ActorUnkRBL1.cpp index 8d550531..3b703a18 100644 --- a/src/074_BossLast1/Actor/ActorUnkRBL1.cpp +++ b/src/074_BossLast1/Actor/ActorUnkRBL1.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkRBL1.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkRBL1 sActorProfileUnkRBL1; - -ARM ActorProfileUnkRBL1 *ActorProfileUnkRBL1::GetProfile() { - return &sActorProfileUnkRBL1; -} +ARM DECL_PROFILE(ActorProfileUnkRBL1); ARM Actor *ActorProfileUnkRBL1::Create() { return new(HeapIndex_2) ActorUnkRBL1(); diff --git a/src/074_BossLast1/Actor/ActorUnkZLBB.cpp b/src/074_BossLast1/Actor/ActorUnkZLBB.cpp index 29f1ba27..aba3e5b9 100644 --- a/src/074_BossLast1/Actor/ActorUnkZLBB.cpp +++ b/src/074_BossLast1/Actor/ActorUnkZLBB.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkZLBB.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkZLBB sActorProfileUnkZLBB; - -ARM ActorProfileUnkZLBB *ActorProfileUnkZLBB::GetProfile() { - return &sActorProfileUnkZLBB; -} +ARM DECL_PROFILE(ActorProfileUnkZLBB); ARM Actor *ActorProfileUnkZLBB::Create() { return new(HeapIndex_2) ActorUnkZLBB(); diff --git a/src/074_BossLast1/Actor/ActorUnkZLBS.cpp b/src/074_BossLast1/Actor/ActorUnkZLBS.cpp index 48928a24..a6b20d49 100644 --- a/src/074_BossLast1/Actor/ActorUnkZLBS.cpp +++ b/src/074_BossLast1/Actor/ActorUnkZLBS.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkZLBS.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkZLBS sActorProfileUnkZLBS; - -ARM ActorProfileUnkZLBS *ActorProfileUnkZLBS::GetProfile() { - return &sActorProfileUnkZLBS; -} +ARM DECL_PROFILE(ActorProfileUnkZLBS); ARM Actor *ActorProfileUnkZLBS::Create() { return new(HeapIndex_2) ActorUnkZLBS(); diff --git a/src/075_BossLast2/Actor/ActorUnkMABL.cpp b/src/075_BossLast2/Actor/ActorUnkMABL.cpp index 852f3f71..3e7cb680 100644 --- a/src/075_BossLast2/Actor/ActorUnkMABL.cpp +++ b/src/075_BossLast2/Actor/ActorUnkMABL.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkMABL.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkMABL sActorProfileUnkMABL; - -ARM ActorProfileUnkMABL *ActorProfileUnkMABL::GetProfile() { - return &sActorProfileUnkMABL; -} +ARM DECL_PROFILE(ActorProfileUnkMABL); ARM Actor *ActorProfileUnkMABL::Create() { return new(HeapIndex_2) ActorUnkMABL(); diff --git a/src/075_BossLast2/Actor/ActorUnkMRD2.cpp b/src/075_BossLast2/Actor/ActorUnkMRD2.cpp index 19fc82e3..6daf978f 100644 --- a/src/075_BossLast2/Actor/ActorUnkMRD2.cpp +++ b/src/075_BossLast2/Actor/ActorUnkMRD2.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkMRD2.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkMRD2 sActorProfileUnkMRD2; - -ARM ActorProfileUnkMRD2 *ActorProfileUnkMRD2::GetProfile() { - return &sActorProfileUnkMRD2; -} +ARM DECL_PROFILE(ActorProfileUnkMRD2); ARM Actor *ActorProfileUnkMRD2::Create() { return new(HeapIndex_2) ActorUnkMRD2(); diff --git a/src/075_BossLast2/Actor/ActorUnkMRDA_MRDO.cpp b/src/075_BossLast2/Actor/ActorUnkMRDA_MRDO.cpp index adf3d0ce..6e47287c 100644 --- a/src/075_BossLast2/Actor/ActorUnkMRDA_MRDO.cpp +++ b/src/075_BossLast2/Actor/ActorUnkMRDA_MRDO.cpp @@ -5,11 +5,7 @@ // --- Actor MRDA --- -static ActorProfileUnkMRDA sActorProfileUnkMRDA; - -ARM ActorProfileUnkMRDA *ActorProfileUnkMRDA::GetProfile() { - return &sActorProfileUnkMRDA; -} +ARM DECL_PROFILE(ActorProfileUnkMRDA); ARM Actor *ActorProfileUnkMRDA::Create() { return new(HeapIndex_2) ActorUnkMRDA(); @@ -22,11 +18,7 @@ ARM ActorUnkMRDA::ActorUnkMRDA() {} // --- Actor MRDO --- -static ActorProfileUnkMRDO sActorProfileUnkMRDO; - -ARM ActorProfileUnkMRDO *ActorProfileUnkMRDO::GetProfile() { - return &sActorProfileUnkMRDO; -} +ARM DECL_PROFILE(ActorProfileUnkMRDO); ARM Actor *ActorProfileUnkMRDO::Create() { return new(HeapIndex_2) ActorUnkMRDO(); diff --git a/src/075_BossLast2/Actor/ActorUnkMRDL.cpp b/src/075_BossLast2/Actor/ActorUnkMRDL.cpp index ca85a969..f4198b70 100644 --- a/src/075_BossLast2/Actor/ActorUnkMRDL.cpp +++ b/src/075_BossLast2/Actor/ActorUnkMRDL.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkMRDL.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkMRDL sActorProfileUnkMRDL; - -ARM ActorProfileUnkMRDL *ActorProfileUnkMRDL::GetProfile() { - return &sActorProfileUnkMRDL; -} +ARM DECL_PROFILE(ActorProfileUnkMRDL); ARM Actor *ActorProfileUnkMRDL::Create() { return new(HeapIndex_2) ActorUnkMRDL(); diff --git a/src/076_DgnLv1/Actor/ActorUnkBGOK.cpp b/src/076_DgnLv1/Actor/ActorUnkBGOK.cpp index f1495686..9e7881f4 100644 --- a/src/076_DgnLv1/Actor/ActorUnkBGOK.cpp +++ b/src/076_DgnLv1/Actor/ActorUnkBGOK.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkBGOK.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkBGOK sActorProfileUnkBGOK; - -ARM ActorProfileUnkBGOK *ActorProfileUnkBGOK::GetProfile() { - return &sActorProfileUnkBGOK; -} +ARM DECL_PROFILE(ActorProfileUnkBGOK); ARM Actor *ActorProfileUnkBGOK::Create() { return new(HeapIndex_2) ActorUnkBGOK(); diff --git a/src/077_DgnForest/Actor/ActorUnkASBA.cpp b/src/077_DgnForest/Actor/ActorUnkASBA.cpp index e67e8e06..72dfa17d 100644 --- a/src/077_DgnForest/Actor/ActorUnkASBA.cpp +++ b/src/077_DgnForest/Actor/ActorUnkASBA.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkASBA.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkASBA sActorProfileUnkASBA; - -ARM ActorProfileUnkASBA *ActorProfileUnkASBA::GetProfile() { - return &sActorProfileUnkASBA; -} +ARM DECL_PROFILE(ActorProfileUnkASBA); ARM Actor *ActorProfileUnkASBA::Create() { return new(HeapIndex_2) ActorUnkASBA(); diff --git a/src/077_DgnForest/Actor/ActorUnkASYU.cpp b/src/077_DgnForest/Actor/ActorUnkASYU.cpp index 62ffcc5f..d4e38f51 100644 --- a/src/077_DgnForest/Actor/ActorUnkASYU.cpp +++ b/src/077_DgnForest/Actor/ActorUnkASYU.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkASYU.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkASYU sActorProfileUnkASYU; - -ARM ActorProfileUnkASYU *ActorProfileUnkASYU::GetProfile() { - return &sActorProfileUnkASYU; -} +ARM DECL_PROFILE(ActorProfileUnkASYU); ARM Actor *ActorProfileUnkASYU::Create() { return new(HeapIndex_2) ActorUnkASYU(); diff --git a/src/077_DgnForest/Actor/ActorUnkBBLE.cpp b/src/077_DgnForest/Actor/ActorUnkBBLE.cpp index 7aaddc9f..f7211c87 100644 --- a/src/077_DgnForest/Actor/ActorUnkBBLE.cpp +++ b/src/077_DgnForest/Actor/ActorUnkBBLE.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkBBLE.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkBBLE sActorProfileUnkBBLE; - -ARM ActorProfileUnkBBLE *ActorProfileUnkBBLE::GetProfile() { - return &sActorProfileUnkBBLE; -} +ARM DECL_PROFILE(ActorProfileUnkBBLE); ARM Actor *ActorProfileUnkBBLE::Create() { return new(HeapIndex_2) ActorUnkBBLE(); diff --git a/src/077_DgnForest/Actor/ActorUnkDSFR.cpp b/src/077_DgnForest/Actor/ActorUnkDSFR.cpp index ba32d44a..1f14b11f 100644 --- a/src/077_DgnForest/Actor/ActorUnkDSFR.cpp +++ b/src/077_DgnForest/Actor/ActorUnkDSFR.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkDSFR.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkDSFR sActorProfileUnkDSFR; - -ARM ActorProfileUnkDSFR *ActorProfileUnkDSFR::GetProfile() { - return &sActorProfileUnkDSFR; -} +ARM DECL_PROFILE(ActorProfileUnkDSFR); ARM Actor *ActorProfileUnkDSFR::Create() { return new(HeapIndex_2) ActorUnkDSFR(); diff --git a/src/077_DgnForest/Actor/ActorUnkGOKI.cpp b/src/077_DgnForest/Actor/ActorUnkGOKI.cpp index 3d724710..1ae35387 100644 --- a/src/077_DgnForest/Actor/ActorUnkGOKI.cpp +++ b/src/077_DgnForest/Actor/ActorUnkGOKI.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkGOKI.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkGOKI sActorProfileUnkGOKI; - -ARM ActorProfileUnkGOKI *ActorProfileUnkGOKI::GetProfile() { - return &sActorProfileUnkGOKI; -} +ARM DECL_PROFILE(ActorProfileUnkGOKI); ARM Actor *ActorProfileUnkGOKI::Create() { return new(HeapIndex_2) ActorUnkGOKI(); diff --git a/src/077_DgnForest/Actor/ActorUnkOFSW.cpp b/src/077_DgnForest/Actor/ActorUnkOFSW.cpp index 3fc0ef1d..e64e61c2 100644 --- a/src/077_DgnForest/Actor/ActorUnkOFSW.cpp +++ b/src/077_DgnForest/Actor/ActorUnkOFSW.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkOFSW.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkOFSW sActorProfileUnkOFSW; - -ARM ActorProfileUnkOFSW *ActorProfileUnkOFSW::GetProfile() { - return &sActorProfileUnkOFSW; -} +ARM DECL_PROFILE(ActorProfileUnkOFSW); ARM Actor *ActorProfileUnkOFSW::Create() { return new(HeapIndex_2) ActorUnkOFSW(); diff --git a/src/077_DgnForest/Actor/ActorUnkPMST.cpp b/src/077_DgnForest/Actor/ActorUnkPMST.cpp index 729e5644..14890c6e 100644 --- a/src/077_DgnForest/Actor/ActorUnkPMST.cpp +++ b/src/077_DgnForest/Actor/ActorUnkPMST.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkPMST.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkPMST sActorProfileUnkPMST; - -ARM ActorProfileUnkPMST *ActorProfileUnkPMST::GetProfile() { - return &sActorProfileUnkPMST; -} +ARM DECL_PROFILE(ActorProfileUnkPMST); ARM Actor *ActorProfileUnkPMST::Create() { return new(HeapIndex_2) ActorUnkPMST(); diff --git a/src/077_DgnForest/MapObject/MapObjectUnkGTRK.cpp b/src/077_DgnForest/MapObject/MapObjectUnkGTRK.cpp index 4190546e..431db2ff 100644 --- a/src/077_DgnForest/MapObject/MapObjectUnkGTRK.cpp +++ b/src/077_DgnForest/MapObject/MapObjectUnkGTRK.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkGTRK.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkGTRK sMapObjectProfileUnkGTRK; - -ARM MapObjectProfileUnkGTRK *MapObjectProfileUnkGTRK::GetProfile() { - return &sMapObjectProfileUnkGTRK; -} +ARM DECL_PROFILE(MapObjectProfileUnkGTRK); ARM MapObject *MapObjectProfileUnkGTRK::Create() { return new(HeapIndex_2) MapObjectUnkGTRK(); diff --git a/src/077_DgnForest/MapObject/MapObjectUnkPLFR.cpp b/src/077_DgnForest/MapObject/MapObjectUnkPLFR.cpp index 051accd7..83f6c69a 100644 --- a/src/077_DgnForest/MapObject/MapObjectUnkPLFR.cpp +++ b/src/077_DgnForest/MapObject/MapObjectUnkPLFR.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkPLFR.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkPLFR sMapObjectProfileUnkPLFR; - -ARM MapObjectProfileUnkPLFR *MapObjectProfileUnkPLFR::GetProfile() { - return &sMapObjectProfileUnkPLFR; -} +ARM DECL_PROFILE(MapObjectProfileUnkPLFR); ARM MapObject *MapObjectProfileUnkPLFR::Create() { return new(HeapIndex_2) MapObjectUnkPLFR(); diff --git a/src/078_BossForest/Actor/ActorUnkFRBS.cpp b/src/078_BossForest/Actor/ActorUnkFRBS.cpp index c53de79e..abe7a4be 100644 --- a/src/078_BossForest/Actor/ActorUnkFRBS.cpp +++ b/src/078_BossForest/Actor/ActorUnkFRBS.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkFRBS.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkFRBS sActorProfileUnkFRBS; - -ARM ActorProfileUnkFRBS *ActorProfileUnkFRBS::GetProfile() { - return &sActorProfileUnkFRBS; -} +ARM DECL_PROFILE(ActorProfileUnkFRBS); ARM Actor *ActorProfileUnkFRBS::Create() { return new(HeapIndex_2) ActorUnkFRBS(); diff --git a/src/078_BossForest/Actor/ActorUnkRBFR.cpp b/src/078_BossForest/Actor/ActorUnkRBFR.cpp index f4946330..4595c71b 100644 --- a/src/078_BossForest/Actor/ActorUnkRBFR.cpp +++ b/src/078_BossForest/Actor/ActorUnkRBFR.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkRBFR.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkRBFR sActorProfileUnkRBFR; - -ARM ActorProfileUnkRBFR *ActorProfileUnkRBFR::GetProfile() { - return &sActorProfileUnkRBFR; -} +ARM DECL_PROFILE(ActorProfileUnkRBFR); ARM Actor *ActorProfileUnkRBFR::Create() { return new(HeapIndex_2) ActorUnkRBFR(); diff --git a/src/078_BossForest/MapObject/MapObjectUnkSTSF.cpp b/src/078_BossForest/MapObject/MapObjectUnkSTSF.cpp index b7ebcb39..9772d8f3 100644 --- a/src/078_BossForest/MapObject/MapObjectUnkSTSF.cpp +++ b/src/078_BossForest/MapObject/MapObjectUnkSTSF.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkSTSF.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkSTSF sMapObjectProfileUnkSTSF; - -ARM MapObjectProfileUnkSTSF *MapObjectProfileUnkSTSF::GetProfile() { - return &sMapObjectProfileUnkSTSF; -} +ARM DECL_PROFILE(MapObjectProfileUnkSTSF); ARM MapObject *MapObjectProfileUnkSTSF::Create() { return new(HeapIndex_2) MapObjectUnkSTSF(); diff --git a/src/079_DgnSnow/Actor/ActorUnkDSSN.cpp b/src/079_DgnSnow/Actor/ActorUnkDSSN.cpp index 4f12e732..54581832 100644 --- a/src/079_DgnSnow/Actor/ActorUnkDSSN.cpp +++ b/src/079_DgnSnow/Actor/ActorUnkDSSN.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkDSSN.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkDSSN sActorProfileUnkDSSN; - -ARM ActorProfileUnkDSSN *ActorProfileUnkDSSN::GetProfile() { - return &sActorProfileUnkDSSN; -} +ARM DECL_PROFILE(ActorProfileUnkDSSN); ARM Actor *ActorProfileUnkDSSN::Create() { return new(HeapIndex_2) ActorUnkDSSN(); diff --git a/src/079_DgnSnow/Actor/ActorUnkOCTW.cpp b/src/079_DgnSnow/Actor/ActorUnkOCTW.cpp index c18ffb50..38ff6e8d 100644 --- a/src/079_DgnSnow/Actor/ActorUnkOCTW.cpp +++ b/src/079_DgnSnow/Actor/ActorUnkOCTW.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkOCTW.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkOCTW sActorProfileUnkOCTW; - -ARM ActorProfileUnkOCTW *ActorProfileUnkOCTW::GetProfile() { - return &sActorProfileUnkOCTW; -} +ARM DECL_PROFILE(ActorProfileUnkOCTW); ARM Actor *ActorProfileUnkOCTW::Create() { return new(HeapIndex_2) ActorUnkOCTW(); diff --git a/src/079_DgnSnow/Actor/ActorUnkOCWS.cpp b/src/079_DgnSnow/Actor/ActorUnkOCWS.cpp index 841072ad..f83aaf3a 100644 --- a/src/079_DgnSnow/Actor/ActorUnkOCWS.cpp +++ b/src/079_DgnSnow/Actor/ActorUnkOCWS.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkOCWS.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkOCWS sActorProfileUnkOCWS; - -ARM ActorProfileUnkOCWS *ActorProfileUnkOCWS::GetProfile() { - return &sActorProfileUnkOCWS; -} +ARM DECL_PROFILE(ActorProfileUnkOCWS); ARM Actor *ActorProfileUnkOCWS::Create() { return new(HeapIndex_2) ActorUnkOCWS(); diff --git a/src/079_DgnSnow/Actor/ActorUnkPSBL.cpp b/src/079_DgnSnow/Actor/ActorUnkPSBL.cpp index 915acf83..f550a129 100644 --- a/src/079_DgnSnow/Actor/ActorUnkPSBL.cpp +++ b/src/079_DgnSnow/Actor/ActorUnkPSBL.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkPSBL.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkPSBL sActorProfileUnkPSBL; - -ARM ActorProfileUnkPSBL *ActorProfileUnkPSBL::GetProfile() { - return &sActorProfileUnkPSBL; -} +ARM DECL_PROFILE(ActorProfileUnkPSBL); ARM Actor *ActorProfileUnkPSBL::Create() { return new(HeapIndex_2) ActorUnkPSBL(); diff --git a/src/079_DgnSnow/Actor/ActorUnkSSFC.cpp b/src/079_DgnSnow/Actor/ActorUnkSSFC.cpp index 515c1833..0cbb0ad3 100644 --- a/src/079_DgnSnow/Actor/ActorUnkSSFC.cpp +++ b/src/079_DgnSnow/Actor/ActorUnkSSFC.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkSSFC.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkSSFC sActorProfileUnkSSFC; - -ARM ActorProfileUnkSSFC *ActorProfileUnkSSFC::GetProfile() { - return &sActorProfileUnkSSFC; -} +ARM DECL_PROFILE(ActorProfileUnkSSFC); ARM Actor *ActorProfileUnkSSFC::Create() { return new(HeapIndex_2) ActorUnkSSFC(); diff --git a/src/079_DgnSnow/MapObject/MapObjectUnkBLHL.cpp b/src/079_DgnSnow/MapObject/MapObjectUnkBLHL.cpp index e7d90f49..3786dd9d 100644 --- a/src/079_DgnSnow/MapObject/MapObjectUnkBLHL.cpp +++ b/src/079_DgnSnow/MapObject/MapObjectUnkBLHL.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkBLHL.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkBLHL sMapObjectProfileUnkBLHL; - -ARM MapObjectProfileUnkBLHL *MapObjectProfileUnkBLHL::GetProfile() { - return &sMapObjectProfileUnkBLHL; -} +ARM DECL_PROFILE(MapObjectProfileUnkBLHL); ARM MapObject *MapObjectProfileUnkBLHL::Create() { return new(HeapIndex_2) MapObjectUnkBLHL(); diff --git a/src/079_DgnSnow/MapObject/MapObjectUnkDRSN.cpp b/src/079_DgnSnow/MapObject/MapObjectUnkDRSN.cpp index 27f285ea..56872979 100644 --- a/src/079_DgnSnow/MapObject/MapObjectUnkDRSN.cpp +++ b/src/079_DgnSnow/MapObject/MapObjectUnkDRSN.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkDRSN.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkDRSN sMapObjectProfileUnkDRSN; - -ARM MapObjectProfileUnkDRSN *MapObjectProfileUnkDRSN::GetProfile() { - return &sMapObjectProfileUnkDRSN; -} +ARM DECL_PROFILE(MapObjectProfileUnkDRSN); ARM MapObject *MapObjectProfileUnkDRSN::Create() { return new(HeapIndex_2) MapObjectUnkDRSN(); diff --git a/src/079_DgnSnow/MapObject/MapObjectUnkFSSV.cpp b/src/079_DgnSnow/MapObject/MapObjectUnkFSSV.cpp index 7c043a8a..4869dffe 100644 --- a/src/079_DgnSnow/MapObject/MapObjectUnkFSSV.cpp +++ b/src/079_DgnSnow/MapObject/MapObjectUnkFSSV.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkFSSV.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkFSSV sMapObjectProfileUnkFSSV; - -ARM MapObjectProfileUnkFSSV *MapObjectProfileUnkFSSV::GetProfile() { - return &sMapObjectProfileUnkFSSV; -} +ARM DECL_PROFILE(MapObjectProfileUnkFSSV); ARM MapObject *MapObjectProfileUnkFSSV::Create() { return new(HeapIndex_2) MapObjectUnkFSSV(); diff --git a/src/079_DgnSnow/MapObject/MapObjectUnkGTSN.cpp b/src/079_DgnSnow/MapObject/MapObjectUnkGTSN.cpp index 65b78850..f16da5e5 100644 --- a/src/079_DgnSnow/MapObject/MapObjectUnkGTSN.cpp +++ b/src/079_DgnSnow/MapObject/MapObjectUnkGTSN.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkGTSN.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkGTSN sMapObjectProfileUnkGTSN; - -ARM MapObjectProfileUnkGTSN *MapObjectProfileUnkGTSN::GetProfile() { - return &sMapObjectProfileUnkGTSN; -} +ARM DECL_PROFILE(MapObjectProfileUnkGTSN); ARM MapObject *MapObjectProfileUnkGTSN::Create() { return new(HeapIndex_2) MapObjectUnkGTSN(); diff --git a/src/079_DgnSnow/MapObject/MapObjectUnkICGR.cpp b/src/079_DgnSnow/MapObject/MapObjectUnkICGR.cpp index d976b51f..e42b3e0e 100644 --- a/src/079_DgnSnow/MapObject/MapObjectUnkICGR.cpp +++ b/src/079_DgnSnow/MapObject/MapObjectUnkICGR.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkICGR.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkICGR sMapObjectProfileUnkICGR; - -ARM MapObjectProfileUnkICGR *MapObjectProfileUnkICGR::GetProfile() { - return &sMapObjectProfileUnkICGR; -} +ARM DECL_PROFILE(MapObjectProfileUnkICGR); ARM MapObject *MapObjectProfileUnkICGR::Create() { return new(HeapIndex_2) MapObjectUnkICGR(); diff --git a/src/080_BossSnow/Actor/ActorUnkICBA.cpp b/src/080_BossSnow/Actor/ActorUnkICBA.cpp index c80b6e97..dd5ce5f3 100644 --- a/src/080_BossSnow/Actor/ActorUnkICBA.cpp +++ b/src/080_BossSnow/Actor/ActorUnkICBA.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkICBA.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkICBA sActorProfileUnkICBA; - -ARM ActorProfileUnkICBA *ActorProfileUnkICBA::GetProfile() { - return &sActorProfileUnkICBA; -} +ARM DECL_PROFILE(ActorProfileUnkICBA); ARM Actor *ActorProfileUnkICBA::Create() { return new(HeapIndex_2) ActorUnkICBA(); diff --git a/src/080_BossSnow/Actor/ActorUnkICBS.cpp b/src/080_BossSnow/Actor/ActorUnkICBS.cpp index 9f30dc51..82c6ebca 100644 --- a/src/080_BossSnow/Actor/ActorUnkICBS.cpp +++ b/src/080_BossSnow/Actor/ActorUnkICBS.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkICBS.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkICBS sActorProfileUnkICBS; - -ARM ActorProfileUnkICBS *ActorProfileUnkICBS::GetProfile() { - return &sActorProfileUnkICBS; -} +ARM DECL_PROFILE(ActorProfileUnkICBS); ARM Actor *ActorProfileUnkICBS::Create() { return new(HeapIndex_2) ActorUnkICBS(); diff --git a/src/080_BossSnow/Actor/ActorUnkRBSN.cpp b/src/080_BossSnow/Actor/ActorUnkRBSN.cpp index f07f9304..9a485eea 100644 --- a/src/080_BossSnow/Actor/ActorUnkRBSN.cpp +++ b/src/080_BossSnow/Actor/ActorUnkRBSN.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkRBSN.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkRBSN sActorProfileUnkRBSN; - -ARM ActorProfileUnkRBSN *ActorProfileUnkRBSN::GetProfile() { - return &sActorProfileUnkRBSN; -} +ARM DECL_PROFILE(ActorProfileUnkRBSN); ARM Actor *ActorProfileUnkRBSN::Create() { return new(HeapIndex_2) ActorUnkRBSN(); diff --git a/src/080_BossSnow/MapObject/MapObjectUnkSTSS.cpp b/src/080_BossSnow/MapObject/MapObjectUnkSTSS.cpp index 9c27a344..6b32d381 100644 --- a/src/080_BossSnow/MapObject/MapObjectUnkSTSS.cpp +++ b/src/080_BossSnow/MapObject/MapObjectUnkSTSS.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkSTSS.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkSTSS sMapObjectProfileUnkSTSS; - -ARM MapObjectProfileUnkSTSS *MapObjectProfileUnkSTSS::GetProfile() { - return &sMapObjectProfileUnkSTSS; -} +ARM DECL_PROFILE(MapObjectProfileUnkSTSS); ARM MapObject *MapObjectProfileUnkSTSS::Create() { return new(HeapIndex_2) MapObjectUnkSTSS(); diff --git a/src/081_DgnLv3/Actor/ActorUnkPRPL.cpp b/src/081_DgnLv3/Actor/ActorUnkPRPL.cpp index bc6a5055..32d9b41f 100644 --- a/src/081_DgnLv3/Actor/ActorUnkPRPL.cpp +++ b/src/081_DgnLv3/Actor/ActorUnkPRPL.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkPRPL.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkPRPL sActorProfileUnkPRPL; - -ARM ActorProfileUnkPRPL *ActorProfileUnkPRPL::GetProfile() { - return &sActorProfileUnkPRPL; -} +ARM DECL_PROFILE(ActorProfileUnkPRPL); ARM Actor *ActorProfileUnkPRPL::Create() { return new(HeapIndex_2) ActorUnkPRPL(); diff --git a/src/081_DgnLv3/Actor/ActorUnkPRPP.cpp b/src/081_DgnLv3/Actor/ActorUnkPRPP.cpp index 7e3cdb79..7dd4b470 100644 --- a/src/081_DgnLv3/Actor/ActorUnkPRPP.cpp +++ b/src/081_DgnLv3/Actor/ActorUnkPRPP.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkPRPP.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkPRPP sActorProfileUnkPRPP; - -ARM ActorProfileUnkPRPP *ActorProfileUnkPRPP::GetProfile() { - return &sActorProfileUnkPRPP; -} +ARM DECL_PROFILE(ActorProfileUnkPRPP); ARM Actor *ActorProfileUnkPRPP::Create() { return new(HeapIndex_2) ActorUnkPRPP(); diff --git a/src/081_DgnLv3/MapObject/MapObjectUnkPRSH.cpp b/src/081_DgnLv3/MapObject/MapObjectUnkPRSH.cpp index ff424f08..62b69559 100644 --- a/src/081_DgnLv3/MapObject/MapObjectUnkPRSH.cpp +++ b/src/081_DgnLv3/MapObject/MapObjectUnkPRSH.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkPRSH.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkPRSH sMapObjectProfileUnkPRSH; - -ARM MapObjectProfileUnkPRSH *MapObjectProfileUnkPRSH::GetProfile() { - return &sMapObjectProfileUnkPRSH; -} +ARM DECL_PROFILE(MapObjectProfileUnkPRSH); ARM MapObject *MapObjectProfileUnkPRSH::Create() { return new(HeapIndex_2) MapObjectUnkPRSH(); diff --git a/src/082_DgnWater/Actor/ActorUnkDSWT.cpp b/src/082_DgnWater/Actor/ActorUnkDSWT.cpp index 5b8fed1b..3bdaf413 100644 --- a/src/082_DgnWater/Actor/ActorUnkDSWT.cpp +++ b/src/082_DgnWater/Actor/ActorUnkDSWT.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkDSWT.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkDSWT sActorProfileUnkDSWT; - -ARM ActorProfileUnkDSWT *ActorProfileUnkDSWT::GetProfile() { - return &sActorProfileUnkDSWT; -} +ARM DECL_PROFILE(ActorProfileUnkDSWT); ARM Actor *ActorProfileUnkDSWT::Create() { return new(HeapIndex_2) ActorUnkDSWT(); diff --git a/src/082_DgnWater/Actor/ActorUnkEWHI.cpp b/src/082_DgnWater/Actor/ActorUnkEWHI.cpp index 36648eea..23c329a2 100644 --- a/src/082_DgnWater/Actor/ActorUnkEWHI.cpp +++ b/src/082_DgnWater/Actor/ActorUnkEWHI.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkEWHI.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkEWHI sActorProfileUnkEWHI; - -ARM ActorProfileUnkEWHI *ActorProfileUnkEWHI::GetProfile() { - return &sActorProfileUnkEWHI; -} +ARM DECL_PROFILE(ActorProfileUnkEWHI); ARM Actor *ActorProfileUnkEWHI::Create() { return new(HeapIndex_2) ActorUnkEWHI(); diff --git a/src/082_DgnWater/Actor/ActorUnkWHMA.cpp b/src/082_DgnWater/Actor/ActorUnkWHMA.cpp index da74db7a..0c8a5d1d 100644 --- a/src/082_DgnWater/Actor/ActorUnkWHMA.cpp +++ b/src/082_DgnWater/Actor/ActorUnkWHMA.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkWHMA.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkWHMA sActorProfileUnkWHMA; - -ARM ActorProfileUnkWHMA *ActorProfileUnkWHMA::GetProfile() { - return &sActorProfileUnkWHMA; -} +ARM DECL_PROFILE(ActorProfileUnkWHMA); ARM Actor *ActorProfileUnkWHMA::Create() { return new(HeapIndex_2) ActorUnkWHMA(); diff --git a/src/083_BossWater/Actor/ActorUnkEFR3.cpp b/src/083_BossWater/Actor/ActorUnkEFR3.cpp index 187e5039..d3e1dcfc 100644 --- a/src/083_BossWater/Actor/ActorUnkEFR3.cpp +++ b/src/083_BossWater/Actor/ActorUnkEFR3.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkEFR3.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkEFR3 sActorProfileUnkEFR3; - -ARM ActorProfileUnkEFR3 *ActorProfileUnkEFR3::GetProfile() { - return &sActorProfileUnkEFR3; -} +ARM DECL_PROFILE(ActorProfileUnkEFR3); ARM Actor *ActorProfileUnkEFR3::Create() { return new(HeapIndex_2) ActorUnkEFR3(); diff --git a/src/083_BossWater/Actor/ActorUnkEFW3.cpp b/src/083_BossWater/Actor/ActorUnkEFW3.cpp index 4231fd36..c36a1454 100644 --- a/src/083_BossWater/Actor/ActorUnkEFW3.cpp +++ b/src/083_BossWater/Actor/ActorUnkEFW3.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkEFW3.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkEFW3 sActorProfileUnkEFW3; - -ARM ActorProfileUnkEFW3 *ActorProfileUnkEFW3::GetProfile() { - return &sActorProfileUnkEFW3; -} +ARM DECL_PROFILE(ActorProfileUnkEFW3); ARM Actor *ActorProfileUnkEFW3::Create() { return new(HeapIndex_2) ActorUnkEFW3(); diff --git a/src/083_BossWater/Actor/ActorUnkNPWC.cpp b/src/083_BossWater/Actor/ActorUnkNPWC.cpp index 0144d4cc..8d6f137b 100644 --- a/src/083_BossWater/Actor/ActorUnkNPWC.cpp +++ b/src/083_BossWater/Actor/ActorUnkNPWC.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkNPWC.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkNPWC sActorProfileUnkNPWC; - -ARM ActorProfileUnkNPWC *ActorProfileUnkNPWC::GetProfile() { - return &sActorProfileUnkNPWC; -} +ARM DECL_PROFILE(ActorProfileUnkNPWC); ARM Actor *ActorProfileUnkNPWC::Create() { return new(HeapIndex_2) ActorUnkNPWC(); diff --git a/src/083_BossWater/Actor/ActorUnkRBWS.cpp b/src/083_BossWater/Actor/ActorUnkRBWS.cpp index 7ef376a7..a6fa81f1 100644 --- a/src/083_BossWater/Actor/ActorUnkRBWS.cpp +++ b/src/083_BossWater/Actor/ActorUnkRBWS.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkRBWS.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkRBWS sActorProfileUnkRBWS; - -ARM ActorProfileUnkRBWS *ActorProfileUnkRBWS::GetProfile() { - return &sActorProfileUnkRBWS; -} +ARM DECL_PROFILE(ActorProfileUnkRBWS); ARM Actor *ActorProfileUnkRBWS::Create() { return new(HeapIndex_2) ActorUnkRBWS(); diff --git a/src/083_BossWater/Actor/ActorUnkRBWT.cpp b/src/083_BossWater/Actor/ActorUnkRBWT.cpp index 43c81a1f..6cdb12e5 100644 --- a/src/083_BossWater/Actor/ActorUnkRBWT.cpp +++ b/src/083_BossWater/Actor/ActorUnkRBWT.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkRBWT.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkRBWT sActorProfileUnkRBWT; - -ARM ActorProfileUnkRBWT *ActorProfileUnkRBWT::GetProfile() { - return &sActorProfileUnkRBWT; -} +ARM DECL_PROFILE(ActorProfileUnkRBWT); ARM Actor *ActorProfileUnkRBWT::Create() { return new(HeapIndex_2) ActorUnkRBWT(); diff --git a/src/083_BossWater/Actor/ActorUnkWBEF.cpp b/src/083_BossWater/Actor/ActorUnkWBEF.cpp index c5ba692b..cd3d07e3 100644 --- a/src/083_BossWater/Actor/ActorUnkWBEF.cpp +++ b/src/083_BossWater/Actor/ActorUnkWBEF.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkWBEF.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkWBEF sActorProfileUnkWBEF; - -ARM ActorProfileUnkWBEF *ActorProfileUnkWBEF::GetProfile() { - return &sActorProfileUnkWBEF; -} +ARM DECL_PROFILE(ActorProfileUnkWBEF); ARM Actor *ActorProfileUnkWBEF::Create() { return new(HeapIndex_2) ActorUnkWBEF(); diff --git a/src/083_BossWater/Actor/ActorUnkWBPS.cpp b/src/083_BossWater/Actor/ActorUnkWBPS.cpp index c4be28d6..359214bd 100644 --- a/src/083_BossWater/Actor/ActorUnkWBPS.cpp +++ b/src/083_BossWater/Actor/ActorUnkWBPS.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkWBPS.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkWBPS sActorProfileUnkWBPS; - -ARM ActorProfileUnkWBPS *ActorProfileUnkWBPS::GetProfile() { - return &sActorProfileUnkWBPS; -} +ARM DECL_PROFILE(ActorProfileUnkWBPS); ARM Actor *ActorProfileUnkWBPS::Create() { return new(HeapIndex_2) ActorUnkWBPS(); diff --git a/src/083_BossWater/Actor/ActorUnkWTBS.cpp b/src/083_BossWater/Actor/ActorUnkWTBS.cpp index d5306033..a024675e 100644 --- a/src/083_BossWater/Actor/ActorUnkWTBS.cpp +++ b/src/083_BossWater/Actor/ActorUnkWTBS.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkWTBS.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkWTBS sActorProfileUnkWTBS; - -ARM ActorProfileUnkWTBS *ActorProfileUnkWTBS::GetProfile() { - return &sActorProfileUnkWTBS; -} +ARM DECL_PROFILE(ActorProfileUnkWTBS); ARM Actor *ActorProfileUnkWTBS::Create() { return new(HeapIndex_2) ActorUnkWTBS(); diff --git a/src/083_BossWater/MapObject/MapObjectUnkSHWB.cpp b/src/083_BossWater/MapObject/MapObjectUnkSHWB.cpp index ea417a61..dfdf4fc2 100644 --- a/src/083_BossWater/MapObject/MapObjectUnkSHWB.cpp +++ b/src/083_BossWater/MapObject/MapObjectUnkSHWB.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkSHWB.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkSHWB sMapObjectProfileUnkSHWB; - -ARM MapObjectProfileUnkSHWB *MapObjectProfileUnkSHWB::GetProfile() { - return &sMapObjectProfileUnkSHWB; -} +ARM DECL_PROFILE(MapObjectProfileUnkSHWB); ARM MapObject *MapObjectProfileUnkSHWB::Create() { return new(HeapIndex_2) MapObjectUnkSHWB(); diff --git a/src/084_BossFlame/Actor/ActorUnkDSVC.cpp b/src/084_BossFlame/Actor/ActorUnkDSVC.cpp index b9d3706e..0e9b10d3 100644 --- a/src/084_BossFlame/Actor/ActorUnkDSVC.cpp +++ b/src/084_BossFlame/Actor/ActorUnkDSVC.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkDSVC.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkDSVC sActorProfileUnkDSVC; - -ARM ActorProfileUnkDSVC *ActorProfileUnkDSVC::GetProfile() { - return &sActorProfileUnkDSVC; -} +ARM DECL_PROFILE(ActorProfileUnkDSVC); ARM Actor *ActorProfileUnkDSVC::Create() { return new(HeapIndex_2) ActorUnkDSVC(); diff --git a/src/084_BossFlame/Actor/ActorUnkFIRB.cpp b/src/084_BossFlame/Actor/ActorUnkFIRB.cpp index 7afa38c9..4c035042 100644 --- a/src/084_BossFlame/Actor/ActorUnkFIRB.cpp +++ b/src/084_BossFlame/Actor/ActorUnkFIRB.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkFIRB.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkFIRB sActorProfileUnkFIRB; - -ARM ActorProfileUnkFIRB *ActorProfileUnkFIRB::GetProfile() { - return &sActorProfileUnkFIRB; -} +ARM DECL_PROFILE(ActorProfileUnkFIRB); ARM Actor *ActorProfileUnkFIRB::Create() { return new(HeapIndex_2) ActorUnkFIRB(); diff --git a/src/084_BossFlame/Actor/ActorUnkITSC.cpp b/src/084_BossFlame/Actor/ActorUnkITSC.cpp index 15be7621..d9bf27ba 100644 --- a/src/084_BossFlame/Actor/ActorUnkITSC.cpp +++ b/src/084_BossFlame/Actor/ActorUnkITSC.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkITSC.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkITSC sActorProfileUnkITSC; - -ARM ActorProfileUnkITSC *ActorProfileUnkITSC::GetProfile() { - return &sActorProfileUnkITSC; -} +ARM DECL_PROFILE(ActorProfileUnkITSC); ARM Actor *ActorProfileUnkITSC::Create() { return new(HeapIndex_2) ActorUnkITSC(); diff --git a/src/084_BossFlame/Actor/ActorUnkIWTS.cpp b/src/084_BossFlame/Actor/ActorUnkIWTS.cpp index b25de85e..ae162ce5 100644 --- a/src/084_BossFlame/Actor/ActorUnkIWTS.cpp +++ b/src/084_BossFlame/Actor/ActorUnkIWTS.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkIWTS.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkIWTS sActorProfileUnkIWTS; - -ARM ActorProfileUnkIWTS *ActorProfileUnkIWTS::GetProfile() { - return &sActorProfileUnkIWTS; -} +ARM DECL_PROFILE(ActorProfileUnkIWTS); ARM Actor *ActorProfileUnkIWTS::Create() { return new(HeapIndex_2) ActorUnkIWTS(); diff --git a/src/084_BossFlame/Actor/ActorUnkLAVA.cpp b/src/084_BossFlame/Actor/ActorUnkLAVA.cpp index e0b00772..12baae1d 100644 --- a/src/084_BossFlame/Actor/ActorUnkLAVA.cpp +++ b/src/084_BossFlame/Actor/ActorUnkLAVA.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkLAVA.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkLAVA sActorProfileUnkLAVA; - -ARM ActorProfileUnkLAVA *ActorProfileUnkLAVA::GetProfile() { - return &sActorProfileUnkLAVA; -} +ARM DECL_PROFILE(ActorProfileUnkLAVA); ARM Actor *ActorProfileUnkLAVA::Create() { return new(HeapIndex_2) ActorUnkLAVA(); diff --git a/src/084_BossFlame/Actor/ActorUnkLBRC.cpp b/src/084_BossFlame/Actor/ActorUnkLBRC.cpp index 25d82c92..84744cd7 100644 --- a/src/084_BossFlame/Actor/ActorUnkLBRC.cpp +++ b/src/084_BossFlame/Actor/ActorUnkLBRC.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkLBRC.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkLBRC sActorProfileUnkLBRC; - -ARM ActorProfileUnkLBRC *ActorProfileUnkLBRC::GetProfile() { - return &sActorProfileUnkLBRC; -} +ARM DECL_PROFILE(ActorProfileUnkLBRC); ARM Actor *ActorProfileUnkLBRC::Create() { return new(HeapIndex_2) ActorUnkLBRC(); diff --git a/src/084_BossFlame/Actor/ActorUnkLVBD.cpp b/src/084_BossFlame/Actor/ActorUnkLVBD.cpp index 970cfc58..e6bf60ba 100644 --- a/src/084_BossFlame/Actor/ActorUnkLVBD.cpp +++ b/src/084_BossFlame/Actor/ActorUnkLVBD.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkLVBD.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkLVBD sActorProfileUnkLVBD; - -ARM ActorProfileUnkLVBD *ActorProfileUnkLVBD::GetProfile() { - return &sActorProfileUnkLVBD; -} +ARM DECL_PROFILE(ActorProfileUnkLVBD); ARM Actor *ActorProfileUnkLVBD::Create() { return new(HeapIndex_2) ActorUnkLVBD(); diff --git a/src/084_BossFlame/Actor/ActorUnkRBVC.cpp b/src/084_BossFlame/Actor/ActorUnkRBVC.cpp index 7ee37d21..2e7c0e53 100644 --- a/src/084_BossFlame/Actor/ActorUnkRBVC.cpp +++ b/src/084_BossFlame/Actor/ActorUnkRBVC.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkRBVC.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkRBVC sActorProfileUnkRBVC; - -ARM ActorProfileUnkRBVC *ActorProfileUnkRBVC::GetProfile() { - return &sActorProfileUnkRBVC; -} +ARM DECL_PROFILE(ActorProfileUnkRBVC); ARM Actor *ActorProfileUnkRBVC::Create() { return new(HeapIndex_2) ActorUnkRBVC(); diff --git a/src/084_BossFlame/Actor/ActorUnkWIDR.cpp b/src/084_BossFlame/Actor/ActorUnkWIDR.cpp index 1927bbcf..8d0cfa0a 100644 --- a/src/084_BossFlame/Actor/ActorUnkWIDR.cpp +++ b/src/084_BossFlame/Actor/ActorUnkWIDR.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkWIDR.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkWIDR sActorProfileUnkWIDR; - -ARM ActorProfileUnkWIDR *ActorProfileUnkWIDR::GetProfile() { - return &sActorProfileUnkWIDR; -} +ARM DECL_PROFILE(ActorProfileUnkWIDR); ARM Actor *ActorProfileUnkWIDR::Create() { return new(HeapIndex_2) ActorUnkWIDR(); diff --git a/src/084_BossFlame/Actor/ActorUnkWIDT.cpp b/src/084_BossFlame/Actor/ActorUnkWIDT.cpp index d4fe652a..a4a46be7 100644 --- a/src/084_BossFlame/Actor/ActorUnkWIDT.cpp +++ b/src/084_BossFlame/Actor/ActorUnkWIDT.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkWIDT.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkWIDT sActorProfileUnkWIDT; - -ARM ActorProfileUnkWIDT *ActorProfileUnkWIDT::GetProfile() { - return &sActorProfileUnkWIDT; -} +ARM DECL_PROFILE(ActorProfileUnkWIDT); ARM Actor *ActorProfileUnkWIDT::Create() { return new(HeapIndex_2) ActorUnkWIDT(); diff --git a/src/084_BossFlame/MapObject/MapObjectUnkLVCM.cpp b/src/084_BossFlame/MapObject/MapObjectUnkLVCM.cpp index 56c29f06..c2a36242 100644 --- a/src/084_BossFlame/MapObject/MapObjectUnkLVCM.cpp +++ b/src/084_BossFlame/MapObject/MapObjectUnkLVCM.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkLVCM.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkLVCM sMapObjectProfileUnkLVCM; - -ARM MapObjectProfileUnkLVCM *MapObjectProfileUnkLVCM::GetProfile() { - return &sMapObjectProfileUnkLVCM; -} +ARM DECL_PROFILE(MapObjectProfileUnkLVCM); ARM MapObject *MapObjectProfileUnkLVCM::Create() { return new(HeapIndex_2) MapObjectUnkLVCM(); diff --git a/src/084_BossFlame/MapObject/MapObjectUnkMLVC.cpp b/src/084_BossFlame/MapObject/MapObjectUnkMLVC.cpp index 9808e21e..625a5b2b 100644 --- a/src/084_BossFlame/MapObject/MapObjectUnkMLVC.cpp +++ b/src/084_BossFlame/MapObject/MapObjectUnkMLVC.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkMLVC.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkMLVC sMapObjectProfileUnkMLVC; - -ARM MapObjectProfileUnkMLVC *MapObjectProfileUnkMLVC::GetProfile() { - return &sMapObjectProfileUnkMLVC; -} +ARM DECL_PROFILE(MapObjectProfileUnkMLVC); ARM MapObject *MapObjectProfileUnkMLVC::Create() { return new(HeapIndex_2) MapObjectUnkMLVC(); diff --git a/src/084_BossFlame/MapObject/MapObjectUnkPLV2.cpp b/src/084_BossFlame/MapObject/MapObjectUnkPLV2.cpp index fc27556d..15b70990 100644 --- a/src/084_BossFlame/MapObject/MapObjectUnkPLV2.cpp +++ b/src/084_BossFlame/MapObject/MapObjectUnkPLV2.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkPLV2.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkPLV2 sMapObjectProfileUnkPLV2; - -ARM MapObjectProfileUnkPLV2 *MapObjectProfileUnkPLV2::GetProfile() { - return &sMapObjectProfileUnkPLV2; -} +ARM DECL_PROFILE(MapObjectProfileUnkPLV2); ARM MapObject *MapObjectProfileUnkPLV2::Create() { return new(HeapIndex_2) MapObjectUnkPLV2(); diff --git a/src/084_BossFlame/MapObject/MapObjectUnkSTSV.cpp b/src/084_BossFlame/MapObject/MapObjectUnkSTSV.cpp index 8a84562c..babb2270 100644 --- a/src/084_BossFlame/MapObject/MapObjectUnkSTSV.cpp +++ b/src/084_BossFlame/MapObject/MapObjectUnkSTSV.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkSTSV.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkSTSV sMapObjectProfileUnkSTSV; - -ARM MapObjectProfileUnkSTSV *MapObjectProfileUnkSTSV::GetProfile() { - return &sMapObjectProfileUnkSTSV; -} +ARM DECL_PROFILE(MapObjectProfileUnkSTSV); ARM MapObject *MapObjectProfileUnkSTSV::Create() { return new(HeapIndex_2) MapObjectUnkSTSV(); diff --git a/src/084_BossFlame/MapObject/MapObjectUnkTMLV.cpp b/src/084_BossFlame/MapObject/MapObjectUnkTMLV.cpp index 11542ae2..ee084416 100644 --- a/src/084_BossFlame/MapObject/MapObjectUnkTMLV.cpp +++ b/src/084_BossFlame/MapObject/MapObjectUnkTMLV.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkTMLV.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkTMLV sMapObjectProfileUnkTMLV; - -ARM MapObjectProfileUnkTMLV *MapObjectProfileUnkTMLV::GetProfile() { - return &sMapObjectProfileUnkTMLV; -} +ARM DECL_PROFILE(MapObjectProfileUnkTMLV); ARM MapObject *MapObjectProfileUnkTMLV::Create() { return new(HeapIndex_2) MapObjectUnkTMLV(); diff --git a/src/085_DgnLv5/Actor/ActorUnkGRCM.cpp b/src/085_DgnLv5/Actor/ActorUnkGRCM.cpp index ff7ecc14..41f84dbb 100644 --- a/src/085_DgnLv5/Actor/ActorUnkGRCM.cpp +++ b/src/085_DgnLv5/Actor/ActorUnkGRCM.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkGRCM.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkGRCM sActorProfileUnkGRCM; - -ARM ActorProfileUnkGRCM *ActorProfileUnkGRCM::GetProfile() { - return &sActorProfileUnkGRCM; -} +ARM DECL_PROFILE(ActorProfileUnkGRCM); ARM Actor *ActorProfileUnkGRCM::Create() { return new(HeapIndex_2) ActorUnkGRCM(); diff --git a/src/085_DgnLv5/Actor/ActorUnkSRST.cpp b/src/085_DgnLv5/Actor/ActorUnkSRST.cpp index 335ea265..2f968b03 100644 --- a/src/085_DgnLv5/Actor/ActorUnkSRST.cpp +++ b/src/085_DgnLv5/Actor/ActorUnkSRST.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkSRST.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkSRST sActorProfileUnkSRST; - -ARM ActorProfileUnkSRST *ActorProfileUnkSRST::GetProfile() { - return &sActorProfileUnkSRST; -} +ARM DECL_PROFILE(ActorProfileUnkSRST); ARM Actor *ActorProfileUnkSRST::Create() { return new(HeapIndex_2) ActorUnkSRST(); diff --git a/src/085_DgnLv5/MapObject/MapObjectUnkCTPT.cpp b/src/085_DgnLv5/MapObject/MapObjectUnkCTPT.cpp index 832619d2..c999b7c6 100644 --- a/src/085_DgnLv5/MapObject/MapObjectUnkCTPT.cpp +++ b/src/085_DgnLv5/MapObject/MapObjectUnkCTPT.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkCTPT.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkCTPT sMapObjectProfileUnkCTPT; - -ARM MapObjectProfileUnkCTPT *MapObjectProfileUnkCTPT::GetProfile() { - return &sMapObjectProfileUnkCTPT; -} +ARM DECL_PROFILE(MapObjectProfileUnkCTPT); ARM MapObject *MapObjectProfileUnkCTPT::Create() { return new(HeapIndex_2) MapObjectUnkCTPT(); diff --git a/src/086_DgnDesert/Actor/ActorUnkDSDS.cpp b/src/086_DgnDesert/Actor/ActorUnkDSDS.cpp index 37b14aa2..b017466b 100644 --- a/src/086_DgnDesert/Actor/ActorUnkDSDS.cpp +++ b/src/086_DgnDesert/Actor/ActorUnkDSDS.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkDSDS.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkDSDS sActorProfileUnkDSDS; - -ARM ActorProfileUnkDSDS *ActorProfileUnkDSDS::GetProfile() { - return &sActorProfileUnkDSDS; -} +ARM DECL_PROFILE(ActorProfileUnkDSDS); ARM Actor *ActorProfileUnkDSDS::Create() { return new(HeapIndex_2) ActorUnkDSDS(); diff --git a/src/086_DgnDesert/Actor/ActorUnkEFSC.cpp b/src/086_DgnDesert/Actor/ActorUnkEFSC.cpp index ef2e9166..ea8d9978 100644 --- a/src/086_DgnDesert/Actor/ActorUnkEFSC.cpp +++ b/src/086_DgnDesert/Actor/ActorUnkEFSC.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkEFSC.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkEFSC sActorProfileUnkEFSC; - -ARM ActorProfileUnkEFSC *ActorProfileUnkEFSC::GetProfile() { - return &sActorProfileUnkEFSC; -} +ARM DECL_PROFILE(ActorProfileUnkEFSC); ARM Actor *ActorProfileUnkEFSC::Create() { return new(HeapIndex_2) ActorUnkEFSC(); diff --git a/src/086_DgnDesert/Actor/ActorUnkHAMN.cpp b/src/086_DgnDesert/Actor/ActorUnkHAMN.cpp index 53598720..f9edf127 100644 --- a/src/086_DgnDesert/Actor/ActorUnkHAMN.cpp +++ b/src/086_DgnDesert/Actor/ActorUnkHAMN.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkHAMN.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkHAMN sActorProfileUnkHAMN; - -ARM ActorProfileUnkHAMN *ActorProfileUnkHAMN::GetProfile() { - return &sActorProfileUnkHAMN; -} +ARM DECL_PROFILE(ActorProfileUnkHAMN); ARM Actor *ActorProfileUnkHAMN::Create() { return new(HeapIndex_2) ActorUnkHAMN(); diff --git a/src/086_DgnDesert/Actor/ActorUnkOCGS.cpp b/src/086_DgnDesert/Actor/ActorUnkOCGS.cpp index 2d435dc5..d4e2dd2d 100644 --- a/src/086_DgnDesert/Actor/ActorUnkOCGS.cpp +++ b/src/086_DgnDesert/Actor/ActorUnkOCGS.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkOCGS.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkOCGS sActorProfileUnkOCGS; - -ARM ActorProfileUnkOCGS *ActorProfileUnkOCGS::GetProfile() { - return &sActorProfileUnkOCGS; -} +ARM DECL_PROFILE(ActorProfileUnkOCGS); ARM Actor *ActorProfileUnkOCGS::Create() { return new(HeapIndex_2) ActorUnkOCGS(); diff --git a/src/086_DgnDesert/Actor/ActorUnkOCTG.cpp b/src/086_DgnDesert/Actor/ActorUnkOCTG.cpp index 5e58cae4..8b78e357 100644 --- a/src/086_DgnDesert/Actor/ActorUnkOCTG.cpp +++ b/src/086_DgnDesert/Actor/ActorUnkOCTG.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkOCTG.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkOCTG sActorProfileUnkOCTG; - -ARM ActorProfileUnkOCTG *ActorProfileUnkOCTG::GetProfile() { - return &sActorProfileUnkOCTG; -} +ARM DECL_PROFILE(ActorProfileUnkOCTG); ARM Actor *ActorProfileUnkOCTG::Create() { return new(HeapIndex_2) ActorUnkOCTG(); diff --git a/src/086_DgnDesert/Actor/ActorUnkQKSD.cpp b/src/086_DgnDesert/Actor/ActorUnkQKSD.cpp index 48a78387..898159e9 100644 --- a/src/086_DgnDesert/Actor/ActorUnkQKSD.cpp +++ b/src/086_DgnDesert/Actor/ActorUnkQKSD.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkQKSD.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkQKSD sActorProfileUnkQKSD; - -ARM ActorProfileUnkQKSD *ActorProfileUnkQKSD::GetProfile() { - return &sActorProfileUnkQKSD; -} +ARM DECL_PROFILE(ActorProfileUnkQKSD); ARM Actor *ActorProfileUnkQKSD::Create() { return new(HeapIndex_2) ActorUnkQKSD(); diff --git a/src/086_DgnDesert/Actor/ActorUnkQKTG.cpp b/src/086_DgnDesert/Actor/ActorUnkQKTG.cpp index 675a9b7f..f700b073 100644 --- a/src/086_DgnDesert/Actor/ActorUnkQKTG.cpp +++ b/src/086_DgnDesert/Actor/ActorUnkQKTG.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkQKTG.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkQKTG sActorProfileUnkQKTG; - -ARM ActorProfileUnkQKTG *ActorProfileUnkQKTG::GetProfile() { - return &sActorProfileUnkQKTG; -} +ARM DECL_PROFILE(ActorProfileUnkQKTG); ARM Actor *ActorProfileUnkQKTG::Create() { return new(HeapIndex_2) ActorUnkQKTG(); diff --git a/src/086_DgnDesert/Actor/ActorUnkRMDS.cpp b/src/086_DgnDesert/Actor/ActorUnkRMDS.cpp index 76ab5b49..8eee4729 100644 --- a/src/086_DgnDesert/Actor/ActorUnkRMDS.cpp +++ b/src/086_DgnDesert/Actor/ActorUnkRMDS.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkRMDS.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkRMDS sActorProfileUnkRMDS; - -ARM ActorProfileUnkRMDS *ActorProfileUnkRMDS::GetProfile() { - return &sActorProfileUnkRMDS; -} +ARM DECL_PROFILE(ActorProfileUnkRMDS); ARM Actor *ActorProfileUnkRMDS::Create() { return new(HeapIndex_2) ActorUnkRMDS(); diff --git a/src/086_DgnDesert/Actor/ActorUnkRNTN.cpp b/src/086_DgnDesert/Actor/ActorUnkRNTN.cpp index c9c46d47..93fccb81 100644 --- a/src/086_DgnDesert/Actor/ActorUnkRNTN.cpp +++ b/src/086_DgnDesert/Actor/ActorUnkRNTN.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkRNTN.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkRNTN sActorProfileUnkRNTN; - -ARM ActorProfileUnkRNTN *ActorProfileUnkRNTN::GetProfile() { - return &sActorProfileUnkRNTN; -} +ARM DECL_PROFILE(ActorProfileUnkRNTN); ARM Actor *ActorProfileUnkRNTN::Create() { return new(HeapIndex_2) ActorUnkRNTN(); diff --git a/src/086_DgnDesert/MapObject/MapObjectUnkDRBR.cpp b/src/086_DgnDesert/MapObject/MapObjectUnkDRBR.cpp index 1dad90fd..df83f7f6 100644 --- a/src/086_DgnDesert/MapObject/MapObjectUnkDRBR.cpp +++ b/src/086_DgnDesert/MapObject/MapObjectUnkDRBR.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkDRBR.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkDRBR sMapObjectProfileUnkDRBR; - -ARM MapObjectProfileUnkDRBR *MapObjectProfileUnkDRBR::GetProfile() { - return &sMapObjectProfileUnkDRBR; -} +ARM DECL_PROFILE(MapObjectProfileUnkDRBR); ARM MapObject *MapObjectProfileUnkDRBR::Create() { return new(HeapIndex_2) MapObjectUnkDRBR(); diff --git a/src/086_DgnDesert/MapObject/MapObjectUnkDRRS.cpp b/src/086_DgnDesert/MapObject/MapObjectUnkDRRS.cpp index 72b6aa84..9e92603b 100644 --- a/src/086_DgnDesert/MapObject/MapObjectUnkDRRS.cpp +++ b/src/086_DgnDesert/MapObject/MapObjectUnkDRRS.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkDRRS.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkDRRS sMapObjectProfileUnkDRRS; - -ARM MapObjectProfileUnkDRRS *MapObjectProfileUnkDRRS::GetProfile() { - return &sMapObjectProfileUnkDRRS; -} +ARM DECL_PROFILE(MapObjectProfileUnkDRRS); ARM MapObject *MapObjectProfileUnkDRRS::Create() { return new(HeapIndex_2) MapObjectUnkDRRS(); diff --git a/src/086_DgnDesert/MapObject/MapObjectUnkGRSG.cpp b/src/086_DgnDesert/MapObject/MapObjectUnkGRSG.cpp index fa42b5c2..cd60f5d4 100644 --- a/src/086_DgnDesert/MapObject/MapObjectUnkGRSG.cpp +++ b/src/086_DgnDesert/MapObject/MapObjectUnkGRSG.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkGRSG.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkGRSG sMapObjectProfileUnkGRSG; - -ARM MapObjectProfileUnkGRSG *MapObjectProfileUnkGRSG::GetProfile() { - return &sMapObjectProfileUnkGRSG; -} +ARM DECL_PROFILE(MapObjectProfileUnkGRSG); ARM MapObject *MapObjectProfileUnkGRSG::Create() { return new(HeapIndex_2) MapObjectUnkGRSG(); diff --git a/src/086_DgnDesert/MapObject/MapObjectUnkSTDS.cpp b/src/086_DgnDesert/MapObject/MapObjectUnkSTDS.cpp index 8b35c61d..7da1abce 100644 --- a/src/086_DgnDesert/MapObject/MapObjectUnkSTDS.cpp +++ b/src/086_DgnDesert/MapObject/MapObjectUnkSTDS.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkSTDS.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkSTDS sMapObjectProfileUnkSTDS; - -ARM MapObjectProfileUnkSTDS *MapObjectProfileUnkSTDS::GetProfile() { - return &sMapObjectProfileUnkSTDS; -} +ARM DECL_PROFILE(MapObjectProfileUnkSTDS); ARM MapObject *MapObjectProfileUnkSTDS::Create() { return new(HeapIndex_2) MapObjectUnkSTDS(); diff --git a/src/087_BossDesert/Actor/ActorUnkDSBB.cpp b/src/087_BossDesert/Actor/ActorUnkDSBB.cpp index f4ea2ad1..8ad6ac92 100644 --- a/src/087_BossDesert/Actor/ActorUnkDSBB.cpp +++ b/src/087_BossDesert/Actor/ActorUnkDSBB.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkDSBB.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkDSBB sActorProfileUnkDSBB; - -ARM ActorProfileUnkDSBB *ActorProfileUnkDSBB::GetProfile() { - return &sActorProfileUnkDSBB; -} +ARM DECL_PROFILE(ActorProfileUnkDSBB); ARM Actor *ActorProfileUnkDSBB::Create() { return new(HeapIndex_2) ActorUnkDSBB(); diff --git a/src/087_BossDesert/Actor/ActorUnkDSBH.cpp b/src/087_BossDesert/Actor/ActorUnkDSBH.cpp index b8a7d95c..380c4cd4 100644 --- a/src/087_BossDesert/Actor/ActorUnkDSBH.cpp +++ b/src/087_BossDesert/Actor/ActorUnkDSBH.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkDSBH.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkDSBH sActorProfileUnkDSBH; - -ARM ActorProfileUnkDSBH *ActorProfileUnkDSBH::GetProfile() { - return &sActorProfileUnkDSBH; -} +ARM DECL_PROFILE(ActorProfileUnkDSBH); ARM Actor *ActorProfileUnkDSBH::Create() { return new(HeapIndex_2) ActorUnkDSBH(); diff --git a/src/087_BossDesert/Actor/ActorUnkDSBN.cpp b/src/087_BossDesert/Actor/ActorUnkDSBN.cpp index 2f212162..bc8f1ce5 100644 --- a/src/087_BossDesert/Actor/ActorUnkDSBN.cpp +++ b/src/087_BossDesert/Actor/ActorUnkDSBN.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkDSBN.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkDSBN sActorProfileUnkDSBN; - -ARM ActorProfileUnkDSBN *ActorProfileUnkDSBN::GetProfile() { - return &sActorProfileUnkDSBN; -} +ARM DECL_PROFILE(ActorProfileUnkDSBN); ARM Actor *ActorProfileUnkDSBN::Create() { return new(HeapIndex_2) ActorUnkDSBN(); diff --git a/src/087_BossDesert/Actor/ActorUnkRBD2.cpp b/src/087_BossDesert/Actor/ActorUnkRBD2.cpp index 0726ba0d..c3a240bf 100644 --- a/src/087_BossDesert/Actor/ActorUnkRBD2.cpp +++ b/src/087_BossDesert/Actor/ActorUnkRBD2.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkRBD2.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkRBD2 sActorProfileUnkRBD2; - -ARM ActorProfileUnkRBD2 *ActorProfileUnkRBD2::GetProfile() { - return &sActorProfileUnkRBD2; -} +ARM DECL_PROFILE(ActorProfileUnkRBD2); ARM Actor *ActorProfileUnkRBD2::Create() { return new(HeapIndex_2) ActorUnkRBD2(); diff --git a/src/087_BossDesert/Actor/ActorUnkRBDS.cpp b/src/087_BossDesert/Actor/ActorUnkRBDS.cpp index 36ff6d16..187739dd 100644 --- a/src/087_BossDesert/Actor/ActorUnkRBDS.cpp +++ b/src/087_BossDesert/Actor/ActorUnkRBDS.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkRBDS.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkRBDS sActorProfileUnkRBDS; - -ARM ActorProfileUnkRBDS *ActorProfileUnkRBDS::GetProfile() { - return &sActorProfileUnkRBDS; -} +ARM DECL_PROFILE(ActorProfileUnkRBDS); ARM Actor *ActorProfileUnkRBDS::Create() { return new(HeapIndex_2) ActorUnkRBDS(); diff --git a/src/087_BossDesert/MapObject/MapObjectUnkSTSD.cpp b/src/087_BossDesert/MapObject/MapObjectUnkSTSD.cpp index e50a8312..ad79a861 100644 --- a/src/087_BossDesert/MapObject/MapObjectUnkSTSD.cpp +++ b/src/087_BossDesert/MapObject/MapObjectUnkSTSD.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkSTSD.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkSTSD sMapObjectProfileUnkSTSD; - -ARM MapObjectProfileUnkSTSD *MapObjectProfileUnkSTSD::GetProfile() { - return &sMapObjectProfileUnkSTSD; -} +ARM DECL_PROFILE(MapObjectProfileUnkSTSD); ARM MapObject *MapObjectProfileUnkSTSD::Create() { return new(HeapIndex_2) MapObjectUnkSTSD(); diff --git a/src/088_Stb/Actor/ActorUnkDMCH.cpp b/src/088_Stb/Actor/ActorUnkDMCH.cpp index f66c3d34..a64e3654 100644 --- a/src/088_Stb/Actor/ActorUnkDMCH.cpp +++ b/src/088_Stb/Actor/ActorUnkDMCH.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkDMCH.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkDMCH sActorProfileUnkDMCH; - -ARM ActorProfileUnkDMCH *ActorProfileUnkDMCH::GetProfile() { - return &sActorProfileUnkDMCH; -} +ARM DECL_PROFILE(ActorProfileUnkDMCH); ARM Actor *ActorProfileUnkDMCH::Create() { return new(HeapIndex_2) ActorUnkDMCH(); diff --git a/src/088_Stb/Actor/ActorUnkDMEQ.cpp b/src/088_Stb/Actor/ActorUnkDMEQ.cpp index f71b76dc..850159c1 100644 --- a/src/088_Stb/Actor/ActorUnkDMEQ.cpp +++ b/src/088_Stb/Actor/ActorUnkDMEQ.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkDMEQ.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkDMEQ sActorProfileUnkDMEQ; - -ARM ActorProfileUnkDMEQ *ActorProfileUnkDMEQ::GetProfile() { - return &sActorProfileUnkDMEQ; -} +ARM DECL_PROFILE(ActorProfileUnkDMEQ); ARM Actor *ActorProfileUnkDMEQ::Create() { return new(HeapIndex_2) ActorUnkDMEQ(); diff --git a/src/088_Stb/Actor/ActorUnkDMET.cpp b/src/088_Stb/Actor/ActorUnkDMET.cpp index aef6c6b9..008ac80e 100644 --- a/src/088_Stb/Actor/ActorUnkDMET.cpp +++ b/src/088_Stb/Actor/ActorUnkDMET.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkDMET.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkDMET sActorProfileUnkDMET; - -ARM ActorProfileUnkDMET *ActorProfileUnkDMET::GetProfile() { - return &sActorProfileUnkDMET; -} +ARM DECL_PROFILE(ActorProfileUnkDMET); ARM Actor *ActorProfileUnkDMET::Create() { return new(HeapIndex_2) ActorUnkDMET(); diff --git a/src/088_Stb/Actor/ActorUnkDMFR.cpp b/src/088_Stb/Actor/ActorUnkDMFR.cpp index ec307192..52b402a3 100644 --- a/src/088_Stb/Actor/ActorUnkDMFR.cpp +++ b/src/088_Stb/Actor/ActorUnkDMFR.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkDMFR.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkDMFR sActorProfileUnkDMFR; - -ARM ActorProfileUnkDMFR *ActorProfileUnkDMFR::GetProfile() { - return &sActorProfileUnkDMFR; -} +ARM DECL_PROFILE(ActorProfileUnkDMFR); ARM Actor *ActorProfileUnkDMFR::Create() { return new(HeapIndex_2) ActorUnkDMFR(); diff --git a/src/088_Stb/Actor/ActorUnkDMGM.cpp b/src/088_Stb/Actor/ActorUnkDMGM.cpp index 94787984..012dd05c 100644 --- a/src/088_Stb/Actor/ActorUnkDMGM.cpp +++ b/src/088_Stb/Actor/ActorUnkDMGM.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkDMGM.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkDMGM sActorProfileUnkDMGM; - -ARM ActorProfileUnkDMGM *ActorProfileUnkDMGM::GetProfile() { - return &sActorProfileUnkDMGM; -} +ARM DECL_PROFILE(ActorProfileUnkDMGM); ARM Actor *ActorProfileUnkDMGM::Create() { return new(HeapIndex_2) ActorUnkDMGM(); diff --git a/src/088_Stb/Actor/ActorUnkDMMM.cpp b/src/088_Stb/Actor/ActorUnkDMMM.cpp index b3dc4c01..c6e72809 100644 --- a/src/088_Stb/Actor/ActorUnkDMMM.cpp +++ b/src/088_Stb/Actor/ActorUnkDMMM.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkDMMM.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkDMMM sActorProfileUnkDMMM; - -ARM ActorProfileUnkDMMM *ActorProfileUnkDMMM::GetProfile() { - return &sActorProfileUnkDMMM; -} +ARM DECL_PROFILE(ActorProfileUnkDMMM); ARM Actor *ActorProfileUnkDMMM::Create() { return new(HeapIndex_2) ActorUnkDMMM(); diff --git a/src/088_Stb/Actor/ActorUnkDMMS.cpp b/src/088_Stb/Actor/ActorUnkDMMS.cpp index 5661773b..3e527de7 100644 --- a/src/088_Stb/Actor/ActorUnkDMMS.cpp +++ b/src/088_Stb/Actor/ActorUnkDMMS.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkDMMS.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkDMMS sActorProfileUnkDMMS; - -ARM ActorProfileUnkDMMS *ActorProfileUnkDMMS::GetProfile() { - return &sActorProfileUnkDMMS; -} +ARM DECL_PROFILE(ActorProfileUnkDMMS); ARM Actor *ActorProfileUnkDMMS::Create() { return new(HeapIndex_2) ActorUnkDMMS(); diff --git a/src/088_Stb/Actor/ActorUnkDMMT.cpp b/src/088_Stb/Actor/ActorUnkDMMT.cpp index a820e2fb..aa1ed490 100644 --- a/src/088_Stb/Actor/ActorUnkDMMT.cpp +++ b/src/088_Stb/Actor/ActorUnkDMMT.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkDMMT.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkDMMT sActorProfileUnkDMMT; - -ARM ActorProfileUnkDMMT *ActorProfileUnkDMMT::GetProfile() { - return &sActorProfileUnkDMMT; -} +ARM DECL_PROFILE(ActorProfileUnkDMMT); ARM Actor *ActorProfileUnkDMMT::Create() { return new(HeapIndex_2) ActorUnkDMMT(); diff --git a/src/088_Stb/Actor/ActorUnkDMPK.cpp b/src/088_Stb/Actor/ActorUnkDMPK.cpp index 88c5f692..65c90c3c 100644 --- a/src/088_Stb/Actor/ActorUnkDMPK.cpp +++ b/src/088_Stb/Actor/ActorUnkDMPK.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkDMPK.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkDMPK sActorProfileUnkDMPK; - -ARM ActorProfileUnkDMPK *ActorProfileUnkDMPK::GetProfile() { - return &sActorProfileUnkDMPK; -} +ARM DECL_PROFILE(ActorProfileUnkDMPK); ARM Actor *ActorProfileUnkDMPK::Create() { return new(HeapIndex_2) ActorUnkDMPK(); diff --git a/src/088_Stb/Actor/ActorUnkDMPS.cpp b/src/088_Stb/Actor/ActorUnkDMPS.cpp index 25670aae..7e571764 100644 --- a/src/088_Stb/Actor/ActorUnkDMPS.cpp +++ b/src/088_Stb/Actor/ActorUnkDMPS.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkDMPS.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkDMPS sActorProfileUnkDMPS; - -ARM ActorProfileUnkDMPS *ActorProfileUnkDMPS::GetProfile() { - return &sActorProfileUnkDMPS; -} +ARM DECL_PROFILE(ActorProfileUnkDMPS); ARM Actor *ActorProfileUnkDMPS::Create() { return new(HeapIndex_2) ActorUnkDMPS(); diff --git a/src/088_Stb/Actor/ActorUnkDMSS.cpp b/src/088_Stb/Actor/ActorUnkDMSS.cpp index 17e49f42..3c5b334a 100644 --- a/src/088_Stb/Actor/ActorUnkDMSS.cpp +++ b/src/088_Stb/Actor/ActorUnkDMSS.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkDMSS.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkDMSS sActorProfileUnkDMSS; - -ARM ActorProfileUnkDMSS *ActorProfileUnkDMSS::GetProfile() { - return &sActorProfileUnkDMSS; -} +ARM DECL_PROFILE(ActorProfileUnkDMSS); ARM Actor *ActorProfileUnkDMSS::Create() { return new(HeapIndex_2) ActorUnkDMSS(); diff --git a/src/088_Stb/Actor/ActorUnkDMST.cpp b/src/088_Stb/Actor/ActorUnkDMST.cpp index e4e44ad0..85da56d0 100644 --- a/src/088_Stb/Actor/ActorUnkDMST.cpp +++ b/src/088_Stb/Actor/ActorUnkDMST.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkDMST.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkDMST sActorProfileUnkDMST; - -ARM ActorProfileUnkDMST *ActorProfileUnkDMST::GetProfile() { - return &sActorProfileUnkDMST; -} +ARM DECL_PROFILE(ActorProfileUnkDMST); ARM Actor *ActorProfileUnkDMST::Create() { return new(HeapIndex_2) ActorUnkDMST(); diff --git a/src/088_Stb/Actor/ActorUnkDMT2.cpp b/src/088_Stb/Actor/ActorUnkDMT2.cpp index a12b8019..5cf30c53 100644 --- a/src/088_Stb/Actor/ActorUnkDMT2.cpp +++ b/src/088_Stb/Actor/ActorUnkDMT2.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkDMT2.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkDMT2 sActorProfileUnkDMT2; - -ARM ActorProfileUnkDMT2 *ActorProfileUnkDMT2::GetProfile() { - return &sActorProfileUnkDMT2; -} +ARM DECL_PROFILE(ActorProfileUnkDMT2); ARM Actor *ActorProfileUnkDMT2::Create() { return new(HeapIndex_2) ActorUnkDMT2(); diff --git a/src/088_Stb/Actor/ActorUnkDMTR.cpp b/src/088_Stb/Actor/ActorUnkDMTR.cpp index 3abc67c2..7efb9bea 100644 --- a/src/088_Stb/Actor/ActorUnkDMTR.cpp +++ b/src/088_Stb/Actor/ActorUnkDMTR.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkDMTR.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkDMTR sActorProfileUnkDMTR; - -ARM ActorProfileUnkDMTR *ActorProfileUnkDMTR::GetProfile() { - return &sActorProfileUnkDMTR; -} +ARM DECL_PROFILE(ActorProfileUnkDMTR); ARM Actor *ActorProfileUnkDMTR::Create() { return new(HeapIndex_2) ActorUnkDMTR(); diff --git a/src/088_Stb/Actor/ActorUnkDMWS.cpp b/src/088_Stb/Actor/ActorUnkDMWS.cpp index 1b6eeccd..2f6d7e93 100644 --- a/src/088_Stb/Actor/ActorUnkDMWS.cpp +++ b/src/088_Stb/Actor/ActorUnkDMWS.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkDMWS.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkDMWS sActorProfileUnkDMWS; - -ARM ActorProfileUnkDMWS *ActorProfileUnkDMWS::GetProfile() { - return &sActorProfileUnkDMWS; -} +ARM DECL_PROFILE(ActorProfileUnkDMWS); ARM Actor *ActorProfileUnkDMWS::Create() { return new(HeapIndex_2) ActorUnkDMWS(); diff --git a/src/088_Stb/Actor/ActorUnkDMWT.cpp b/src/088_Stb/Actor/ActorUnkDMWT.cpp index 454b6457..932a72a3 100644 --- a/src/088_Stb/Actor/ActorUnkDMWT.cpp +++ b/src/088_Stb/Actor/ActorUnkDMWT.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkDMWT.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkDMWT sActorProfileUnkDMWT; - -ARM ActorProfileUnkDMWT *ActorProfileUnkDMWT::GetProfile() { - return &sActorProfileUnkDMWT; -} +ARM DECL_PROFILE(ActorProfileUnkDMWT); ARM Actor *ActorProfileUnkDMWT::Create() { return new(HeapIndex_2) ActorUnkDMWT(); diff --git a/src/088_Stb/Actor/ActorUnkDMZS.cpp b/src/088_Stb/Actor/ActorUnkDMZS.cpp index 54755416..bd0ca565 100644 --- a/src/088_Stb/Actor/ActorUnkDMZS.cpp +++ b/src/088_Stb/Actor/ActorUnkDMZS.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkDMZS.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkDMZS sActorProfileUnkDMZS; - -ARM ActorProfileUnkDMZS *ActorProfileUnkDMZS::GetProfile() { - return &sActorProfileUnkDMZS; -} +ARM DECL_PROFILE(ActorProfileUnkDMZS); ARM Actor *ActorProfileUnkDMZS::Create() { return new(HeapIndex_2) ActorUnkDMZS(); diff --git a/src/088_Stb/Actor/ActorUnkRMDO.cpp b/src/088_Stb/Actor/ActorUnkRMDO.cpp index 99cdbbb3..fdb80033 100644 --- a/src/088_Stb/Actor/ActorUnkRMDO.cpp +++ b/src/088_Stb/Actor/ActorUnkRMDO.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkRMDO.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkRMDO sActorProfileUnkRMDO; - -ARM ActorProfileUnkRMDO *ActorProfileUnkRMDO::GetProfile() { - return &sActorProfileUnkRMDO; -} +ARM DECL_PROFILE(ActorProfileUnkRMDO); ARM Actor *ActorProfileUnkRMDO::Create() { return new(HeapIndex_2) ActorUnkRMDO(); diff --git a/src/088_Stb/Actor/ActorUnkRMM2.cpp b/src/088_Stb/Actor/ActorUnkRMM2.cpp index e17d59b0..b7328b83 100644 --- a/src/088_Stb/Actor/ActorUnkRMM2.cpp +++ b/src/088_Stb/Actor/ActorUnkRMM2.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkRMM2.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkRMM2 sActorProfileUnkRMM2; - -ARM ActorProfileUnkRMM2 *ActorProfileUnkRMM2::GetProfile() { - return &sActorProfileUnkRMM2; -} +ARM DECL_PROFILE(ActorProfileUnkRMM2); ARM Actor *ActorProfileUnkRMM2::Create() { return new(HeapIndex_2) ActorUnkRMM2(); diff --git a/src/090_TrainNormal/Actor/ActorUnkE3GL.cpp b/src/090_TrainNormal/Actor/ActorUnkE3GL.cpp index 4a30a1a7..bffc0d20 100644 --- a/src/090_TrainNormal/Actor/ActorUnkE3GL.cpp +++ b/src/090_TrainNormal/Actor/ActorUnkE3GL.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkE3GL.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkE3GL sActorProfileUnkE3GL; - -ARM ActorProfileUnkE3GL *ActorProfileUnkE3GL::GetProfile() { - return &sActorProfileUnkE3GL; -} +ARM DECL_PROFILE(ActorProfileUnkE3GL); ARM Actor *ActorProfileUnkE3GL::Create() { return new(HeapIndex_2) ActorUnkE3GL(); diff --git a/src/090_TrainNormal/Actor/ActorUnkE3ST.cpp b/src/090_TrainNormal/Actor/ActorUnkE3ST.cpp index 7ebc3a2b..45a339cb 100644 --- a/src/090_TrainNormal/Actor/ActorUnkE3ST.cpp +++ b/src/090_TrainNormal/Actor/ActorUnkE3ST.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkE3ST.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkE3ST sActorProfileUnkE3ST; - -ARM ActorProfileUnkE3ST *ActorProfileUnkE3ST::GetProfile() { - return &sActorProfileUnkE3ST; -} +ARM DECL_PROFILE(ActorProfileUnkE3ST); ARM Actor *ActorProfileUnkE3ST::Create() { return new(HeapIndex_2) ActorUnkE3ST(); diff --git a/src/090_TrainNormal/Actor/ActorUnkE3TT.cpp b/src/090_TrainNormal/Actor/ActorUnkE3TT.cpp index afa794f1..2f53d46d 100644 --- a/src/090_TrainNormal/Actor/ActorUnkE3TT.cpp +++ b/src/090_TrainNormal/Actor/ActorUnkE3TT.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkE3TT.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkE3TT sActorProfileUnkE3TT; - -ARM ActorProfileUnkE3TT *ActorProfileUnkE3TT::GetProfile() { - return &sActorProfileUnkE3TT; -} +ARM DECL_PROFILE(ActorProfileUnkE3TT); ARM Actor *ActorProfileUnkE3TT::Create() { return new(HeapIndex_2) ActorUnkE3TT(); diff --git a/src/090_TrainNormal/Actor/ActorUnkSPID.cpp b/src/090_TrainNormal/Actor/ActorUnkSPID.cpp index 4c37e08c..d87d720b 100644 --- a/src/090_TrainNormal/Actor/ActorUnkSPID.cpp +++ b/src/090_TrainNormal/Actor/ActorUnkSPID.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkSPID.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkSPID sActorProfileUnkSPID; - -ARM ActorProfileUnkSPID *ActorProfileUnkSPID::GetProfile() { - return &sActorProfileUnkSPID; -} +ARM DECL_PROFILE(ActorProfileUnkSPID); ARM Actor *ActorProfileUnkSPID::Create() { return new(HeapIndex_2) ActorUnkSPID(); diff --git a/src/090_TrainNormal/Actor/ActorUnkSZRD.cpp b/src/090_TrainNormal/Actor/ActorUnkSZRD.cpp index a7b00545..09bf1fe1 100644 --- a/src/090_TrainNormal/Actor/ActorUnkSZRD.cpp +++ b/src/090_TrainNormal/Actor/ActorUnkSZRD.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkSZRD.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkSZRD sActorProfileUnkSZRD; - -ARM ActorProfileUnkSZRD *ActorProfileUnkSZRD::GetProfile() { - return &sActorProfileUnkSZRD; -} +ARM DECL_PROFILE(ActorProfileUnkSZRD); ARM Actor *ActorProfileUnkSZRD::Create() { return new(HeapIndex_2) ActorUnkSZRD(); diff --git a/src/090_TrainNormal/Actor/ActorUnkWDBA.cpp b/src/090_TrainNormal/Actor/ActorUnkWDBA.cpp index a5857986..8bf45c58 100644 --- a/src/090_TrainNormal/Actor/ActorUnkWDBA.cpp +++ b/src/090_TrainNormal/Actor/ActorUnkWDBA.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkWDBA.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkWDBA sActorProfileUnkWDBA; - -ARM ActorProfileUnkWDBA *ActorProfileUnkWDBA::GetProfile() { - return &sActorProfileUnkWDBA; -} +ARM DECL_PROFILE(ActorProfileUnkWDBA); ARM Actor *ActorProfileUnkWDBA::Create() { return new(HeapIndex_2) ActorUnkWDBA(); diff --git a/src/090_TrainNormal/Actor/ActorUnkWDRD.cpp b/src/090_TrainNormal/Actor/ActorUnkWDRD.cpp index 3c4c38ea..cd179ce8 100644 --- a/src/090_TrainNormal/Actor/ActorUnkWDRD.cpp +++ b/src/090_TrainNormal/Actor/ActorUnkWDRD.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkWDRD.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkWDRD sActorProfileUnkWDRD; - -ARM ActorProfileUnkWDRD *ActorProfileUnkWDRD::GetProfile() { - return &sActorProfileUnkWDRD; -} +ARM DECL_PROFILE(ActorProfileUnkWDRD); ARM Actor *ActorProfileUnkWDRD::Create() { return new(HeapIndex_2) ActorUnkWDRD(); diff --git a/src/090_TrainNormal/MapObject/MapObjectUnkETNM.cpp b/src/090_TrainNormal/MapObject/MapObjectUnkETNM.cpp index cf6f38ed..368ffb7b 100644 --- a/src/090_TrainNormal/MapObject/MapObjectUnkETNM.cpp +++ b/src/090_TrainNormal/MapObject/MapObjectUnkETNM.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkETNM.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkETNM sMapObjectProfileUnkETNM; - -ARM MapObjectProfileUnkETNM *MapObjectProfileUnkETNM::GetProfile() { - return &sMapObjectProfileUnkETNM; -} +ARM DECL_PROFILE(MapObjectProfileUnkETNM); ARM MapObject *MapObjectProfileUnkETNM::Create() { return new(HeapIndex_2) MapObjectUnkETNM(); diff --git a/src/090_TrainNormal/MapObject/MapObjectUnkNPST.cpp b/src/090_TrainNormal/MapObject/MapObjectUnkNPST.cpp index e4cb54c9..8268bd85 100644 --- a/src/090_TrainNormal/MapObject/MapObjectUnkNPST.cpp +++ b/src/090_TrainNormal/MapObject/MapObjectUnkNPST.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkNPST.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkNPST sMapObjectProfileUnkNPST; - -ARM MapObjectProfileUnkNPST *MapObjectProfileUnkNPST::GetProfile() { - return &sMapObjectProfileUnkNPST; -} +ARM DECL_PROFILE(MapObjectProfileUnkNPST); ARM MapObject *MapObjectProfileUnkNPST::Create() { return new(HeapIndex_2) MapObjectUnkNPST(); diff --git a/src/090_TrainNormal/MapObject/MapObjectUnkRBMR.cpp b/src/090_TrainNormal/MapObject/MapObjectUnkRBMR.cpp index 1772362b..1bba4a35 100644 --- a/src/090_TrainNormal/MapObject/MapObjectUnkRBMR.cpp +++ b/src/090_TrainNormal/MapObject/MapObjectUnkRBMR.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkRBMR.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkRBMR sMapObjectProfileUnkRBMR; - -ARM MapObjectProfileUnkRBMR *MapObjectProfileUnkRBMR::GetProfile() { - return &sMapObjectProfileUnkRBMR; -} +ARM DECL_PROFILE(MapObjectProfileUnkRBMR); ARM MapObject *MapObjectProfileUnkRBMR::Create() { return new(HeapIndex_2) MapObjectUnkRBMR(); diff --git a/src/090_TrainNormal/MapObject/MapObjectUnkRBRC.cpp b/src/090_TrainNormal/MapObject/MapObjectUnkRBRC.cpp index 9dfd89a4..0de489ee 100644 --- a/src/090_TrainNormal/MapObject/MapObjectUnkRBRC.cpp +++ b/src/090_TrainNormal/MapObject/MapObjectUnkRBRC.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkRBRC.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkRBRC sMapObjectProfileUnkRBRC; - -ARM MapObjectProfileUnkRBRC *MapObjectProfileUnkRBRC::GetProfile() { - return &sMapObjectProfileUnkRBRC; -} +ARM DECL_PROFILE(MapObjectProfileUnkRBRC); ARM MapObject *MapObjectProfileUnkRBRC::Create() { return new(HeapIndex_2) MapObjectUnkRBRC(); diff --git a/src/090_TrainNormal/MapObject/MapObjectUnkSTTR.cpp b/src/090_TrainNormal/MapObject/MapObjectUnkSTTR.cpp index 507d7f5b..092532a3 100644 --- a/src/090_TrainNormal/MapObject/MapObjectUnkSTTR.cpp +++ b/src/090_TrainNormal/MapObject/MapObjectUnkSTTR.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkSTTR.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkSTTR sMapObjectProfileUnkSTTR; - -ARM MapObjectProfileUnkSTTR *MapObjectProfileUnkSTTR::GetProfile() { - return &sMapObjectProfileUnkSTTR; -} +ARM DECL_PROFILE(MapObjectProfileUnkSTTR); ARM MapObject *MapObjectProfileUnkSTTR::Create() { return new(HeapIndex_2) MapObjectUnkSTTR(); diff --git a/src/090_TrainNormal/MapObject/MapObjectUnkTRCC.cpp b/src/090_TrainNormal/MapObject/MapObjectUnkTRCC.cpp index 8891eaff..ee247417 100644 --- a/src/090_TrainNormal/MapObject/MapObjectUnkTRCC.cpp +++ b/src/090_TrainNormal/MapObject/MapObjectUnkTRCC.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkTRCC.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkTRCC sMapObjectProfileUnkTRCC; - -ARM MapObjectProfileUnkTRCC *MapObjectProfileUnkTRCC::GetProfile() { - return &sMapObjectProfileUnkTRCC; -} +ARM DECL_PROFILE(MapObjectProfileUnkTRCC); ARM MapObject *MapObjectProfileUnkTRCC::Create() { return new(HeapIndex_2) MapObjectUnkTRCC(); diff --git a/src/090_TrainNormal/MapObject/MapObjectUnkTRDT.cpp b/src/090_TrainNormal/MapObject/MapObjectUnkTRDT.cpp index 2eadd17d..3250e017 100644 --- a/src/090_TrainNormal/MapObject/MapObjectUnkTRDT.cpp +++ b/src/090_TrainNormal/MapObject/MapObjectUnkTRDT.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkTRDT.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkTRDT sMapObjectProfileUnkTRDT; - -ARM MapObjectProfileUnkTRDT *MapObjectProfileUnkTRDT::GetProfile() { - return &sMapObjectProfileUnkTRDT; -} +ARM DECL_PROFILE(MapObjectProfileUnkTRDT); ARM MapObject *MapObjectProfileUnkTRDT::Create() { return new(HeapIndex_2) MapObjectUnkTRDT(); diff --git a/src/090_TrainNormal/MapObject/MapObjectUnkTRGW.cpp b/src/090_TrainNormal/MapObject/MapObjectUnkTRGW.cpp index 0ebfa4e8..f43f0729 100644 --- a/src/090_TrainNormal/MapObject/MapObjectUnkTRGW.cpp +++ b/src/090_TrainNormal/MapObject/MapObjectUnkTRGW.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkTRGW.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkTRGW sMapObjectProfileUnkTRGW; - -ARM MapObjectProfileUnkTRGW *MapObjectProfileUnkTRGW::GetProfile() { - return &sMapObjectProfileUnkTRGW; -} +ARM DECL_PROFILE(MapObjectProfileUnkTRGW); ARM MapObject *MapObjectProfileUnkTRGW::Create() { return new(HeapIndex_2) MapObjectUnkTRGW(); diff --git a/src/090_TrainNormal/MapObject/MapObjectUnkTRMR.cpp b/src/090_TrainNormal/MapObject/MapObjectUnkTRMR.cpp index 794e281c..133d1439 100644 --- a/src/090_TrainNormal/MapObject/MapObjectUnkTRMR.cpp +++ b/src/090_TrainNormal/MapObject/MapObjectUnkTRMR.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkTRMR.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkTRMR sMapObjectProfileUnkTRMR; - -ARM MapObjectProfileUnkTRMR *MapObjectProfileUnkTRMR::GetProfile() { - return &sMapObjectProfileUnkTRMR; -} +ARM DECL_PROFILE(MapObjectProfileUnkTRMR); ARM MapObject *MapObjectProfileUnkTRMR::Create() { return new(HeapIndex_2) MapObjectUnkTRMR(); diff --git a/src/090_TrainNormal/MapObject/MapObjectUnkTRSD.cpp b/src/090_TrainNormal/MapObject/MapObjectUnkTRSD.cpp index 9cf3ef78..ed6fa65d 100644 --- a/src/090_TrainNormal/MapObject/MapObjectUnkTRSD.cpp +++ b/src/090_TrainNormal/MapObject/MapObjectUnkTRSD.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkTRSD.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkTRSD sMapObjectProfileUnkTRSD; - -ARM MapObjectProfileUnkTRSD *MapObjectProfileUnkTRSD::GetProfile() { - return &sMapObjectProfileUnkTRSD; -} +ARM DECL_PROFILE(MapObjectProfileUnkTRSD); ARM MapObject *MapObjectProfileUnkTRSD::Create() { return new(HeapIndex_2) MapObjectUnkTRSD(); diff --git a/src/090_TrainNormal/MapObject/MapObjectUnkTWGS.cpp b/src/090_TrainNormal/MapObject/MapObjectUnkTWGS.cpp index dc5dfa3f..4fd842eb 100644 --- a/src/090_TrainNormal/MapObject/MapObjectUnkTWGS.cpp +++ b/src/090_TrainNormal/MapObject/MapObjectUnkTWGS.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkTWGS.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkTWGS sMapObjectProfileUnkTWGS; - -ARM MapObjectProfileUnkTWGS *MapObjectProfileUnkTWGS::GetProfile() { - return &sMapObjectProfileUnkTWGS; -} +ARM DECL_PROFILE(MapObjectProfileUnkTWGS); ARM MapObject *MapObjectProfileUnkTWGS::Create() { return new(HeapIndex_2) MapObjectUnkTWGS(); diff --git a/src/090_TrainNormal/MapObject/MapObjectUnkTWPC.cpp b/src/090_TrainNormal/MapObject/MapObjectUnkTWPC.cpp index 0ea34d27..0a13186b 100644 --- a/src/090_TrainNormal/MapObject/MapObjectUnkTWPC.cpp +++ b/src/090_TrainNormal/MapObject/MapObjectUnkTWPC.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkTWPC.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkTWPC sMapObjectProfileUnkTWPC; - -ARM MapObjectProfileUnkTWPC *MapObjectProfileUnkTWPC::GetProfile() { - return &sMapObjectProfileUnkTWPC; -} +ARM DECL_PROFILE(MapObjectProfileUnkTWPC); ARM MapObject *MapObjectProfileUnkTWPC::Create() { return new(HeapIndex_2) MapObjectUnkTWPC(); diff --git a/src/090_TrainNormal/MapObject/MapObjectUnkTWPG.cpp b/src/090_TrainNormal/MapObject/MapObjectUnkTWPG.cpp index 2c8921e2..94bca717 100644 --- a/src/090_TrainNormal/MapObject/MapObjectUnkTWPG.cpp +++ b/src/090_TrainNormal/MapObject/MapObjectUnkTWPG.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkTWPG.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkTWPG sMapObjectProfileUnkTWPG; - -ARM MapObjectProfileUnkTWPG *MapObjectProfileUnkTWPG::GetProfile() { - return &sMapObjectProfileUnkTWPG; -} +ARM DECL_PROFILE(MapObjectProfileUnkTWPG); ARM MapObject *MapObjectProfileUnkTWPG::Create() { return new(HeapIndex_2) MapObjectUnkTWPG(); diff --git a/src/091_TrainExtra/Actor/ActorUnkBMOC.cpp b/src/091_TrainExtra/Actor/ActorUnkBMOC.cpp index 166158f2..cc841e7f 100644 --- a/src/091_TrainExtra/Actor/ActorUnkBMOC.cpp +++ b/src/091_TrainExtra/Actor/ActorUnkBMOC.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkBMOC.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkBMOC sActorProfileUnkBMOC; - -ARM ActorProfileUnkBMOC *ActorProfileUnkBMOC::GetProfile() { - return &sActorProfileUnkBMOC; -} +ARM DECL_PROFILE(ActorProfileUnkBMOC); ARM Actor *ActorProfileUnkBMOC::Create() { return new(HeapIndex_2) ActorUnkBMOC(); diff --git a/src/091_TrainExtra/Actor/ActorUnkCTFS.cpp b/src/091_TrainExtra/Actor/ActorUnkCTFS.cpp index d72b3540..f678c525 100644 --- a/src/091_TrainExtra/Actor/ActorUnkCTFS.cpp +++ b/src/091_TrainExtra/Actor/ActorUnkCTFS.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkCTFS.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkCTFS sActorProfileUnkCTFS; - -ARM ActorProfileUnkCTFS *ActorProfileUnkCTFS::GetProfile() { - return &sActorProfileUnkCTFS; -} +ARM DECL_PROFILE(ActorProfileUnkCTFS); ARM Actor *ActorProfileUnkCTFS::Create() { return new(HeapIndex_2) ActorUnkCTFS(); diff --git a/src/091_TrainExtra/Actor/ActorUnkMZCT.cpp b/src/091_TrainExtra/Actor/ActorUnkMZCT.cpp index 48e83a52..c6dba295 100644 --- a/src/091_TrainExtra/Actor/ActorUnkMZCT.cpp +++ b/src/091_TrainExtra/Actor/ActorUnkMZCT.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkMZCT.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkMZCT sActorProfileUnkMZCT; - -ARM ActorProfileUnkMZCT *ActorProfileUnkMZCT::GetProfile() { - return &sActorProfileUnkMZCT; -} +ARM DECL_PROFILE(ActorProfileUnkMZCT); ARM Actor *ActorProfileUnkMZCT::Create() { return new(HeapIndex_2) ActorUnkMZCT(); diff --git a/src/091_TrainExtra/Actor/ActorUnkNLTR.cpp b/src/091_TrainExtra/Actor/ActorUnkNLTR.cpp index dd07e4fd..6cbb881a 100644 --- a/src/091_TrainExtra/Actor/ActorUnkNLTR.cpp +++ b/src/091_TrainExtra/Actor/ActorUnkNLTR.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkNLTR.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkNLTR sActorProfileUnkNLTR; - -ARM ActorProfileUnkNLTR *ActorProfileUnkNLTR::GetProfile() { - return &sActorProfileUnkNLTR; -} +ARM DECL_PROFILE(ActorProfileUnkNLTR); ARM Actor *ActorProfileUnkNLTR::Create() { return new(HeapIndex_2) ActorUnkNLTR(); diff --git a/src/091_TrainExtra/Actor/ActorUnkSEFS.cpp b/src/091_TrainExtra/Actor/ActorUnkSEFS.cpp index 9d44525a..4f27e827 100644 --- a/src/091_TrainExtra/Actor/ActorUnkSEFS.cpp +++ b/src/091_TrainExtra/Actor/ActorUnkSEFS.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkSEFS.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkSEFS sActorProfileUnkSEFS; - -ARM ActorProfileUnkSEFS *ActorProfileUnkSEFS::GetProfile() { - return &sActorProfileUnkSEFS; -} +ARM DECL_PROFILE(ActorProfileUnkSEFS); ARM Actor *ActorProfileUnkSEFS::Create() { return new(HeapIndex_2) ActorUnkSEFS(); diff --git a/src/091_TrainExtra/Actor/ActorUnkSMCT.cpp b/src/091_TrainExtra/Actor/ActorUnkSMCT.cpp index e2b0a94d..b7d5ea09 100644 --- a/src/091_TrainExtra/Actor/ActorUnkSMCT.cpp +++ b/src/091_TrainExtra/Actor/ActorUnkSMCT.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkSMCT.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkSMCT sActorProfileUnkSMCT; - -ARM ActorProfileUnkSMCT *ActorProfileUnkSMCT::GetProfile() { - return &sActorProfileUnkSMCT; -} +ARM DECL_PROFILE(ActorProfileUnkSMCT); ARM Actor *ActorProfileUnkSMCT::Create() { return new(HeapIndex_2) ActorUnkSMCT(); diff --git a/src/091_TrainExtra/Actor/ActorUnkSTCT.cpp b/src/091_TrainExtra/Actor/ActorUnkSTCT.cpp index c5ebd176..00357b88 100644 --- a/src/091_TrainExtra/Actor/ActorUnkSTCT.cpp +++ b/src/091_TrainExtra/Actor/ActorUnkSTCT.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkSTCT.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkSTCT sActorProfileUnkSTCT; - -ARM ActorProfileUnkSTCT *ActorProfileUnkSTCT::GetProfile() { - return &sActorProfileUnkSTCT; -} +ARM DECL_PROFILE(ActorProfileUnkSTCT); ARM Actor *ActorProfileUnkSTCT::Create() { return new(HeapIndex_2) ActorUnkSTCT(); diff --git a/src/091_TrainExtra/Actor/ActorUnkTPDO.cpp b/src/091_TrainExtra/Actor/ActorUnkTPDO.cpp index 0f836389..6f589043 100644 --- a/src/091_TrainExtra/Actor/ActorUnkTPDO.cpp +++ b/src/091_TrainExtra/Actor/ActorUnkTPDO.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkTPDO.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkTPDO sActorProfileUnkTPDO; - -ARM ActorProfileUnkTPDO *ActorProfileUnkTPDO::GetProfile() { - return &sActorProfileUnkTPDO; -} +ARM DECL_PROFILE(ActorProfileUnkTPDO); ARM Actor *ActorProfileUnkTPDO::Create() { return new(HeapIndex_2) ActorUnkTPDO(); diff --git a/src/091_TrainExtra/Actor/ActorUnkTRIC.cpp b/src/091_TrainExtra/Actor/ActorUnkTRIC.cpp index a1aa61e2..f92bb8a3 100644 --- a/src/091_TrainExtra/Actor/ActorUnkTRIC.cpp +++ b/src/091_TrainExtra/Actor/ActorUnkTRIC.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkTRIC.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkTRIC sActorProfileUnkTRIC; - -ARM ActorProfileUnkTRIC *ActorProfileUnkTRIC::GetProfile() { - return &sActorProfileUnkTRIC; -} +ARM DECL_PROFILE(ActorProfileUnkTRIC); ARM Actor *ActorProfileUnkTRIC::Create() { return new(HeapIndex_2) ActorUnkTRIC(); diff --git a/src/091_TrainExtra/Actor/ActorUnkTSMT.cpp b/src/091_TrainExtra/Actor/ActorUnkTSMT.cpp index ac14f2ab..120115f1 100644 --- a/src/091_TrainExtra/Actor/ActorUnkTSMT.cpp +++ b/src/091_TrainExtra/Actor/ActorUnkTSMT.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkTSMT.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkTSMT sActorProfileUnkTSMT; - -ARM ActorProfileUnkTSMT *ActorProfileUnkTSMT::GetProfile() { - return &sActorProfileUnkTSMT; -} +ARM DECL_PROFILE(ActorProfileUnkTSMT); ARM Actor *ActorProfileUnkTSMT::Create() { return new(HeapIndex_2) ActorUnkTSMT(); diff --git a/src/091_TrainExtra/Actor/ActorUnkTTKB.cpp b/src/091_TrainExtra/Actor/ActorUnkTTKB.cpp index c4f88325..082fdb6d 100644 --- a/src/091_TrainExtra/Actor/ActorUnkTTKB.cpp +++ b/src/091_TrainExtra/Actor/ActorUnkTTKB.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkTTKB.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkTTKB sActorProfileUnkTTKB; - -ARM ActorProfileUnkTTKB *ActorProfileUnkTTKB::GetProfile() { - return &sActorProfileUnkTTKB; -} +ARM DECL_PROFILE(ActorProfileUnkTTKB); ARM Actor *ActorProfileUnkTTKB::Create() { return new(HeapIndex_2) ActorUnkTTKB(); diff --git a/src/091_TrainExtra/Actor/ActorUnkTTUT.cpp b/src/091_TrainExtra/Actor/ActorUnkTTUT.cpp index 595f6f49..87da6a69 100644 --- a/src/091_TrainExtra/Actor/ActorUnkTTUT.cpp +++ b/src/091_TrainExtra/Actor/ActorUnkTTUT.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkTTUT.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkTTUT sActorProfileUnkTTUT; - -ARM ActorProfileUnkTTUT *ActorProfileUnkTTUT::GetProfile() { - return &sActorProfileUnkTTUT; -} +ARM DECL_PROFILE(ActorProfileUnkTTUT); ARM Actor *ActorProfileUnkTTUT::Create() { return new(HeapIndex_2) ActorUnkTTUT(); diff --git a/src/091_TrainExtra/MapObject/MapObjectUnkBOGN.cpp b/src/091_TrainExtra/MapObject/MapObjectUnkBOGN.cpp index c0305418..68051f30 100644 --- a/src/091_TrainExtra/MapObject/MapObjectUnkBOGN.cpp +++ b/src/091_TrainExtra/MapObject/MapObjectUnkBOGN.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkBOGN.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkBOGN sMapObjectProfileUnkBOGN; - -ARM MapObjectProfileUnkBOGN *MapObjectProfileUnkBOGN::GetProfile() { - return &sMapObjectProfileUnkBOGN; -} +ARM DECL_PROFILE(MapObjectProfileUnkBOGN); ARM MapObject *MapObjectProfileUnkBOGN::Create() { return new(HeapIndex_2) MapObjectUnkBOGN(); diff --git a/src/091_TrainExtra/MapObject/MapObjectUnkETUS.cpp b/src/091_TrainExtra/MapObject/MapObjectUnkETUS.cpp index 2d2744ad..47f96dd9 100644 --- a/src/091_TrainExtra/MapObject/MapObjectUnkETUS.cpp +++ b/src/091_TrainExtra/MapObject/MapObjectUnkETUS.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkETUS.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkETUS sMapObjectProfileUnkETUS; - -ARM MapObjectProfileUnkETUS *MapObjectProfileUnkETUS::GetProfile() { - return &sMapObjectProfileUnkETUS; -} +ARM DECL_PROFILE(MapObjectProfileUnkETUS); ARM MapObject *MapObjectProfileUnkETUS::Create() { return new(HeapIndex_2) MapObjectUnkETUS(); diff --git a/src/091_TrainExtra/MapObject/MapObjectUnkFRSH.cpp b/src/091_TrainExtra/MapObject/MapObjectUnkFRSH.cpp index 903bdf30..d97b1135 100644 --- a/src/091_TrainExtra/MapObject/MapObjectUnkFRSH.cpp +++ b/src/091_TrainExtra/MapObject/MapObjectUnkFRSH.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkFRSH.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkFRSH sMapObjectProfileUnkFRSH; - -ARM MapObjectProfileUnkFRSH *MapObjectProfileUnkFRSH::GetProfile() { - return &sMapObjectProfileUnkFRSH; -} +ARM DECL_PROFILE(MapObjectProfileUnkFRSH); ARM MapObject *MapObjectProfileUnkFRSH::Create() { return new(HeapIndex_2) MapObjectUnkFRSH(); diff --git a/src/091_TrainExtra/MapObject/MapObjectUnkMZFX.cpp b/src/091_TrainExtra/MapObject/MapObjectUnkMZFX.cpp index a17f4c02..a2022ccd 100644 --- a/src/091_TrainExtra/MapObject/MapObjectUnkMZFX.cpp +++ b/src/091_TrainExtra/MapObject/MapObjectUnkMZFX.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkMZFX.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkMZFX sMapObjectProfileUnkMZFX; - -ARM MapObjectProfileUnkMZFX *MapObjectProfileUnkMZFX::GetProfile() { - return &sMapObjectProfileUnkMZFX; -} +ARM DECL_PROFILE(MapObjectProfileUnkMZFX); ARM MapObject *MapObjectProfileUnkMZFX::Create() { return new(HeapIndex_2) MapObjectUnkMZFX(); diff --git a/src/091_TrainExtra/MapObject/MapObjectUnkMZTR.cpp b/src/091_TrainExtra/MapObject/MapObjectUnkMZTR.cpp index 569d8458..56c1d261 100644 --- a/src/091_TrainExtra/MapObject/MapObjectUnkMZTR.cpp +++ b/src/091_TrainExtra/MapObject/MapObjectUnkMZTR.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkMZTR.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkMZTR sMapObjectProfileUnkMZTR; - -ARM MapObjectProfileUnkMZTR *MapObjectProfileUnkMZTR::GetProfile() { - return &sMapObjectProfileUnkMZTR; -} +ARM DECL_PROFILE(MapObjectProfileUnkMZTR); ARM MapObject *MapObjectProfileUnkMZTR::Create() { return new(HeapIndex_2) MapObjectUnkMZTR(); diff --git a/src/091_TrainExtra/MapObject/MapObjectUnkTMSB.cpp b/src/091_TrainExtra/MapObject/MapObjectUnkTMSB.cpp index 57195497..17fd0757 100644 --- a/src/091_TrainExtra/MapObject/MapObjectUnkTMSB.cpp +++ b/src/091_TrainExtra/MapObject/MapObjectUnkTMSB.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkTMSB.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkTMSB sMapObjectProfileUnkTMSB; - -ARM MapObjectProfileUnkTMSB *MapObjectProfileUnkTMSB::GetProfile() { - return &sMapObjectProfileUnkTMSB; -} +ARM DECL_PROFILE(MapObjectProfileUnkTMSB); ARM MapObject *MapObjectProfileUnkTMSB::Create() { return new(HeapIndex_2) MapObjectUnkTMSB(); diff --git a/src/092_TrainDark/Actor/ActorUnkDKCB.cpp b/src/092_TrainDark/Actor/ActorUnkDKCB.cpp index e9708e7a..de06b6ab 100644 --- a/src/092_TrainDark/Actor/ActorUnkDKCB.cpp +++ b/src/092_TrainDark/Actor/ActorUnkDKCB.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkDKCB.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkDKCB sActorProfileUnkDKCB; - -ARM ActorProfileUnkDKCB *ActorProfileUnkDKCB::GetProfile() { - return &sActorProfileUnkDKCB; -} +ARM DECL_PROFILE(ActorProfileUnkDKCB); ARM Actor *ActorProfileUnkDKCB::Create() { return new(HeapIndex_2) ActorUnkDKCB(); diff --git a/src/092_TrainDark/Actor/ActorUnkMABC.cpp b/src/092_TrainDark/Actor/ActorUnkMABC.cpp index 532dbad4..cb01a2cb 100644 --- a/src/092_TrainDark/Actor/ActorUnkMABC.cpp +++ b/src/092_TrainDark/Actor/ActorUnkMABC.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkMABC.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkMABC sActorProfileUnkMABC; - -ARM ActorProfileUnkMABC *ActorProfileUnkMABC::GetProfile() { - return &sActorProfileUnkMABC; -} +ARM DECL_PROFILE(ActorProfileUnkMABC); ARM Actor *ActorProfileUnkMABC::Create() { return new(HeapIndex_2) ActorUnkMABC(); diff --git a/src/092_TrainDark/Actor/ActorUnkMAFI.cpp b/src/092_TrainDark/Actor/ActorUnkMAFI.cpp index 06ca3af4..28b18388 100644 --- a/src/092_TrainDark/Actor/ActorUnkMAFI.cpp +++ b/src/092_TrainDark/Actor/ActorUnkMAFI.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkMAFI.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkMAFI sActorProfileUnkMAFI; - -ARM ActorProfileUnkMAFI *ActorProfileUnkMAFI::GetProfile() { - return &sActorProfileUnkMAFI; -} +ARM DECL_PROFILE(ActorProfileUnkMAFI); ARM Actor *ActorProfileUnkMAFI::Create() { return new(HeapIndex_2) ActorUnkMAFI(); diff --git a/src/092_TrainDark/Actor/ActorUnkMARG.cpp b/src/092_TrainDark/Actor/ActorUnkMARG.cpp index eee04009..31474832 100644 --- a/src/092_TrainDark/Actor/ActorUnkMARG.cpp +++ b/src/092_TrainDark/Actor/ActorUnkMARG.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkMARG.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkMARG sActorProfileUnkMARG; - -ARM ActorProfileUnkMARG *ActorProfileUnkMARG::GetProfile() { - return &sActorProfileUnkMARG; -} +ARM DECL_PROFILE(ActorProfileUnkMARG); ARM Actor *ActorProfileUnkMARG::Create() { return new(HeapIndex_2) ActorUnkMARG(); diff --git a/src/092_TrainDark/Actor/ActorUnkMATR.cpp b/src/092_TrainDark/Actor/ActorUnkMATR.cpp index 3eecdbae..601547db 100644 --- a/src/092_TrainDark/Actor/ActorUnkMATR.cpp +++ b/src/092_TrainDark/Actor/ActorUnkMATR.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkMATR.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkMATR sActorProfileUnkMATR; - -ARM ActorProfileUnkMATR *ActorProfileUnkMATR::GetProfile() { - return &sActorProfileUnkMATR; -} +ARM DECL_PROFILE(ActorProfileUnkMATR); ARM Actor *ActorProfileUnkMATR::Create() { return new(HeapIndex_2) ActorUnkMATR(); diff --git a/src/092_TrainDark/Actor/ActorUnkMBCC.cpp b/src/092_TrainDark/Actor/ActorUnkMBCC.cpp index 49222f64..b566d902 100644 --- a/src/092_TrainDark/Actor/ActorUnkMBCC.cpp +++ b/src/092_TrainDark/Actor/ActorUnkMBCC.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkMBCC.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkMBCC sActorProfileUnkMBCC; - -ARM ActorProfileUnkMBCC *ActorProfileUnkMBCC::GetProfile() { - return &sActorProfileUnkMBCC; -} +ARM DECL_PROFILE(ActorProfileUnkMBCC); ARM Actor *ActorProfileUnkMBCC::Create() { return new(HeapIndex_2) ActorUnkMBCC(); diff --git a/src/092_TrainDark/Actor/ActorUnkMTFB.cpp b/src/092_TrainDark/Actor/ActorUnkMTFB.cpp index 9a20ce16..09e90345 100644 --- a/src/092_TrainDark/Actor/ActorUnkMTFB.cpp +++ b/src/092_TrainDark/Actor/ActorUnkMTFB.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkMTFB.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkMTFB sActorProfileUnkMTFB; - -ARM ActorProfileUnkMTFB *ActorProfileUnkMTFB::GetProfile() { - return &sActorProfileUnkMTFB; -} +ARM DECL_PROFILE(ActorProfileUnkMTFB); ARM Actor *ActorProfileUnkMTFB::Create() { return new(HeapIndex_2) ActorUnkMTFB(); diff --git a/src/092_TrainDark/Actor/ActorUnkMTFL.cpp b/src/092_TrainDark/Actor/ActorUnkMTFL.cpp index bed0ab56..86c23fc5 100644 --- a/src/092_TrainDark/Actor/ActorUnkMTFL.cpp +++ b/src/092_TrainDark/Actor/ActorUnkMTFL.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkMTFL.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkMTFL sActorProfileUnkMTFL; - -ARM ActorProfileUnkMTFL *ActorProfileUnkMTFL::GetProfile() { - return &sActorProfileUnkMTFL; -} +ARM DECL_PROFILE(ActorProfileUnkMTFL); ARM Actor *ActorProfileUnkMTFL::Create() { return new(HeapIndex_2) ActorUnkMTFL(); diff --git a/src/092_TrainDark/Actor/ActorUnkMTWP.cpp b/src/092_TrainDark/Actor/ActorUnkMTWP.cpp index ce8b1ede..53500679 100644 --- a/src/092_TrainDark/Actor/ActorUnkMTWP.cpp +++ b/src/092_TrainDark/Actor/ActorUnkMTWP.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkMTWP.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkMTWP sActorProfileUnkMTWP; - -ARM ActorProfileUnkMTWP *ActorProfileUnkMTWP::GetProfile() { - return &sActorProfileUnkMTWP; -} +ARM DECL_PROFILE(ActorProfileUnkMTWP); ARM Actor *ActorProfileUnkMTWP::Create() { return new(HeapIndex_2) ActorUnkMTWP(); diff --git a/src/092_TrainDark/Actor/ActorUnkSZKL.cpp b/src/092_TrainDark/Actor/ActorUnkSZKL.cpp index 0d0a2c63..477f5476 100644 --- a/src/092_TrainDark/Actor/ActorUnkSZKL.cpp +++ b/src/092_TrainDark/Actor/ActorUnkSZKL.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkSZKL.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkSZKL sActorProfileUnkSZKL; - -ARM ActorProfileUnkSZKL *ActorProfileUnkSZKL::GetProfile() { - return &sActorProfileUnkSZKL; -} +ARM DECL_PROFILE(ActorProfileUnkSZKL); ARM Actor *ActorProfileUnkSZKL::Create() { return new(HeapIndex_2) ActorUnkSZKL(); diff --git a/src/092_TrainDark/Actor/ActorUnkTDKT.cpp b/src/092_TrainDark/Actor/ActorUnkTDKT.cpp index 96dbfdf2..2ce7e51e 100644 --- a/src/092_TrainDark/Actor/ActorUnkTDKT.cpp +++ b/src/092_TrainDark/Actor/ActorUnkTDKT.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkTDKT.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkTDKT sActorProfileUnkTDKT; - -ARM ActorProfileUnkTDKT *ActorProfileUnkTDKT::GetProfile() { - return &sActorProfileUnkTDKT; -} +ARM DECL_PROFILE(ActorProfileUnkTDKT); ARM Actor *ActorProfileUnkTDKT::Create() { return new(HeapIndex_2) ActorUnkTDKT(); diff --git a/src/092_TrainDark/Actor/ActorUnkTEVT.cpp b/src/092_TrainDark/Actor/ActorUnkTEVT.cpp index 902183a1..474a6ce7 100644 --- a/src/092_TrainDark/Actor/ActorUnkTEVT.cpp +++ b/src/092_TrainDark/Actor/ActorUnkTEVT.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkTEVT.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkTEVT sActorProfileUnkTEVT; - -ARM ActorProfileUnkTEVT *ActorProfileUnkTEVT::GetProfile() { - return &sActorProfileUnkTEVT; -} +ARM DECL_PROFILE(ActorProfileUnkTEVT); ARM Actor *ActorProfileUnkTEVT::Create() { return new(HeapIndex_2) ActorUnkTEVT(); diff --git a/src/092_TrainDark/MapObject/MapObjectUnkETDD.cpp b/src/092_TrainDark/MapObject/MapObjectUnkETDD.cpp index 5d4fb2f6..c31f5de0 100644 --- a/src/092_TrainDark/MapObject/MapObjectUnkETDD.cpp +++ b/src/092_TrainDark/MapObject/MapObjectUnkETDD.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkETDD.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkETDD sMapObjectProfileUnkETDD; - -ARM MapObjectProfileUnkETDD *MapObjectProfileUnkETDD::GetProfile() { - return &sMapObjectProfileUnkETDD; -} +ARM DECL_PROFILE(MapObjectProfileUnkETDD); ARM MapObject *MapObjectProfileUnkETDD::Create() { return new(HeapIndex_2) MapObjectUnkETDD(); diff --git a/src/092_TrainDark/MapObject/MapObjectUnkETET.cpp b/src/092_TrainDark/MapObject/MapObjectUnkETET.cpp index d7620ffb..f6dd29c9 100644 --- a/src/092_TrainDark/MapObject/MapObjectUnkETET.cpp +++ b/src/092_TrainDark/MapObject/MapObjectUnkETET.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkETET.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkETET sMapObjectProfileUnkETET; - -ARM MapObjectProfileUnkETET *MapObjectProfileUnkETET::GetProfile() { - return &sMapObjectProfileUnkETET; -} +ARM DECL_PROFILE(MapObjectProfileUnkETET); ARM MapObject *MapObjectProfileUnkETET::Create() { return new(HeapIndex_2) MapObjectUnkETET(); diff --git a/src/092_TrainDark/MapObject/MapObjectUnkETFD.cpp b/src/092_TrainDark/MapObject/MapObjectUnkETFD.cpp index 244accd9..d5229171 100644 --- a/src/092_TrainDark/MapObject/MapObjectUnkETFD.cpp +++ b/src/092_TrainDark/MapObject/MapObjectUnkETFD.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkETFD.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkETFD sMapObjectProfileUnkETFD; - -ARM MapObjectProfileUnkETFD *MapObjectProfileUnkETFD::GetProfile() { - return &sMapObjectProfileUnkETFD; -} +ARM DECL_PROFILE(MapObjectProfileUnkETFD); ARM MapObject *MapObjectProfileUnkETFD::Create() { return new(HeapIndex_2) MapObjectUnkETFD(); diff --git a/src/092_TrainDark/MapObject/MapObjectUnkETMW.cpp b/src/092_TrainDark/MapObject/MapObjectUnkETMW.cpp index 424a24e8..5ee09e7f 100644 --- a/src/092_TrainDark/MapObject/MapObjectUnkETMW.cpp +++ b/src/092_TrainDark/MapObject/MapObjectUnkETMW.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkETMW.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkETMW sMapObjectProfileUnkETMW; - -ARM MapObjectProfileUnkETMW *MapObjectProfileUnkETMW::GetProfile() { - return &sMapObjectProfileUnkETMW; -} +ARM DECL_PROFILE(MapObjectProfileUnkETMW); ARM MapObject *MapObjectProfileUnkETMW::Create() { return new(HeapIndex_2) MapObjectUnkETMW(); diff --git a/src/092_TrainDark/MapObject/MapObjectUnkETYG.cpp b/src/092_TrainDark/MapObject/MapObjectUnkETYG.cpp index 39ecbc20..35cdfbe7 100644 --- a/src/092_TrainDark/MapObject/MapObjectUnkETYG.cpp +++ b/src/092_TrainDark/MapObject/MapObjectUnkETYG.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkETYG.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkETYG sMapObjectProfileUnkETYG; - -ARM MapObjectProfileUnkETYG *MapObjectProfileUnkETYG::GetProfile() { - return &sMapObjectProfileUnkETYG; -} +ARM DECL_PROFILE(MapObjectProfileUnkETYG); ARM MapObject *MapObjectProfileUnkETYG::Create() { return new(HeapIndex_2) MapObjectUnkETYG(); diff --git a/src/092_TrainDark/MapObject/MapObjectUnkTBSD.cpp b/src/092_TrainDark/MapObject/MapObjectUnkTBSD.cpp index ed748176..0db2644d 100644 --- a/src/092_TrainDark/MapObject/MapObjectUnkTBSD.cpp +++ b/src/092_TrainDark/MapObject/MapObjectUnkTBSD.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkTBSD.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkTBSD sMapObjectProfileUnkTBSD; - -ARM MapObjectProfileUnkTBSD *MapObjectProfileUnkTBSD::GetProfile() { - return &sMapObjectProfileUnkTBSD; -} +ARM DECL_PROFILE(MapObjectProfileUnkTBSD); ARM MapObject *MapObjectProfileUnkTBSD::Create() { return new(HeapIndex_2) MapObjectUnkTBSD(); diff --git a/src/092_TrainDark/MapObject/MapObjectUnkTDBP.cpp b/src/092_TrainDark/MapObject/MapObjectUnkTDBP.cpp index ef513d10..82623e04 100644 --- a/src/092_TrainDark/MapObject/MapObjectUnkTDBP.cpp +++ b/src/092_TrainDark/MapObject/MapObjectUnkTDBP.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkTDBP.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkTDBP sMapObjectProfileUnkTDBP; - -ARM MapObjectProfileUnkTDBP *MapObjectProfileUnkTDBP::GetProfile() { - return &sMapObjectProfileUnkTDBP; -} +ARM DECL_PROFILE(MapObjectProfileUnkTDBP); ARM MapObject *MapObjectProfileUnkTDBP::Create() { return new(HeapIndex_2) MapObjectUnkTDBP(); diff --git a/src/092_TrainDark/MapObject/MapObjectUnkTDBR.cpp b/src/092_TrainDark/MapObject/MapObjectUnkTDBR.cpp index e39bcffb..2d96b029 100644 --- a/src/092_TrainDark/MapObject/MapObjectUnkTDBR.cpp +++ b/src/092_TrainDark/MapObject/MapObjectUnkTDBR.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkTDBR.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkTDBR sMapObjectProfileUnkTDBR; - -ARM MapObjectProfileUnkTDBR *MapObjectProfileUnkTDBR::GetProfile() { - return &sMapObjectProfileUnkTDBR; -} +ARM DECL_PROFILE(MapObjectProfileUnkTDBR); ARM MapObject *MapObjectProfileUnkTDBR::Create() { return new(HeapIndex_2) MapObjectUnkTDBR(); diff --git a/src/092_TrainDark/MapObject/MapObjectUnkTDDR.cpp b/src/092_TrainDark/MapObject/MapObjectUnkTDDR.cpp index 892084b0..b0bb1549 100644 --- a/src/092_TrainDark/MapObject/MapObjectUnkTDDR.cpp +++ b/src/092_TrainDark/MapObject/MapObjectUnkTDDR.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkTDDR.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkTDDR sMapObjectProfileUnkTDDR; - -ARM MapObjectProfileUnkTDDR *MapObjectProfileUnkTDDR::GetProfile() { - return &sMapObjectProfileUnkTDDR; -} +ARM DECL_PROFILE(MapObjectProfileUnkTDDR); ARM MapObject *MapObjectProfileUnkTDDR::Create() { return new(HeapIndex_2) MapObjectUnkTDDR(); diff --git a/src/092_TrainDark/MapObject/MapObjectUnkTRDR.cpp b/src/092_TrainDark/MapObject/MapObjectUnkTRDR.cpp index 29505f60..4d3403f0 100644 --- a/src/092_TrainDark/MapObject/MapObjectUnkTRDR.cpp +++ b/src/092_TrainDark/MapObject/MapObjectUnkTRDR.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkTRDR.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkTRDR sMapObjectProfileUnkTRDR; - -ARM MapObjectProfileUnkTRDR *MapObjectProfileUnkTRDR::GetProfile() { - return &sMapObjectProfileUnkTRDR; -} +ARM DECL_PROFILE(MapObjectProfileUnkTRDR); ARM MapObject *MapObjectProfileUnkTRDR::Create() { return new(HeapIndex_2) MapObjectUnkTRDR(); diff --git a/src/093_PlayerSub/Actor/ActorUnkBLON.cpp b/src/093_PlayerSub/Actor/ActorUnkBLON.cpp index d5f31310..27b26e9a 100644 --- a/src/093_PlayerSub/Actor/ActorUnkBLON.cpp +++ b/src/093_PlayerSub/Actor/ActorUnkBLON.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkBLON.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkBLON sActorProfileUnkBLON; - -ARM ActorProfileUnkBLON *ActorProfileUnkBLON::GetProfile() { - return &sActorProfileUnkBLON; -} +ARM DECL_PROFILE(ActorProfileUnkBLON); ARM Actor *ActorProfileUnkBLON::Create() { return new(HeapIndex_2) ActorUnkBLON(); diff --git a/src/093_PlayerSub/Actor/ActorUnkPHTM.cpp b/src/093_PlayerSub/Actor/ActorUnkPHTM.cpp index f7b256db..fd12e987 100644 --- a/src/093_PlayerSub/Actor/ActorUnkPHTM.cpp +++ b/src/093_PlayerSub/Actor/ActorUnkPHTM.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkPHTM.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkPHTM sActorProfileUnkPHTM; - -ARM ActorProfileUnkPHTM *ActorProfileUnkPHTM::GetProfile() { - return &sActorProfileUnkPHTM; -} +ARM DECL_PROFILE(ActorProfileUnkPHTM); ARM Actor *ActorProfileUnkPHTM::Create() { return new(HeapIndex_2) ActorUnkPHTM(); diff --git a/src/093_PlayerSub/Actor/ActorUnkPMTB.cpp b/src/093_PlayerSub/Actor/ActorUnkPMTB.cpp index 08e2e354..faad9015 100644 --- a/src/093_PlayerSub/Actor/ActorUnkPMTB.cpp +++ b/src/093_PlayerSub/Actor/ActorUnkPMTB.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkPMTB.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkPMTB sActorProfileUnkPMTB; - -ARM ActorProfileUnkPMTB *ActorProfileUnkPMTB::GetProfile() { - return &sActorProfileUnkPMTB; -} +ARM DECL_PROFILE(ActorProfileUnkPMTB); ARM Actor *ActorProfileUnkPMTB::Create() { return new(HeapIndex_2) ActorUnkPMTB(); diff --git a/src/093_PlayerSub/Actor/ActorUnkPMTC.cpp b/src/093_PlayerSub/Actor/ActorUnkPMTC.cpp index 1c4a0502..c2731063 100644 --- a/src/093_PlayerSub/Actor/ActorUnkPMTC.cpp +++ b/src/093_PlayerSub/Actor/ActorUnkPMTC.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkPMTC.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkPMTC sActorProfileUnkPMTC; - -ARM ActorProfileUnkPMTC *ActorProfileUnkPMTC::GetProfile() { - return &sActorProfileUnkPMTC; -} +ARM DECL_PROFILE(ActorProfileUnkPMTC); ARM Actor *ActorProfileUnkPMTC::Create() { return new(HeapIndex_2) ActorUnkPMTC(); diff --git a/src/093_PlayerSub/Actor/ActorUnkPMTD.cpp b/src/093_PlayerSub/Actor/ActorUnkPMTD.cpp index 8ebccbce..401c63dd 100644 --- a/src/093_PlayerSub/Actor/ActorUnkPMTD.cpp +++ b/src/093_PlayerSub/Actor/ActorUnkPMTD.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkPMTD.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkPMTD sActorProfileUnkPMTD; - -ARM ActorProfileUnkPMTD *ActorProfileUnkPMTD::GetProfile() { - return &sActorProfileUnkPMTD; -} +ARM DECL_PROFILE(ActorProfileUnkPMTD); ARM Actor *ActorProfileUnkPMTD::Create() { return new(HeapIndex_2) ActorUnkPMTD(); diff --git a/src/093_PlayerSub/Actor/ActorUnkSPTT.cpp b/src/093_PlayerSub/Actor/ActorUnkSPTT.cpp index 873c960f..91690d51 100644 --- a/src/093_PlayerSub/Actor/ActorUnkSPTT.cpp +++ b/src/093_PlayerSub/Actor/ActorUnkSPTT.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkSPTT.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkSPTT sActorProfileUnkSPTT; - -ARM ActorProfileUnkSPTT *ActorProfileUnkSPTT::GetProfile() { - return &sActorProfileUnkSPTT; -} +ARM DECL_PROFILE(ActorProfileUnkSPTT); ARM Actor *ActorProfileUnkSPTT::Create() { return new(HeapIndex_2) ActorUnkSPTT(); diff --git a/src/093_PlayerSub/Actor/ActorUnkTCAM.cpp b/src/093_PlayerSub/Actor/ActorUnkTCAM.cpp index 1ed0ea73..9c09a9b7 100644 --- a/src/093_PlayerSub/Actor/ActorUnkTCAM.cpp +++ b/src/093_PlayerSub/Actor/ActorUnkTCAM.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkTCAM.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkTCAM sActorProfileUnkTCAM; - -ARM ActorProfileUnkTCAM *ActorProfileUnkTCAM::GetProfile() { - return &sActorProfileUnkTCAM; -} +ARM DECL_PROFILE(ActorProfileUnkTCAM); ARM Actor *ActorProfileUnkTCAM::Create() { return new(HeapIndex_2) ActorUnkTCAM(); diff --git a/src/094_Land2/Actor/ActorUnkEFOC.cpp b/src/094_Land2/Actor/ActorUnkEFOC.cpp index a8328e35..a4a1bd16 100644 --- a/src/094_Land2/Actor/ActorUnkEFOC.cpp +++ b/src/094_Land2/Actor/ActorUnkEFOC.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkEFOC.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkEFOC sActorProfileUnkEFOC; - -ARM ActorProfileUnkEFOC *ActorProfileUnkEFOC::GetProfile() { - return &sActorProfileUnkEFOC; -} +ARM DECL_PROFILE(ActorProfileUnkEFOC); ARM Actor *ActorProfileUnkEFOC::Create() { return new(HeapIndex_2) ActorUnkEFOC(); diff --git a/src/094_Land2/Actor/ActorUnkEFR2.cpp b/src/094_Land2/Actor/ActorUnkEFR2.cpp index b3424b0a..42607e21 100644 --- a/src/094_Land2/Actor/ActorUnkEFR2.cpp +++ b/src/094_Land2/Actor/ActorUnkEFR2.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkEFR2.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkEFR2 sActorProfileUnkEFR2; - -ARM ActorProfileUnkEFR2 *ActorProfileUnkEFR2::GetProfile() { - return &sActorProfileUnkEFR2; -} +ARM DECL_PROFILE(ActorProfileUnkEFR2); ARM Actor *ActorProfileUnkEFR2::Create() { return new(HeapIndex_2) ActorUnkEFR2(); diff --git a/src/094_Land2/Actor/ActorUnkEFW2.cpp b/src/094_Land2/Actor/ActorUnkEFW2.cpp index e2aca85b..96549f62 100644 --- a/src/094_Land2/Actor/ActorUnkEFW2.cpp +++ b/src/094_Land2/Actor/ActorUnkEFW2.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkEFW2.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkEFW2 sActorProfileUnkEFW2; - -ARM ActorProfileUnkEFW2 *ActorProfileUnkEFW2::GetProfile() { - return &sActorProfileUnkEFW2; -} +ARM DECL_PROFILE(ActorProfileUnkEFW2); ARM Actor *ActorProfileUnkEFW2::Create() { return new(HeapIndex_2) ActorUnkEFW2(); diff --git a/src/094_Land2/Actor/ActorUnkFBRG.cpp b/src/094_Land2/Actor/ActorUnkFBRG.cpp index bba38840..7421f142 100644 --- a/src/094_Land2/Actor/ActorUnkFBRG.cpp +++ b/src/094_Land2/Actor/ActorUnkFBRG.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkFBRG.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkFBRG sActorProfileUnkFBRG; - -ARM ActorProfileUnkFBRG *ActorProfileUnkFBRG::GetProfile() { - return &sActorProfileUnkFBRG; -} +ARM DECL_PROFILE(ActorProfileUnkFBRG); ARM Actor *ActorProfileUnkFBRG::Create() { return new(HeapIndex_2) ActorUnkFBRG(); diff --git a/src/094_Land2/Actor/ActorUnkKOTA.cpp b/src/094_Land2/Actor/ActorUnkKOTA.cpp index 646904e2..44a71088 100644 --- a/src/094_Land2/Actor/ActorUnkKOTA.cpp +++ b/src/094_Land2/Actor/ActorUnkKOTA.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkKOTA.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkKOTA sActorProfileUnkKOTA; - -ARM ActorProfileUnkKOTA *ActorProfileUnkKOTA::GetProfile() { - return &sActorProfileUnkKOTA; -} +ARM DECL_PROFILE(ActorProfileUnkKOTA); ARM Actor *ActorProfileUnkKOTA::Create() { return new(HeapIndex_2) ActorUnkKOTA(); diff --git a/src/094_Land2/Actor/ActorUnkLOCK.cpp b/src/094_Land2/Actor/ActorUnkLOCK.cpp index d5da7251..60c80689 100644 --- a/src/094_Land2/Actor/ActorUnkLOCK.cpp +++ b/src/094_Land2/Actor/ActorUnkLOCK.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkLOCK.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkLOCK sActorProfileUnkLOCK; - -ARM ActorProfileUnkLOCK *ActorProfileUnkLOCK::GetProfile() { - return &sActorProfileUnkLOCK; -} +ARM DECL_PROFILE(ActorProfileUnkLOCK); ARM Actor *ActorProfileUnkLOCK::Create() { return new(HeapIndex_2) ActorUnkLOCK(); diff --git a/src/094_Land2/Actor/ActorUnkMNCB.cpp b/src/094_Land2/Actor/ActorUnkMNCB.cpp index a60c81b7..e79655bc 100644 --- a/src/094_Land2/Actor/ActorUnkMNCB.cpp +++ b/src/094_Land2/Actor/ActorUnkMNCB.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkMNCB.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkMNCB sActorProfileUnkMNCB; - -ARM ActorProfileUnkMNCB *ActorProfileUnkMNCB::GetProfile() { - return &sActorProfileUnkMNCB; -} +ARM DECL_PROFILE(ActorProfileUnkMNCB); ARM Actor *ActorProfileUnkMNCB::Create() { return new(HeapIndex_2) ActorUnkMNCB(); diff --git a/src/094_Land2/Actor/ActorUnkPCTG.cpp b/src/094_Land2/Actor/ActorUnkPCTG.cpp index 51e35844..ebb31fa9 100644 --- a/src/094_Land2/Actor/ActorUnkPCTG.cpp +++ b/src/094_Land2/Actor/ActorUnkPCTG.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkPCTG.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkPCTG sActorProfileUnkPCTG; - -ARM ActorProfileUnkPCTG *ActorProfileUnkPCTG::GetProfile() { - return &sActorProfileUnkPCTG; -} +ARM DECL_PROFILE(ActorProfileUnkPCTG); ARM Actor *ActorProfileUnkPCTG::Create() { return new(HeapIndex_2) ActorUnkPCTG(); diff --git a/src/094_Land2/Actor/ActorUnkPSWB.cpp b/src/094_Land2/Actor/ActorUnkPSWB.cpp index b140d5f7..0d6abacf 100644 --- a/src/094_Land2/Actor/ActorUnkPSWB.cpp +++ b/src/094_Land2/Actor/ActorUnkPSWB.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkPSWB.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkPSWB sActorProfileUnkPSWB; - -ARM ActorProfileUnkPSWB *ActorProfileUnkPSWB::GetProfile() { - return &sActorProfileUnkPSWB; -} +ARM DECL_PROFILE(ActorProfileUnkPSWB); ARM Actor *ActorProfileUnkPSWB::Create() { return new(HeapIndex_2) ActorUnkPSWB(); diff --git a/src/094_Land2/Actor/ActorUnkSNOW.cpp b/src/094_Land2/Actor/ActorUnkSNOW.cpp index 639f7649..f3f2ff07 100644 --- a/src/094_Land2/Actor/ActorUnkSNOW.cpp +++ b/src/094_Land2/Actor/ActorUnkSNOW.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkSNOW.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkSNOW sActorProfileUnkSNOW; - -ARM ActorProfileUnkSNOW *ActorProfileUnkSNOW::GetProfile() { - return &sActorProfileUnkSNOW; -} +ARM DECL_PROFILE(ActorProfileUnkSNOW); ARM Actor *ActorProfileUnkSNOW::Create() { return new(HeapIndex_2) ActorUnkSNOW(); diff --git a/src/094_Land2/Actor/ActorUnkSPTG.cpp b/src/094_Land2/Actor/ActorUnkSPTG.cpp index 21b4bac9..cb6478ef 100644 --- a/src/094_Land2/Actor/ActorUnkSPTG.cpp +++ b/src/094_Land2/Actor/ActorUnkSPTG.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkSPTG.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkSPTG sActorProfileUnkSPTG; - -ARM ActorProfileUnkSPTG *ActorProfileUnkSPTG::GetProfile() { - return &sActorProfileUnkSPTG; -} +ARM DECL_PROFILE(ActorProfileUnkSPTG); ARM Actor *ActorProfileUnkSPTG::Create() { return new(HeapIndex_2) ActorUnkSPTG(); diff --git a/src/094_Land2/Actor/ActorUnkSTTG.cpp b/src/094_Land2/Actor/ActorUnkSTTG.cpp index b29b8e0c..8a641d89 100644 --- a/src/094_Land2/Actor/ActorUnkSTTG.cpp +++ b/src/094_Land2/Actor/ActorUnkSTTG.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkSTTG.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkSTTG sActorProfileUnkSTTG; - -ARM ActorProfileUnkSTTG *ActorProfileUnkSTTG::GetProfile() { - return &sActorProfileUnkSTTG; -} +ARM DECL_PROFILE(ActorProfileUnkSTTG); ARM Actor *ActorProfileUnkSTTG::Create() { return new(HeapIndex_2) ActorUnkSTTG(); diff --git a/src/094_Land2/Actor/ActorUnkSYRN.cpp b/src/094_Land2/Actor/ActorUnkSYRN.cpp index 9aff0c42..eaf8cc87 100644 --- a/src/094_Land2/Actor/ActorUnkSYRN.cpp +++ b/src/094_Land2/Actor/ActorUnkSYRN.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkSYRN.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkSYRN sActorProfileUnkSYRN; - -ARM ActorProfileUnkSYRN *ActorProfileUnkSYRN::GetProfile() { - return &sActorProfileUnkSYRN; -} +ARM DECL_PROFILE(ActorProfileUnkSYRN); ARM Actor *ActorProfileUnkSYRN::Create() { return new(HeapIndex_2) ActorUnkSYRN(); diff --git a/src/094_Land2/Actor/ActorUnkVLCR.cpp b/src/094_Land2/Actor/ActorUnkVLCR.cpp index 180bbba9..ec2ed76c 100644 --- a/src/094_Land2/Actor/ActorUnkVLCR.cpp +++ b/src/094_Land2/Actor/ActorUnkVLCR.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkVLCR.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkVLCR sActorProfileUnkVLCR; - -ARM ActorProfileUnkVLCR *ActorProfileUnkVLCR::GetProfile() { - return &sActorProfileUnkVLCR; -} +ARM DECL_PROFILE(ActorProfileUnkVLCR); ARM Actor *ActorProfileUnkVLCR::Create() { return new(HeapIndex_2) ActorUnkVLCR(); diff --git a/src/094_Land2/Actor/ActorUnkVRGN.cpp b/src/094_Land2/Actor/ActorUnkVRGN.cpp index 2ef6a2da..1b546764 100644 --- a/src/094_Land2/Actor/ActorUnkVRGN.cpp +++ b/src/094_Land2/Actor/ActorUnkVRGN.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkVRGN.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkVRGN sActorProfileUnkVRGN; - -ARM ActorProfileUnkVRGN *ActorProfileUnkVRGN::GetProfile() { - return &sActorProfileUnkVRGN; -} +ARM DECL_PROFILE(ActorProfileUnkVRGN); ARM Actor *ActorProfileUnkVRGN::Create() { return new(HeapIndex_2) ActorUnkVRGN(); diff --git a/src/094_Land2/MapObject/MapObjectUnkBRGW.cpp b/src/094_Land2/MapObject/MapObjectUnkBRGW.cpp index 407f7d90..84b453fb 100644 --- a/src/094_Land2/MapObject/MapObjectUnkBRGW.cpp +++ b/src/094_Land2/MapObject/MapObjectUnkBRGW.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkBRGW.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkBRGW sMapObjectProfileUnkBRGW; - -ARM MapObjectProfileUnkBRGW *MapObjectProfileUnkBRGW::GetProfile() { - return &sMapObjectProfileUnkBRGW; -} +ARM DECL_PROFILE(MapObjectProfileUnkBRGW); ARM MapObject *MapObjectProfileUnkBRGW::Create() { return new(HeapIndex_2) MapObjectUnkBRGW(); diff --git a/src/094_Land2/MapObject/MapObjectUnkCLMN.cpp b/src/094_Land2/MapObject/MapObjectUnkCLMN.cpp index 8c712efd..5187b21b 100644 --- a/src/094_Land2/MapObject/MapObjectUnkCLMN.cpp +++ b/src/094_Land2/MapObject/MapObjectUnkCLMN.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkCLMN.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkCLMN sMapObjectProfileUnkCLMN; - -ARM MapObjectProfileUnkCLMN *MapObjectProfileUnkCLMN::GetProfile() { - return &sMapObjectProfileUnkCLMN; -} +ARM DECL_PROFILE(MapObjectProfileUnkCLMN); ARM MapObject *MapObjectProfileUnkCLMN::Create() { return new(HeapIndex_2) MapObjectUnkCLMN(); diff --git a/src/094_Land2/MapObject/MapObjectUnkFNCE.cpp b/src/094_Land2/MapObject/MapObjectUnkFNCE.cpp index 5f871061..b94e497b 100644 --- a/src/094_Land2/MapObject/MapObjectUnkFNCE.cpp +++ b/src/094_Land2/MapObject/MapObjectUnkFNCE.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkFNCE.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkFNCE sMapObjectProfileUnkFNCE; - -ARM MapObjectProfileUnkFNCE *MapObjectProfileUnkFNCE::GetProfile() { - return &sMapObjectProfileUnkFNCE; -} +ARM DECL_PROFILE(MapObjectProfileUnkFNCE); ARM MapObject *MapObjectProfileUnkFNCE::Create() { return new(HeapIndex_2) MapObjectUnkFNCE(); diff --git a/src/094_Land2/MapObject/MapObjectUnkICEB.cpp b/src/094_Land2/MapObject/MapObjectUnkICEB.cpp index 51a75b0b..d9dfafbe 100644 --- a/src/094_Land2/MapObject/MapObjectUnkICEB.cpp +++ b/src/094_Land2/MapObject/MapObjectUnkICEB.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkICEB.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkICEB sMapObjectProfileUnkICEB; - -ARM MapObjectProfileUnkICEB *MapObjectProfileUnkICEB::GetProfile() { - return &sMapObjectProfileUnkICEB; -} +ARM DECL_PROFILE(MapObjectProfileUnkICEB); ARM MapObject *MapObjectProfileUnkICEB::Create() { return new(HeapIndex_2) MapObjectUnkICEB(); diff --git a/src/094_Land2/MapObject/MapObjectUnkMBBS.cpp b/src/094_Land2/MapObject/MapObjectUnkMBBS.cpp index 2847c286..39e1ba9f 100644 --- a/src/094_Land2/MapObject/MapObjectUnkMBBS.cpp +++ b/src/094_Land2/MapObject/MapObjectUnkMBBS.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkMBBS.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkMBBS sMapObjectProfileUnkMBBS; - -ARM MapObjectProfileUnkMBBS *MapObjectProfileUnkMBBS::GetProfile() { - return &sMapObjectProfileUnkMBBS; -} +ARM DECL_PROFILE(MapObjectProfileUnkMBBS); ARM MapObject *MapObjectProfileUnkMBBS::Create() { return new(HeapIndex_2) MapObjectUnkMBBS(); diff --git a/src/094_Land2/MapObject/MapObjectUnkMTWD.cpp b/src/094_Land2/MapObject/MapObjectUnkMTWD.cpp index b8eb7bc2..5246d887 100644 --- a/src/094_Land2/MapObject/MapObjectUnkMTWD.cpp +++ b/src/094_Land2/MapObject/MapObjectUnkMTWD.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkMTWD.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkMTWD sMapObjectProfileUnkMTWD; - -ARM MapObjectProfileUnkMTWD *MapObjectProfileUnkMTWD::GetProfile() { - return &sMapObjectProfileUnkMTWD; -} +ARM DECL_PROFILE(MapObjectProfileUnkMTWD); ARM MapObject *MapObjectProfileUnkMTWD::Create() { return new(HeapIndex_2) MapObjectUnkMTWD(); diff --git a/src/094_Land2/MapObject/MapObjectUnkTHAW.cpp b/src/094_Land2/MapObject/MapObjectUnkTHAW.cpp index 765cc1ec..1be3e9bf 100644 --- a/src/094_Land2/MapObject/MapObjectUnkTHAW.cpp +++ b/src/094_Land2/MapObject/MapObjectUnkTHAW.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkTHAW.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkTHAW sMapObjectProfileUnkTHAW; - -ARM MapObjectProfileUnkTHAW *MapObjectProfileUnkTHAW::GetProfile() { - return &sMapObjectProfileUnkTHAW; -} +ARM DECL_PROFILE(MapObjectProfileUnkTHAW); ARM MapObject *MapObjectProfileUnkTHAW::Create() { return new(HeapIndex_2) MapObjectUnkTHAW(); diff --git a/src/094_Land2/MapObject/MapObjectUnkWDST.cpp b/src/094_Land2/MapObject/MapObjectUnkWDST.cpp index 7a634683..e21c7733 100644 --- a/src/094_Land2/MapObject/MapObjectUnkWDST.cpp +++ b/src/094_Land2/MapObject/MapObjectUnkWDST.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkWDST.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkWDST sMapObjectProfileUnkWDST; - -ARM MapObjectProfileUnkWDST *MapObjectProfileUnkWDST::GetProfile() { - return &sMapObjectProfileUnkWDST; -} +ARM DECL_PROFILE(MapObjectProfileUnkWDST); ARM MapObject *MapObjectProfileUnkWDST::Create() { return new(HeapIndex_2) MapObjectUnkWDST(); diff --git a/src/094_Land2/MapObject/MapObjectUnkWLMP.cpp b/src/094_Land2/MapObject/MapObjectUnkWLMP.cpp index 4c58c214..f02dce6b 100644 --- a/src/094_Land2/MapObject/MapObjectUnkWLMP.cpp +++ b/src/094_Land2/MapObject/MapObjectUnkWLMP.cpp @@ -3,11 +3,7 @@ #include "MapObject/MapObjectUnkWLMP.hpp" #include "System/SysNew.hpp" -static MapObjectProfileUnkWLMP sMapObjectProfileUnkWLMP; - -ARM MapObjectProfileUnkWLMP *MapObjectProfileUnkWLMP::GetProfile() { - return &sMapObjectProfileUnkWLMP; -} +ARM DECL_PROFILE(MapObjectProfileUnkWLMP); ARM MapObject *MapObjectProfileUnkWLMP::Create() { return new(HeapIndex_2) MapObjectUnkWLMP(); diff --git a/src/096_PlayerZelda/Actor/ActorUnkBPBS.cpp b/src/096_PlayerZelda/Actor/ActorUnkBPBS.cpp index 573ca275..e0663369 100644 --- a/src/096_PlayerZelda/Actor/ActorUnkBPBS.cpp +++ b/src/096_PlayerZelda/Actor/ActorUnkBPBS.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkBPBS.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkBPBS sActorProfileUnkBPBS; - -ARM ActorProfileUnkBPBS *ActorProfileUnkBPBS::GetProfile() { - return &sActorProfileUnkBPBS; -} +ARM DECL_PROFILE(ActorProfileUnkBPBS); ARM Actor *ActorProfileUnkBPBS::Create() { return new(HeapIndex_2) ActorUnkBPBS(); diff --git a/src/096_PlayerZelda/Actor/ActorUnkCLBT.cpp b/src/096_PlayerZelda/Actor/ActorUnkCLBT.cpp index 25e6afc7..f1fd316c 100644 --- a/src/096_PlayerZelda/Actor/ActorUnkCLBT.cpp +++ b/src/096_PlayerZelda/Actor/ActorUnkCLBT.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkCLBT.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkCLBT sActorProfileUnkCLBT; - -ARM ActorProfileUnkCLBT *ActorProfileUnkCLBT::GetProfile() { - return &sActorProfileUnkCLBT; -} +ARM DECL_PROFILE(ActorProfileUnkCLBT); ARM Actor *ActorProfileUnkCLBT::Create() { return new(HeapIndex_2) ActorUnkCLBT(); diff --git a/src/096_PlayerZelda/Actor/ActorUnkLZET.cpp b/src/096_PlayerZelda/Actor/ActorUnkLZET.cpp index fa715833..51b2a2aa 100644 --- a/src/096_PlayerZelda/Actor/ActorUnkLZET.cpp +++ b/src/096_PlayerZelda/Actor/ActorUnkLZET.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkLZET.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkLZET sActorProfileUnkLZET; - -ARM ActorProfileUnkLZET *ActorProfileUnkLZET::GetProfile() { - return &sActorProfileUnkLZET; -} +ARM DECL_PROFILE(ActorProfileUnkLZET); ARM Actor *ActorProfileUnkLZET::Create() { return new(HeapIndex_2) ActorUnkLZET(); diff --git a/src/096_PlayerZelda/Actor/ActorUnkTKYT.cpp b/src/096_PlayerZelda/Actor/ActorUnkTKYT.cpp index 8a6a437f..9a310fac 100644 --- a/src/096_PlayerZelda/Actor/ActorUnkTKYT.cpp +++ b/src/096_PlayerZelda/Actor/ActorUnkTKYT.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkTKYT.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkTKYT sActorProfileUnkTKYT; - -ARM ActorProfileUnkTKYT *ActorProfileUnkTKYT::GetProfile() { - return &sActorProfileUnkTKYT; -} +ARM DECL_PROFILE(ActorProfileUnkTKYT); ARM Actor *ActorProfileUnkTKYT::Create() { return new(HeapIndex_2) ActorUnkTKYT(); diff --git a/src/098_MapWater/Actor/ActorUnkEFRI.cpp b/src/098_MapWater/Actor/ActorUnkEFRI.cpp index 7bf37f1b..01d85eae 100644 --- a/src/098_MapWater/Actor/ActorUnkEFRI.cpp +++ b/src/098_MapWater/Actor/ActorUnkEFRI.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkEFRI.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkEFRI sActorProfileUnkEFRI; - -ARM ActorProfileUnkEFRI *ActorProfileUnkEFRI::GetProfile() { - return &sActorProfileUnkEFRI; -} +ARM DECL_PROFILE(ActorProfileUnkEFRI); ARM Actor *ActorProfileUnkEFRI::Create() { return new(HeapIndex_2) ActorUnkEFRI(); diff --git a/src/098_MapWater/Actor/ActorUnkEFRP.cpp b/src/098_MapWater/Actor/ActorUnkEFRP.cpp index 2f4dac61..44cf8eca 100644 --- a/src/098_MapWater/Actor/ActorUnkEFRP.cpp +++ b/src/098_MapWater/Actor/ActorUnkEFRP.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkEFRP.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkEFRP sActorProfileUnkEFRP; - -ARM ActorProfileUnkEFRP *ActorProfileUnkEFRP::GetProfile() { - return &sActorProfileUnkEFRP; -} +ARM DECL_PROFILE(ActorProfileUnkEFRP); ARM Actor *ActorProfileUnkEFRP::Create() { return new(HeapIndex_2) ActorUnkEFRP(); diff --git a/src/098_MapWater/Actor/ActorUnkEFWI.cpp b/src/098_MapWater/Actor/ActorUnkEFWI.cpp index f53b2641..fea64bbb 100644 --- a/src/098_MapWater/Actor/ActorUnkEFWI.cpp +++ b/src/098_MapWater/Actor/ActorUnkEFWI.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkEFWI.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkEFWI sActorProfileUnkEFWI; - -ARM ActorProfileUnkEFWI *ActorProfileUnkEFWI::GetProfile() { - return &sActorProfileUnkEFWI; -} +ARM DECL_PROFILE(ActorProfileUnkEFWI); ARM Actor *ActorProfileUnkEFWI::Create() { return new(HeapIndex_2) ActorUnkEFWI(); diff --git a/src/098_MapWater/Actor/ActorUnkEFWV.cpp b/src/098_MapWater/Actor/ActorUnkEFWV.cpp index 3b27959c..efa9513a 100644 --- a/src/098_MapWater/Actor/ActorUnkEFWV.cpp +++ b/src/098_MapWater/Actor/ActorUnkEFWV.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkEFWV.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkEFWV sActorProfileUnkEFWV; - -ARM ActorProfileUnkEFWV *ActorProfileUnkEFWV::GetProfile() { - return &sActorProfileUnkEFWV; -} +ARM DECL_PROFILE(ActorProfileUnkEFWV); ARM Actor *ActorProfileUnkEFWV::Create() { return new(HeapIndex_2) ActorUnkEFWV(); diff --git a/src/098_MapWater/Actor/ActorUnkSEAT.cpp b/src/098_MapWater/Actor/ActorUnkSEAT.cpp index 7d8b074c..8d3bba66 100644 --- a/src/098_MapWater/Actor/ActorUnkSEAT.cpp +++ b/src/098_MapWater/Actor/ActorUnkSEAT.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkSEAT.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkSEAT sActorProfileUnkSEAT; - -ARM ActorProfileUnkSEAT *ActorProfileUnkSEAT::GetProfile() { - return &sActorProfileUnkSEAT; -} +ARM DECL_PROFILE(ActorProfileUnkSEAT); ARM Actor *ActorProfileUnkSEAT::Create() { return new(HeapIndex_2) ActorUnkSEAT(); diff --git a/src/099_MapLava/Actor/ActorUnkE3LV.cpp b/src/099_MapLava/Actor/ActorUnkE3LV.cpp index dcfdfdb4..2c2b247b 100644 --- a/src/099_MapLava/Actor/ActorUnkE3LV.cpp +++ b/src/099_MapLava/Actor/ActorUnkE3LV.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkE3LV.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkE3LV sActorProfileUnkE3LV; - -ARM ActorProfileUnkE3LV *ActorProfileUnkE3LV::GetProfile() { - return &sActorProfileUnkE3LV; -} +ARM DECL_PROFILE(ActorProfileUnkE3LV); ARM Actor *ActorProfileUnkE3LV::Create() { return new(HeapIndex_2) ActorUnkE3LV(); diff --git a/src/099_MapLava/Actor/ActorUnkEFRL.cpp b/src/099_MapLava/Actor/ActorUnkEFRL.cpp index 69ca14e0..77275e89 100644 --- a/src/099_MapLava/Actor/ActorUnkEFRL.cpp +++ b/src/099_MapLava/Actor/ActorUnkEFRL.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkEFRL.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkEFRL sActorProfileUnkEFRL; - -ARM ActorProfileUnkEFRL *ActorProfileUnkEFRL::GetProfile() { - return &sActorProfileUnkEFRL; -} +ARM DECL_PROFILE(ActorProfileUnkEFRL); ARM Actor *ActorProfileUnkEFRL::Create() { return new(HeapIndex_2) ActorUnkEFRL(); diff --git a/src/099_MapLava/Actor/ActorUnkEFWL.cpp b/src/099_MapLava/Actor/ActorUnkEFWL.cpp index 97184bd0..5c087387 100644 --- a/src/099_MapLava/Actor/ActorUnkEFWL.cpp +++ b/src/099_MapLava/Actor/ActorUnkEFWL.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkEFWL.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkEFWL sActorProfileUnkEFWL; - -ARM ActorProfileUnkEFWL *ActorProfileUnkEFWL::GetProfile() { - return &sActorProfileUnkEFWL; -} +ARM DECL_PROFILE(ActorProfileUnkEFWL); ARM Actor *ActorProfileUnkEFWL::Create() { return new(HeapIndex_2) ActorUnkEFWL(); diff --git a/src/099_MapLava/Actor/ActorUnkVOLV.cpp b/src/099_MapLava/Actor/ActorUnkVOLV.cpp index 62758b52..f77773c9 100644 --- a/src/099_MapLava/Actor/ActorUnkVOLV.cpp +++ b/src/099_MapLava/Actor/ActorUnkVOLV.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkVOLV.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkVOLV sActorProfileUnkVOLV; - -ARM ActorProfileUnkVOLV *ActorProfileUnkVOLV::GetProfile() { - return &sActorProfileUnkVOLV; -} +ARM DECL_PROFILE(ActorProfileUnkVOLV); ARM Actor *ActorProfileUnkVOLV::Create() { return new(HeapIndex_2) ActorUnkVOLV(); diff --git a/src/105_PlayerWhip/Actor/ActorUnkITWP.cpp b/src/105_PlayerWhip/Actor/ActorUnkITWP.cpp index 2ea4b230..e70bcac3 100644 --- a/src/105_PlayerWhip/Actor/ActorUnkITWP.cpp +++ b/src/105_PlayerWhip/Actor/ActorUnkITWP.cpp @@ -3,11 +3,7 @@ #include "Actor/ActorUnkITWP.hpp" #include "System/SysNew.hpp" -static ActorProfileUnkITWP sActorProfileUnkITWP; - -ARM ActorProfileUnkITWP *ActorProfileUnkITWP::GetProfile() { - return &sActorProfileUnkITWP; -} +ARM DECL_PROFILE(ActorProfileUnkITWP); ARM Actor *ActorProfileUnkITWP::Create() { return new(HeapIndex_2) ActorUnkITWP();