From 58b1255fd4512c7d21fb9869f14caa6eb5a8a675 Mon Sep 17 00:00:00 2001 From: Alessevan <44125445+Alessevan@users.noreply.github.com> Date: Fri, 2 Oct 2026 06:42:43 -0400 Subject: [PATCH] Decompiling Keese (#149) * feat: init decompiling * fix: build issues * style: add override * feat: progress matching * feat: some progress * feat: some progress * feat: match vfunc_08 * feat: increase matching a bit * fix: add back includes removed from circular inclusion * fix: function symbol and definition * fix: include gpMapObjManager for Boomerang * feat: try fixing missing .data * feat: progression ig * fix: apply suggestions * fix: match func_ov032_0211f3ac --- config/eur/arm9/overlays/ov000/symbols.txt | 8 +- config/eur/arm9/overlays/ov017/symbols.txt | 4 +- config/eur/arm9/overlays/ov031/symbols.txt | 12 +- config/eur/arm9/overlays/ov032/delinks.txt | 3 +- config/eur/arm9/overlays/ov032/relocs.txt | 8 +- config/eur/arm9/overlays/ov032/symbols.txt | 133 ++-- config/eur/arm9/overlays/ov063/symbols.txt | 2 +- config/eur/arm9/symbols.txt | 2 +- config/eur1/arm9/overlays/ov000/symbols.txt | 34 +- config/eur1/arm9/overlays/ov017/symbols.txt | 10 +- config/eur1/arm9/overlays/ov031/symbols.txt | 12 +- config/eur1/arm9/overlays/ov032/delinks.txt | 3 +- config/eur1/arm9/overlays/ov032/relocs.txt | 22 +- config/eur1/arm9/overlays/ov032/symbols.txt | 155 ++-- config/eur1/arm9/overlays/ov058/relocs.txt | 2 +- config/eur1/arm9/overlays/ov063/symbols.txt | 2 +- config/eur1/arm9/symbols.txt | 2 +- config/jp/arm9/overlays/ov000/symbols.txt | 10 +- config/jp/arm9/overlays/ov017/symbols.txt | 4 +- config/jp/arm9/overlays/ov031/symbols.txt | 10 +- config/jp/arm9/overlays/ov032/delinks.txt | 3 +- config/jp/arm9/overlays/ov032/relocs.txt | 8 +- config/jp/arm9/overlays/ov032/symbols.txt | 151 ++-- config/jp/arm9/overlays/ov060/relocs.txt | 4 +- config/jp/arm9/overlays/ov063/symbols.txt | 2 +- config/jp/arm9/symbols.txt | 2 +- config/usa/arm9/overlays/ov000/symbols.txt | 34 +- config/usa/arm9/overlays/ov017/symbols.txt | 4 +- config/usa/arm9/overlays/ov031/symbols.txt | 12 +- config/usa/arm9/overlays/ov032/delinks.txt | 3 +- config/usa/arm9/overlays/ov032/relocs.txt | 22 +- config/usa/arm9/overlays/ov032/symbols.txt | 157 ++-- config/usa/arm9/overlays/ov058/relocs.txt | 2 +- config/usa/arm9/overlays/ov063/symbols.txt | 2 +- config/usa/arm9/symbols.txt | 2 +- include/Actor/Actor.hpp | 3 + include/Actor/ActorBomb.hpp | 4 +- include/Actor/ActorItemBoomerang.hpp | 2 +- include/Actor/ActorItemTornado.hpp | 2 +- include/Actor/ActorKeese.hpp | 166 +++++ include/Actor/ActorShotArrow.hpp | 2 +- include/Actor/ActorSpinut.hpp | 2 +- include/Actor/ActorTable.inl | 2 +- include/Actor/ActorUnkCANS.hpp | 2 +- include/Actor/ActorUnkKETH.hpp | 87 --- include/Actor/ActorUnkSWBM.hpp | 2 +- include/Render/ModelRender.hpp | 2 +- include/Unknown/UnkStruct_027e0cd8.hpp | 3 - include/Unknown/UnkStruct_027e0ce0.hpp | 2 +- include/Unknown/UnkStruct_ov000_020b19f0.hpp | 3 + include/Unknown/UnkStruct_ov031_Items.hpp | 2 +- .../Player/PlayerLinkActor_001.cpp | 1 + src/001_SceneInit/UnkStruct_027e0cd8_001.cpp | 1 + src/031_Land/Actor/ActorBomb.cpp | 8 +- src/031_Land/Actor/ActorItemBoomerang.cpp | 14 +- src/031_Land/Actor/ActorShotArrow.cpp | 2 +- src/031_Land/Actor/ActorUnkSKDO.cpp | 3 +- src/031_Land/Actor/ActorUnkSWBM.cpp | 2 +- src/031_Land/MapObject/MapObjectChestBase.cpp | 2 + src/032_MapA1/Actor/ActorKeese.cpp | 691 ++++++++++++++++++ src/032_MapA1/Actor/ActorSpinut.cpp | 5 +- src/032_MapA1/Actor/ActorUnkKETH.cpp | 65 -- src/063_Shrine/Actor/ActorUnkCANS.cpp | 20 +- tools/configure.py | 2 +- 64 files changed, 1326 insertions(+), 622 deletions(-) create mode 100644 include/Actor/ActorKeese.hpp delete mode 100644 include/Actor/ActorUnkKETH.hpp create mode 100644 src/032_MapA1/Actor/ActorKeese.cpp delete mode 100644 src/032_MapA1/Actor/ActorUnkKETH.cpp diff --git a/config/eur/arm9/overlays/ov000/symbols.txt b/config/eur/arm9/overlays/ov000/symbols.txt index 1875f1cd..e1298428 100644 --- a/config/eur/arm9/overlays/ov000/symbols.txt +++ b/config/eur/arm9/overlays/ov000/symbols.txt @@ -1413,7 +1413,7 @@ func_ov000_0207bd84 kind:function(arm,size=0x260) addr:0x0207bd84 _ZN24UnkStruct_ov000_020b28388vfunc_00Ev kind:function(arm,size=0x4) addr:0x0207bfe4 _ZN24UnkStruct_ov000_020b2838D0Ev kind:function(arm,size=0x14) addr:0x0207bfe8 _ZN29UnkStruct_ov031_Items_00_BaseD2Ev kind:function(arm,size=0x4) addr:0x0207bffc -_ZN26UnkStruct_027e0ce0_38_Base8vfunc_08EPK24UnkStruct_ov031_020f3310 kind:function(arm,size=0x8) addr:0x0207c000 +_ZN26UnkStruct_027e0ce0_38_Base8vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0x8) addr:0x0207c000 _ZN26UnkStruct_027e0ce0_38_Base8vfunc_0CEPK24UnkStruct_ov031_020e54d4Pii kind:function(arm,size=0x8) addr:0x0207c008 _ZN26UnkStruct_027e0ce0_38_Base8vfunc_10E8ActorRefi kind:function(arm,size=0x8) addr:0x0207c010 _ZN17MapObject_10_BaseC2Ev kind:function(arm,size=0x30) addr:0x0207c018 @@ -2308,7 +2308,7 @@ func_ov000_020981e0 kind:function(arm,size=0x64) addr:0x020981e0 func_ov000_02098244 kind:function(arm,size=0x64) addr:0x02098244 _ZN24UnkStruct_ov031_Items_00C2Ev kind:function(arm,size=0x18) addr:0x020982a8 _ZN24UnkStruct_ov071_0215f92cC1Ev kind:function(arm,size=0x18) addr:0x020982c0 -_ZN24UnkStruct_ov031_Items_008vfunc_08EPK24UnkStruct_ov031_020f3310 kind:function(arm,size=0x80) addr:0x020982d8 +_ZN24UnkStruct_ov031_Items_008vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0x80) addr:0x020982d8 _ZN19func_ov000_02098358D1Ev kind:function(arm,size=0x14) addr:0x02098358 _ZN19func_ov000_0209836cD0Ev kind:function(arm,size=0x1c) addr:0x0209836c _ZN5ActorC2Ev kind:function(arm,size=0xe8) addr:0x02098388 @@ -2341,7 +2341,7 @@ _ZN5Actor19func_ov000_020986fcEi kind:function(arm,size=0x7c) addr:0x020986fc func_ov000_02098778 kind:function(arm,size=0x88) addr:0x02098778 _ZN5Actor19func_ov000_02098800Eb kind:function(arm,size=0x38) addr:0x02098800 _ZN5Actor19func_ov000_02098838Ev kind:function(arm,size=0x28) addr:0x02098838 -func_ov000_02098860 kind:function(arm,size=0xb0) addr:0x02098860 +_ZN5Actor19func_ov000_0209a008Eis kind:function(arm,size=0xb0) addr:0x02098860 _ZN5Actor19func_ov000_02098910EP24UnkStruct_ov031_Items_00i kind:function(arm,size=0xd0) addr:0x02098910 _ZN5Actor19func_ov000_020989e0Ev kind:function(arm,size=0x38) addr:0x020989e0 func_ov000_02098a18 kind:function(arm,size=0x48) addr:0x02098a18 @@ -2492,7 +2492,7 @@ _ZN12ActorUnkEFIK8vfunc_54Ei kind:function(arm,size=0x8) addr:0x0209c2e4 _ZN12ActorUnkEFIKD1Ev kind:function(arm,size=0x20) addr:0x0209c2ec _ZN12ActorUnkEFIKD0Ev kind:function(arm,size=0x28) addr:0x0209c30c _ZN19ActorProfileUnkEFIKD1Ev kind:function(arm,size=0x14) addr:0x0209c334 -func_ov000_0209c348 kind:function(arm,size=0x24) addr:0x0209c348 +_ZN24UnkStruct_ov000_020b34c48vfunc_00EP9MapObject kind:function(arm,size=0x24) addr:0x0209c348 func_ov000_0209c36c kind:function(arm,size=0x3c) addr:0x0209c36c _ZN16MapObjectManager19func_ov000_0209c3a8Ev kind:function(arm,size=0x40) addr:0x0209c3a8 _ZN16MapObjectManager19func_ov000_0209c3e8Ev kind:function(arm,size=0x5c) addr:0x0209c3e8 diff --git a/config/eur/arm9/overlays/ov017/symbols.txt b/config/eur/arm9/overlays/ov017/symbols.txt index d236cc26..30a6b24d 100644 --- a/config/eur/arm9/overlays/ov017/symbols.txt +++ b/config/eur/arm9/overlays/ov017/symbols.txt @@ -67,8 +67,8 @@ _ZN5Actor19func_ov017_020bf3e0Eii kind:function(arm,size=0xd0) addr:0x020bf3e0 func_ov017_020bf4b0 kind:function(arm,size=0xc4) addr:0x020bf4b0 func_ov017_020bf574 kind:function(arm,size=0x50) addr:0x020bf574 _ZN5Actor19func_ov017_020bf5c4EP7VecFx32iiii kind:function(arm,size=0x70) addr:0x020bf5c4 -func_ov017_020bf634 kind:function(arm,size=0x54) addr:0x020bf634 -func_ov017_020bf688 kind:function(arm,size=0x88) addr:0x020bf688 +_ZN5Actor19func_ov017_020bf634EPK7VecFx32ti kind:function(arm,size=0x54) addr:0x020bf634 +_ZN5Actor19func_ov017_020bf688Ev kind:function(arm,size=0x88) addr:0x020bf688 func_ov017_020bf710 kind:function(arm,size=0x98) addr:0x020bf710 func_ov017_020bf7a8 kind:function(arm,size=0xec) addr:0x020bf7a8 _ZN14Actor_Derived219func_ov017_020bf894EP26UnkStruct_ActorUnkCANS_224 kind:function(arm,size=0x60) addr:0x020bf894 diff --git a/config/eur/arm9/overlays/ov031/symbols.txt b/config/eur/arm9/overlays/ov031/symbols.txt index 0eebc7ba..93670636 100644 --- a/config/eur/arm9/overlays/ov031/symbols.txt +++ b/config/eur/arm9/overlays/ov031/symbols.txt @@ -358,10 +358,10 @@ _ZN9ActorBomb19func_ov031_020e2c2cEv kind:function(arm,size=0x14c) addr:0x020e2c _ZN13ActorBomb_180C1EP5Actor kind:function(arm,size=0x3c) addr:0x020e2d78 _ZN13ActorBomb_180D1Ev kind:function(arm,size=0x1c) addr:0x020e2db4 _ZN13ActorBomb_180D0Ev kind:function(arm,size=0x24) addr:0x020e2dd0 -_ZN13ActorBomb_1808vfunc_08EPK24UnkStruct_ov031_020f3310 kind:function(arm,size=0x48) addr:0x020e2df4 +_ZN13ActorBomb_1808vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0x48) addr:0x020e2df4 _ZN13ActorBomb_1808vfunc_0CEPK24UnkStruct_ov031_020e54d4Pii kind:function(arm,size=0x450) addr:0x020e2e3c _ZN13ActorBomb_1808vfunc_10E8ActorRefi kind:function(arm,size=0x84) addr:0x020e328c -_ZN24ActorBomb_ov031_020e21348vfunc_08EPK24UnkStruct_ov031_020f3310 kind:function(arm,size=0x30) addr:0x020e3310 +_ZN24ActorBomb_ov031_020e21348vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0x30) addr:0x020e3310 _ZN13ActorBomb_19CC1EP5Actor kind:function(arm,size=0x3c) addr:0x020e3340 _ZN13ActorBomb_19C8vfunc_10EP5Actor kind:function(arm,size=0x30) addr:0x020e337c _ZN13ActorBomb_unkC1Ev kind:function(arm,size=0x14) addr:0x020e33ac @@ -443,13 +443,13 @@ _ZN21ActorItemBoomerang_CC8vfunc_0CEP5ActorP7VecFx32 kind:function(arm,size=0x4c _ZN22ActorItemBoomerang_11CC1EP18ActorItemBoomerang kind:function(arm,size=0x28) addr:0x020e544c _ZN22ActorItemBoomerang_11CD1Ev kind:function(arm,size=0x14) addr:0x020e5474 _ZN22ActorItemBoomerang_11CD0Ev kind:function(arm,size=0x1c) addr:0x020e5488 -_ZN22ActorItemBoomerang_11C8vfunc_08EPK24UnkStruct_ov031_020f3310 kind:function(arm,size=0x30) addr:0x020e54a4 +_ZN22ActorItemBoomerang_11C8vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0x30) addr:0x020e54a4 _ZN22ActorItemBoomerang_11C8vfunc_0CEPK24UnkStruct_ov031_020e54d4Pii kind:function(arm,size=0x230) addr:0x020e54d4 _ZN26ActorItemBoomerang_Unknown19func_ov031_020e5704Ev kind:function(arm,size=0xc) addr:0x020e5704 _ZN21ActorItemBoomerang_A0D0Ev kind:function(arm,size=0x1c) addr:0x020e5710 _ZN21ActorItemBoomerang_CCD0Ev kind:function(arm,size=0x1c) addr:0x020e572c _ZN25ActorProfileItemBoomerangD1Ev kind:function(arm,size=0x14) addr:0x020e5748 -_ZN24UnkStruct_ov031_02112ff48vfunc_08EPK24UnkStruct_ov031_020f3310 kind:function(arm,size=0x28) addr:0x020e575c +_ZN24UnkStruct_ov031_02112ff48vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0x28) addr:0x020e575c _ZN24UnkStruct_ov031_02112ff48vfunc_0CEPK24UnkStruct_ov031_020e54d4i kind:function(arm,size=0x114) addr:0x020e5784 func_ov031_020e5898 kind:function(arm,size=0x30) addr:0x020e5898 _ZN23ActorProfileItemTornado10GetProfileEv kind:function(arm,size=0xc) addr:0x020e58c8 @@ -481,7 +481,7 @@ _ZN19func_ov031_020e6774D0Ev kind:function(arm,size=0x68) addr:0x020e6774 func_ov031_020e67dc kind:function(arm,size=0x7c) addr:0x020e67dc func_ov031_020e6858 kind:function(arm,size=0x64) addr:0x020e6858 _ZN19func_ov031_020e68bcD0Ev kind:function(arm,size=0x1c) addr:0x020e68bc -_ZN15ActorUnkSWBM_948vfunc_08EPK24UnkStruct_ov031_020f3310 kind:function(arm,size=0x28) addr:0x020e68d8 +_ZN15ActorUnkSWBM_948vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0x28) addr:0x020e68d8 _ZN15ActorUnkSWBM_948vfunc_0CEPK24UnkStruct_ov031_020e54d4Pii kind:function(arm,size=0x1c) addr:0x020e6900 _ZN15ActorUnkSWBM_988vfunc_0CEP5ActorP7VecFx32 kind:function(arm,size=0x58) addr:0x020e691c _ZN15ActorUnkSWBM_988vfunc_10EP5Actor kind:function(arm,size=0x58) addr:0x020e6974 @@ -923,7 +923,7 @@ _ZN18ActorShotArrow_178C1EP14ActorShotArrow kind:function(arm,size=0x3c) addr:0x _ZN18ActorShotArrow_178D1Ev kind:function(arm,size=0x1c) addr:0x020f32c4 _ZN18ActorShotArrow_178D0Ev kind:function(arm,size=0x24) addr:0x020f32e0 _ZN18ActorShotArrow_17819func_ov031_020f3304Ev kind:function(arm,size=0xc) addr:0x020f3304 -_ZN18ActorShotArrow_1788vfunc_08EPK24UnkStruct_ov031_020f3310 kind:function(arm,size=0xac) addr:0x020f3310 +_ZN18ActorShotArrow_1788vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0xac) addr:0x020f3310 _ZN18ActorShotArrow_1788vfunc_0CEPK24UnkStruct_ov031_020e54d4Pii kind:function(arm,size=0x350) addr:0x020f33bc _ZN18ActorShotArrow_194C1EP14ActorShotArrow kind:function(arm,size=0x40) addr:0x020f370c _ZN18ActorShotArrow_19419func_ov031_020f374cEP5Actor kind:function(arm,size=0x164) addr:0x020f374c diff --git a/config/eur/arm9/overlays/ov032/delinks.txt b/config/eur/arm9/overlays/ov032/delinks.txt index 75894495..c74bfc7c 100644 --- a/config/eur/arm9/overlays/ov032/delinks.txt +++ b/config/eur/arm9/overlays/ov032/delinks.txt @@ -19,10 +19,11 @@ src/032_MapA1/Actor/ActorFleeingSpinut.cpp: .data start:0x021223a8 end:0x021224d8 .bss start:0x02122908 end:0x02122974 -src/032_MapA1/Actor/ActorUnkKETH.cpp: +src/032_MapA1/Actor/ActorKeese.cpp: .text start:0x0211db40 end:0x0211fd80 .init start:0x02122020 end:0x0212208c .ctor start:0x02122134 end:0x02122138 + .data start:0x021224d8 end:0x0212268c .bss start:0x02122974 end:0x02122a5c src/032_MapA1/Actor/ActorUnkNSSW.cpp: diff --git a/config/eur/arm9/overlays/ov032/relocs.txt b/config/eur/arm9/overlays/ov032/relocs.txt index 3240fa1c..d943ef9a 100644 --- a/config/eur/arm9/overlays/ov032/relocs.txt +++ b/config/eur/arm9/overlays/ov032/relocs.txt @@ -533,7 +533,7 @@ from:0x0211db7c kind:arm_call to:0x02097898 module:overlay(0) from:0x0211dbc8 kind:load to:0x0212253c add:0x8 module:overlay(32) from:0x0211dbd4 kind:arm_call_thumb to:0x0209a764 module:overlay(0) from:0x0211dbe8 kind:arm_call to:0x02057f18 module:overlay(0) -from:0x0211dbf8 kind:load to:0x02122568 module:overlay(32) +from:0x0211dbf8 kind:load to:0x02122560 module:overlay(32) add:0x8 from:0x0211dbfc kind:load to:0x02121ed4 module:overlay(32) from:0x0211dc10 kind:arm_call to:0x02098b28 module:overlay(0) from:0x0211dc74 kind:arm_call to:0x0211dbcc module:overlay(32) @@ -558,7 +558,7 @@ from:0x0211de08 kind:load to:0x021224d8 module:overlay(32) from:0x0211de14 kind:arm_call_thumb to:0x02057bd4 module:overlay(0) from:0x0211de28 kind:arm_call to:0x020a0304 module:overlay(0) from:0x0211de40 kind:arm_call to:0x020982a8 module:overlay(0) -from:0x0211de68 kind:load to:0x02122528 module:overlay(32) +from:0x0211de68 kind:load to:0x02122520 module:overlay(32) add:0x8 from:0x0211de7c kind:arm_call to:0x0207bffc module:overlay(0) from:0x0211de98 kind:arm_call to:0x0207bffc module:overlay(0) from:0x0211dea0 kind:arm_call to:0x02011ff4 module:main @@ -747,7 +747,7 @@ from:0x0211faec kind:load to:0x027e0ce0 module:dtcm from:0x0211fb58 kind:arm_call to:0x0200e260 module:main from:0x0211fb68 kind:arm_call to:0x01ffad5c module:itcm from:0x0211fb98 kind:load to:0x027e0964 module:dtcm -from:0x0211fbb0 kind:load to:0x0212251c module:overlay(32) +from:0x0211fbb0 kind:load to:0x02122514 module:overlay(32) add:0x8 from:0x0211fbbc kind:arm_call to:0x0209c348 module:overlay(0) from:0x0211fc08 kind:arm_call_thumb to:0x02057bd4 module:overlay(0) from:0x0211fc10 kind:arm_call to:0x02011ff4 module:main @@ -890,7 +890,7 @@ from:0x02120c54 kind:arm_call to:0x02120894 module:overlay(32) from:0x02120cc8 kind:arm_call to:0x01ffa06c module:itcm from:0x02120ce0 kind:arm_call to:0x02120894 module:overlay(32) from:0x02120d08 kind:arm_call to:0x020f6284 module:overlay(31) -from:0x02120d20 kind:load to:0x02122694 module:overlay(32) +from:0x02120d20 kind:load to:0x0212268c module:overlay(32) add:0x8 from:0x02120d40 kind:arm_call to:0x02120b34 module:overlay(32) from:0x02120d50 kind:arm_call to:0x020f62e4 module:overlay(31) from:0x02120d6c kind:arm_call to:0x02120b6c module:overlay(32) diff --git a/config/eur/arm9/overlays/ov032/symbols.txt b/config/eur/arm9/overlays/ov032/symbols.txt index 9744499f..6611171b 100644 --- a/config/eur/arm9/overlays/ov032/symbols.txt +++ b/config/eur/arm9/overlays/ov032/symbols.txt @@ -49,7 +49,7 @@ _ZN11ActorSpinut8vfunc_54Ei kind:function(arm,size=0x168) addr:0x0211b408 _ZN15ActorSpinut_268C1Ev kind:function(arm,size=0x30) addr:0x0211b570 _ZN15ActorSpinut_268D1Ev kind:function(arm,size=0x14) addr:0x0211b5a0 _ZN15ActorSpinut_268D0Ev kind:function(arm,size=0x1c) addr:0x0211b5b4 -_ZN15ActorSpinut_2688vfunc_08EPK24UnkStruct_ov031_020f3310 kind:function(arm,size=0x24) addr:0x0211b5d0 +_ZN15ActorSpinut_2688vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0x24) addr:0x0211b5d0 _ZN15ActorSpinut_1BC8vfunc_3CEv kind:function(arm,size=0x24) addr:0x0211b5f4 _ZN15ActorSpinut_1BC8vfunc_38Eii kind:function(arm,size=0x10) addr:0x0211b618 _ZN15ActorSpinut_1BC8vfunc_30Ev kind:function(arm,size=0x8) addr:0x0211b628 @@ -111,60 +111,60 @@ _ZN22ActorFleeingSpinut_1EC19func_ov032_0211d864EP7VecFx32 kind:function(arm,siz _ZN22ActorFleeingSpinut_1EC19func_ov032_0211d910Ev kind:function(arm,size=0x10) addr:0x0211d910 _ZN22ActorFleeingSpinut_1EC19func_ov032_0211d920EP7VecFx32 kind:function(arm,size=0xec) addr:0x0211d920 _ZN22ActorFleeingSpinut_1EC19func_ov032_0211da0cEiP7VecFx32 kind:function(arm,size=0x120) addr:0x0211da0c -_ZN25ActorProfileFleeingSpinutD1Ev kind:function(arm,size=0x14) addr:0x0211db2c -_ZN19ActorProfileUnkKETH10GetProfileEv kind:function(arm,size=0xc) addr:0x0211db40 -_ZN19ActorProfileUnkKETH6CreateEv kind:function(arm,size=0x24) addr:0x0211db4c -_ZN19ActorProfileUnkKETHC1Ev kind:function(arm,size=0x5c) addr:0x0211db70 -_ZN12ActorUnkKETH19func_ov032_0211dbccEv kind:function(arm,size=0x34) addr:0x0211dbcc -_ZN12ActorUnkKETHC1Ev kind:function(arm,size=0x20c) addr:0x0211dc00 -_ZN12ActorUnkKETH19func_ov032_0211de0cEv kind:function(arm,size=0x14) addr:0x0211de0c -_ZN12ActorUnkKETH19func_ov032_0211de20Ev kind:function(arm,size=0x14) addr:0x0211de20 -_ZN12ActorUnkKETH19func_ov032_0211de34Ev kind:function(arm,size=0x38) addr:0x0211de34 -_ZN12ActorUnkKETHD1Ev kind:function(arm,size=0x1c) addr:0x0211de6c -_ZN12ActorUnkKETHD0Ev kind:function(arm,size=0x24) addr:0x0211de88 -_ZN12ActorUnkKETH19func_ov032_0211deacEv kind:function(arm,size=0x24) addr:0x0211deac -_ZN12ActorUnkKETH19func_ov032_0211ded0Ev kind:function(arm,size=0x144) addr:0x0211ded0 -_ZN12ActorUnkKETH19func_ov032_0211e014Ev kind:function(arm,size=0xac) addr:0x0211e014 -_ZN12ActorUnkKETH19func_ov032_0211e0c0Ev kind:function(arm,size=0x14) addr:0x0211e0c0 -_ZN12ActorUnkKETH19func_ov032_0211e0d4Ev kind:function(arm,size=0x234) addr:0x0211e0d4 -_ZN12ActorUnkKETH19func_ov032_0211e308Ev kind:function(arm,size=0x78) addr:0x0211e308 -_ZN12ActorUnkKETH19func_ov032_0211e380Ev kind:function(arm,size=0x8c) addr:0x0211e380 -_ZN12ActorUnkKETH19func_ov032_0211e40cEv kind:function(arm,size=0x14) addr:0x0211e40c -_ZN12ActorUnkKETH19func_ov032_0211e420Ev kind:function(arm,size=0x48) addr:0x0211e420 -_ZN12ActorUnkKETH19func_ov032_0211e468Ev kind:function(arm,size=0x310) addr:0x0211e468 -_ZN12ActorUnkKETH19func_ov032_0211e778Ev kind:function(arm,size=0x1b8) addr:0x0211e778 -_ZN12ActorUnkKETH19func_ov032_0211e930Ev kind:function(arm,size=0xbc) addr:0x0211e930 -_ZN12ActorUnkKETH19func_ov032_0211e9ecEv kind:function(arm,size=0x174) addr:0x0211e9ec -_ZN12ActorUnkKETH19func_ov032_0211eb60Ev kind:function(arm,size=0x188) addr:0x0211eb60 -_ZN12ActorUnkKETH19func_ov032_0211ece8Ev kind:function(arm,size=0x174) addr:0x0211ece8 -_ZN12ActorUnkKETH19func_ov032_0211ee5cEv kind:function(arm,size=0x1f8) addr:0x0211ee5c -_ZN12ActorUnkKETH19func_ov032_0211f054Ev kind:function(arm,size=0x54) addr:0x0211f054 -_ZN12ActorUnkKETH19func_ov032_0211f0a8Ev kind:function(arm,size=0x148) addr:0x0211f0a8 -_ZN12ActorUnkKETH19func_ov032_0211f1f0Ev kind:function(arm,size=0x4) addr:0x0211f1f0 -_ZN12ActorUnkKETH19func_ov032_0211f1f4Ev kind:function(arm,size=0x10c) addr:0x0211f1f4 -_ZN12ActorUnkKETH19func_ov032_0211f300Ev kind:function(arm,size=0x10) addr:0x0211f300 -_ZN12ActorUnkKETH19func_ov032_0211f310Ev kind:function(arm,size=0x9c) addr:0x0211f310 -_ZN12ActorUnkKETH19func_ov032_0211f3acEv kind:function(arm,size=0x58) addr:0x0211f3ac -_ZN12ActorUnkKETH19func_ov032_0211f404Ev kind:function(arm,size=0xa0) addr:0x0211f404 -_ZN12ActorUnkKETH19func_ov032_0211f4a4Ev kind:function(arm,size=0x68) addr:0x0211f4a4 -_ZN12ActorUnkKETH19func_ov032_0211f50cEv kind:function(arm,size=0x54) addr:0x0211f50c -_ZN12ActorUnkKETH19func_ov032_0211f560Ev kind:function(arm,size=0x2c) addr:0x0211f560 -_ZN12ActorUnkKETH19func_ov032_0211f58cEv kind:function(arm,size=0x78) addr:0x0211f58c -_ZN12ActorUnkKETH19func_ov032_0211f604Ev kind:function(arm,size=0x10) addr:0x0211f604 -_ZN12ActorUnkKETH19func_ov032_0211f614Ev kind:function(arm,size=0xa8) addr:0x0211f614 -_ZN12ActorUnkKETH19func_ov032_0211f6bcEv kind:function(arm,size=0x148) addr:0x0211f6bc -_ZN12ActorUnkKETH19func_ov032_0211f804Ev kind:function(arm,size=0x138) addr:0x0211f804 -_ZN12ActorUnkKETH19func_ov032_0211f93cEv kind:function(arm,size=0x88) addr:0x0211f93c -_ZN12ActorUnkKETH19func_ov032_0211f9c4Ev kind:function(arm,size=0x88) addr:0x0211f9c4 -_ZN12ActorUnkKETH19func_ov032_0211fa4cEv kind:function(arm,size=0xa4) addr:0x0211fa4c -_ZN12ActorUnkKETH19func_ov032_0211faf0Ev kind:function(arm,size=0xac) addr:0x0211faf0 -_ZN12ActorUnkKETH19func_ov032_0211fb9cEv kind:function(arm,size=0x18) addr:0x0211fb9c -_ZN12ActorUnkKETH19func_ov032_0211fbb4Ev kind:function(arm,size=0x38) addr:0x0211fbb4 -_ZN12ActorUnkKETH19func_ov032_0211fbecEv kind:function(arm,size=0x14) addr:0x0211fbec -_ZN12ActorUnkKETH19func_ov032_0211fc00Ev kind:function(arm,size=0x1c) addr:0x0211fc00 -_ZN12ActorUnkKETH19func_ov032_0211fc1cEv kind:function(arm,size=0xa4) addr:0x0211fc1c -_ZN12ActorUnkKETH19func_ov032_0211fcc0Ev kind:function(arm,size=0xac) addr:0x0211fcc0 -_ZN19ActorProfileUnkKETHD1Ev kind:function(arm,size=0x14) addr:0x0211fd6c +_ZN19ActorProfileUnkMKURD1Ev kind:function(arm,size=0x14) addr:0x0211db2c +_ZN17ActorProfileKeese10GetProfileEv kind:function(arm,size=0xc) addr:0x0211db40 +_ZN17ActorProfileKeese6CreateEv kind:function(arm,size=0x24) addr:0x0211db4c +_ZN17ActorProfileKeeseC1Ev kind:function(arm,size=0x5c) addr:0x0211db70 +_ZN26ModelRender_ov032_02122568C1EP10G3d_Model_ kind:function(arm,size=0x34) addr:0x0211dbcc +_ZN10ActorKeeseC1Ev kind:function(arm,size=0x20c) addr:0x0211dc00 +_ZN26ModelRender_ov032_02122568D1Ev kind:function(arm,size=0x14) addr:0x0211de0c +_ZN14ActorKeese_284D1Ev kind:function(arm,size=0x14) addr:0x0211de20 +_ZN14ActorKeese_2ACC1EP10ActorKeese kind:function(arm,size=0x38) addr:0x0211de34 +_ZN14ActorKeese_2ACD1Ev kind:function(arm,size=0x1c) addr:0x0211de6c +_ZN14ActorKeese_2ACD0Ev kind:function(arm,size=0x24) addr:0x0211de88 +_ZN14ActorKeese_2AC8vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0x24) addr:0x0211deac +_ZN14ActorKeese_2AC8vfunc_0CEPK24UnkStruct_ov031_020e54d4Pii kind:function(arm,size=0x144) addr:0x0211ded0 +_ZN10ActorKeese8vfunc_18Ei kind:function(arm,size=0xac) addr:0x0211e014 +_ZN10ActorKeese19func_ov032_0211e0c0Ev kind:function(arm,size=0x14) addr:0x0211e0c0 +_ZN10ActorKeese19func_ov032_0211e0d4Esi kind:function(arm,size=0x234) addr:0x0211e0d4 +_ZN10ActorKeese19func_ov032_0211e308Ev kind:function(arm,size=0x78) addr:0x0211e308 +_ZN10ActorKeese19func_ov032_0211e380Ev kind:function(arm,size=0x8c) addr:0x0211e380 +_ZN10ActorKeese19func_ov032_0211e40cEv kind:function(arm,size=0x14) addr:0x0211e40c +_ZN10ActorKeese8SetStateEs kind:function(arm,size=0x48) addr:0x0211e420 +_ZN10ActorKeese19func_ov032_0211e468Ev kind:function(arm,size=0x310) addr:0x0211e468 +_ZN10ActorKeese8vfunc_20Ev kind:function(arm,size=0x1b8) addr:0x0211e778 +_ZN10ActorKeese8vfunc_2CEi kind:function(arm,size=0xbc) addr:0x0211e930 +_ZN10ActorKeese19func_ov032_0211e9ecEv kind:function(arm,size=0x174) addr:0x0211e9ec +_ZN10ActorKeese19func_ov032_0211eb60Ev kind:function(arm,size=0x188) addr:0x0211eb60 +_ZN10ActorKeese19func_ov032_0211ece8Ev kind:function(arm,size=0x174) addr:0x0211ece8 +_ZN10ActorKeese19func_ov032_0211ee5cEv kind:function(arm,size=0x1f8) addr:0x0211ee5c +_ZN10ActorKeese19func_ov032_0211f054Ev kind:function(arm,size=0x54) addr:0x0211f054 +_ZN10ActorKeese19func_ov032_0211f0a8Ev kind:function(arm,size=0x148) addr:0x0211f0a8 +_ZN10ActorKeese19func_ov032_0211f1f0Ev kind:function(arm,size=0x4) addr:0x0211f1f0 +_ZN10ActorKeese19func_ov032_0211f1f4Ev kind:function(arm,size=0x10c) addr:0x0211f1f4 +_ZN10ActorKeese19func_ov032_0211f300Ev kind:function(arm,size=0x10) addr:0x0211f300 +_ZN10ActorKeese19func_ov032_0211f310Ev kind:function(arm,size=0x9c) addr:0x0211f310 +_ZN10ActorKeese19func_ov032_0211f3acEv kind:function(arm,size=0x58) addr:0x0211f3ac +_ZN10ActorKeese19func_ov032_0211f404Ev kind:function(arm,size=0xa0) addr:0x0211f404 +_ZN10ActorKeese19func_ov032_0211f4a4Ev kind:function(arm,size=0x68) addr:0x0211f4a4 +_ZN10ActorKeese19func_ov032_0211f50cEv kind:function(arm,size=0x54) addr:0x0211f50c +_ZN10ActorKeese19func_ov032_0211f560Ev kind:function(arm,size=0x2c) addr:0x0211f560 +_ZN10ActorKeese19func_ov032_0211f58cEv kind:function(arm,size=0x78) addr:0x0211f58c +_ZN10ActorKeese19func_ov032_0211f604Ev kind:function(arm,size=0x10) addr:0x0211f604 +_ZN10ActorKeese19func_ov032_0211f614Ev kind:function(arm,size=0xa8) addr:0x0211f614 +_ZN10ActorKeese19func_ov032_0211f6bcEv kind:function(arm,size=0x148) addr:0x0211f6bc +_ZN10ActorKeese19func_ov032_0211f804Ev kind:function(arm,size=0x138) addr:0x0211f804 +_ZN10ActorKeese19func_ov032_0211f93cEP7VecFx32i kind:function(arm,size=0x88) addr:0x0211f93c +_ZN10ActorKeese19func_ov032_0211f9c4Ev kind:function(arm,size=0x88) addr:0x0211f9c4 +_ZN10ActorKeese19func_ov032_0211fa4cEi kind:function(arm,size=0xa4) addr:0x0211fa4c +_ZN10ActorKeese19func_ov032_0211faf0EPvi kind:function(arm,size=0xac) addr:0x0211faf0 +_ZN24UnkStruct_ov032_0212251cC1Ev kind:function(arm,size=0x18) addr:0x0211fb9c +_ZN24UnkStruct_ov032_0212251c8vfunc_00EP9MapObject kind:function(arm,size=0x38) addr:0x0211fbb4 +_ZN14ActorKeese_284C1Ev kind:function(arm,size=0x14) addr:0x0211fbec +_ZN26ModelRender_ov032_02122568D0Ev kind:function(arm,size=0x1c) addr:0x0211fc00 +_ZN10ActorKeeseD1Ev kind:function(arm,size=0xa4) addr:0x0211fc1c +_ZN10ActorKeeseD0Ev kind:function(arm,size=0xac) addr:0x0211fcc0 +_ZN17ActorProfileKeeseD1Ev kind:function(arm,size=0x14) addr:0x0211fd6c _ZN19ActorProfileUnkNSSW10GetProfileEv kind:function(arm,size=0xc) addr:0x0211fd80 _ZN19ActorProfileUnkNSSW6CreateEv kind:function(arm,size=0x24) addr:0x0211fd8c _ZN19ActorProfileUnkNSSWC1Ev kind:function(arm,size=0x44) addr:0x0211fdb0 @@ -224,12 +224,12 @@ data_ov032_02121f14 kind:data(any) addr:0x02121f14 data_ov032_02121f24 kind:data(any) addr:0x02121f24 __sinit_ActorSpinut.cpp kind:function(arm,size=0x6c) addr:0x02121f34 __sinit_ActorFleeingSpinut.cpp kind:function(arm,size=0x80) addr:0x02121fa0 -__sinit_ActorUnkKETH.cpp kind:function(arm,size=0x6c) addr:0x02122020 +__sinit_ActorKeese.cpp kind:function(arm,size=0x6c) addr:0x02122020 __sinit_ActorUnkNSSW.cpp kind:function(arm,size=0x50) addr:0x0212208c __sinit_MapObjectUnkSWSW.cpp kind:function(arm,size=0x50) addr:0x021220dc .p__sinit_ActorSpinut.cpp kind:data(word) addr:0x0212212c .p__sinit_ActorFleeingSpinut.cpp kind:data(word) addr:0x02122130 -.p__sinit_ActorUnkKETH.cpp kind:data(word) addr:0x02122134 +.p__sinit_ActorKeese.cpp kind:data(word) addr:0x02122134 .p__sinit_ActorUnkNSSW.cpp kind:data(word) addr:0x02122138 .p__sinit_MapObjectUnkSWSW.cpp kind:data(word) addr:0x0212213c data_ov032_02122160 kind:data(any) addr:0x02122160 @@ -253,18 +253,17 @@ _ZTV18ActorFleeingSpinut kind:data(any) addr:0x02122478 data_ov032_021224d8 kind:data(any) addr:0x021224d8 data_ov032_021224e4 kind:data(any) addr:0x021224e4 data_ov032_021224fc kind:data(any) addr:0x021224fc -data_ov032_0212251c kind:data(any) addr:0x0212251c -data_ov032_02122528 kind:data(any) addr:0x02122528 -_ZTV19data_ov032_0212253c kind:data(any) addr:0x0212253c -data_ov032_02122568 kind:data(any) addr:0x02122568 +_ZTV24UnkStruct_ov032_0212251c kind:data(any) addr:0x02122514 +_ZTV14ActorKeese_2AC kind:data(any) addr:0x02122520 +_ZTV17ActorProfileKeese kind:data(any) addr:0x0212253c +_ZTV26ModelRender_ov032_02122568 kind:data(any) addr:0x02122560 data_ov032_0212258c kind:data(any) addr:0x0212258c -data_ov032_021225a8 kind:data(any) addr:0x021225a8 ambiguous data_ov032_021225dc kind:data(any) addr:0x021225dc -_ZTV19data_ov032_0212262c kind:data(any) addr:0x0212262c -data_ov032_02122694 kind:data(any) addr:0x02122694 +_ZTV10ActorKeese kind:data(any) addr:0x0212262c +_ZTV19data_ov032_02122694 kind:data(any) addr:0x0212268c data_ov032_021226ac kind:data(any) addr:0x021226ac _ZTV19data_ov032_021226c0 kind:data(any) addr:0x021226c0 -_ZTV19data_ov032_021226e4 kind:data(any) addr:0x021226e4 +data_ov032_021226e4 kind:data(any) addr:0x021226e4 _ZTV23MapObjectProfileUnkSWSW kind:data(any) addr:0x02122744 _ZTV28MapObjectProfileUnkSWSW_Base kind:data(any) addr:0x02122760 _ZTV17MapObject_10_SWSW kind:data(any) addr:0x0212277c @@ -278,9 +277,9 @@ data_ov032_0212290c kind:bss addr:0x0212290c _ZGVN15ProfileInstanceI25ActorProfileFleeingSpinutE8sProfileE kind:bss addr:0x02122918 @11142 kind:bss addr:0x02122924 _ZN15ProfileInstanceI25ActorProfileFleeingSpinutE8sProfileE kind:bss addr:0x02122930 -_ZGVN15ProfileInstanceI19ActorProfileUnkKETHE8sProfileE kind:bss addr:0x02122974 +_ZGVN15ProfileInstanceI17ActorProfileKeeseE8sProfileE kind:bss addr:0x02122974 @11148 kind:bss addr:0x02122978 -_ZN15ProfileInstanceI19ActorProfileUnkKETHE8sProfileE kind:bss addr:0x02122984 +_ZN15ProfileInstanceI17ActorProfileKeeseE8sProfileE kind:bss addr:0x02122984 _ZGVN15ProfileInstanceI19ActorProfileUnkNSSWE8sProfileE kind:bss addr:0x02122a5c @11154 kind:bss addr:0x02122a60 _ZN15ProfileInstanceI19ActorProfileUnkNSSWE8sProfileE kind:bss addr:0x02122a6c diff --git a/config/eur/arm9/overlays/ov063/symbols.txt b/config/eur/arm9/overlays/ov063/symbols.txt index 3086ac8e..d89f7f89 100644 --- a/config/eur/arm9/overlays/ov063/symbols.txt +++ b/config/eur/arm9/overlays/ov063/symbols.txt @@ -53,7 +53,7 @@ _ZN12ActorUnkCANS19func_ov063_0215a678EPS_P29UnkStruct_func_ov063_0215a678 kind: _ZN24UnkStruct_ov063_02162ea8C1Ev kind:function(arm,size=0x30) addr:0x0215a7d4 _ZN24UnkStruct_ov063_02162ea8D1Ev kind:function(arm,size=0x14) addr:0x0215a804 _ZN24UnkStruct_ov063_02162ea8D0Ev kind:function(arm,size=0x1c) addr:0x0215a818 -_ZN24UnkStruct_ov063_02162ea88vfunc_08EPK24UnkStruct_ov031_020f3310 kind:function(arm,size=0x4c) addr:0x0215a834 +_ZN24UnkStruct_ov063_02162ea88vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0x4c) addr:0x0215a834 _ZN24UnkStruct_ov063_02162ea88vfunc_0CEPK24UnkStruct_ov031_020e54d4Pii kind:function(arm,size=0xcc) addr:0x0215a880 _ZN24UnkStruct_ov063_02162f148vfunc_3CEv kind:function(arm,size=0x24) addr:0x0215a94c _ZN24UnkStruct_ov063_02162f148vfunc_38Eii kind:function(arm,size=0x2c) addr:0x0215a970 diff --git a/config/eur/arm9/symbols.txt b/config/eur/arm9/symbols.txt index 0ecc1c75..1f8d87c9 100644 --- a/config/eur/arm9/symbols.txt +++ b/config/eur/arm9/symbols.txt @@ -849,7 +849,7 @@ func_02016d7c kind:function(arm,size=0xf8) addr:0x02016d7c func_02016e74 kind:function(arm,size=0x68) addr:0x02016e74 func_02016edc kind:function(arm,size=0xe0) addr:0x02016edc func_02016fbc kind:function(arm,size=0xf0) addr:0x02016fbc -func_020170ac kind:function(arm,size=0xac) addr:0x020170ac +_ZN24UnkStruct_ov032_0212251c13func_020170acEP7VecFx32 kind:function(arm,size=0xac) addr:0x020170ac func_02017158 kind:function(arm,size=0x38) addr:0x02017158 func_02017190 kind:function(arm,size=0x54) addr:0x02017190 _ZN9UnkResultC1Ev kind:function(arm,size=0x4c) addr:0x020171e4 diff --git a/config/eur1/arm9/overlays/ov000/symbols.txt b/config/eur1/arm9/overlays/ov000/symbols.txt index 20d818f2..2e770fbd 100644 --- a/config/eur1/arm9/overlays/ov000/symbols.txt +++ b/config/eur1/arm9/overlays/ov000/symbols.txt @@ -1413,9 +1413,9 @@ func_ov000_0207bd84 kind:function(arm,size=0x260) addr:0x0207bdb8 _ZN24UnkStruct_ov000_020b28388vfunc_00Ev kind:function(arm,size=0x4) addr:0x0207c018 _ZN24UnkStruct_ov000_020b2838D0Ev kind:function(arm,size=0x14) addr:0x0207c01c _ZN29UnkStruct_ov031_Items_00_BaseD2Ev kind:function(arm,size=0x4) addr:0x0207c030 -_ZN26UnkStruct_027e0ce0_38_Base8vfunc_08EPK24UnkStruct_ov031_020f3310 kind:function(arm,size=0x8) addr:0x0207c034 +_ZN26UnkStruct_027e0ce0_38_Base8vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0x8) addr:0x0207c034 _ZN26UnkStruct_027e0ce0_38_Base8vfunc_0CEPK24UnkStruct_ov031_020e54d4Pii kind:function(arm,size=0x8) addr:0x0207c03c -_ZN26UnkStruct_027e0ce0_38_Base8vfunc_10Ev kind:function(arm,size=0x8) addr:0x0207c044 +_ZN26UnkStruct_027e0ce0_38_Base8vfunc_10E8ActorRefi kind:function(arm,size=0x8) addr:0x0207c044 _ZN17MapObject_10_BaseC2Ev kind:function(arm,size=0x30) addr:0x0207c04c func_ov000_0207c048 kind:function(arm,size=0x30) addr:0x0207c07c func_ov000_0207c078 kind:function(arm,size=0x38) addr:0x0207c0ac @@ -2308,7 +2308,7 @@ func_ov000_020981e0 kind:function(arm,size=0x64) addr:0x02098234 func_ov000_02098244 kind:function(arm,size=0x64) addr:0x02098298 _ZN24UnkStruct_ov031_Items_00C2Ev kind:function(arm,size=0x18) addr:0x020982fc _ZN24UnkStruct_ov071_0215f92cC1Ev kind:function(arm,size=0x18) addr:0x02098314 -_ZN24UnkStruct_ov031_Items_008vfunc_08EPK24UnkStruct_ov031_020f3310 kind:function(arm,size=0x80) addr:0x0209832c +_ZN24UnkStruct_ov031_Items_008vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0x80) addr:0x0209832c _ZN19func_ov000_02098358D1Ev kind:function(arm,size=0x14) addr:0x020983ac _ZN19func_ov000_0209836cD0Ev kind:function(arm,size=0x1c) addr:0x020983c0 _ZN5ActorC2Ev kind:function(arm,size=0xe8) addr:0x020983dc @@ -2341,7 +2341,7 @@ func_ov000_020986fc kind:function(arm,size=0x7c) addr:0x02098750 func_ov000_02098778 kind:function(arm,size=0x88) addr:0x020987cc _ZN5Actor19func_ov000_02098800Eb kind:function(arm,size=0x38) addr:0x02098854 _ZN5Actor19func_ov000_02098838Ev kind:function(arm,size=0x28) addr:0x0209888c -func_ov000_02098860 kind:function(arm,size=0xb0) addr:0x020988b4 +_ZN5Actor19func_ov000_0209a008Eis kind:function(arm,size=0xb0) addr:0x020988b4 _ZN5Actor19func_ov000_02098910EP24UnkStruct_ov031_Items_00i kind:function(arm,size=0xd0) addr:0x02098964 _ZN5Actor19func_ov000_020989e0Ev kind:function(arm,size=0x38) addr:0x02098a34 func_ov000_02098a18 kind:function(arm,size=0x48) addr:0x02098a6c @@ -2352,28 +2352,28 @@ _ZN14Actor_Derived2C2Ev kind:function(arm,size=0x64) addr:0x02098b7c _ZN5Actor19func_ov000_02098b8cEiP24UnkStruct_ov031_Items_00 kind:function(arm,size=0x184) addr:0x02098be0 func_ov000_02098d10 kind:function(arm,size=0x6c) addr:0x02098d64 func_ov000_02098d7c kind:function(arm,size=0x1b8) addr:0x02098dd0 -func_ov000_02098f34 kind:function(arm,size=0xd0) addr:0x02098f88 +_ZN14Actor_Derived219func_ov000_02098f34EP7VecFx32 kind:function(arm,size=0xd0) addr:0x02098f88 _ZN14Actor_Derived28vfunc_30EP14Actor_vfunc_30 kind:function(arm,size=0xc) addr:0x02099058 func_ov000_02099010 kind:function(arm,size=0xb0) addr:0x02099064 func_ov000_020990c0 kind:function(arm,size=0x21c) addr:0x02099114 -func_ov000_020992dc kind:function(arm,size=0x90) addr:0x02099330 +_ZN14Actor_Derived219func_ov000_020992dcEv kind:function(arm,size=0x90) addr:0x02099330 func_ov000_0209936c kind:function(arm,size=0x64) addr:0x020993c0 func_ov000_020993d0 kind:function(arm,size=0x80) addr:0x02099424 -func_ov000_02099450 kind:function(arm,size=0x50) addr:0x020994a4 -func_ov000_020994a0 kind:function(arm,size=0x74) addr:0x020994f4 +_ZN14Actor_Derived219func_ov000_02099450EPvP7VecFx32it kind:function(arm,size=0x50) addr:0x020994a4 +_ZN14Actor_Derived219func_ov000_020994a0Ev kind:function(arm,size=0x74) addr:0x020994f4 func_ov000_02099514 kind:function(arm,size=0x74) addr:0x02099568 _ZN14Actor_Derived28vfunc_54Ei kind:function(arm,size=0x1b0) addr:0x020995dc func_ov000_02099738 kind:function(arm,size=0x2c) addr:0x0209978c func_ov000_02099764 kind:function(arm,size=0x20) addr:0x020997b8 func_ov000_02099784 kind:function(arm,size=0x20) addr:0x020997d8 func_ov000_020997a4 kind:function(arm,size=0x20) addr:0x020997f8 -func_ov000_020997c4 kind:function(arm,size=0x2c) addr:0x02099818 +_ZN14Actor_Derived219func_ov000_020997c4Ei kind:function(arm,size=0x2c) addr:0x02099818 _ZN14Actor_Derived2D1Ev kind:function(arm,size=0x14) addr:0x02099844 _ZN14Actor_Derived2D0Ev kind:function(arm,size=0x1c) addr:0x02099858 _ZN26UnkStruct_ActorUnkCANS_224C1Ev kind:function(arm,size=0x50) addr:0x02099874 func_ov000_02099870 kind:function(arm,size=0x80) addr:0x020998c4 func_ov000_020998f0 kind:function(arm,size=0x11c) addr:0x02099944 -func_ov000_02099a0c kind:function(arm,size=0x10) addr:0x02099a60 +_ZN26UnkStruct_ActorUnkCANS_22419func_ov000_02099a0cEv kind:function(arm,size=0x10) addr:0x02099a60 func_ov000_02099a1c kind:function(arm,size=0xc) addr:0x02099a70 _ZN24UnkStruct_ov000_020b31a8C2EP10UnkSystem5P11ModelRenderP19UnkActorFileSystem2 kind:function(thumb,size=0x54) addr:0x02099a7c func_ov000_02099a7c kind:function(thumb,size=0x48) addr:0x02099ad0 @@ -2386,7 +2386,7 @@ _ZN24UnkStruct_ov000_020b31a88vfunc_0CEv kind:function(arm,size=0x68) addr:0x020 _ZN24UnkStruct_ov000_020b31a88vfunc_20Ev kind:function(arm,size=0x110) addr:0x02099bf4 _ZN24UnkStruct_ov000_020b31a88vfunc_1CE25ActorUnkZLSL_AnimationTagiii kind:function(arm,size=0x84) addr:0x02099d04 func_ov000_02099d34 kind:function(arm,size=0xa8) addr:0x02099d88 -func_ov000_02099ddc kind:function(arm,size=0x7c) addr:0x02099e30 +_ZN24UnkStruct_ov000_020b31a819func_ov000_02099ddcE25ActorUnkZLSL_AnimationTagii kind:function(arm,size=0x7c) addr:0x02099e30 func_ov000_02099e58 kind:function(arm,size=0x98) addr:0x02099eac func_ov000_02099ef0 kind:function(arm,size=0x74) addr:0x02099f44 func_ov000_02099f64 kind:function(arm,size=0x94) addr:0x02099fb8 @@ -2401,7 +2401,7 @@ _ZN24UnkStruct_ov000_020b31a88vfunc_14Ev kind:function(arm,size=0x8) addr:0x0209 func_ov000_0209a14c kind:function(arm,size=0x24) addr:0x0209a1a0 func_ov000_0209a170 kind:function(arm,size=0x10) addr:0x0209a1c4 func_ov000_0209a180 kind:function(arm,size=0x8) addr:0x0209a1d4 -_ZN24UnkStruct_ov000_020b31f0C2EPvS0_S0_i kind:function(thumb,size=0x30) addr:0x0209a1dc +_ZN24UnkStruct_ov000_020b31f0C2EP10UnkSystem5S1_P11ModelRenderP19UnkActorFileSystem2 kind:function(thumb,size=0x30) addr:0x0209a1dc func_ov000_0209a1b8 kind:function(thumb,size=0x34) addr:0x0209a20c func_ov000_0209a1ec kind:function(thumb,size=0x3c) addr:0x0209a240 func_ov000_0209a228 kind:function(thumb,size=0xc) addr:0x0209a27c @@ -2492,7 +2492,7 @@ _ZN12ActorUnkEFIK8vfunc_54Ei kind:function(arm,size=0x8) addr:0x0209c338 _ZN12ActorUnkEFIKD1Ev kind:function(arm,size=0x20) addr:0x0209c340 _ZN12ActorUnkEFIKD0Ev kind:function(arm,size=0x28) addr:0x0209c360 _ZN19ActorProfileUnkEFIKD1Ev kind:function(arm,size=0x14) addr:0x0209c388 -func_ov000_0209c348 kind:function(arm,size=0x24) addr:0x0209c39c +_ZN24UnkStruct_ov000_020b34c48vfunc_00EP9MapObject kind:function(arm,size=0x24) addr:0x0209c39c func_ov000_0209c36c kind:function(arm,size=0x3c) addr:0x0209c3c0 _ZN16MapObjectManager19func_ov000_0209c3a8Ev kind:function(arm,size=0x40) addr:0x0209c3fc _ZN16MapObjectManager19func_ov000_0209c3e8Ev kind:function(arm,size=0x5c) addr:0x0209c43c @@ -3251,10 +3251,10 @@ data_ov000_020adce4 kind:data(any) addr:0x020adce4 data_ov000_020ae4bc kind:data(any) addr:0x020ae510 data_ov000_020aece8 kind:data(any) addr:0x020aed3c data_ov000_020aed40 kind:data(any) addr:0x020aed40 -data_ov000_020aed44 kind:data(any) addr:0x020aed44 -data_ov000_020aed48 kind:data(any) addr:0x020aed48 -data_ov000_020aed4c kind:data(any) addr:0x020aed4c -data_ov000_020aed50 kind:data(any) addr:0x020aed50 +data_ov000_020aecf0 kind:data(any) addr:0x020aed44 +data_ov000_020aecf4 kind:data(any) addr:0x020aed48 +data_ov000_020aecf8 kind:data(any) addr:0x020aed4c +data_ov000_020aecfc kind:data(any) addr:0x020aed50 data_ov000_020aed54 kind:data(any) addr:0x020aed54 data_ov000_020aed58 kind:data(any) addr:0x020aed58 data_ov000_020aed5c kind:data(any) addr:0x020aed5c diff --git a/config/eur1/arm9/overlays/ov017/symbols.txt b/config/eur1/arm9/overlays/ov017/symbols.txt index 5f1c0884..3c7018bc 100644 --- a/config/eur1/arm9/overlays/ov017/symbols.txt +++ b/config/eur1/arm9/overlays/ov017/symbols.txt @@ -56,22 +56,22 @@ func_ov017_020bee84 kind:function(arm,size=0x20) addr:0x020beec4 func_ov017_020beea4 kind:function(arm,size=0x28) addr:0x020beee4 func_ov017_020beecc kind:function(arm,size=0x20) addr:0x020bef0c _ZN5Actor19func_ov017_020beeecEi kind:function(arm,size=0x60) addr:0x020bef2c -func_ov017_020bef4c kind:function(arm,size=0x3c) addr:0x020bef8c +_ZN14Actor_Derived219func_ov017_020bef4cEi kind:function(arm,size=0x3c) addr:0x020bef8c _ZN5Actor19func_ov017_020bef88EP14Actor_vfunc_30Pvi kind:function(arm,size=0x9c) addr:0x020befc8 func_ov017_020bf024 kind:function(arm,size=0x2c) addr:0x020bf064 func_ov017_020bf050 kind:function(arm,size=0x128) addr:0x020bf090 func_ov017_020bf178 kind:function(arm,size=0x10c) addr:0x020bf1b8 func_ov017_020bf284 kind:function(arm,size=0x54) addr:0x020bf2c4 func_ov017_020bf2d8 kind:function(arm,size=0x108) addr:0x020bf318 -func_ov017_020bf3e0 kind:function(arm,size=0xd0) addr:0x020bf420 +_ZN5Actor19func_ov017_020bf3e0Eii kind:function(arm,size=0xd0) addr:0x020bf420 func_ov017_020bf4b0 kind:function(arm,size=0xc4) addr:0x020bf4f0 func_ov017_020bf574 kind:function(arm,size=0x50) addr:0x020bf5b4 _ZN5Actor19func_ov017_020bf5c4EP7VecFx32iiii kind:function(arm,size=0x70) addr:0x020bf604 -func_ov017_020bf634 kind:function(arm,size=0x54) addr:0x020bf674 -func_ov017_020bf688 kind:function(arm,size=0x88) addr:0x020bf6c8 +_ZN5Actor19func_ov017_020bf634EPK7VecFx32ti kind:function(arm,size=0x54) addr:0x020bf674 +_ZN5Actor19func_ov017_020bf688Ev kind:function(arm,size=0x88) addr:0x020bf6c8 func_ov017_020bf710 kind:function(arm,size=0x98) addr:0x020bf750 func_ov017_020bf7a8 kind:function(arm,size=0xec) addr:0x020bf7e8 -func_ov017_020bf894 kind:function(arm,size=0x60) addr:0x020bf8d4 +_ZN14Actor_Derived219func_ov017_020bf894EP26UnkStruct_ActorUnkCANS_224 kind:function(arm,size=0x60) addr:0x020bf8d4 _ZN5Actor8vfunc_40Ev kind:function(arm,size=0x44) addr:0x020bf934 _ZN5Actor8vfunc_44Ev kind:function(arm,size=0x64) addr:0x020bf978 func_ov017_020bf99c kind:function(arm,size=0x2c) addr:0x020bf9dc diff --git a/config/eur1/arm9/overlays/ov031/symbols.txt b/config/eur1/arm9/overlays/ov031/symbols.txt index ef8ce1e7..8e0a93f7 100644 --- a/config/eur1/arm9/overlays/ov031/symbols.txt +++ b/config/eur1/arm9/overlays/ov031/symbols.txt @@ -358,10 +358,10 @@ _ZN9ActorBomb19func_ov031_020e2c2cEv kind:function(arm,size=0x14c) addr:0x020e2d _ZN13ActorBomb_180C1EP5Actor kind:function(arm,size=0x3c) addr:0x020e2e98 _ZN13ActorBomb_180D1Ev kind:function(arm,size=0x1c) addr:0x020e2ed4 _ZN13ActorBomb_180D0Ev kind:function(arm,size=0x24) addr:0x020e2ef0 -_ZN13ActorBomb_1808vfunc_08EPK24UnkStruct_ov031_020f3310 kind:function(arm,size=0x48) addr:0x020e2f14 +_ZN13ActorBomb_1808vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0x48) addr:0x020e2f14 _ZN13ActorBomb_1808vfunc_0CEPK24UnkStruct_ov031_020e54d4Pii kind:function(arm,size=0x450) addr:0x020e2f5c _ZN13ActorBomb_1808vfunc_10E8ActorRefi kind:function(arm,size=0x84) addr:0x020e33ac -_ZN24ActorBomb_ov031_020e21348vfunc_08EPK24UnkStruct_ov031_020f3310 kind:function(arm,size=0x30) addr:0x020e3430 +_ZN24ActorBomb_ov031_020e21348vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0x30) addr:0x020e3430 _ZN13ActorBomb_19CC1EP5Actor kind:function(arm,size=0x3c) addr:0x020e3460 _ZN13ActorBomb_19C8vfunc_10EP5Actor kind:function(arm,size=0x30) addr:0x020e349c _ZN13ActorBomb_unkC1Ev kind:function(arm,size=0x14) addr:0x020e34cc @@ -443,13 +443,13 @@ _ZN21ActorItemBoomerang_CC8vfunc_0CEP5ActorP7VecFx32 kind:function(arm,size=0x4c _ZN22ActorItemBoomerang_11CC1EP18ActorItemBoomerang kind:function(arm,size=0x28) addr:0x020e556c _ZN22ActorItemBoomerang_11CD1Ev kind:function(arm,size=0x14) addr:0x020e5594 _ZN22ActorItemBoomerang_11CD0Ev kind:function(arm,size=0x1c) addr:0x020e55a8 -_ZN22ActorItemBoomerang_11C8vfunc_08EPK24UnkStruct_ov031_020f3310 kind:function(arm,size=0x30) addr:0x020e55c4 +_ZN22ActorItemBoomerang_11C8vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0x30) addr:0x020e55c4 _ZN22ActorItemBoomerang_11C8vfunc_0CEPK24UnkStruct_ov031_020e54d4Pii kind:function(arm,size=0x230) addr:0x020e55f4 _ZN26ActorItemBoomerang_Unknown19func_ov031_020e5704Ev kind:function(arm,size=0xc) addr:0x020e5824 _ZN21ActorItemBoomerang_A0D0Ev kind:function(arm,size=0x1c) addr:0x020e5830 _ZN21ActorItemBoomerang_CCD0Ev kind:function(arm,size=0x1c) addr:0x020e584c _ZN25ActorProfileItemBoomerangD1Ev kind:function(arm,size=0x14) addr:0x020e5868 -_ZN24UnkStruct_ov031_02112ff48vfunc_08EPK24UnkStruct_ov031_020f3310 kind:function(arm,size=0x28) addr:0x020e587c +_ZN24UnkStruct_ov031_02112ff48vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0x28) addr:0x020e587c _ZN24UnkStruct_ov031_02112ff48vfunc_0CEPK24UnkStruct_ov031_020e54d4i kind:function(arm,size=0x114) addr:0x020e58a4 func_ov031_020e5898 kind:function(arm,size=0x30) addr:0x020e59b8 _ZN23ActorProfileItemTornado10GetProfileEv kind:function(arm,size=0xc) addr:0x020e59e8 @@ -481,7 +481,7 @@ _ZN19func_ov031_020e6774D0Ev kind:function(arm,size=0x68) addr:0x020e6894 func_ov031_020e67dc kind:function(arm,size=0x7c) addr:0x020e68fc func_ov031_020e6858 kind:function(arm,size=0x64) addr:0x020e6978 _ZN19func_ov031_020e68bcD0Ev kind:function(arm,size=0x1c) addr:0x020e69dc -_ZN15ActorUnkSWBM_948vfunc_08EPK24UnkStruct_ov031_020f3310 kind:function(arm,size=0x28) addr:0x020e69f8 +_ZN15ActorUnkSWBM_948vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0x28) addr:0x020e69f8 _ZN15ActorUnkSWBM_948vfunc_0CEPK24UnkStruct_ov031_020e54d4Pii kind:function(arm,size=0x1c) addr:0x020e6a20 _ZN15ActorUnkSWBM_988vfunc_0CEP5ActorP7VecFx32 kind:function(arm,size=0x58) addr:0x020e6a3c _ZN15ActorUnkSWBM_988vfunc_10EP5Actor kind:function(arm,size=0x58) addr:0x020e6a94 @@ -923,7 +923,7 @@ _ZN18ActorShotArrow_178C1EP14ActorShotArrow kind:function(arm,size=0x3c) addr:0x _ZN18ActorShotArrow_178D1Ev kind:function(arm,size=0x1c) addr:0x020f33f4 _ZN18ActorShotArrow_178D0Ev kind:function(arm,size=0x24) addr:0x020f3410 _ZN18ActorShotArrow_17819func_ov031_020f3304Ev kind:function(arm,size=0xc) addr:0x020f3434 -_ZN18ActorShotArrow_1788vfunc_08EPK24UnkStruct_ov031_020f3310 kind:function(arm,size=0xac) addr:0x020f3440 +_ZN18ActorShotArrow_1788vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0xac) addr:0x020f3440 _ZN18ActorShotArrow_1788vfunc_0CEPK24UnkStruct_ov031_020e54d4Pii kind:function(arm,size=0x350) addr:0x020f34ec _ZN18ActorShotArrow_194C1EP14ActorShotArrow kind:function(arm,size=0x40) addr:0x020f383c _ZN18ActorShotArrow_19419func_ov031_020f374cEP5Actor kind:function(arm,size=0x164) addr:0x020f387c diff --git a/config/eur1/arm9/overlays/ov032/delinks.txt b/config/eur1/arm9/overlays/ov032/delinks.txt index fda069a1..707e98ea 100644 --- a/config/eur1/arm9/overlays/ov032/delinks.txt +++ b/config/eur1/arm9/overlays/ov032/delinks.txt @@ -19,10 +19,11 @@ src/032_MapA1/Actor/ActorFleeingSpinut.cpp: .data start:0x02122548 end:0x02122678 .bss start:0x02122aa8 end:0x02122b14 -src/032_MapA1/Actor/ActorUnkKETH.cpp: +src/032_MapA1/Actor/ActorKeese.cpp: .text start:0x0211dc80 end:0x0211fec0 .init start:0x021221dc end:0x02122248 .ctor start:0x021222f0 end:0x021222f4 + .data start:0x02122678 end:0x0212282c .bss start:0x02122b14 end:0x02122bfc src/032_MapA1/Actor/ActorUnkNSSW.cpp: diff --git a/config/eur1/arm9/overlays/ov032/relocs.txt b/config/eur1/arm9/overlays/ov032/relocs.txt index 6daea6f4..7ee7fb3e 100644 --- a/config/eur1/arm9/overlays/ov032/relocs.txt +++ b/config/eur1/arm9/overlays/ov032/relocs.txt @@ -17,8 +17,8 @@ from:0x021192f0 kind:arm_call to:0x0211b6b0 module:overlay(32) from:0x02119350 kind:arm_call to:0x02098680 module:overlay(0) from:0x02119374 kind:load to:0x02122490 module:overlay(32) from:0x02119378 kind:load to:0x021229d0 module:overlay(32) -from:0x0211937c kind:load to:0x021223e4 module:overlay(32) -from:0x02119380 kind:load to:0x0212239c module:overlay(32) +from:0x0211937c kind:load to:0x021223dc module:overlay(32) add:0x8 +from:0x02119380 kind:load to:0x02122394 module:overlay(32) add:0x8 from:0x02119384 kind:load to:0x02122300 module:overlay(32) from:0x02119390 kind:arm_call_thumb to:0x0209a29c module:overlay(0) from:0x021193a4 kind:arm_call_thumb to:0x02099b50 module:overlay(0) @@ -272,7 +272,7 @@ from:0x0211ba0c kind:arm_call to:0x02098680 module:overlay(0) from:0x0211ba28 kind:arm_call to:0x0211bf44 module:overlay(32) from:0x0211ba48 kind:load to:0x02122618 add:0x8 module:overlay(32) from:0x0211ba4c kind:load to:0x02122ad0 module:overlay(32) -from:0x0211ba50 kind:load to:0x021223e4 module:overlay(32) +from:0x0211ba50 kind:load to:0x021223dc module:overlay(32) add:0x8 from:0x0211ba54 kind:load to:0x02122ac4 module:overlay(32) from:0x0211ba58 kind:load to:0x02122aac module:overlay(32) from:0x0211ba5c kind:load to:0x02122548 module:overlay(32) @@ -530,10 +530,10 @@ from:0x0211dc88 kind:load to:0x02122b24 module:overlay(32) from:0x0211dc9c kind:arm_call to:0x02011f3c module:main from:0x0211dca8 kind:arm_call to:0x0211dd40 module:overlay(32) from:0x0211dcbc kind:arm_call to:0x020978ec module:overlay(0) -from:0x0211dd08 kind:load to:0x021226e4 module:overlay(32) +from:0x0211dd08 kind:load to:0x021226dc module:overlay(32) add:0x8 from:0x0211dd14 kind:arm_call_thumb to:0x0209a7b8 module:overlay(0) from:0x0211dd28 kind:arm_call to:0x02057f18 module:overlay(0) -from:0x0211dd38 kind:load to:0x02122708 module:overlay(32) +from:0x0211dd38 kind:load to:0x02122700 module:overlay(32) add:0x8 from:0x0211dd3c kind:load to:0x02122090 module:overlay(32) from:0x0211dd50 kind:arm_call to:0x02098b7c module:overlay(0) from:0x0211ddb4 kind:arm_call to:0x0211dd0c module:overlay(32) @@ -548,17 +548,17 @@ from:0x0211de94 kind:arm_call to:0x02099874 module:overlay(0) from:0x0211dec0 kind:arm_call to:0x0203d160 module:main from:0x0211dee0 kind:arm_call to:0x0211df74 module:overlay(32) from:0x0211df00 kind:arm_call to:0x02098680 module:overlay(0) -from:0x0211df30 kind:load to:0x021227d4 module:overlay(32) +from:0x0211df30 kind:load to:0x021227cc module:overlay(32) add:0x8 from:0x0211df34 kind:load to:0x02122b24 module:overlay(32) -from:0x0211df38 kind:load to:0x021223e4 module:overlay(32) -from:0x0211df3c kind:load to:0x0212239c module:overlay(32) +from:0x0211df38 kind:load to:0x021223dc module:overlay(32) add:0x8 +from:0x0211df3c kind:load to:0x02122394 module:overlay(32) add:0x8 from:0x0211df40 kind:load to:0x0211df60 module:overlay(32) from:0x0211df44 kind:load to:0x0211fd2c module:overlay(32) from:0x0211df48 kind:load to:0x02122678 module:overlay(32) from:0x0211df54 kind:arm_call_thumb to:0x02057bd4 module:overlay(0) from:0x0211df68 kind:arm_call to:0x020a0358 module:overlay(0) from:0x0211df80 kind:arm_call to:0x020982fc module:overlay(0) -from:0x0211dfa8 kind:load to:0x021226c8 module:overlay(32) +from:0x0211dfa8 kind:load to:0x021226c0 module:overlay(32) add:0x8 from:0x0211dfbc kind:arm_call to:0x0207c030 module:overlay(0) from:0x0211dfd8 kind:arm_call to:0x0207c030 module:overlay(0) from:0x0211dfe0 kind:arm_call to:0x02011ff4 module:main @@ -747,7 +747,7 @@ from:0x0211fc2c kind:load to:0x027e0ce0 module:dtcm from:0x0211fc98 kind:arm_call to:0x0200e260 module:main from:0x0211fca8 kind:arm_call to:0x01ffad5c module:itcm from:0x0211fcd8 kind:load to:0x027e0964 module:dtcm -from:0x0211fcf0 kind:load to:0x021226bc module:overlay(32) +from:0x0211fcf0 kind:load to:0x021226b4 module:overlay(32) add:0x8 from:0x0211fcfc kind:arm_call to:0x0209c39c module:overlay(0) from:0x0211fd48 kind:arm_call_thumb to:0x02057bd4 module:overlay(0) from:0x0211fd50 kind:arm_call to:0x02011ff4 module:main @@ -896,7 +896,7 @@ from:0x02120e10 kind:arm_call to:0x021209f4 module:overlay(32) from:0x02120e84 kind:arm_call to:0x01ffa06c module:itcm from:0x02120e9c kind:arm_call to:0x021209f4 module:overlay(32) from:0x02120ec4 kind:arm_call to:0x020f63b4 module:overlay(31) -from:0x02120edc kind:load to:0x02122834 module:overlay(32) +from:0x02120edc kind:load to:0x0212282c module:overlay(32) add:0x8 from:0x02120efc kind:arm_call to:0x02120ce0 module:overlay(32) from:0x02120f0c kind:arm_call to:0x020f6414 module:overlays(21,31) from:0x02120f28 kind:arm_call to:0x02120d18 module:overlay(32) diff --git a/config/eur1/arm9/overlays/ov032/symbols.txt b/config/eur1/arm9/overlays/ov032/symbols.txt index 2401991b..d8ebf5aa 100644 --- a/config/eur1/arm9/overlays/ov032/symbols.txt +++ b/config/eur1/arm9/overlays/ov032/symbols.txt @@ -49,7 +49,7 @@ _ZN11ActorSpinut8vfunc_54Ei kind:function(arm,size=0x168) addr:0x0211b548 _ZN15ActorSpinut_268C1Ev kind:function(arm,size=0x30) addr:0x0211b6b0 _ZN15ActorSpinut_268D1Ev kind:function(arm,size=0x14) addr:0x0211b6e0 _ZN15ActorSpinut_268D0Ev kind:function(arm,size=0x1c) addr:0x0211b6f4 -_ZN15ActorSpinut_2688vfunc_08EPK24UnkStruct_ov031_020f3310 kind:function(arm,size=0x24) addr:0x0211b710 +_ZN15ActorSpinut_2688vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0x24) addr:0x0211b710 _ZN15ActorSpinut_1BC8vfunc_3CEv kind:function(arm,size=0x24) addr:0x0211b734 _ZN15ActorSpinut_1BC8vfunc_38Eii kind:function(arm,size=0x10) addr:0x0211b758 _ZN15ActorSpinut_1BC8vfunc_30Ev kind:function(arm,size=0x8) addr:0x0211b768 @@ -112,59 +112,59 @@ _ZN22ActorFleeingSpinut_1EC19func_ov032_0211d910Ev kind:function(arm,size=0x10) _ZN22ActorFleeingSpinut_1EC19func_ov032_0211d920EP7VecFx32 kind:function(arm,size=0xec) addr:0x0211da60 _ZN22ActorFleeingSpinut_1EC19func_ov032_0211da0cEiP7VecFx32 kind:function(arm,size=0x120) addr:0x0211db4c _ZN25ActorProfileFleeingSpinutD1Ev kind:function(arm,size=0x14) addr:0x0211dc6c -_ZN19ActorProfileUnkKETH10GetProfileEv kind:function(arm,size=0xc) addr:0x0211dc80 -_ZN19ActorProfileUnkKETH6CreateEv kind:function(arm,size=0x24) addr:0x0211dc8c -_ZN19ActorProfileUnkKETHC1Ev kind:function(arm,size=0x5c) addr:0x0211dcb0 -_ZN12ActorUnkKETH19func_ov032_0211dbccEv kind:function(arm,size=0x34) addr:0x0211dd0c -_ZN12ActorUnkKETHC1Ev kind:function(arm,size=0x20c) addr:0x0211dd40 -_ZN12ActorUnkKETH19func_ov032_0211de0cEv kind:function(arm,size=0x14) addr:0x0211df4c -_ZN12ActorUnkKETH19func_ov032_0211de20Ev kind:function(arm,size=0x14) addr:0x0211df60 -_ZN12ActorUnkKETH19func_ov032_0211de34Ev kind:function(arm,size=0x38) addr:0x0211df74 -_ZN12ActorUnkKETHD1Ev kind:function(arm,size=0x1c) addr:0x0211dfac -_ZN12ActorUnkKETHD0Ev kind:function(arm,size=0x24) addr:0x0211dfc8 -_ZN12ActorUnkKETH19func_ov032_0211deacEv kind:function(arm,size=0x24) addr:0x0211dfec -_ZN12ActorUnkKETH19func_ov032_0211ded0Ev kind:function(arm,size=0x144) addr:0x0211e010 -_ZN12ActorUnkKETH19func_ov032_0211e014Ev kind:function(arm,size=0xac) addr:0x0211e154 -_ZN12ActorUnkKETH19func_ov032_0211e0c0Ev kind:function(arm,size=0x14) addr:0x0211e200 -_ZN12ActorUnkKETH19func_ov032_0211e0d4Ev kind:function(arm,size=0x234) addr:0x0211e214 -_ZN12ActorUnkKETH19func_ov032_0211e308Ev kind:function(arm,size=0x78) addr:0x0211e448 -_ZN12ActorUnkKETH19func_ov032_0211e380Ev kind:function(arm,size=0x8c) addr:0x0211e4c0 -_ZN12ActorUnkKETH19func_ov032_0211e40cEv kind:function(arm,size=0x14) addr:0x0211e54c -_ZN12ActorUnkKETH19func_ov032_0211e420Ev kind:function(arm,size=0x48) addr:0x0211e560 -_ZN12ActorUnkKETH19func_ov032_0211e468Ev kind:function(arm,size=0x310) addr:0x0211e5a8 -_ZN12ActorUnkKETH19func_ov032_0211e778Ev kind:function(arm,size=0x1b8) addr:0x0211e8b8 -_ZN12ActorUnkKETH19func_ov032_0211e930Ev kind:function(arm,size=0xbc) addr:0x0211ea70 -_ZN12ActorUnkKETH19func_ov032_0211e9ecEv kind:function(arm,size=0x174) addr:0x0211eb2c -_ZN12ActorUnkKETH19func_ov032_0211eb60Ev kind:function(arm,size=0x188) addr:0x0211eca0 -_ZN12ActorUnkKETH19func_ov032_0211ece8Ev kind:function(arm,size=0x174) addr:0x0211ee28 -_ZN12ActorUnkKETH19func_ov032_0211ee5cEv kind:function(arm,size=0x1f8) addr:0x0211ef9c -_ZN12ActorUnkKETH19func_ov032_0211f054Ev kind:function(arm,size=0x54) addr:0x0211f194 -_ZN12ActorUnkKETH19func_ov032_0211f0a8Ev kind:function(arm,size=0x148) addr:0x0211f1e8 -_ZN12ActorUnkKETH19func_ov032_0211f1f0Ev kind:function(arm,size=0x4) addr:0x0211f330 -_ZN12ActorUnkKETH19func_ov032_0211f1f4Ev kind:function(arm,size=0x10c) addr:0x0211f334 -_ZN12ActorUnkKETH19func_ov032_0211f300Ev kind:function(arm,size=0x10) addr:0x0211f440 -_ZN12ActorUnkKETH19func_ov032_0211f310Ev kind:function(arm,size=0x9c) addr:0x0211f450 -_ZN12ActorUnkKETH19func_ov032_0211f3acEv kind:function(arm,size=0x58) addr:0x0211f4ec -_ZN12ActorUnkKETH19func_ov032_0211f404Ev kind:function(arm,size=0xa0) addr:0x0211f544 -_ZN12ActorUnkKETH19func_ov032_0211f4a4Ev kind:function(arm,size=0x68) addr:0x0211f5e4 -_ZN12ActorUnkKETH19func_ov032_0211f50cEv kind:function(arm,size=0x54) addr:0x0211f64c -_ZN12ActorUnkKETH19func_ov032_0211f560Ev kind:function(arm,size=0x2c) addr:0x0211f6a0 -_ZN12ActorUnkKETH19func_ov032_0211f58cEv kind:function(arm,size=0x78) addr:0x0211f6cc -_ZN12ActorUnkKETH19func_ov032_0211f604Ev kind:function(arm,size=0x10) addr:0x0211f744 -_ZN12ActorUnkKETH19func_ov032_0211f614Ev kind:function(arm,size=0xa8) addr:0x0211f754 -_ZN12ActorUnkKETH19func_ov032_0211f6bcEv kind:function(arm,size=0x148) addr:0x0211f7fc -_ZN12ActorUnkKETH19func_ov032_0211f804Ev kind:function(arm,size=0x138) addr:0x0211f944 -_ZN12ActorUnkKETH19func_ov032_0211f93cEv kind:function(arm,size=0x88) addr:0x0211fa7c -_ZN12ActorUnkKETH19func_ov032_0211f9c4Ev kind:function(arm,size=0x88) addr:0x0211fb04 -_ZN12ActorUnkKETH19func_ov032_0211fa4cEv kind:function(arm,size=0xa4) addr:0x0211fb8c -_ZN12ActorUnkKETH19func_ov032_0211faf0Ev kind:function(arm,size=0xac) addr:0x0211fc30 -_ZN12ActorUnkKETH19func_ov032_0211fb9cEv kind:function(arm,size=0x18) addr:0x0211fcdc -_ZN12ActorUnkKETH19func_ov032_0211fbb4Ev kind:function(arm,size=0x38) addr:0x0211fcf4 -_ZN12ActorUnkKETH19func_ov032_0211fbecEv kind:function(arm,size=0x14) addr:0x0211fd2c -_ZN12ActorUnkKETH19func_ov032_0211fc00Ev kind:function(arm,size=0x1c) addr:0x0211fd40 -_ZN12ActorUnkKETH19func_ov032_0211fc1cEv kind:function(arm,size=0xa4) addr:0x0211fd5c -_ZN12ActorUnkKETH19func_ov032_0211fcc0Ev kind:function(arm,size=0xac) addr:0x0211fe00 -_ZN19ActorProfileUnkKETHD1Ev kind:function(arm,size=0x14) addr:0x0211feac +_ZN17ActorProfileKeese10GetProfileEv kind:function(arm,size=0xc) addr:0x0211dc80 +_ZN17ActorProfileKeese6CreateEv kind:function(arm,size=0x24) addr:0x0211dc8c +_ZN17ActorProfileKeeseC1Ev kind:function(arm,size=0x5c) addr:0x0211dcb0 +_ZN26ModelRender_ov032_02122568C1EP10G3d_Model_ kind:function(arm,size=0x34) addr:0x0211dd0c +_ZN10ActorKeeseC1Ev kind:function(arm,size=0x20c) addr:0x0211dd40 +_ZN26ModelRender_ov032_02122568D1Ev kind:function(arm,size=0x14) addr:0x0211df4c +_ZN14ActorKeese_284D1Ev kind:function(arm,size=0x14) addr:0x0211df60 +_ZN14ActorKeese_2ACC1EP10ActorKeese kind:function(arm,size=0x38) addr:0x0211df74 +_ZN14ActorKeese_2ACD1Ev kind:function(arm,size=0x1c) addr:0x0211dfac +_ZN14ActorKeese_2ACD0Ev kind:function(arm,size=0x24) addr:0x0211dfc8 +_ZN14ActorKeese_2AC8vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0x24) addr:0x0211dfec +_ZN14ActorKeese_2AC8vfunc_0CEPK24UnkStruct_ov031_020e54d4Pii kind:function(arm,size=0x144) addr:0x0211e010 +_ZN10ActorKeese8vfunc_18Ei kind:function(arm,size=0xac) addr:0x0211e154 +_ZN10ActorKeese19func_ov032_0211e0c0Ev kind:function(arm,size=0x14) addr:0x0211e200 +_ZN10ActorKeese19func_ov032_0211e0d4Esi kind:function(arm,size=0x234) addr:0x0211e214 +_ZN10ActorKeese19func_ov032_0211e308Ev kind:function(arm,size=0x78) addr:0x0211e448 +_ZN10ActorKeese19func_ov032_0211e380Ev kind:function(arm,size=0x8c) addr:0x0211e4c0 +_ZN10ActorKeese19func_ov032_0211e40cEv kind:function(arm,size=0x14) addr:0x0211e54c +_ZN10ActorKeese8SetStateEs kind:function(arm,size=0x48) addr:0x0211e560 +_ZN10ActorKeese19func_ov032_0211e468Ev kind:function(arm,size=0x310) addr:0x0211e5a8 +_ZN10ActorKeese8vfunc_20Ev kind:function(arm,size=0x1b8) addr:0x0211e8b8 +_ZN10ActorKeese8vfunc_2CEi kind:function(arm,size=0xbc) addr:0x0211ea70 +_ZN10ActorKeese19func_ov032_0211e9ecEv kind:function(arm,size=0x174) addr:0x0211eb2c +_ZN10ActorKeese19func_ov032_0211eb60Ev kind:function(arm,size=0x188) addr:0x0211eca0 +_ZN10ActorKeese19func_ov032_0211ece8Ev kind:function(arm,size=0x174) addr:0x0211ee28 +_ZN10ActorKeese19func_ov032_0211ee5cEv kind:function(arm,size=0x1f8) addr:0x0211ef9c +_ZN10ActorKeese19func_ov032_0211f054Ev kind:function(arm,size=0x54) addr:0x0211f194 +_ZN10ActorKeese19func_ov032_0211f0a8Ev kind:function(arm,size=0x148) addr:0x0211f1e8 +_ZN10ActorKeese19func_ov032_0211f1f0Ev kind:function(arm,size=0x4) addr:0x0211f330 +_ZN10ActorKeese19func_ov032_0211f1f4Ev kind:function(arm,size=0x10c) addr:0x0211f334 +_ZN10ActorKeese19func_ov032_0211f300Ev kind:function(arm,size=0x10) addr:0x0211f440 +_ZN10ActorKeese19func_ov032_0211f310Ev kind:function(arm,size=0x9c) addr:0x0211f450 +_ZN10ActorKeese19func_ov032_0211f3acEv kind:function(arm,size=0x58) addr:0x0211f4ec +_ZN10ActorKeese19func_ov032_0211f404Ev kind:function(arm,size=0xa0) addr:0x0211f544 +_ZN10ActorKeese19func_ov032_0211f4a4Ev kind:function(arm,size=0x68) addr:0x0211f5e4 +_ZN10ActorKeese19func_ov032_0211f50cEv kind:function(arm,size=0x54) addr:0x0211f64c +_ZN10ActorKeese19func_ov032_0211f560Ev kind:function(arm,size=0x2c) addr:0x0211f6a0 +_ZN10ActorKeese19func_ov032_0211f58cEv kind:function(arm,size=0x78) addr:0x0211f6cc +_ZN10ActorKeese19func_ov032_0211f604Ev kind:function(arm,size=0x10) addr:0x0211f744 +_ZN10ActorKeese19func_ov032_0211f614Ev kind:function(arm,size=0xa8) addr:0x0211f754 +_ZN10ActorKeese19func_ov032_0211f6bcEv kind:function(arm,size=0x148) addr:0x0211f7fc +_ZN10ActorKeese19func_ov032_0211f804Ev kind:function(arm,size=0x138) addr:0x0211f944 +_ZN10ActorKeese19func_ov032_0211f93cEP7VecFx32i kind:function(arm,size=0x88) addr:0x0211fa7c +_ZN10ActorKeese19func_ov032_0211f9c4Ev kind:function(arm,size=0x88) addr:0x0211fb04 +_ZN10ActorKeese19func_ov032_0211fa4cEi kind:function(arm,size=0xa4) addr:0x0211fb8c +_ZN10ActorKeese19func_ov032_0211faf0EPvi kind:function(arm,size=0xac) addr:0x0211fc30 +_ZN24UnkStruct_ov032_0212251cC1Ev kind:function(arm,size=0x18) addr:0x0211fcdc +_ZN24UnkStruct_ov032_0212251c8vfunc_00EP9MapObject kind:function(arm,size=0x38) addr:0x0211fcf4 +_ZN14ActorKeese_284C1Ev kind:function(arm,size=0x14) addr:0x0211fd2c +_ZN26ModelRender_ov032_02122568D0Ev kind:function(arm,size=0x1c) addr:0x0211fd40 +_ZN10ActorKeeseD1Ev kind:function(arm,size=0xa4) addr:0x0211fd5c +_ZN10ActorKeeseD0Ev kind:function(arm,size=0xac) addr:0x0211fe00 +_ZN17ActorProfileKeeseD1Ev kind:function(arm,size=0x14) addr:0x0211feac _ZN19ActorProfileUnkNSSW10GetProfileEv kind:function(arm,size=0xc) addr:0x0211fec0 _ZN19ActorProfileUnkNSSW6CreateEv kind:function(arm,size=0x24) addr:0x0211fecc _ZN19ActorProfileUnkNSSWC1Ev kind:function(arm,size=0x44) addr:0x0211fef0 @@ -216,7 +216,7 @@ _ZN19MapObjectUnkSWSW_40D0Ev kind:function(arm,size=0x1c) addr:0x02122014 _ZN16MapObjectUnkSWSWD1Ev kind:function(arm,size=0x20) addr:0x02122030 _ZN16MapObjectUnkSWSWD0Ev kind:function(arm,size=0x28) addr:0x02122050 _ZN23MapObjectProfileUnkSWSWD1Ev kind:function(arm,size=0x14) addr:0x02122078 -data_ov032_02122090 kind:data(any) addr:0x02122090 +data_ov032_02121ed4 kind:data(any) addr:0x02122090 data_ov032_021220a0 kind:data(any) addr:0x021220a0 data_ov032_021220b0 kind:data(any) addr:0x021220b0 data_ov032_021220c0 kind:data(any) addr:0x021220c0 @@ -224,12 +224,12 @@ data_ov032_021220d0 kind:data(any) addr:0x021220d0 data_ov032_021220e0 kind:data(any) addr:0x021220e0 __sinit_ActorSpinut.cpp kind:function(arm,size=0x6c) addr:0x021220f0 local __sinit_ActorFleeingSpinut.cpp kind:function(arm,size=0x80) addr:0x0212215c local -__sinit_ActorUnkKETH.cpp kind:function(arm,size=0x6c) addr:0x021221dc local +__sinit_ActorKeese.cpp kind:function(arm,size=0x6c) addr:0x021221dc local __sinit_ActorUnkNSSW.cpp kind:function(arm,size=0x50) addr:0x02122248 local __sinit_MapObjectUnkSWSW.cpp kind:function(arm,size=0x50) addr:0x02122298 local .p__sinit_ActorSpinut.cpp kind:data(word) addr:0x021222e8 local .p__sinit_ActorFleeingSpinut.cpp kind:data(word) addr:0x021222ec local -.p__sinit_ActorUnkKETH.cpp kind:data(word) addr:0x021222f0 local +.p__sinit_ActorKeese.cpp kind:data(word) addr:0x021222f0 local .p__sinit_ActorUnkNSSW.cpp kind:data(word) addr:0x021222f4 local .p__sinit_MapObjectUnkSWSW.cpp kind:data(word) addr:0x021222f8 local data_ov032_02122300 kind:data(any) addr:0x02122300 @@ -238,31 +238,30 @@ data_ov032_02122324 kind:data(any) addr:0x02122324 data_ov032_0212233c kind:data(any) addr:0x0212233c data_ov032_0212235c kind:data(any) addr:0x0212235c data_ov032_02122378 kind:data(any) addr:0x02122378 -data_ov032_0212239c kind:data(any) addr:0x0212239c -_ZTV15ActorSpinut_110 kind:data(any) addr:0x021223e4 +_ZTV15ActorSpinut_1BC kind:data(any) addr:0x02122394 +_ZTV15ActorSpinut_110 kind:data(any) addr:0x021223dc data_ov032_02122428 kind:data(any) addr:0x02122428 data_ov032_02122490 kind:data(any) addr:0x02122490 data_ov032_021224e8 kind:data(any) addr:0x021224e8 data_ov032_02122531 kind:data(any) addr:0x02122531 ambiguous -data_ov032_021223a8 kind:data(any) addr:0x02122548 -data_ov032_021223b4 kind:data(any) addr:0x02122554 -data_ov032_021223cc kind:data(any) addr:0x0212256c -data_ov032_021223e4 kind:data(any) addr:0x02122584 -data_ov032_0212241c kind:data(any) addr:0x021225bc +data_ov032_02122548 kind:data(any) addr:0x02122548 +data_ov032_02122554 kind:data(any) addr:0x02122554 +data_ov032_0212256c kind:data(any) addr:0x0212256c +data_ov032_02122584 kind:data(any) addr:0x02122584 +data_ov032_021225bc kind:data(any) addr:0x021225bc _ZTV25ActorProfileFleeingSpinut kind:data(any) addr:0x021225f4 _ZTV18ActorFleeingSpinut kind:data(any) addr:0x02122618 -data_ov032_02122678 kind:data(any) addr:0x02122678 -data_ov032_02122684 kind:data(any) addr:0x02122684 -data_ov032_0212269c kind:data(any) addr:0x0212269c -data_ov032_021226bc kind:data(any) addr:0x021226bc -data_ov032_021226c8 kind:data(any) addr:0x021226c8 -data_ov032_021226e4 kind:data(any) addr:0x021226e4 -data_ov032_021226e8 kind:data(any) addr:0x021226e8 ambiguous -data_ov032_02122708 kind:data(any) addr:0x02122708 -data_ov032_0212272c kind:data(any) addr:0x0212272c -data_ov032_0212277c kind:data(any) addr:0x0212277c -data_ov032_021227d4 kind:data(any) addr:0x021227d4 -data_ov032_02122834 kind:data(any) addr:0x02122834 +data_ov032_021224d8 kind:data(any) addr:0x02122678 +data_ov032_021224e4 kind:data(any) addr:0x02122684 +data_ov032_021224fc kind:data(any) addr:0x0212269c +_ZTV19data_ov032_021226bc kind:data(any) addr:0x021226b4 +_ZTV14ActorKeese_2AC kind:data(any) addr:0x021226c0 +_ZTV17ActorProfileKeese kind:data(any) addr:0x021226dc +_ZTV26ModelRender_ov032_02122568 kind:data(any) addr:0x02122700 +data_ov032_0212258c kind:data(any) addr:0x0212272c +data_ov032_021225dc kind:data(any) addr:0x0212277c +_ZTV10ActorKeese kind:data(any) addr:0x021227cc +_ZTV19data_ov032_02122834 kind:data(any) addr:0x0212282c data_ov032_0212284c kind:data(any) addr:0x0212284c data_ov032_02122868 kind:data(any) addr:0x02122868 data_ov032_0212288c kind:data(any) addr:0x0212288c @@ -279,9 +278,9 @@ data_ov032_0212290c kind:bss addr:0x02122aac _ZGVN15ProfileInstanceI25ActorProfileFleeingSpinutE8sProfileE kind:bss addr:0x02122ab8 @11142 kind:bss addr:0x02122ac4 local _ZN15ProfileInstanceI25ActorProfileFleeingSpinutE8sProfileE kind:bss addr:0x02122ad0 -_ZGVN15ProfileInstanceI19ActorProfileUnkKETHE8sProfileE kind:bss addr:0x02122b14 +_ZGVN15ProfileInstanceI17ActorProfileKeeseE8sProfileE kind:bss addr:0x02122b14 @11148 kind:bss addr:0x02122b18 local -_ZN15ProfileInstanceI19ActorProfileUnkKETHE8sProfileE kind:bss addr:0x02122b24 +_ZN15ProfileInstanceI17ActorProfileKeeseE8sProfileE kind:bss addr:0x02122b24 _ZGVN15ProfileInstanceI19ActorProfileUnkNSSWE8sProfileE kind:bss addr:0x02122bfc @11154 kind:bss addr:0x02122c00 local _ZN15ProfileInstanceI19ActorProfileUnkNSSWE8sProfileE kind:bss addr:0x02122c0c diff --git a/config/eur1/arm9/overlays/ov058/relocs.txt b/config/eur1/arm9/overlays/ov058/relocs.txt index 3ea01f39..934a5c27 100644 --- a/config/eur1/arm9/overlays/ov058/relocs.txt +++ b/config/eur1/arm9/overlays/ov058/relocs.txt @@ -2271,7 +2271,7 @@ from:0x02152bb4 kind:arm_call to:0x02061648 module:overlay(0) from:0x02152bd0 kind:arm_call to:0x0201baec module:main from:0x02152bf0 kind:arm_call to:0x020611dc module:overlay(0) from:0x02152bfc kind:load to:0x02155f28 module:overlay(58) -from:0x02152c00 kind:load to:0x021226e8 module:overlays(32,33,36,37) +from:0x02152c00 kind:load to:0x021226e8 module:overlays(33,36,37) from:0x02152c04 kind:load to:0x0204a088 module:main from:0x02152c14 kind:arm_call to:0x0201bacc module:main from:0x02152c1c kind:arm_call to:0x020616c8 module:overlay(0) diff --git a/config/eur1/arm9/overlays/ov063/symbols.txt b/config/eur1/arm9/overlays/ov063/symbols.txt index 617f1023..1b172933 100644 --- a/config/eur1/arm9/overlays/ov063/symbols.txt +++ b/config/eur1/arm9/overlays/ov063/symbols.txt @@ -53,7 +53,7 @@ _ZN12ActorUnkCANS19func_ov063_0215a678EPS_P29UnkStruct_func_ov063_0215a678 kind: _ZN24UnkStruct_ov063_02162ea8C1Ev kind:function(arm,size=0x30) addr:0x0215a8f4 _ZN24UnkStruct_ov063_02162ea8D1Ev kind:function(arm,size=0x14) addr:0x0215a924 _ZN24UnkStruct_ov063_02162ea8D0Ev kind:function(arm,size=0x1c) addr:0x0215a938 -_ZN24UnkStruct_ov063_02162ea88vfunc_08EPK24UnkStruct_ov031_020f3310 kind:function(arm,size=0x4c) addr:0x0215a954 +_ZN24UnkStruct_ov063_02162ea88vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0x4c) addr:0x0215a954 _ZN24UnkStruct_ov063_02162ea88vfunc_0CEPK24UnkStruct_ov031_020e54d4Pii kind:function(arm,size=0xcc) addr:0x0215a9a0 _ZN24UnkStruct_ov063_02162f148vfunc_3CEv kind:function(arm,size=0x24) addr:0x0215aa6c _ZN24UnkStruct_ov063_02162f148vfunc_38Eii kind:function(arm,size=0x2c) addr:0x0215aa90 diff --git a/config/eur1/arm9/symbols.txt b/config/eur1/arm9/symbols.txt index b31f3a3f..59923b60 100644 --- a/config/eur1/arm9/symbols.txt +++ b/config/eur1/arm9/symbols.txt @@ -849,7 +849,7 @@ func_02016d7c kind:function(arm,size=0xf8) addr:0x02016d7c func_02016e74 kind:function(arm,size=0x68) addr:0x02016e74 func_02016edc kind:function(arm,size=0xe0) addr:0x02016edc func_02016fbc kind:function(arm,size=0xf0) addr:0x02016fbc -func_020170ac kind:function(arm,size=0xac) addr:0x020170ac +_ZN24UnkStruct_ov032_0212251c13func_020170acEP7VecFx32 kind:function(arm,size=0xac) addr:0x020170ac func_02017158 kind:function(arm,size=0x38) addr:0x02017158 func_02017190 kind:function(arm,size=0x54) addr:0x02017190 _ZN9UnkResultC1Ev kind:function(arm,size=0x4c) addr:0x020171e4 diff --git a/config/jp/arm9/overlays/ov000/symbols.txt b/config/jp/arm9/overlays/ov000/symbols.txt index 632ebd7e..304ee47e 100644 --- a/config/jp/arm9/overlays/ov000/symbols.txt +++ b/config/jp/arm9/overlays/ov000/symbols.txt @@ -211,7 +211,7 @@ _ZN29UnkStruct_027e0960_TableEntryD1Ev kind:function(thumb,size=0x44) addr:0x020 func_ov000_0205b1b8 kind:function(arm,size=0x9c) addr:0x0205b1b8 _ZN29UnkStruct_027e0960_TableEntry19func_ov000_02059cccEhh kind:function(arm,size=0xa4) addr:0x0205b254 func_ov000_0205b2f8 kind:function(arm,size=0x34) addr:0x0205b2f8 -func_ov000_0205b32c kind:function(arm,size=0xfc) addr:0x0205b32c +func_ov000_02059da4 kind:function(arm,size=0xfc) addr:0x0205b32c func_ov000_0205b428 kind:function(arm,size=0x1e4) addr:0x0205b428 _ZN32UnkStruct_027e0960_TableEntry_048vfunc_18Ev kind:function(arm,size=0xc) addr:0x0205b60c _ZN32UnkStruct_027e0960_TableEntry_048vfunc_14Ev kind:function(arm,size=0xc) addr:0x0205b618 @@ -1414,7 +1414,7 @@ func_ov000_0207d43c kind:function(arm,size=0x260) addr:0x0207d43c func_ov000_0207d69c kind:function(arm,size=0x4) addr:0x0207d69c _ZN19func_ov000_0207d6a0D0Ev kind:function(arm,size=0x14) addr:0x0207d6a0 _ZN29UnkStruct_ov031_Items_00_BaseD2Ev kind:function(arm,size=0x4) addr:0x0207d6b4 -_ZN26UnkStruct_027e0ce0_38_Base8vfunc_08EPK24UnkStruct_ov031_020f3310 kind:function(arm,size=0x8) addr:0x0207d6b8 +_ZN26UnkStruct_027e0ce0_38_Base8vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0x8) addr:0x0207d6b8 _ZN26UnkStruct_027e0ce0_38_Base8vfunc_0CEPK24UnkStruct_ov031_020e54d4Pii kind:function(arm,size=0x8) addr:0x0207d6c0 _ZN26UnkStruct_027e0ce0_38_Base8vfunc_10E8ActorRefi kind:function(arm,size=0x8) addr:0x0207d6c8 _ZN17MapObject_10_BaseC2Ev kind:function(arm,size=0x30) addr:0x0207d6d0 @@ -2308,7 +2308,7 @@ func_ov000_02099988 kind:function(arm,size=0x64) addr:0x02099988 func_ov000_020999ec kind:function(arm,size=0x64) addr:0x020999ec _ZN24UnkStruct_ov031_Items_00C2Ev kind:function(arm,size=0x18) addr:0x02099a50 _ZN24UnkStruct_ov071_0215f92cC1Ev kind:function(arm,size=0x18) addr:0x02099a68 -_ZN24UnkStruct_ov031_Items_008vfunc_08EPK24UnkStruct_ov031_020f3310 kind:function(arm,size=0x80) addr:0x02099a80 +_ZN24UnkStruct_ov031_Items_008vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0x80) addr:0x02099a80 _ZN19func_ov000_02099b00D1Ev kind:function(arm,size=0x14) addr:0x02099b00 _ZN19func_ov000_02099b14D0Ev kind:function(arm,size=0x1c) addr:0x02099b14 _ZN5ActorC2Ev kind:function(arm,size=0xe8) addr:0x02099b30 @@ -2341,7 +2341,7 @@ _ZN5Actor19func_ov000_020986fcEi kind:function(arm,size=0x7c) addr:0x02099ea4 func_ov000_02099f20 kind:function(arm,size=0x88) addr:0x02099f20 _ZN5Actor19func_ov000_02098800Eb kind:function(arm,size=0x38) addr:0x02099fa8 _ZN5Actor19func_ov000_02098838Ev kind:function(arm,size=0x28) addr:0x02099fe0 -func_ov000_0209a008 kind:function(arm,size=0xb0) addr:0x0209a008 +_ZN5Actor19func_ov000_0209a008Eis kind:function(arm,size=0xb0) addr:0x0209a008 _ZN5Actor19func_ov000_02098910EP24UnkStruct_ov031_Items_00i kind:function(arm,size=0xd0) addr:0x0209a0b8 _ZN5Actor19func_ov000_020989e0Ev kind:function(arm,size=0x38) addr:0x0209a188 func_ov000_0209a1c0 kind:function(arm,size=0x48) addr:0x0209a1c0 @@ -2492,7 +2492,7 @@ _ZN12ActorUnkEFIK8vfunc_54Ei kind:function(arm,size=0x8) addr:0x0209dab0 _ZN12ActorUnkEFIKD1Ev kind:function(arm,size=0x20) addr:0x0209dab8 _ZN12ActorUnkEFIKD0Ev kind:function(arm,size=0x28) addr:0x0209dad8 _ZN19ActorProfileUnkEFIKD1Ev kind:function(arm,size=0x14) addr:0x0209db00 -func_ov000_0209c348 kind:function(arm,size=0x24) addr:0x0209db14 +_ZN24UnkStruct_ov000_020b34c48vfunc_00EP9MapObject kind:function(arm,size=0x24) addr:0x0209db14 func_ov000_0209db38 kind:function(arm,size=0x3c) addr:0x0209db38 _ZN16MapObjectManager19func_ov000_0209c3a8Ev kind:function(arm,size=0x40) addr:0x0209db74 _ZN16MapObjectManager19func_ov000_0209c3e8Ev kind:function(arm,size=0x5c) addr:0x0209dbb4 diff --git a/config/jp/arm9/overlays/ov017/symbols.txt b/config/jp/arm9/overlays/ov017/symbols.txt index 0a9c18a3..f9c274d8 100644 --- a/config/jp/arm9/overlays/ov017/symbols.txt +++ b/config/jp/arm9/overlays/ov017/symbols.txt @@ -67,8 +67,8 @@ _ZN5Actor19func_ov017_020bf3e0Eii kind:function(arm,size=0xd0) addr:0x020c0c0c func_ov017_020c0cdc kind:function(arm,size=0xc4) addr:0x020c0cdc func_ov017_020c0da0 kind:function(arm,size=0x50) addr:0x020c0da0 _ZN5Actor19func_ov017_020bf5c4EP7VecFx32iiii kind:function(arm,size=0x70) addr:0x020c0df0 -func_ov017_020bf634 kind:function(arm,size=0x54) addr:0x020c0e60 -func_ov017_020bf688 kind:function(arm,size=0x88) addr:0x020c0eb4 +_ZN5Actor19func_ov017_020bf634EPK7VecFx32ti kind:function(arm,size=0x54) addr:0x020c0e60 +_ZN5Actor19func_ov017_020bf688Ev kind:function(arm,size=0x88) addr:0x020c0eb4 func_ov017_020c0f3c kind:function(arm,size=0x98) addr:0x020c0f3c func_ov017_020c0fd4 kind:function(arm,size=0xec) addr:0x020c0fd4 _ZN14Actor_Derived219func_ov017_020bf894EP26UnkStruct_ActorUnkCANS_224 kind:function(arm,size=0x60) addr:0x020c10c0 diff --git a/config/jp/arm9/overlays/ov031/symbols.txt b/config/jp/arm9/overlays/ov031/symbols.txt index 8f6c9251..424fd5ff 100644 --- a/config/jp/arm9/overlays/ov031/symbols.txt +++ b/config/jp/arm9/overlays/ov031/symbols.txt @@ -358,10 +358,10 @@ _ZN9ActorBomb19func_ov031_020e2c2cEv kind:function(arm,size=0x14c) addr:0x020e46 _ZN13ActorBomb_180C1EP5Actor kind:function(arm,size=0x3c) addr:0x020e4764 _ZN13ActorBomb_180D1Ev kind:function(arm,size=0x1c) addr:0x020e47a0 _ZN13ActorBomb_180D0Ev kind:function(arm,size=0x24) addr:0x020e47bc -_ZN13ActorBomb_1808vfunc_08EPK24UnkStruct_ov031_020f3310 kind:function(arm,size=0x48) addr:0x020e47e0 +_ZN13ActorBomb_1808vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0x48) addr:0x020e47e0 _ZN13ActorBomb_1808vfunc_0CEPK24UnkStruct_ov031_020e54d4Pii kind:function(arm,size=0x450) addr:0x020e4828 _ZN13ActorBomb_1808vfunc_10E8ActorRefi kind:function(arm,size=0x84) addr:0x020e4c78 -_ZN24ActorBomb_ov031_020e21348vfunc_08EPK24UnkStruct_ov031_020f3310 kind:function(arm,size=0x30) addr:0x020e4cfc +_ZN24ActorBomb_ov031_020e21348vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0x30) addr:0x020e4cfc _ZN13ActorBomb_19CC1EP5Actor kind:function(arm,size=0x3c) addr:0x020e4d2c _ZN13ActorBomb_19C8vfunc_10EP5Actor kind:function(arm,size=0x30) addr:0x020e4d68 _ZN13ActorBomb_unkC1Ev kind:function(arm,size=0x14) addr:0x020e4d98 @@ -443,7 +443,7 @@ _ZN21ActorItemBoomerang_CC8vfunc_0CEP5ActorP7VecFx32 kind:function(arm,size=0x4c _ZN22ActorItemBoomerang_11CC1EP18ActorItemBoomerang kind:function(arm,size=0x28) addr:0x020e6e38 _ZN22ActorItemBoomerang_11CD1Ev kind:function(arm,size=0x14) addr:0x020e6e60 _ZN22ActorItemBoomerang_11CD0Ev kind:function(arm,size=0x1c) addr:0x020e6e74 -_ZN22ActorItemBoomerang_11C8vfunc_08EPK24UnkStruct_ov031_020f3310 kind:function(arm,size=0x30) addr:0x020e6e90 +_ZN22ActorItemBoomerang_11C8vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0x30) addr:0x020e6e90 _ZN22ActorItemBoomerang_11C8vfunc_0CEPK24UnkStruct_ov031_020e54d4Pii kind:function(arm,size=0x230) addr:0x020e6ec0 _ZN26ActorItemBoomerang_Unknown19func_ov031_020e5704Ev kind:function(arm,size=0xc) addr:0x020e70f0 _ZN21ActorItemBoomerang_A0D0Ev kind:function(arm,size=0x1c) addr:0x020e70fc @@ -481,7 +481,7 @@ _ZN19func_ov031_020e6774D0Ev kind:function(arm,size=0x68) addr:0x020e8160 func_ov031_020e81c8 kind:function(arm,size=0x7c) addr:0x020e81c8 func_ov031_020e8244 kind:function(arm,size=0x64) addr:0x020e8244 _ZN19func_ov031_020e68bcD0Ev kind:function(arm,size=0x1c) addr:0x020e82a8 -_ZN15ActorUnkSWBM_948vfunc_08EPK24UnkStruct_ov031_020f3310 kind:function(arm,size=0x28) addr:0x020e82c4 +_ZN15ActorUnkSWBM_948vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0x28) addr:0x020e82c4 _ZN15ActorUnkSWBM_948vfunc_0CEPK24UnkStruct_ov031_020e54d4Pii kind:function(arm,size=0x1c) addr:0x020e82ec _ZN15ActorUnkSWBM_988vfunc_0CEP5ActorP7VecFx32 kind:function(arm,size=0x58) addr:0x020e8308 _ZN15ActorUnkSWBM_988vfunc_10EP5Actor kind:function(arm,size=0x58) addr:0x020e8360 @@ -923,7 +923,7 @@ _ZN18ActorShotArrow_178C1EP14ActorShotArrow kind:function(arm,size=0x3c) addr:0x _ZN18ActorShotArrow_178D1Ev kind:function(arm,size=0x1c) addr:0x020f4cc0 _ZN18ActorShotArrow_178D0Ev kind:function(arm,size=0x24) addr:0x020f4cdc _ZN18ActorShotArrow_17819func_ov031_020f3304Ev kind:function(arm,size=0xc) addr:0x020f4d00 -_ZN18ActorShotArrow_1788vfunc_08EPK24UnkStruct_ov031_020f3310 kind:function(arm,size=0xac) addr:0x020f4d0c +_ZN18ActorShotArrow_1788vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0xac) addr:0x020f4d0c _ZN18ActorShotArrow_1788vfunc_0CEPK24UnkStruct_ov031_020e54d4Pii kind:function(arm,size=0x3f8) addr:0x020f4db8 _ZN18ActorShotArrow_194C1EP14ActorShotArrow kind:function(arm,size=0x40) addr:0x020f51b0 _ZN18ActorShotArrow_19419func_ov031_020f374cEP5Actor kind:function(arm,size=0x164) addr:0x020f51f0 diff --git a/config/jp/arm9/overlays/ov032/delinks.txt b/config/jp/arm9/overlays/ov032/delinks.txt index dabb7a09..7048011f 100644 --- a/config/jp/arm9/overlays/ov032/delinks.txt +++ b/config/jp/arm9/overlays/ov032/delinks.txt @@ -19,10 +19,11 @@ src/032_MapA1/Actor/ActorFleeingSpinut.cpp: .data start:0x02124368 end:0x02124498 .bss start:0x021248e8 end:0x02124954 -src/032_MapA1/Actor/ActorUnkKETH.cpp: +src/032_MapA1/Actor/ActorKeese.cpp: .text start:0x0211f8e0 end:0x02121b20 .init start:0x02123ff8 end:0x02124064 .ctor start:0x0212410c end:0x02124110 + .data start:0x02124498 end:0x0212464c .bss start:0x02124954 end:0x02124a3c src/032_MapA1/Actor/ActorUnkNSSW.cpp: diff --git a/config/jp/arm9/overlays/ov032/relocs.txt b/config/jp/arm9/overlays/ov032/relocs.txt index 9d86093e..45d9cb16 100644 --- a/config/jp/arm9/overlays/ov032/relocs.txt +++ b/config/jp/arm9/overlays/ov032/relocs.txt @@ -533,7 +533,7 @@ from:0x0211f91c kind:arm_call to:0x02099040 module:overlay(0) from:0x0211f968 kind:load to:0x021244fc add:0x8 module:overlay(32) from:0x0211f974 kind:arm_call_thumb to:0x0209bf30 module:overlay(0) from:0x0211f988 kind:arm_call to:0x02059498 module:overlay(0) -from:0x0211f998 kind:load to:0x02124528 module:overlay(32) +from:0x0211f998 kind:load to:0x02124520 module:overlay(32) add:0x8 from:0x0211f99c kind:load to:0x02123eac module:overlay(32) from:0x0211f9b0 kind:arm_call to:0x0209a2d0 module:overlay(0) from:0x0211fa14 kind:arm_call to:0x0211f96c module:overlay(32) @@ -558,7 +558,7 @@ from:0x0211fba8 kind:load to:0x02124498 module:overlay(32) from:0x0211fbb4 kind:arm_call_thumb to:0x02059154 module:overlay(0) from:0x0211fbc8 kind:arm_call to:0x020a1adc module:overlay(0) from:0x0211fbe0 kind:arm_call to:0x02099a50 module:overlay(0) -from:0x0211fc08 kind:load to:0x021244e8 module:overlay(32) +from:0x0211fc08 kind:load to:0x021244e0 module:overlay(32) add:0x8 from:0x0211fc1c kind:arm_call to:0x0207d6b4 module:overlay(0) from:0x0211fc38 kind:arm_call to:0x0207d6b4 module:overlay(0) from:0x0211fc40 kind:arm_call to:0x02011ff4 module:main @@ -747,7 +747,7 @@ from:0x0212188c kind:load to:0x027e0ce0 module:dtcm from:0x021218f8 kind:arm_call to:0x0200e260 module:main from:0x02121908 kind:arm_call to:0x01ffad5c module:itcm from:0x02121938 kind:load to:0x027e0964 module:dtcm -from:0x02121950 kind:load to:0x021244dc module:overlay(32) +from:0x02121950 kind:load to:0x021244d4 module:overlay(32) add:0x8 from:0x0212195c kind:arm_call to:0x0209db14 module:overlay(0) from:0x021219a8 kind:arm_call_thumb to:0x02059154 module:overlay(0) from:0x021219b0 kind:arm_call to:0x02011ff4 module:main @@ -903,7 +903,7 @@ from:0x02122b64 kind:arm_call to:0x021226b4 module:overlay(32) from:0x02122bdc kind:arm_call to:0x01ffa06c module:itcm from:0x02122bf4 kind:arm_call to:0x021226b4 module:overlay(32) from:0x02122c1c kind:arm_call to:0x020f7d24 module:overlays(21,31) -from:0x02122c34 kind:load to:0x02124654 module:overlay(32) +from:0x02122c34 kind:load to:0x0212464c module:overlay(32) add:0x8 from:0x02122c54 kind:arm_call to:0x021229a0 module:overlay(32) from:0x02122c64 kind:arm_call to:0x020f7d84 module:overlay(31) from:0x02122c80 kind:arm_call to:0x021229d8 module:overlay(32) diff --git a/config/jp/arm9/overlays/ov032/symbols.txt b/config/jp/arm9/overlays/ov032/symbols.txt index 0258ed4c..8e412f09 100644 --- a/config/jp/arm9/overlays/ov032/symbols.txt +++ b/config/jp/arm9/overlays/ov032/symbols.txt @@ -49,7 +49,7 @@ _ZN11ActorSpinut8vfunc_54Ei kind:function(arm,size=0x168) addr:0x0211d1a8 _ZN15ActorSpinut_268C1Ev kind:function(arm,size=0x30) addr:0x0211d310 _ZN15ActorSpinut_268D1Ev kind:function(arm,size=0x14) addr:0x0211d340 _ZN15ActorSpinut_268D0Ev kind:function(arm,size=0x1c) addr:0x0211d354 -_ZN15ActorSpinut_2688vfunc_08EPK24UnkStruct_ov031_020f3310 kind:function(arm,size=0x24) addr:0x0211d370 +_ZN15ActorSpinut_2688vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0x24) addr:0x0211d370 _ZN15ActorSpinut_1BC8vfunc_3CEv kind:function(arm,size=0x24) addr:0x0211d394 _ZN15ActorSpinut_1BC8vfunc_38Eii kind:function(arm,size=0x10) addr:0x0211d3b8 _ZN15ActorSpinut_1BC8vfunc_30Ev kind:function(arm,size=0x8) addr:0x0211d3c8 @@ -112,59 +112,59 @@ _ZN22ActorFleeingSpinut_1EC19func_ov032_0211d910Ev kind:function(arm,size=0x10) _ZN22ActorFleeingSpinut_1EC19func_ov032_0211d920EP7VecFx32 kind:function(arm,size=0xec) addr:0x0211f6c0 _ZN22ActorFleeingSpinut_1EC19func_ov032_0211da0cEiP7VecFx32 kind:function(arm,size=0x120) addr:0x0211f7ac _ZN25ActorProfileFleeingSpinutD1Ev kind:function(arm,size=0x14) addr:0x0211f8cc -_ZN19ActorProfileUnkKETH10GetProfileEv kind:function(arm,size=0xc) addr:0x0211f8e0 -_ZN19ActorProfileUnkKETH6CreateEv kind:function(arm,size=0x24) addr:0x0211f8ec -_ZN19ActorProfileUnkKETHC1Ev kind:function(arm,size=0x5c) addr:0x0211f910 -_ZN12ActorUnkKETH19func_ov032_0211dbccEv kind:function(arm,size=0x34) addr:0x0211f96c -_ZN12ActorUnkKETHC1Ev kind:function(arm,size=0x20c) addr:0x0211f9a0 -_ZN12ActorUnkKETH19func_ov032_0211de0cEv kind:function(arm,size=0x14) addr:0x0211fbac -_ZN12ActorUnkKETH19func_ov032_0211de20Ev kind:function(arm,size=0x14) addr:0x0211fbc0 -_ZN12ActorUnkKETH19func_ov032_0211de34Ev kind:function(arm,size=0x38) addr:0x0211fbd4 -_ZN12ActorUnkKETHD1Ev kind:function(arm,size=0x1c) addr:0x0211fc0c -_ZN12ActorUnkKETHD0Ev kind:function(arm,size=0x24) addr:0x0211fc28 -_ZN12ActorUnkKETH19func_ov032_0211deacEv kind:function(arm,size=0x24) addr:0x0211fc4c -_ZN12ActorUnkKETH19func_ov032_0211ded0Ev kind:function(arm,size=0x144) addr:0x0211fc70 -_ZN12ActorUnkKETH19func_ov032_0211e014Ev kind:function(arm,size=0xac) addr:0x0211fdb4 -_ZN12ActorUnkKETH19func_ov032_0211e0c0Ev kind:function(arm,size=0x14) addr:0x0211fe60 -_ZN12ActorUnkKETH19func_ov032_0211e0d4Ev kind:function(arm,size=0x234) addr:0x0211fe74 -_ZN12ActorUnkKETH19func_ov032_0211e308Ev kind:function(arm,size=0x78) addr:0x021200a8 -_ZN12ActorUnkKETH19func_ov032_0211e380Ev kind:function(arm,size=0x8c) addr:0x02120120 -_ZN12ActorUnkKETH19func_ov032_0211e40cEv kind:function(arm,size=0x14) addr:0x021201ac -_ZN12ActorUnkKETH19func_ov032_0211e420Ev kind:function(arm,size=0x48) addr:0x021201c0 -_ZN12ActorUnkKETH19func_ov032_0211e468Ev kind:function(arm,size=0x310) addr:0x02120208 -_ZN12ActorUnkKETH19func_ov032_0211e778Ev kind:function(arm,size=0x1b8) addr:0x02120518 -_ZN12ActorUnkKETH19func_ov032_0211e930Ev kind:function(arm,size=0xbc) addr:0x021206d0 -_ZN12ActorUnkKETH19func_ov032_0211e9ecEv kind:function(arm,size=0x174) addr:0x0212078c -_ZN12ActorUnkKETH19func_ov032_0211eb60Ev kind:function(arm,size=0x188) addr:0x02120900 -_ZN12ActorUnkKETH19func_ov032_0211ece8Ev kind:function(arm,size=0x174) addr:0x02120a88 -_ZN12ActorUnkKETH19func_ov032_0211ee5cEv kind:function(arm,size=0x1f8) addr:0x02120bfc -_ZN12ActorUnkKETH19func_ov032_0211f054Ev kind:function(arm,size=0x54) addr:0x02120df4 -_ZN12ActorUnkKETH19func_ov032_0211f0a8Ev kind:function(arm,size=0x148) addr:0x02120e48 -_ZN12ActorUnkKETH19func_ov032_0211f1f0Ev kind:function(arm,size=0x4) addr:0x02120f90 -_ZN12ActorUnkKETH19func_ov032_0211f1f4Ev kind:function(arm,size=0x10c) addr:0x02120f94 -_ZN12ActorUnkKETH19func_ov032_0211f300Ev kind:function(arm,size=0x10) addr:0x021210a0 -_ZN12ActorUnkKETH19func_ov032_0211f310Ev kind:function(arm,size=0x9c) addr:0x021210b0 -_ZN12ActorUnkKETH19func_ov032_0211f3acEv kind:function(arm,size=0x58) addr:0x0212114c -_ZN12ActorUnkKETH19func_ov032_0211f404Ev kind:function(arm,size=0xa0) addr:0x021211a4 -_ZN12ActorUnkKETH19func_ov032_0211f4a4Ev kind:function(arm,size=0x68) addr:0x02121244 -_ZN12ActorUnkKETH19func_ov032_0211f50cEv kind:function(arm,size=0x54) addr:0x021212ac -_ZN12ActorUnkKETH19func_ov032_0211f560Ev kind:function(arm,size=0x2c) addr:0x02121300 -_ZN12ActorUnkKETH19func_ov032_0211f58cEv kind:function(arm,size=0x78) addr:0x0212132c -_ZN12ActorUnkKETH19func_ov032_0211f604Ev kind:function(arm,size=0x10) addr:0x021213a4 -_ZN12ActorUnkKETH19func_ov032_0211f614Ev kind:function(arm,size=0xa8) addr:0x021213b4 -_ZN12ActorUnkKETH19func_ov032_0211f6bcEv kind:function(arm,size=0x148) addr:0x0212145c -_ZN12ActorUnkKETH19func_ov032_0211f804Ev kind:function(arm,size=0x138) addr:0x021215a4 -_ZN12ActorUnkKETH19func_ov032_0211f93cEv kind:function(arm,size=0x88) addr:0x021216dc -_ZN12ActorUnkKETH19func_ov032_0211f9c4Ev kind:function(arm,size=0x88) addr:0x02121764 -_ZN12ActorUnkKETH19func_ov032_0211fa4cEv kind:function(arm,size=0xa4) addr:0x021217ec -_ZN12ActorUnkKETH19func_ov032_0211faf0Ev kind:function(arm,size=0xac) addr:0x02121890 -_ZN12ActorUnkKETH19func_ov032_0211fb9cEv kind:function(arm,size=0x18) addr:0x0212193c -_ZN12ActorUnkKETH19func_ov032_0211fbb4Ev kind:function(arm,size=0x38) addr:0x02121954 -_ZN12ActorUnkKETH19func_ov032_0211fbecEv kind:function(arm,size=0x14) addr:0x0212198c -_ZN12ActorUnkKETH19func_ov032_0211fc00Ev kind:function(arm,size=0x1c) addr:0x021219a0 -_ZN12ActorUnkKETH19func_ov032_0211fc1cEv kind:function(arm,size=0xa4) addr:0x021219bc -_ZN12ActorUnkKETH19func_ov032_0211fcc0Ev kind:function(arm,size=0xac) addr:0x02121a60 -_ZN19ActorProfileUnkKETHD1Ev kind:function(arm,size=0x14) addr:0x02121b0c +_ZN17ActorProfileKeese10GetProfileEv kind:function(arm,size=0xc) addr:0x0211f8e0 +_ZN17ActorProfileKeese6CreateEv kind:function(arm,size=0x24) addr:0x0211f8ec +_ZN17ActorProfileKeeseC1Ev kind:function(arm,size=0x5c) addr:0x0211f910 +_ZN26ModelRender_ov032_02122568C1EP10G3d_Model_ kind:function(arm,size=0x34) addr:0x0211f96c +_ZN10ActorKeeseC1Ev kind:function(arm,size=0x20c) addr:0x0211f9a0 +_ZN26ModelRender_ov032_02122568D1Ev kind:function(arm,size=0x14) addr:0x0211fbac +_ZN14ActorKeese_284D1Ev kind:function(arm,size=0x14) addr:0x0211fbc0 +_ZN14ActorKeese_2ACC1EP10ActorKeese kind:function(arm,size=0x38) addr:0x0211fbd4 +_ZN14ActorKeese_2ACD1Ev kind:function(arm,size=0x1c) addr:0x0211fc0c +_ZN14ActorKeese_2ACD0Ev kind:function(arm,size=0x24) addr:0x0211fc28 +_ZN14ActorKeese_2AC8vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0x24) addr:0x0211fc4c +_ZN14ActorKeese_2AC8vfunc_0CEPK24UnkStruct_ov031_020e54d4Pii kind:function(arm,size=0x144) addr:0x0211fc70 +_ZN10ActorKeese8vfunc_18Ei kind:function(arm,size=0xac) addr:0x0211fdb4 +_ZN10ActorKeese19func_ov032_0211e0c0Ev kind:function(arm,size=0x14) addr:0x0211fe60 +_ZN10ActorKeese19func_ov032_0211e0d4Esi kind:function(arm,size=0x234) addr:0x0211fe74 +_ZN10ActorKeese19func_ov032_0211e308Ev kind:function(arm,size=0x78) addr:0x021200a8 +_ZN10ActorKeese19func_ov032_0211e380Ev kind:function(arm,size=0x8c) addr:0x02120120 +_ZN10ActorKeese19func_ov032_0211e40cEv kind:function(arm,size=0x14) addr:0x021201ac +_ZN10ActorKeese8SetStateEs kind:function(arm,size=0x48) addr:0x021201c0 +_ZN10ActorKeese19func_ov032_0211e468Ev kind:function(arm,size=0x310) addr:0x02120208 +_ZN10ActorKeese8vfunc_20Ev kind:function(arm,size=0x1b8) addr:0x02120518 +_ZN10ActorKeese8vfunc_2CEi kind:function(arm,size=0xbc) addr:0x021206d0 +_ZN10ActorKeese19func_ov032_0211e9ecEv kind:function(arm,size=0x174) addr:0x0212078c +_ZN10ActorKeese19func_ov032_0211eb60Ev kind:function(arm,size=0x188) addr:0x02120900 +_ZN10ActorKeese19func_ov032_0211ece8Ev kind:function(arm,size=0x174) addr:0x02120a88 +_ZN10ActorKeese19func_ov032_0211ee5cEv kind:function(arm,size=0x1f8) addr:0x02120bfc +_ZN10ActorKeese19func_ov032_0211f054Ev kind:function(arm,size=0x54) addr:0x02120df4 +_ZN10ActorKeese19func_ov032_0211f0a8Ev kind:function(arm,size=0x148) addr:0x02120e48 +_ZN10ActorKeese19func_ov032_0211f1f0Ev kind:function(arm,size=0x4) addr:0x02120f90 +_ZN10ActorKeese19func_ov032_0211f1f4Ev kind:function(arm,size=0x10c) addr:0x02120f94 +_ZN10ActorKeese19func_ov032_0211f300Ev kind:function(arm,size=0x10) addr:0x021210a0 +_ZN10ActorKeese19func_ov032_0211f310Ev kind:function(arm,size=0x9c) addr:0x021210b0 +_ZN10ActorKeese19func_ov032_0211f3acEv kind:function(arm,size=0x58) addr:0x0212114c +_ZN10ActorKeese19func_ov032_0211f404Ev kind:function(arm,size=0xa0) addr:0x021211a4 +_ZN10ActorKeese19func_ov032_0211f4a4Ev kind:function(arm,size=0x68) addr:0x02121244 +_ZN10ActorKeese19func_ov032_0211f50cEv kind:function(arm,size=0x54) addr:0x021212ac +_ZN10ActorKeese19func_ov032_0211f560Ev kind:function(arm,size=0x2c) addr:0x02121300 +_ZN10ActorKeese19func_ov032_0211f58cEv kind:function(arm,size=0x78) addr:0x0212132c +_ZN10ActorKeese19func_ov032_0211f604Ev kind:function(arm,size=0x10) addr:0x021213a4 +_ZN10ActorKeese19func_ov032_0211f614Ev kind:function(arm,size=0xa8) addr:0x021213b4 +_ZN10ActorKeese19func_ov032_0211f6bcEv kind:function(arm,size=0x148) addr:0x0212145c +_ZN10ActorKeese19func_ov032_0211f804Ev kind:function(arm,size=0x138) addr:0x021215a4 +_ZN10ActorKeese19func_ov032_0211f93cEP7VecFx32i kind:function(arm,size=0x88) addr:0x021216dc +_ZN10ActorKeese19func_ov032_0211f9c4Ev kind:function(arm,size=0x88) addr:0x02121764 +_ZN10ActorKeese19func_ov032_0211fa4cEi kind:function(arm,size=0xa4) addr:0x021217ec +_ZN10ActorKeese19func_ov032_0211faf0EPvi kind:function(arm,size=0xac) addr:0x02121890 +_ZN24UnkStruct_ov032_0212251cC1Ev kind:function(arm,size=0x18) addr:0x0212193c +_ZN24UnkStruct_ov032_0212251c8vfunc_00EP9MapObject kind:function(arm,size=0x38) addr:0x02121954 +_ZN14ActorKeese_284C1Ev kind:function(arm,size=0x14) addr:0x0212198c +_ZN26ModelRender_ov032_02122568D0Ev kind:function(arm,size=0x1c) addr:0x021219a0 +_ZN10ActorKeeseD1Ev kind:function(arm,size=0xa4) addr:0x021219bc +_ZN10ActorKeeseD0Ev kind:function(arm,size=0xac) addr:0x02121a60 +_ZN17ActorProfileKeeseD1Ev kind:function(arm,size=0x14) addr:0x02121b0c _ZN19ActorProfileUnkNSSW10GetProfileEv kind:function(arm,size=0xc) addr:0x02121b20 _ZN19ActorProfileUnkNSSW6CreateEv kind:function(arm,size=0x24) addr:0x02121b2c _ZN19ActorProfileUnkNSSWC1Ev kind:function(arm,size=0x44) addr:0x02121b50 @@ -220,7 +220,7 @@ _ZN19MapObjectUnkSWSW_40D0Ev kind:function(arm,size=0x1c) addr:0x02123e30 _ZN16MapObjectUnkSWSWD1Ev kind:function(arm,size=0x20) addr:0x02123e4c _ZN16MapObjectUnkSWSWD0Ev kind:function(arm,size=0x28) addr:0x02123e6c _ZN23MapObjectProfileUnkSWSWD1Ev kind:function(arm,size=0x14) addr:0x02123e94 -data_ov032_02123eac kind:data(any) addr:0x02123eac +data_ov032_02121ed4 kind:data(any) addr:0x02123eac data_ov032_02123ebc kind:data(any) addr:0x02123ebc data_ov032_02121ef4 kind:data(any) addr:0x02123ecc data_ov032_02121f04 kind:data(any) addr:0x02123edc @@ -228,12 +228,12 @@ data_ov032_02121f14 kind:data(any) addr:0x02123eec data_ov032_02121f24 kind:data(any) addr:0x02123efc __sinit_ActorSpinut.cpp kind:function(arm,size=0x6c) addr:0x02123f0c __sinit_ActorFleeingSpinut.cpp kind:function(arm,size=0x80) addr:0x02123f78 -__sinit_ActorUnkKETH.cpp kind:function(arm,size=0x6c) addr:0x02123ff8 +__sinit_ActorKeese.cpp kind:function(arm,size=0x6c) addr:0x02123ff8 __sinit_ActorUnkNSSW.cpp kind:function(arm,size=0x50) addr:0x02124064 __sinit_MapObjectUnkSWSW.cpp kind:function(arm,size=0x50) addr:0x021240b4 .p__sinit_ActorSpinut.cpp kind:data(word) addr:0x02124104 .p__sinit_ActorFleeingSpinut.cpp kind:data(word) addr:0x02124108 -.p__sinit_ActorUnkKETH.cpp kind:data(word) addr:0x0212410c +.p__sinit_ActorKeese.cpp kind:data(word) addr:0x0212410c .p__sinit_ActorUnkNSSW.cpp kind:data(word) addr:0x02124110 .p__sinit_MapObjectUnkSWSW.cpp kind:data(word) addr:0x02124114 data_ov032_02122160 kind:data(any) addr:0x02124120 @@ -247,25 +247,24 @@ _ZTV15ActorSpinut_110 kind:data(any) addr:0x021241fc data_ov032_02122288 kind:data(any) addr:0x02124248 _ZTV11ActorSpinut kind:data(any) addr:0x021242a8 data_ov032_02122348 kind:data(any) addr:0x02124308 -data_ov032_021223a8 kind:data(any) addr:0x02124368 -data_ov032_021223b4 kind:data(any) addr:0x02124374 -data_ov032_021223cc kind:data(any) addr:0x0212438c -data_ov032_021223e4 kind:data(any) addr:0x021243a4 -data_ov032_0212241c kind:data(any) addr:0x021243dc +data_ov032_02124368 kind:data(any) addr:0x02124368 +data_ov032_02124374 kind:data(any) addr:0x02124374 +data_ov032_0212438c kind:data(any) addr:0x0212438c +data_ov032_021243a4 kind:data(any) addr:0x021243a4 +data_ov032_021243dc kind:data(any) addr:0x021243dc _ZTV25ActorProfileFleeingSpinut kind:data(any) addr:0x02124414 _ZTV18ActorFleeingSpinut kind:data(any) addr:0x02124438 -data_ov032_02124498 kind:data(any) addr:0x02124498 -data_ov032_021244a4 kind:data(any) addr:0x021244a4 -data_ov032_021244bc kind:data(any) addr:0x021244bc -data_ov032_021244dc kind:data(any) addr:0x021244dc -data_ov032_021244e8 kind:data(any) addr:0x021244e8 -_ZTV19data_ov032_021244fc kind:data(any) addr:0x021244fc -data_ov032_02124528 kind:data(any) addr:0x02124528 -data_ov032_0212454c kind:data(any) addr:0x0212454c -data_ov032_0212459c kind:data(any) addr:0x0212459c -data_ov032_021245d0 kind:data(any) addr:0x021245d0 ambiguous -_ZTV19data_ov032_021245ec kind:data(any) addr:0x021245ec -data_ov032_02124654 kind:data(any) addr:0x02124654 +data_ov032_021224d8 kind:data(any) addr:0x02124498 +data_ov032_021224e4 kind:data(any) addr:0x021244a4 +data_ov032_021224fc kind:data(any) addr:0x021244bc +_ZTV24UnkStruct_ov032_0212251c kind:data(any) addr:0x021244d4 +_ZTV14ActorKeese_2AC kind:data(any) addr:0x021244e0 +_ZTV17ActorProfileKeese kind:data(any) addr:0x021244fc +_ZTV26ModelRender_ov032_02122568 kind:data(any) addr:0x02124520 +data_ov032_0212258c kind:data(any) addr:0x0212454c +data_ov032_021225dc kind:data(any) addr:0x0212459c +_ZTV10ActorKeese kind:data(any) addr:0x021245ec +_ZTV19data_ov032_02124654 kind:data(any) addr:0x0212464c data_ov032_0212466c kind:data(any) addr:0x0212466c data_ov032_02124688 kind:data(any) addr:0x02124688 _ZTV19data_ov032_0212469c kind:data(any) addr:0x0212469c @@ -283,9 +282,9 @@ data_ov032_0212290c kind:bss addr:0x021248ec _ZGVN15ProfileInstanceI25ActorProfileFleeingSpinutE8sProfileE kind:bss addr:0x021248f8 @31142 kind:bss addr:0x02124904 _ZN15ProfileInstanceI25ActorProfileFleeingSpinutE8sProfileE kind:bss addr:0x02124910 -_ZGVN15ProfileInstanceI19ActorProfileUnkKETHE8sProfileE kind:bss addr:0x02124954 +_ZGVN15ProfileInstanceI17ActorProfileKeeseE8sProfileE kind:bss addr:0x02124954 @31148 kind:bss addr:0x02124958 -_ZN15ProfileInstanceI19ActorProfileUnkKETHE8sProfileE kind:bss addr:0x02124964 +_ZN15ProfileInstanceI17ActorProfileKeeseE8sProfileE kind:bss addr:0x02124964 _ZGVN15ProfileInstanceI19ActorProfileUnkNSSWE8sProfileE kind:bss addr:0x02124a3c @31154 kind:bss addr:0x02124a40 _ZN15ProfileInstanceI19ActorProfileUnkNSSWE8sProfileE kind:bss addr:0x02124a4c diff --git a/config/jp/arm9/overlays/ov060/relocs.txt b/config/jp/arm9/overlays/ov060/relocs.txt index 7c1b73a2..d640527b 100644 --- a/config/jp/arm9/overlays/ov060/relocs.txt +++ b/config/jp/arm9/overlays/ov060/relocs.txt @@ -436,11 +436,11 @@ from:0x0215ead8 kind:arm_call to:0x020aa6c0 module:overlay(0) from:0x0215eae4 kind:load to:0x027e09b8 module:dtcm from:0x0215eb00 kind:arm_call to:0x0215eb78 module:overlay(60) from:0x0215eb5c kind:arm_call to:0x0211c92c module:overlay(37) -from:0x0215eb74 kind:load to:0x021245d0 module:overlays(32,36,37) +from:0x0215eb74 kind:load to:0x021245d0 module:overlays(36,37) from:0x0215eb98 kind:arm_call to:0x020c62cc module:overlay(24) from:0x0215eba0 kind:load to:0x020453b0 module:main from:0x0215eba4 kind:load to:0x020da000 module:overlay(24) -from:0x0215eba8 kind:load to:0x021245d0 module:overlays(32,36,37) +from:0x0215eba8 kind:load to:0x021245d0 module:overlays(36,37) from:0x0215ebb8 kind:arm_call_thumb to:0x02059154 module:overlay(0) from:0x0215ebc0 kind:arm_call_thumb to:0x0209ba14 module:overlay(0) from:0x0215ebc8 kind:arm_call to:0x020e8e20 module:overlay(31) diff --git a/config/jp/arm9/overlays/ov063/symbols.txt b/config/jp/arm9/overlays/ov063/symbols.txt index a3900b72..c9743beb 100644 --- a/config/jp/arm9/overlays/ov063/symbols.txt +++ b/config/jp/arm9/overlays/ov063/symbols.txt @@ -53,7 +53,7 @@ _ZN12ActorUnkCANS19func_ov063_0215a678EPS_P29UnkStruct_func_ov063_0215a678 kind: _ZN24UnkStruct_ov063_02162ea8C1Ev kind:function(arm,size=0x30) addr:0x0215c570 _ZN24UnkStruct_ov063_02162ea8D1Ev kind:function(arm,size=0x14) addr:0x0215c5a0 _ZN24UnkStruct_ov063_02162ea8D0Ev kind:function(arm,size=0x1c) addr:0x0215c5b4 -_ZN24UnkStruct_ov063_02162ea88vfunc_08EPK24UnkStruct_ov031_020f3310 kind:function(arm,size=0x4c) addr:0x0215c5d0 +_ZN24UnkStruct_ov063_02162ea88vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0x4c) addr:0x0215c5d0 _ZN24UnkStruct_ov063_02162ea88vfunc_0CEPK24UnkStruct_ov031_020e54d4Pii kind:function(arm,size=0xcc) addr:0x0215c61c _ZN24UnkStruct_ov063_02162f148vfunc_3CEv kind:function(arm,size=0x24) addr:0x0215c6e8 _ZN24UnkStruct_ov063_02162f148vfunc_38Eii kind:function(arm,size=0x2c) addr:0x0215c70c diff --git a/config/jp/arm9/symbols.txt b/config/jp/arm9/symbols.txt index f5e161cb..50e52824 100644 --- a/config/jp/arm9/symbols.txt +++ b/config/jp/arm9/symbols.txt @@ -849,7 +849,7 @@ func_02016d14 kind:function(arm,size=0xf8) addr:0x02016d14 func_02016e0c kind:function(arm,size=0x68) addr:0x02016e0c func_02016e74 kind:function(arm,size=0xe0) addr:0x02016e74 func_02016fbc kind:function(arm,size=0xf0) addr:0x02016f54 -func_02017044 kind:function(arm,size=0xac) addr:0x02017044 +_ZN24UnkStruct_ov032_0212251c13func_020170acEP7VecFx32 kind:function(arm,size=0xac) addr:0x02017044 func_020170f0 kind:function(arm,size=0x38) addr:0x020170f0 func_02017128 kind:function(arm,size=0x54) addr:0x02017128 _ZN9UnkResultC1Ev kind:function(arm,size=0x4c) addr:0x0201717c diff --git a/config/usa/arm9/overlays/ov000/symbols.txt b/config/usa/arm9/overlays/ov000/symbols.txt index 93fe6675..86718f20 100644 --- a/config/usa/arm9/overlays/ov000/symbols.txt +++ b/config/usa/arm9/overlays/ov000/symbols.txt @@ -1413,9 +1413,9 @@ func_ov000_0207bd84 kind:function(arm,size=0x260) addr:0x0207bd64 _ZN24UnkStruct_ov000_020b28388vfunc_00Ev kind:function(arm,size=0x4) addr:0x0207bfc4 _ZN24UnkStruct_ov000_020b2838D0Ev kind:function(arm,size=0x14) addr:0x0207bfc8 _ZN29UnkStruct_ov031_Items_00_BaseD2Ev kind:function(arm,size=0x4) addr:0x0207bfdc -_ZN26UnkStruct_027e0ce0_38_Base8vfunc_08EPK24UnkStruct_ov031_020f3310 kind:function(arm,size=0x8) addr:0x0207bfe0 +_ZN26UnkStruct_027e0ce0_38_Base8vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0x8) addr:0x0207bfe0 _ZN26UnkStruct_027e0ce0_38_Base8vfunc_0CEPK24UnkStruct_ov031_020e54d4Pii kind:function(arm,size=0x8) addr:0x0207bfe8 -_ZN26UnkStruct_027e0ce0_38_Base8vfunc_10Ev kind:function(arm,size=0x8) addr:0x0207bff0 +_ZN26UnkStruct_027e0ce0_38_Base8vfunc_10E8ActorRefi kind:function(arm,size=0x8) addr:0x0207bff0 _ZN17MapObject_10_BaseC2Ev kind:function(arm,size=0x30) addr:0x0207bff8 func_ov000_0207c048 kind:function(arm,size=0x30) addr:0x0207c028 func_ov000_0207c078 kind:function(arm,size=0x38) addr:0x0207c058 @@ -2308,7 +2308,7 @@ func_ov000_020981e0 kind:function(arm,size=0x64) addr:0x020981c0 func_ov000_02098244 kind:function(arm,size=0x64) addr:0x02098224 _ZN24UnkStruct_ov031_Items_00C2Ev kind:function(arm,size=0x18) addr:0x02098288 _ZN24UnkStruct_ov071_0215f92cC1Ev kind:function(arm,size=0x18) addr:0x020982a0 -_ZN24UnkStruct_ov031_Items_008vfunc_08EPK24UnkStruct_ov031_020f3310 kind:function(arm,size=0x80) addr:0x020982b8 +_ZN24UnkStruct_ov031_Items_008vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0x80) addr:0x020982b8 _ZN19func_ov000_02098358D1Ev kind:function(arm,size=0x14) addr:0x02098338 _ZN19func_ov000_0209836cD0Ev kind:function(arm,size=0x1c) addr:0x0209834c _ZN5ActorC2Ev kind:function(arm,size=0xe8) addr:0x02098368 @@ -2341,7 +2341,7 @@ func_ov000_020986fc kind:function(arm,size=0x7c) addr:0x020986dc func_ov000_02098778 kind:function(arm,size=0x88) addr:0x02098758 _ZN5Actor19func_ov000_02098800Eb kind:function(arm,size=0x38) addr:0x020987e0 _ZN5Actor19func_ov000_02098838Ev kind:function(arm,size=0x28) addr:0x02098818 -func_ov000_02098860 kind:function(arm,size=0xb0) addr:0x02098840 +_ZN5Actor19func_ov000_0209a008Eis kind:function(arm,size=0xb0) addr:0x02098840 _ZN5Actor19func_ov000_02098910EP24UnkStruct_ov031_Items_00i kind:function(arm,size=0xd0) addr:0x020988f0 _ZN5Actor19func_ov000_020989e0Ev kind:function(arm,size=0x38) addr:0x020989c0 func_ov000_02098a18 kind:function(arm,size=0x48) addr:0x020989f8 @@ -2352,28 +2352,28 @@ _ZN14Actor_Derived2C2Ev kind:function(arm,size=0x64) addr:0x02098b08 _ZN5Actor19func_ov000_02098b8cEiP24UnkStruct_ov031_Items_00 kind:function(arm,size=0x184) addr:0x02098b6c func_ov000_02098d10 kind:function(arm,size=0x6c) addr:0x02098cf0 func_ov000_02098d7c kind:function(arm,size=0x1b8) addr:0x02098d5c -func_ov000_02098f34 kind:function(arm,size=0xd0) addr:0x02098f14 +_ZN14Actor_Derived219func_ov000_02098f34EP7VecFx32 kind:function(arm,size=0xd0) addr:0x02098f14 _ZN14Actor_Derived28vfunc_30EP14Actor_vfunc_30 kind:function(arm,size=0xc) addr:0x02098fe4 func_ov000_02099010 kind:function(arm,size=0xb0) addr:0x02098ff0 func_ov000_020990c0 kind:function(arm,size=0x21c) addr:0x020990a0 -func_ov000_020992dc kind:function(arm,size=0x90) addr:0x020992bc +_ZN14Actor_Derived219func_ov000_020992dcEv kind:function(arm,size=0x90) addr:0x020992bc func_ov000_0209936c kind:function(arm,size=0x64) addr:0x0209934c func_ov000_020993d0 kind:function(arm,size=0x80) addr:0x020993b0 -func_ov000_02099450 kind:function(arm,size=0x50) addr:0x02099430 -func_ov000_020994a0 kind:function(arm,size=0x74) addr:0x02099480 +_ZN14Actor_Derived219func_ov000_02099450EPvP7VecFx32it kind:function(arm,size=0x50) addr:0x02099430 +_ZN14Actor_Derived219func_ov000_020994a0Ev kind:function(arm,size=0x74) addr:0x02099480 func_ov000_02099514 kind:function(arm,size=0x74) addr:0x020994f4 _ZN14Actor_Derived28vfunc_54Ei kind:function(arm,size=0x1b0) addr:0x02099568 func_ov000_02099738 kind:function(arm,size=0x2c) addr:0x02099718 func_ov000_02099764 kind:function(arm,size=0x20) addr:0x02099744 func_ov000_02099784 kind:function(arm,size=0x20) addr:0x02099764 func_ov000_020997a4 kind:function(arm,size=0x20) addr:0x02099784 -func_ov000_020997c4 kind:function(arm,size=0x2c) addr:0x020997a4 +_ZN14Actor_Derived219func_ov000_020997c4Ei kind:function(arm,size=0x2c) addr:0x020997a4 _ZN14Actor_Derived2D1Ev kind:function(arm,size=0x14) addr:0x020997d0 _ZN14Actor_Derived2D0Ev kind:function(arm,size=0x1c) addr:0x020997e4 _ZN26UnkStruct_ActorUnkCANS_224C1Ev kind:function(arm,size=0x50) addr:0x02099800 func_ov000_02099870 kind:function(arm,size=0x80) addr:0x02099850 func_ov000_020998f0 kind:function(arm,size=0x11c) addr:0x020998d0 -func_ov000_02099a0c kind:function(arm,size=0x10) addr:0x020999ec +_ZN26UnkStruct_ActorUnkCANS_22419func_ov000_02099a0cEv kind:function(arm,size=0x10) addr:0x020999ec func_ov000_02099a1c kind:function(arm,size=0xc) addr:0x020999fc _ZN24UnkStruct_ov000_020b31a8C2EP10UnkSystem5P11ModelRenderP19UnkActorFileSystem2 kind:function(thumb,size=0x54) addr:0x02099a08 func_ov000_02099a7c kind:function(thumb,size=0x48) addr:0x02099a5c @@ -2386,7 +2386,7 @@ _ZN24UnkStruct_ov000_020b31a88vfunc_0CEv kind:function(arm,size=0x68) addr:0x020 _ZN24UnkStruct_ov000_020b31a88vfunc_20Ev kind:function(arm,size=0x110) addr:0x02099b80 _ZN24UnkStruct_ov000_020b31a88vfunc_1CE25ActorUnkZLSL_AnimationTagiii kind:function(arm,size=0x84) addr:0x02099c90 func_ov000_02099d34 kind:function(arm,size=0xa8) addr:0x02099d14 -func_ov000_02099ddc kind:function(arm,size=0x7c) addr:0x02099dbc +_ZN24UnkStruct_ov000_020b31a819func_ov000_02099ddcE25ActorUnkZLSL_AnimationTagii kind:function(arm,size=0x7c) addr:0x02099dbc func_ov000_02099e58 kind:function(arm,size=0x98) addr:0x02099e38 func_ov000_02099ef0 kind:function(arm,size=0x74) addr:0x02099ed0 func_ov000_02099f64 kind:function(arm,size=0x94) addr:0x02099f44 @@ -2401,7 +2401,7 @@ _ZN24UnkStruct_ov000_020b31a88vfunc_14Ev kind:function(arm,size=0x8) addr:0x0209 func_ov000_0209a14c kind:function(arm,size=0x24) addr:0x0209a12c func_ov000_0209a170 kind:function(arm,size=0x10) addr:0x0209a150 func_ov000_0209a180 kind:function(arm,size=0x8) addr:0x0209a160 -_ZN24UnkStruct_ov000_020b31f0C2EPvS0_S0_i kind:function(thumb,size=0x30) addr:0x0209a168 +_ZN24UnkStruct_ov000_020b31f0C2EP10UnkSystem5S1_P11ModelRenderP19UnkActorFileSystem2 kind:function(thumb,size=0x30) addr:0x0209a168 func_ov000_0209a1b8 kind:function(thumb,size=0x34) addr:0x0209a198 func_ov000_0209a1ec kind:function(thumb,size=0x3c) addr:0x0209a1cc func_ov000_0209a228 kind:function(thumb,size=0xc) addr:0x0209a208 @@ -2492,7 +2492,7 @@ _ZN12ActorUnkEFIK8vfunc_54Ei kind:function(arm,size=0x8) addr:0x0209c2c4 _ZN12ActorUnkEFIKD1Ev kind:function(arm,size=0x20) addr:0x0209c2cc _ZN12ActorUnkEFIKD0Ev kind:function(arm,size=0x28) addr:0x0209c2ec _ZN19ActorProfileUnkEFIKD1Ev kind:function(arm,size=0x14) addr:0x0209c314 -func_ov000_0209c348 kind:function(arm,size=0x24) addr:0x0209c328 +_ZN24UnkStruct_ov000_020b34c48vfunc_00EP9MapObject kind:function(arm,size=0x24) addr:0x0209c328 func_ov000_0209c36c kind:function(arm,size=0x3c) addr:0x0209c34c _ZN16MapObjectManager19func_ov000_0209c3a8Ev kind:function(arm,size=0x40) addr:0x0209c388 _ZN16MapObjectManager19func_ov000_0209c3e8Ev kind:function(arm,size=0x5c) addr:0x0209c3c8 @@ -3251,10 +3251,10 @@ data_ov000_020adc70 kind:data(any) addr:0x020adc70 data_ov000_020ae4bc kind:data(any) addr:0x020ae49c data_ov000_020aece8 kind:data(any) addr:0x020aecc8 data_ov000_020aeccc kind:data(any) addr:0x020aeccc -data_ov000_020aecd0 kind:data(any) addr:0x020aecd0 -data_ov000_020aecd4 kind:data(any) addr:0x020aecd4 -data_ov000_020aecd8 kind:data(any) addr:0x020aecd8 -data_ov000_020aecdc kind:data(any) addr:0x020aecdc +data_ov000_020aecf0 kind:data(any) addr:0x020aecd0 +data_ov000_020aecf4 kind:data(any) addr:0x020aecd4 +data_ov000_020aecf8 kind:data(any) addr:0x020aecd8 +data_ov000_020aecfc kind:data(any) addr:0x020aecdc data_ov000_020aece0 kind:data(any) addr:0x020aece0 data_ov000_020aece4 kind:data(any) addr:0x020aece4 data_ov000_020aece8_usa kind:data(any) addr:0x020aece8 diff --git a/config/usa/arm9/overlays/ov017/symbols.txt b/config/usa/arm9/overlays/ov017/symbols.txt index 4d8e4f15..000a02db 100644 --- a/config/usa/arm9/overlays/ov017/symbols.txt +++ b/config/usa/arm9/overlays/ov017/symbols.txt @@ -67,8 +67,8 @@ _ZN5Actor19func_ov017_020bf3e0Eii kind:function(arm,size=0xd0) addr:0x020bf3c0 func_ov017_020bf4b0 kind:function(arm,size=0xc4) addr:0x020bf490 func_ov017_020bf574 kind:function(arm,size=0x50) addr:0x020bf554 _ZN5Actor19func_ov017_020bf5c4EP7VecFx32iiii kind:function(arm,size=0x70) addr:0x020bf5a4 -func_ov017_020bf634 kind:function(arm,size=0x54) addr:0x020bf614 -func_ov017_020bf688 kind:function(arm,size=0x88) addr:0x020bf668 +_ZN5Actor19func_ov017_020bf634EPK7VecFx32ti kind:function(arm,size=0x54) addr:0x020bf614 +_ZN5Actor19func_ov017_020bf688Ev kind:function(arm,size=0x88) addr:0x020bf668 func_ov017_020bf710 kind:function(arm,size=0x98) addr:0x020bf6f0 func_ov017_020bf7a8 kind:function(arm,size=0xec) addr:0x020bf788 _ZN14Actor_Derived219func_ov017_020bf894EP26UnkStruct_ActorUnkCANS_224 kind:function(arm,size=0x60) addr:0x020bf874 diff --git a/config/usa/arm9/overlays/ov031/symbols.txt b/config/usa/arm9/overlays/ov031/symbols.txt index 01f1ed2c..e3572fcd 100644 --- a/config/usa/arm9/overlays/ov031/symbols.txt +++ b/config/usa/arm9/overlays/ov031/symbols.txt @@ -358,10 +358,10 @@ _ZN9ActorBomb19func_ov031_020e2c2cEv kind:function(arm,size=0x14c) addr:0x020e2c _ZN13ActorBomb_180C1EP5Actor kind:function(arm,size=0x3c) addr:0x020e2d58 _ZN13ActorBomb_180D1Ev kind:function(arm,size=0x1c) addr:0x020e2d94 _ZN13ActorBomb_180D0Ev kind:function(arm,size=0x24) addr:0x020e2db0 -_ZN13ActorBomb_1808vfunc_08EPK24UnkStruct_ov031_020f3310 kind:function(arm,size=0x48) addr:0x020e2dd4 +_ZN13ActorBomb_1808vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0x48) addr:0x020e2dd4 _ZN13ActorBomb_1808vfunc_0CEPK24UnkStruct_ov031_020e54d4Pii kind:function(arm,size=0x450) addr:0x020e2e1c _ZN13ActorBomb_1808vfunc_10E8ActorRefi kind:function(arm,size=0x84) addr:0x020e326c -_ZN24ActorBomb_ov031_020e21348vfunc_08EPK24UnkStruct_ov031_020f3310 kind:function(arm,size=0x30) addr:0x020e32f0 +_ZN24ActorBomb_ov031_020e21348vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0x30) addr:0x020e32f0 _ZN13ActorBomb_19CC1EP5Actor kind:function(arm,size=0x3c) addr:0x020e3320 _ZN13ActorBomb_19C8vfunc_10EP5Actor kind:function(arm,size=0x30) addr:0x020e335c _ZN13ActorBomb_unkC1Ev kind:function(arm,size=0x14) addr:0x020e338c @@ -443,13 +443,13 @@ _ZN21ActorItemBoomerang_CC8vfunc_0CEP5ActorP7VecFx32 kind:function(arm,size=0x4c _ZN22ActorItemBoomerang_11CC1EP18ActorItemBoomerang kind:function(arm,size=0x28) addr:0x020e542c _ZN22ActorItemBoomerang_11CD1Ev kind:function(arm,size=0x14) addr:0x020e5454 _ZN22ActorItemBoomerang_11CD0Ev kind:function(arm,size=0x1c) addr:0x020e5468 -_ZN22ActorItemBoomerang_11C8vfunc_08EPK24UnkStruct_ov031_020f3310 kind:function(arm,size=0x30) addr:0x020e5484 +_ZN22ActorItemBoomerang_11C8vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0x30) addr:0x020e5484 _ZN22ActorItemBoomerang_11C8vfunc_0CEPK24UnkStruct_ov031_020e54d4Pii kind:function(arm,size=0x230) addr:0x020e54b4 _ZN26ActorItemBoomerang_Unknown19func_ov031_020e5704Ev kind:function(arm,size=0xc) addr:0x020e56e4 _ZN21ActorItemBoomerang_A0D0Ev kind:function(arm,size=0x1c) addr:0x020e56f0 _ZN21ActorItemBoomerang_CCD0Ev kind:function(arm,size=0x1c) addr:0x020e570c _ZN25ActorProfileItemBoomerangD1Ev kind:function(arm,size=0x14) addr:0x020e5728 -_ZN24UnkStruct_ov031_02112ff48vfunc_08EPK24UnkStruct_ov031_020f3310 kind:function(arm,size=0x28) addr:0x020e573c +_ZN24UnkStruct_ov031_02112ff48vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0x28) addr:0x020e573c _ZN24UnkStruct_ov031_02112ff48vfunc_0CEPK24UnkStruct_ov031_020e54d4i kind:function(arm,size=0x114) addr:0x020e5764 func_ov031_020e5898 kind:function(arm,size=0x30) addr:0x020e5878 _ZN23ActorProfileItemTornado10GetProfileEv kind:function(arm,size=0xc) addr:0x020e58a8 @@ -481,7 +481,7 @@ _ZN19func_ov031_020e6774D0Ev kind:function(arm,size=0x68) addr:0x020e6754 func_ov031_020e67dc kind:function(arm,size=0x7c) addr:0x020e67bc func_ov031_020e6858 kind:function(arm,size=0x64) addr:0x020e6838 _ZN19func_ov031_020e68bcD0Ev kind:function(arm,size=0x1c) addr:0x020e689c -_ZN15ActorUnkSWBM_948vfunc_08EPK24UnkStruct_ov031_020f3310 kind:function(arm,size=0x28) addr:0x020e68b8 +_ZN15ActorUnkSWBM_948vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0x28) addr:0x020e68b8 _ZN15ActorUnkSWBM_948vfunc_0CEPK24UnkStruct_ov031_020e54d4Pii kind:function(arm,size=0x1c) addr:0x020e68e0 _ZN15ActorUnkSWBM_988vfunc_0CEP5ActorP7VecFx32 kind:function(arm,size=0x58) addr:0x020e68fc _ZN15ActorUnkSWBM_988vfunc_10EP5Actor kind:function(arm,size=0x58) addr:0x020e6954 @@ -923,7 +923,7 @@ _ZN18ActorShotArrow_178C1EP14ActorShotArrow kind:function(arm,size=0x3c) addr:0x _ZN18ActorShotArrow_178D1Ev kind:function(arm,size=0x1c) addr:0x020f32a4 _ZN18ActorShotArrow_178D0Ev kind:function(arm,size=0x24) addr:0x020f32c0 _ZN18ActorShotArrow_17819func_ov031_020f3304Ev kind:function(arm,size=0xc) addr:0x020f32e4 -_ZN18ActorShotArrow_1788vfunc_08EPK24UnkStruct_ov031_020f3310 kind:function(arm,size=0xac) addr:0x020f32f0 +_ZN18ActorShotArrow_1788vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0xac) addr:0x020f32f0 _ZN18ActorShotArrow_1788vfunc_0CEPK24UnkStruct_ov031_020e54d4Pii kind:function(arm,size=0x350) addr:0x020f339c _ZN18ActorShotArrow_194C1EP14ActorShotArrow kind:function(arm,size=0x40) addr:0x020f36ec _ZN18ActorShotArrow_19419func_ov031_020f374cEP5Actor kind:function(arm,size=0x164) addr:0x020f372c diff --git a/config/usa/arm9/overlays/ov032/delinks.txt b/config/usa/arm9/overlays/ov032/delinks.txt index de82297d..0cd66da5 100644 --- a/config/usa/arm9/overlays/ov032/delinks.txt +++ b/config/usa/arm9/overlays/ov032/delinks.txt @@ -19,10 +19,11 @@ src/032_MapA1/Actor/ActorFleeingSpinut.cpp: .data start:0x02122388 end:0x021224b8 .bss start:0x021228e8 end:0x02122954 -src/032_MapA1/Actor/ActorUnkKETH.cpp: +src/032_MapA1/Actor/ActorKeese.cpp: .text start:0x0211db20 end:0x0211fd60 .init start:0x02122000 end:0x0212206c .ctor start:0x02122114 end:0x02122118 + .data start:0x021224b8 end:0x0212266c .bss start:0x02122954 end:0x02122a3c src/032_MapA1/Actor/ActorUnkNSSW.cpp: diff --git a/config/usa/arm9/overlays/ov032/relocs.txt b/config/usa/arm9/overlays/ov032/relocs.txt index 11ae4f5b..4d76502f 100644 --- a/config/usa/arm9/overlays/ov032/relocs.txt +++ b/config/usa/arm9/overlays/ov032/relocs.txt @@ -17,8 +17,8 @@ from:0x02119190 kind:arm_call to:0x0211b550 module:overlay(32) from:0x021191f0 kind:arm_call to:0x0209860c module:overlay(0) from:0x02119214 kind:load to:0x021222d0 module:overlay(32) from:0x02119218 kind:load to:0x02122810 module:overlay(32) -from:0x0211921c kind:load to:0x02122224 module:overlay(32) -from:0x02119220 kind:load to:0x021221dc module:overlay(32) +from:0x0211921c kind:load to:0x0212221c module:overlay(32) add:0x8 +from:0x02119220 kind:load to:0x021221d4 module:overlay(32) add:0x8 from:0x02119224 kind:load to:0x02122140 module:overlay(32) from:0x02119230 kind:arm_call_thumb to:0x0209a228 module:overlay(0) from:0x02119244 kind:arm_call_thumb to:0x02099adc module:overlay(0) @@ -272,7 +272,7 @@ from:0x0211b8ac kind:arm_call to:0x0209860c module:overlay(0) from:0x0211b8c8 kind:arm_call to:0x0211bde4 module:overlay(32) from:0x0211b8e8 kind:load to:0x02122458 add:0x8 module:overlay(32) from:0x0211b8ec kind:load to:0x02122910 module:overlay(32) -from:0x0211b8f0 kind:load to:0x02122224 module:overlay(32) +from:0x0211b8f0 kind:load to:0x0212221c module:overlay(32) add:0x8 from:0x0211b8f4 kind:load to:0x02122904 module:overlay(32) from:0x0211b8f8 kind:load to:0x021228ec module:overlay(32) from:0x0211b8fc kind:load to:0x02122388 module:overlay(32) @@ -530,10 +530,10 @@ from:0x0211db28 kind:load to:0x02122964 module:overlay(32) from:0x0211db3c kind:arm_call to:0x02011f3c module:main from:0x0211db48 kind:arm_call to:0x0211dbe0 module:overlay(32) from:0x0211db5c kind:arm_call to:0x02097878 module:overlay(0) -from:0x0211dba8 kind:load to:0x02122524 module:overlay(32) +from:0x0211dba8 kind:load to:0x0212251c module:overlay(32) add:0x8 from:0x0211dbb4 kind:arm_call_thumb to:0x0209a744 module:overlay(0) from:0x0211dbc8 kind:arm_call to:0x02057ef8 module:overlay(0) -from:0x0211dbd8 kind:load to:0x02122548 module:overlay(32) +from:0x0211dbd8 kind:load to:0x02122540 module:overlay(32) add:0x8 from:0x0211dbdc kind:load to:0x02121eb4 module:overlay(32) from:0x0211dbf0 kind:arm_call to:0x02098b08 module:overlay(0) from:0x0211dc54 kind:arm_call to:0x0211dbac module:overlay(32) @@ -548,17 +548,17 @@ from:0x0211dd34 kind:arm_call to:0x02099800 module:overlay(0) from:0x0211dd60 kind:arm_call to:0x0203d138 module:main from:0x0211dd80 kind:arm_call to:0x0211de14 module:overlay(32) from:0x0211dda0 kind:arm_call to:0x0209860c module:overlay(0) -from:0x0211ddd0 kind:load to:0x02122614 module:overlay(32) +from:0x0211ddd0 kind:load to:0x0212260c module:overlay(32) add:0x8 from:0x0211ddd4 kind:load to:0x02122964 module:overlay(32) -from:0x0211ddd8 kind:load to:0x02122224 module:overlay(32) -from:0x0211dddc kind:load to:0x021221dc module:overlay(32) +from:0x0211ddd8 kind:load to:0x0212221c module:overlay(32) add:0x8 +from:0x0211dddc kind:load to:0x021221d4 module:overlay(32) add:0x8 from:0x0211dde0 kind:load to:0x0211de00 module:overlay(32) from:0x0211dde4 kind:load to:0x0211fbcc module:overlay(32) from:0x0211dde8 kind:load to:0x021224b8 module:overlay(32) from:0x0211ddf4 kind:arm_call_thumb to:0x02057bb4 module:overlay(0) from:0x0211de08 kind:arm_call to:0x020a02e4 module:overlay(0) from:0x0211de20 kind:arm_call to:0x02098288 module:overlay(0) -from:0x0211de48 kind:load to:0x02122508 module:overlay(32) +from:0x0211de48 kind:load to:0x02122500 module:overlay(32) add:0x8 from:0x0211de5c kind:arm_call to:0x0207bfdc module:overlay(0) from:0x0211de78 kind:arm_call to:0x0207bfdc module:overlay(0) from:0x0211de80 kind:arm_call to:0x02011ff4 module:main @@ -747,7 +747,7 @@ from:0x0211facc kind:load to:0x027e0ce0 module:dtcm from:0x0211fb38 kind:arm_call to:0x0200e260 module:main from:0x0211fb48 kind:arm_call to:0x01ffad5c module:itcm from:0x0211fb78 kind:load to:0x027e0964 module:dtcm -from:0x0211fb90 kind:load to:0x021224fc module:overlay(32) +from:0x0211fb90 kind:load to:0x021224f4 module:overlay(32) add:0x8 from:0x0211fb9c kind:arm_call to:0x0209c328 module:overlay(0) from:0x0211fbe8 kind:arm_call_thumb to:0x02057bb4 module:overlay(0) from:0x0211fbf0 kind:arm_call to:0x02011ff4 module:main @@ -890,7 +890,7 @@ from:0x02120c34 kind:arm_call to:0x02120874 module:overlay(32) from:0x02120ca8 kind:arm_call to:0x01ffa06c module:itcm from:0x02120cc0 kind:arm_call to:0x02120874 module:overlay(32) from:0x02120ce8 kind:arm_call to:0x020f6264 module:overlay(31) -from:0x02120d00 kind:load to:0x02122674 module:overlay(32) +from:0x02120d00 kind:load to:0x0212266c module:overlay(32) add:0x8 from:0x02120d20 kind:arm_call to:0x02120b14 module:overlay(32) from:0x02120d30 kind:arm_call to:0x020f62c4 module:overlay(31) from:0x02120d4c kind:arm_call to:0x02120b4c module:overlay(32) diff --git a/config/usa/arm9/overlays/ov032/symbols.txt b/config/usa/arm9/overlays/ov032/symbols.txt index 39118111..1986f6a7 100644 --- a/config/usa/arm9/overlays/ov032/symbols.txt +++ b/config/usa/arm9/overlays/ov032/symbols.txt @@ -49,7 +49,7 @@ _ZN11ActorSpinut8vfunc_54Ei kind:function(arm,size=0x168) addr:0x0211b3e8 _ZN15ActorSpinut_268C1Ev kind:function(arm,size=0x30) addr:0x0211b550 _ZN15ActorSpinut_268D1Ev kind:function(arm,size=0x14) addr:0x0211b580 _ZN15ActorSpinut_268D0Ev kind:function(arm,size=0x1c) addr:0x0211b594 -_ZN15ActorSpinut_2688vfunc_08EPK24UnkStruct_ov031_020f3310 kind:function(arm,size=0x24) addr:0x0211b5b0 +_ZN15ActorSpinut_2688vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0x24) addr:0x0211b5b0 _ZN15ActorSpinut_1BC8vfunc_3CEv kind:function(arm,size=0x24) addr:0x0211b5d4 _ZN15ActorSpinut_1BC8vfunc_38Eii kind:function(arm,size=0x10) addr:0x0211b5f8 _ZN15ActorSpinut_1BC8vfunc_30Ev kind:function(arm,size=0x8) addr:0x0211b608 @@ -112,59 +112,59 @@ _ZN22ActorFleeingSpinut_1EC19func_ov032_0211d910Ev kind:function(arm,size=0x10) _ZN22ActorFleeingSpinut_1EC19func_ov032_0211d920EP7VecFx32 kind:function(arm,size=0xec) addr:0x0211d900 _ZN22ActorFleeingSpinut_1EC19func_ov032_0211da0cEiP7VecFx32 kind:function(arm,size=0x120) addr:0x0211d9ec _ZN25ActorProfileFleeingSpinutD1Ev kind:function(arm,size=0x14) addr:0x0211db0c -_ZN19ActorProfileUnkKETH10GetProfileEv kind:function(arm,size=0xc) addr:0x0211db20 -_ZN19ActorProfileUnkKETH6CreateEv kind:function(arm,size=0x24) addr:0x0211db2c -_ZN19ActorProfileUnkKETHC1Ev kind:function(arm,size=0x5c) addr:0x0211db50 -_ZN12ActorUnkKETH19func_ov032_0211dbccEv kind:function(arm,size=0x34) addr:0x0211dbac -_ZN12ActorUnkKETHC1Ev kind:function(arm,size=0x20c) addr:0x0211dbe0 -_ZN12ActorUnkKETH19func_ov032_0211de0cEv kind:function(arm,size=0x14) addr:0x0211ddec -_ZN12ActorUnkKETH19func_ov032_0211de20Ev kind:function(arm,size=0x14) addr:0x0211de00 -_ZN12ActorUnkKETH19func_ov032_0211de34Ev kind:function(arm,size=0x38) addr:0x0211de14 -_ZN12ActorUnkKETHD1Ev kind:function(arm,size=0x1c) addr:0x0211de4c -_ZN12ActorUnkKETHD0Ev kind:function(arm,size=0x24) addr:0x0211de68 -_ZN12ActorUnkKETH19func_ov032_0211deacEv kind:function(arm,size=0x24) addr:0x0211de8c -_ZN12ActorUnkKETH19func_ov032_0211ded0Ev kind:function(arm,size=0x144) addr:0x0211deb0 -_ZN12ActorUnkKETH19func_ov032_0211e014Ev kind:function(arm,size=0xac) addr:0x0211dff4 -_ZN12ActorUnkKETH19func_ov032_0211e0c0Ev kind:function(arm,size=0x14) addr:0x0211e0a0 -_ZN12ActorUnkKETH19func_ov032_0211e0d4Ev kind:function(arm,size=0x234) addr:0x0211e0b4 -_ZN12ActorUnkKETH19func_ov032_0211e308Ev kind:function(arm,size=0x78) addr:0x0211e2e8 -_ZN12ActorUnkKETH19func_ov032_0211e380Ev kind:function(arm,size=0x8c) addr:0x0211e360 -_ZN12ActorUnkKETH19func_ov032_0211e40cEv kind:function(arm,size=0x14) addr:0x0211e3ec -_ZN12ActorUnkKETH19func_ov032_0211e420Ev kind:function(arm,size=0x48) addr:0x0211e400 -_ZN12ActorUnkKETH19func_ov032_0211e468Ev kind:function(arm,size=0x310) addr:0x0211e448 -_ZN12ActorUnkKETH19func_ov032_0211e778Ev kind:function(arm,size=0x1b8) addr:0x0211e758 -_ZN12ActorUnkKETH19func_ov032_0211e930Ev kind:function(arm,size=0xbc) addr:0x0211e910 -_ZN12ActorUnkKETH19func_ov032_0211e9ecEv kind:function(arm,size=0x174) addr:0x0211e9cc -_ZN12ActorUnkKETH19func_ov032_0211eb60Ev kind:function(arm,size=0x188) addr:0x0211eb40 -_ZN12ActorUnkKETH19func_ov032_0211ece8Ev kind:function(arm,size=0x174) addr:0x0211ecc8 -_ZN12ActorUnkKETH19func_ov032_0211ee5cEv kind:function(arm,size=0x1f8) addr:0x0211ee3c -_ZN12ActorUnkKETH19func_ov032_0211f054Ev kind:function(arm,size=0x54) addr:0x0211f034 -_ZN12ActorUnkKETH19func_ov032_0211f0a8Ev kind:function(arm,size=0x148) addr:0x0211f088 -_ZN12ActorUnkKETH19func_ov032_0211f1f0Ev kind:function(arm,size=0x4) addr:0x0211f1d0 -_ZN12ActorUnkKETH19func_ov032_0211f1f4Ev kind:function(arm,size=0x10c) addr:0x0211f1d4 -_ZN12ActorUnkKETH19func_ov032_0211f300Ev kind:function(arm,size=0x10) addr:0x0211f2e0 -_ZN12ActorUnkKETH19func_ov032_0211f310Ev kind:function(arm,size=0x9c) addr:0x0211f2f0 -_ZN12ActorUnkKETH19func_ov032_0211f3acEv kind:function(arm,size=0x58) addr:0x0211f38c -_ZN12ActorUnkKETH19func_ov032_0211f404Ev kind:function(arm,size=0xa0) addr:0x0211f3e4 -_ZN12ActorUnkKETH19func_ov032_0211f4a4Ev kind:function(arm,size=0x68) addr:0x0211f484 -_ZN12ActorUnkKETH19func_ov032_0211f50cEv kind:function(arm,size=0x54) addr:0x0211f4ec -_ZN12ActorUnkKETH19func_ov032_0211f560Ev kind:function(arm,size=0x2c) addr:0x0211f540 -_ZN12ActorUnkKETH19func_ov032_0211f58cEv kind:function(arm,size=0x78) addr:0x0211f56c -_ZN12ActorUnkKETH19func_ov032_0211f604Ev kind:function(arm,size=0x10) addr:0x0211f5e4 -_ZN12ActorUnkKETH19func_ov032_0211f614Ev kind:function(arm,size=0xa8) addr:0x0211f5f4 -_ZN12ActorUnkKETH19func_ov032_0211f6bcEv kind:function(arm,size=0x148) addr:0x0211f69c -_ZN12ActorUnkKETH19func_ov032_0211f804Ev kind:function(arm,size=0x138) addr:0x0211f7e4 -_ZN12ActorUnkKETH19func_ov032_0211f93cEv kind:function(arm,size=0x88) addr:0x0211f91c -_ZN12ActorUnkKETH19func_ov032_0211f9c4Ev kind:function(arm,size=0x88) addr:0x0211f9a4 -_ZN12ActorUnkKETH19func_ov032_0211fa4cEv kind:function(arm,size=0xa4) addr:0x0211fa2c -_ZN12ActorUnkKETH19func_ov032_0211faf0Ev kind:function(arm,size=0xac) addr:0x0211fad0 -_ZN12ActorUnkKETH19func_ov032_0211fb9cEv kind:function(arm,size=0x18) addr:0x0211fb7c -_ZN12ActorUnkKETH19func_ov032_0211fbb4Ev kind:function(arm,size=0x38) addr:0x0211fb94 -_ZN12ActorUnkKETH19func_ov032_0211fbecEv kind:function(arm,size=0x14) addr:0x0211fbcc -_ZN12ActorUnkKETH19func_ov032_0211fc00Ev kind:function(arm,size=0x1c) addr:0x0211fbe0 -_ZN12ActorUnkKETH19func_ov032_0211fc1cEv kind:function(arm,size=0xa4) addr:0x0211fbfc -_ZN12ActorUnkKETH19func_ov032_0211fcc0Ev kind:function(arm,size=0xac) addr:0x0211fca0 -_ZN19ActorProfileUnkKETHD1Ev kind:function(arm,size=0x14) addr:0x0211fd4c +_ZN17ActorProfileKeese10GetProfileEv kind:function(arm,size=0xc) addr:0x0211db20 +_ZN17ActorProfileKeese6CreateEv kind:function(arm,size=0x24) addr:0x0211db2c +_ZN17ActorProfileKeeseC1Ev kind:function(arm,size=0x5c) addr:0x0211db50 +_ZN26ModelRender_ov032_02122568C1EP10G3d_Model_ kind:function(arm,size=0x34) addr:0x0211dbac +_ZN10ActorKeeseC1Ev kind:function(arm,size=0x20c) addr:0x0211dbe0 +_ZN26ModelRender_ov032_02122568D1Ev kind:function(arm,size=0x14) addr:0x0211ddec +_ZN14ActorKeese_284D1Ev kind:function(arm,size=0x14) addr:0x0211de00 +_ZN14ActorKeese_2ACC1EP10ActorKeese kind:function(arm,size=0x38) addr:0x0211de14 +_ZN14ActorKeese_2ACD1Ev kind:function(arm,size=0x1c) addr:0x0211de4c +_ZN14ActorKeese_2ACD0Ev kind:function(arm,size=0x24) addr:0x0211de68 +_ZN14ActorKeese_2AC8vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0x24) addr:0x0211de8c +_ZN14ActorKeese_2AC8vfunc_0CEPK24UnkStruct_ov031_020e54d4Pii kind:function(arm,size=0x144) addr:0x0211deb0 +_ZN10ActorKeese8vfunc_18Ei kind:function(arm,size=0xac) addr:0x0211dff4 +_ZN10ActorKeese19func_ov032_0211e0c0Ev kind:function(arm,size=0x14) addr:0x0211e0a0 +_ZN10ActorKeese19func_ov032_0211e0d4Esi kind:function(arm,size=0x234) addr:0x0211e0b4 +_ZN10ActorKeese19func_ov032_0211e308Ev kind:function(arm,size=0x78) addr:0x0211e2e8 +_ZN10ActorKeese19func_ov032_0211e380Ev kind:function(arm,size=0x8c) addr:0x0211e360 +_ZN10ActorKeese19func_ov032_0211e40cEv kind:function(arm,size=0x14) addr:0x0211e3ec +_ZN10ActorKeese8SetStateEs kind:function(arm,size=0x48) addr:0x0211e400 +_ZN10ActorKeese19func_ov032_0211e468Ev kind:function(arm,size=0x310) addr:0x0211e448 +_ZN10ActorKeese8vfunc_20Ev kind:function(arm,size=0x1b8) addr:0x0211e758 +_ZN10ActorKeese8vfunc_2CEi kind:function(arm,size=0xbc) addr:0x0211e910 +_ZN10ActorKeese19func_ov032_0211e9ecEv kind:function(arm,size=0x174) addr:0x0211e9cc +_ZN10ActorKeese19func_ov032_0211eb60Ev kind:function(arm,size=0x188) addr:0x0211eb40 +_ZN10ActorKeese19func_ov032_0211ece8Ev kind:function(arm,size=0x174) addr:0x0211ecc8 +_ZN10ActorKeese19func_ov032_0211ee5cEv kind:function(arm,size=0x1f8) addr:0x0211ee3c +_ZN10ActorKeese19func_ov032_0211f054Ev kind:function(arm,size=0x54) addr:0x0211f034 +_ZN10ActorKeese19func_ov032_0211f0a8Ev kind:function(arm,size=0x148) addr:0x0211f088 +_ZN10ActorKeese19func_ov032_0211f1f0Ev kind:function(arm,size=0x4) addr:0x0211f1d0 +_ZN10ActorKeese19func_ov032_0211f1f4Ev kind:function(arm,size=0x10c) addr:0x0211f1d4 +_ZN10ActorKeese19func_ov032_0211f300Ev kind:function(arm,size=0x10) addr:0x0211f2e0 +_ZN10ActorKeese19func_ov032_0211f310Ev kind:function(arm,size=0x9c) addr:0x0211f2f0 +_ZN10ActorKeese19func_ov032_0211f3acEv kind:function(arm,size=0x58) addr:0x0211f38c +_ZN10ActorKeese19func_ov032_0211f404Ev kind:function(arm,size=0xa0) addr:0x0211f3e4 +_ZN10ActorKeese19func_ov032_0211f4a4Ev kind:function(arm,size=0x68) addr:0x0211f484 +_ZN10ActorKeese19func_ov032_0211f50cEv kind:function(arm,size=0x54) addr:0x0211f4ec +_ZN10ActorKeese19func_ov032_0211f560Ev kind:function(arm,size=0x2c) addr:0x0211f540 +_ZN10ActorKeese19func_ov032_0211f58cEv kind:function(arm,size=0x78) addr:0x0211f56c +_ZN10ActorKeese19func_ov032_0211f604Ev kind:function(arm,size=0x10) addr:0x0211f5e4 +_ZN10ActorKeese19func_ov032_0211f614Ev kind:function(arm,size=0xa8) addr:0x0211f5f4 +_ZN10ActorKeese19func_ov032_0211f6bcEv kind:function(arm,size=0x148) addr:0x0211f69c +_ZN10ActorKeese19func_ov032_0211f804Ev kind:function(arm,size=0x138) addr:0x0211f7e4 +_ZN10ActorKeese19func_ov032_0211f93cEP7VecFx32i kind:function(arm,size=0x88) addr:0x0211f91c +_ZN10ActorKeese19func_ov032_0211f9c4Ev kind:function(arm,size=0x88) addr:0x0211f9a4 +_ZN10ActorKeese19func_ov032_0211fa4cEi kind:function(arm,size=0xa4) addr:0x0211fa2c +_ZN10ActorKeese19func_ov032_0211faf0EPvi kind:function(arm,size=0xac) addr:0x0211fad0 +_ZN24UnkStruct_ov032_0212251cC1Ev kind:function(arm,size=0x18) addr:0x0211fb7c +_ZN24UnkStruct_ov032_0212251c8vfunc_00EP9MapObject kind:function(arm,size=0x38) addr:0x0211fb94 +_ZN14ActorKeese_284C1Ev kind:function(arm,size=0x14) addr:0x0211fbcc +_ZN26ModelRender_ov032_02122568D0Ev kind:function(arm,size=0x1c) addr:0x0211fbe0 +_ZN10ActorKeeseD1Ev kind:function(arm,size=0xa4) addr:0x0211fbfc +_ZN10ActorKeeseD0Ev kind:function(arm,size=0xac) addr:0x0211fca0 +_ZN17ActorProfileKeeseD1Ev kind:function(arm,size=0x14) addr:0x0211fd4c _ZN19ActorProfileUnkNSSW10GetProfileEv kind:function(arm,size=0xc) addr:0x0211fd60 _ZN19ActorProfileUnkNSSW6CreateEv kind:function(arm,size=0x24) addr:0x0211fd6c _ZN19ActorProfileUnkNSSWC1Ev kind:function(arm,size=0x44) addr:0x0211fd90 @@ -216,20 +216,20 @@ _ZN19MapObjectUnkSWSW_40D0Ev kind:function(arm,size=0x1c) addr:0x02121e38 _ZN16MapObjectUnkSWSWD1Ev kind:function(arm,size=0x20) addr:0x02121e54 _ZN16MapObjectUnkSWSWD0Ev kind:function(arm,size=0x28) addr:0x02121e74 _ZN23MapObjectProfileUnkSWSWD1Ev kind:function(arm,size=0x14) addr:0x02121e9c -data_ov032_02121eb4 kind:data(any) addr:0x02121eb4 +data_ov032_02121ed4 kind:data(any) addr:0x02121eb4 data_ov032_02121ec4 kind:data(any) addr:0x02121ec4 -data_ov032_02121ed4 kind:data(any) addr:0x02121ed4 +data_ov032_02121ed4_usa kind:data(any) addr:0x02121ed4 data_ov032_02121ee4 kind:data(any) addr:0x02121ee4 data_ov032_02121ef4 kind:data(any) addr:0x02121ef4 data_ov032_02121f04 kind:data(any) addr:0x02121f04 __sinit_ActorSpinut.cpp kind:function(arm,size=0x6c) addr:0x02121f14 local __sinit_ActorFleeingSpinut.cpp kind:function(arm,size=0x80) addr:0x02121f80 local -__sinit_ActorUnkKETH.cpp kind:function(arm,size=0x6c) addr:0x02122000 local +__sinit_ActorKeese.cpp kind:function(arm,size=0x6c) addr:0x02122000 local __sinit_ActorUnkNSSW.cpp kind:function(arm,size=0x50) addr:0x0212206c local __sinit_MapObjectUnkSWSW.cpp kind:function(arm,size=0x50) addr:0x021220bc local .p__sinit_ActorSpinut.cpp kind:data(word) addr:0x0212210c local .p__sinit_ActorFleeingSpinut.cpp kind:data(word) addr:0x02122110 local -.p__sinit_ActorUnkKETH.cpp kind:data(word) addr:0x02122114 local +.p__sinit_ActorKeese.cpp kind:data(word) addr:0x02122114 local .p__sinit_ActorUnkNSSW.cpp kind:data(word) addr:0x02122118 local .p__sinit_MapObjectUnkSWSW.cpp kind:data(word) addr:0x0212211c local data_ov032_02122140 kind:data(any) addr:0x02122140 @@ -238,30 +238,29 @@ data_ov032_02122164 kind:data(any) addr:0x02122164 data_ov032_0212217c kind:data(any) addr:0x0212217c data_ov032_0212219c kind:data(any) addr:0x0212219c data_ov032_021221b8 kind:data(any) addr:0x021221b8 -data_ov032_021221dc kind:data(any) addr:0x021221dc -data_ov032_02122224 kind:data(any) addr:0x02122224 +_ZTV15ActorSpinut_1BC kind:data(any) addr:0x021221d4 +_ZTV15ActorSpinut_110 kind:data(any) addr:0x0212221c data_ov032_02122268 kind:data(any) addr:0x02122268 data_ov032_021222d0 kind:data(any) addr:0x021222d0 data_ov032_02122328 kind:data(any) addr:0x02122328 -data_ov032_021223a8 kind:data(any) addr:0x02122388 -data_ov032_021223b4 kind:data(any) addr:0x02122394 -data_ov032_021223cc kind:data(any) addr:0x021223ac -data_ov032_021223e4 kind:data(any) addr:0x021223c4 -data_ov032_0212241c kind:data(any) addr:0x021223fc +data_ov032_02122388 kind:data(any) addr:0x02122388 +data_ov032_02122394 kind:data(any) addr:0x02122394 +data_ov032_021223ac kind:data(any) addr:0x021223ac +data_ov032_021223c4 kind:data(any) addr:0x021223c4 +data_ov032_021223fc kind:data(any) addr:0x021223fc _ZTV25ActorProfileFleeingSpinut kind:data(any) addr:0x02122434 _ZTV18ActorFleeingSpinut kind:data(any) addr:0x02122458 -data_ov032_021224b8 kind:data(any) addr:0x021224b8 -data_ov032_021224c4 kind:data(any) addr:0x021224c4 -data_ov032_021224dc kind:data(any) addr:0x021224dc -data_ov032_021224fc kind:data(any) addr:0x021224fc -data_ov032_02122508 kind:data(any) addr:0x02122508 -data_ov032_02122524 kind:data(any) addr:0x02122524 -data_ov032_02122548 kind:data(any) addr:0x02122548 -data_ov032_0212256c kind:data(any) addr:0x0212256c -data_ov032_02122588 kind:data(any) addr:0x02122588 ambiguous -data_ov032_021225bc kind:data(any) addr:0x021225bc -data_ov032_02122614 kind:data(any) addr:0x02122614 -data_ov032_02122674 kind:data(any) addr:0x02122674 +data_ov032_021224d8 kind:data(any) addr:0x021224b8 +data_ov032_021224e4 kind:data(any) addr:0x021224c4 +data_ov032_021224fc kind:data(any) addr:0x021224dc +_ZTV24UnkStruct_ov032_0212251c kind:data(any) addr:0x021224f4 +_ZTV14ActorKeese_2AC kind:data(any) addr:0x02122500 +_ZTV17ActorProfileKeese kind:data(any) addr:0x0212251c +_ZTV26ModelRender_ov032_02122568 kind:data(any) addr:0x02122540 +data_ov032_0212258c kind:data(any) addr:0x0212256c +data_ov032_021225dc kind:data(any) addr:0x021225bc +_ZTV10ActorKeese kind:data(any) addr:0x0212260c +_ZTV19data_ov032_02122674 kind:data(any) addr:0x0212266c data_ov032_0212268c kind:data(any) addr:0x0212268c data_ov032_021226a8 kind:data(any) addr:0x021226a8 data_ov032_021226cc kind:data(any) addr:0x021226cc @@ -278,9 +277,9 @@ data_ov032_0212290c kind:bss addr:0x021228ec _ZGVN15ProfileInstanceI25ActorProfileFleeingSpinutE8sProfileE kind:bss addr:0x021228f8 @11142 kind:bss addr:0x02122904 local _ZN15ProfileInstanceI25ActorProfileFleeingSpinutE8sProfileE kind:bss addr:0x02122910 -_ZGVN15ProfileInstanceI19ActorProfileUnkKETHE8sProfileE kind:bss addr:0x02122954 +_ZGVN15ProfileInstanceI17ActorProfileKeeseE8sProfileE kind:bss addr:0x02122954 @11148 kind:bss addr:0x02122958 local -_ZN15ProfileInstanceI19ActorProfileUnkKETHE8sProfileE kind:bss addr:0x02122964 +_ZN15ProfileInstanceI17ActorProfileKeeseE8sProfileE kind:bss addr:0x02122964 _ZGVN15ProfileInstanceI19ActorProfileUnkNSSWE8sProfileE kind:bss addr:0x02122a3c @11154 kind:bss addr:0x02122a40 local _ZN15ProfileInstanceI19ActorProfileUnkNSSWE8sProfileE kind:bss addr:0x02122a4c diff --git a/config/usa/arm9/overlays/ov058/relocs.txt b/config/usa/arm9/overlays/ov058/relocs.txt index cf4fe7c5..8d828e80 100644 --- a/config/usa/arm9/overlays/ov058/relocs.txt +++ b/config/usa/arm9/overlays/ov058/relocs.txt @@ -2271,7 +2271,7 @@ from:0x02152a74 kind:arm_call to:0x02061628 module:overlay(0) from:0x02152a90 kind:arm_call to:0x0201bac4 module:main from:0x02152ab0 kind:arm_call to:0x020611bc module:overlay(0) from:0x02152abc kind:load to:0x02155de8 module:overlay(58) -from:0x02152ac0 kind:load to:0x02122588 module:overlays(32,33,36,37) +from:0x02152ac0 kind:load to:0x02122588 module:overlays(33,36,37) from:0x02152ac4 kind:load to:0x0204a068 module:main from:0x02152ad4 kind:arm_call to:0x0201baa4 module:main from:0x02152adc kind:arm_call to:0x020616a8 module:overlay(0) diff --git a/config/usa/arm9/overlays/ov063/symbols.txt b/config/usa/arm9/overlays/ov063/symbols.txt index 71c5634a..34390325 100644 --- a/config/usa/arm9/overlays/ov063/symbols.txt +++ b/config/usa/arm9/overlays/ov063/symbols.txt @@ -53,7 +53,7 @@ _ZN12ActorUnkCANS19func_ov063_0215a678EPS_P29UnkStruct_func_ov063_0215a678 kind: _ZN24UnkStruct_ov063_02162ea8C1Ev kind:function(arm,size=0x30) addr:0x0215a7b4 _ZN24UnkStruct_ov063_02162ea8D1Ev kind:function(arm,size=0x14) addr:0x0215a7e4 _ZN24UnkStruct_ov063_02162ea8D0Ev kind:function(arm,size=0x1c) addr:0x0215a7f8 -_ZN24UnkStruct_ov063_02162ea88vfunc_08EPK24UnkStruct_ov031_020f3310 kind:function(arm,size=0x4c) addr:0x0215a814 +_ZN24UnkStruct_ov063_02162ea88vfunc_08EPK24UnkStruct_ov031_020f3310i kind:function(arm,size=0x4c) addr:0x0215a814 _ZN24UnkStruct_ov063_02162ea88vfunc_0CEPK24UnkStruct_ov031_020e54d4Pii kind:function(arm,size=0xcc) addr:0x0215a860 _ZN24UnkStruct_ov063_02162f148vfunc_3CEv kind:function(arm,size=0x24) addr:0x0215a92c _ZN24UnkStruct_ov063_02162f148vfunc_38Eii kind:function(arm,size=0x2c) addr:0x0215a950 diff --git a/config/usa/arm9/symbols.txt b/config/usa/arm9/symbols.txt index 1a7252b0..ae97f5cf 100644 --- a/config/usa/arm9/symbols.txt +++ b/config/usa/arm9/symbols.txt @@ -849,7 +849,7 @@ func_02016d7c kind:function(arm,size=0xf8) addr:0x02016d54 func_02016e74 kind:function(arm,size=0x68) addr:0x02016e4c func_02016edc kind:function(arm,size=0xe0) addr:0x02016eb4 func_02016fbc kind:function(arm,size=0xf0) addr:0x02016f94 -func_020170ac kind:function(arm,size=0xac) addr:0x02017084 +_ZN24UnkStruct_ov032_0212251c13func_020170acEP7VecFx32 kind:function(arm,size=0xac) addr:0x02017084 func_02017158 kind:function(arm,size=0x38) addr:0x02017130 func_02017190 kind:function(arm,size=0x54) addr:0x02017168 _ZN9UnkResultC1Ev kind:function(arm,size=0x4c) addr:0x020171bc diff --git a/include/Actor/Actor.hpp b/include/Actor/Actor.hpp index 3b91114d..8c3abba0 100644 --- a/include/Actor/Actor.hpp +++ b/include/Actor/Actor.hpp @@ -239,6 +239,7 @@ public: void func_ov000_020989e0(); bool func_ov000_02098a60(unk32 param1); void func_ov000_02098a88(unk32 param1, unk32 param2); + void func_ov000_0209a008(unk32 param1, fx16 param2); u32 func_ov000_02098ab4(u8 param1, unk32 param2, unk32 param3, VecFx32 *param4); static void func_ov000_020973f4(ActorRef *pOutRef, UnkStruct_ov000_020b539c *param2, ActorId actorId, ActorParams *pParams, @@ -249,6 +250,8 @@ public: void func_ov017_020bef88(Actor_vfunc_30 *param1, void *param2, unk32 param3); void func_ov017_020bf3e0(unk32 param1, fx32 param2); void func_ov017_020bf5c4(VecFx32 *param1, unk32 param2, unk32 param3, unk32 param4, unk32 param5); + void func_ov017_020bf634(const VecFx32 *param1, u16 param2, unk32 param3); + void func_ov017_020bf688(); void func_ov017_020bf9c8(Actor *param1); void func_ov017_020bfa50(VecFx32 *param1, unk32 param2); void func_ov017_020bfb18(Actor_9C *param1); diff --git a/include/Actor/ActorBomb.hpp b/include/Actor/ActorBomb.hpp index df1e86cb..bfc69853 100644 --- a/include/Actor/ActorBomb.hpp +++ b/include/Actor/ActorBomb.hpp @@ -52,7 +52,7 @@ public: // data_ov031_02112c78 /* 00 */ virtual ~ActorBomb_180() override; - /* 08 */ virtual bool vfunc_08(const UnkStruct_ov031_020f3310 *param1) override; + /* 08 */ virtual bool vfunc_08(const UnkStruct_ov031_020f3310 *param1, unk32 param2) override; /* 0C */ virtual bool vfunc_0C(const UnkStruct_ov031_020e54d4 *param1, unk32 *param2, unk32 param3) override; /* 10 */ virtual bool vfunc_10(ActorRef param1, unk32 param2) override; }; @@ -64,7 +64,7 @@ public: /* 08 */ // data_ov031_02112cb0 - /* 08 */ virtual bool vfunc_08(const UnkStruct_ov031_020f3310 *param1) override; + /* 08 */ virtual bool vfunc_08(const UnkStruct_ov031_020f3310 *param1, unk32 param2) override; }; class ActorBomb : public Actor { diff --git a/include/Actor/ActorItemBoomerang.hpp b/include/Actor/ActorItemBoomerang.hpp index 266d271d..4f534ea7 100644 --- a/include/Actor/ActorItemBoomerang.hpp +++ b/include/Actor/ActorItemBoomerang.hpp @@ -35,7 +35,7 @@ public: ActorItemBoomerang_11C(ActorItemBoomerang *param1); /* 00 */ virtual ~ActorItemBoomerang_11C() override; - /* 08 */ virtual bool vfunc_08(const UnkStruct_ov031_020f3310 *param1) override; + /* 08 */ virtual bool vfunc_08(const UnkStruct_ov031_020f3310 *param1, unk32 param2) override; /* 0C */ virtual bool vfunc_0C(const UnkStruct_ov031_020e54d4 *param1, unk32 *param2, unk32 param3) override; }; diff --git a/include/Actor/ActorItemTornado.hpp b/include/Actor/ActorItemTornado.hpp index 91bb657c..b3e7bd27 100644 --- a/include/Actor/ActorItemTornado.hpp +++ b/include/Actor/ActorItemTornado.hpp @@ -9,7 +9,7 @@ class UnkStruct_ov031_02112ff4 : public UnkStruct_ov031_Items_00 { public: // data_ov031_02112ff4 - /* 08 */ virtual bool vfunc_08(const UnkStruct_ov031_020f3310 *param1); + /* 08 */ virtual bool vfunc_08(const UnkStruct_ov031_020f3310 *param1, unk32 param2); /* 0C */ virtual bool vfunc_0C(const UnkStruct_ov031_020e54d4 *param1, unk32 param2); }; diff --git a/include/Actor/ActorKeese.hpp b/include/Actor/ActorKeese.hpp new file mode 100644 index 00000000..d66bca8c --- /dev/null +++ b/include/Actor/ActorKeese.hpp @@ -0,0 +1,166 @@ +#pragma once + +#include "Actor/Actor.hpp" +#include "Actor/ActorProfile.hpp" +#include "ActorSpinut.hpp" +#include "Map/MapObjectId.hpp" +#include "global.h" +#include "types.h" + +enum ActorKeeseState_ { + ActorKeeseState_0 = 0, + ActorKeeseState_1 = 1, + ActorKeeseState_2 = 2, + ActorKeeseState_3 = 3, + ActorKeeseState_4 = 4, + ActorKeeseState_5 = 5, + ActorKeeseState_6 = 6, + ActorKeeseState_7 = 7, + ActorKeeseState_8 = 8, + ActorKeeseState_9 = 9, + ActorKeeseState_Max +}; + +class ActorKeese; +class UnkStruct_ov000_020b34c4 { +public: + /* 00 (vtable) */ + /* 04 */ MapObjectId mUnk_04; + /* 08 */ + + UnkStruct_ov000_020b34c4(MapObjectId param1) : + mUnk_04(param1) {} + + // data_ov000_020b34c4 + /* 00 */ virtual bool vfunc_00(MapObject *param1); +}; + +class UnkStruct_ov032_0212251c : public UnkStruct_ov000_020b34c4 { +public: + /* 00 (base) */ + /* 08 */ + + UnkStruct_ov032_0212251c(); + + // data_ov032_0212251c + /* 00 */ virtual bool vfunc_00(MapObject *param1) override; + + VecFx32 *func_020170ac(VecFx32 *param1); +}; + +class ActorKeese_2AC : public UnkStruct_ov031_Items_00 { +public: + /* 00 (base) */ + /* 04 */ STRUCT_PAD(0x04, 0x08); + /* 08 */ ActorKeese *mUnk_08; + /* 0C */ VecFx32 mUnk_0C; + /* 18 */ + + ActorKeese_2AC(ActorKeese *param1); + + // data_ov032_02122528 + /* 00 */ virtual ~ActorKeese_2AC() override; + /* 08 */ virtual bool vfunc_08(const UnkStruct_ov031_020f3310 *param1, unk32 param2) override; + /* 0C */ virtual bool vfunc_0C(const UnkStruct_ov031_020e54d4 *param1, unk32 *param2, unk32 param3) override; +}; + +class ModelRender_ov032_02122568 : public UnkStruct_ov000_020b3268 { +public: + /* 00 (base) */ + /* 60 */ STRUCT_PAD(0x60, 0x6C); + /* 6C */ unk32 mUnk_6C; + /* 70 */ + + ModelRender_ov032_02122568(G3d_Model *pModel); + + // data_ov032_02122568 +}; + +class ActorKeese_284 : public UnkSystem7 { +public: + /* 00 (base) */ + /* 04 */ unk32 mUnk_04; + /* 04 */ unk32 mUnk_08; + /* 0C */ + + ActorKeese_284(); +}; + +class ActorKeese : public Actor_Derived2 { +public: + /* 000 (base) */ + /* 0B0 */ ModelRender_ov032_02122568 mUnk_0B0; + /* 120 */ ActorSpinut_110 mUnk_120; + /* 1B0 */ STRUCT_PAD(0x1B0, 0x1CC); + /* 1CC */ ActorSpinut_1BC mUnk_1CC; + /* 20C */ STRUCT_PAD(0x20C, 0x228); + /* 228 */ unk16 mUnk_228; + /* 22A */ unk16 mUnk_22A; + /* 22C */ Actor_Derived1_EC mUnk_22C; + /* 244 */ unk16 mUnk_244; + /* 246 */ unk16 mUnk_246; + /* 248 */ Actor_9C mUnk_248; + /* 268 */ UnkStruct_ActorUnkCANS_224 mUnk_268; + /* 278 */ UnkSystem7 mUnk_278; + /* 27C */ unk32 mUnk_27C; + /* 280 */ unk32 mUnk_280; + /* 284 */ ActorKeese_284 mUnk_284[0x2]; + /* 29C */ fx32 mUnk_29C; + /* 2A0 */ fx32 mUnk_2A0; + /* 2A4 */ unk32 mUnk_2A4; + /* 2A8 */ fx16 mUnk_2A8; + /* 2AC */ ActorKeese_2AC mUnk_2AC; + /* 2C4 */ VecFx32 mUnk_2C4; + /* 2D0 */ Actor_38 *mUnk_2D0; + /* 2D4 */ ActorRef mUnk_2D4; + /* 2D8 */ + + ActorKeese(); + + /* 18 */ virtual bool vfunc_18(unk32 param1) override; + /* 20 */ virtual void vfunc_20() override; + /* 2C */ virtual void vfunc_2C(unk32 param1) override; + + void func_ov032_0211e0c0(); + void func_ov032_0211e0d4(s16 param1, unk32 param2); + void func_ov032_0211e308(); + void func_ov032_0211e380(); + void func_ov032_0211e40c(); + void SetState(ActorState state); + void func_ov032_0211e468(); + void func_ov032_0211e9ec(); + void func_ov032_0211eb60(); + void func_ov032_0211ece8(); + void func_ov032_0211ee5c(); + void func_ov032_0211f054(); + void func_ov032_0211f0a8(); + void func_ov032_0211f1f0(); + void func_ov032_0211f1f4(); + void func_ov032_0211f300(); + void func_ov032_0211f310(); + void func_ov032_0211f3ac(); + void func_ov032_0211f404(); + void func_ov032_0211f4a4(); + void func_ov032_0211f50c(); + void func_ov032_0211f560(); + void func_ov032_0211f58c(); + void func_ov032_0211f604(); + void func_ov032_0211f614(); + void func_ov032_0211f6bc(); + void func_ov032_0211f804(); + bool func_ov032_0211f93c(VecFx32 *param1, unk32 param2); + bool func_ov032_0211f9c4(); + bool func_ov032_0211fa4c(unk32 param1); + static void func_ov032_0211faf0(void *param1, unk32 param2); +}; + +class ActorProfileKeese : public ActorProfile_Derived1 { +public: + /* 00 (base) */ + + ActorProfileKeese(); + + /* 0C */ virtual Actor *Create(); + + static ActorProfileKeese *GetProfile(); +}; diff --git a/include/Actor/ActorShotArrow.hpp b/include/Actor/ActorShotArrow.hpp index fd6a6f6f..af9d7e69 100644 --- a/include/Actor/ActorShotArrow.hpp +++ b/include/Actor/ActorShotArrow.hpp @@ -49,7 +49,7 @@ public: // data_ov031_02114288 /* 00 */ virtual ~ActorShotArrow_178() override; - /* 08 */ virtual bool vfunc_08(const UnkStruct_ov031_020f3310 *param1) override; + /* 08 */ virtual bool vfunc_08(const UnkStruct_ov031_020f3310 *param1, unk32 param2) override; /* 0C */ virtual bool vfunc_0C(const UnkStruct_ov031_020e54d4 *param1, unk32 *param2, unk32 param3) override; void func_ov031_020f3304(); diff --git a/include/Actor/ActorSpinut.hpp b/include/Actor/ActorSpinut.hpp index 44675935..c583b272 100644 --- a/include/Actor/ActorSpinut.hpp +++ b/include/Actor/ActorSpinut.hpp @@ -42,7 +42,7 @@ public: // data_ov032_021221bc /* 00 */ virtual ~ActorSpinut_268(); - /* 08 */ virtual bool vfunc_08(const UnkStruct_ov031_020f3310 *param1) override; + /* 08 */ virtual bool vfunc_08(const UnkStruct_ov031_020f3310 *param1, unk32 param2) override; }; class ActorSpinut_110 : public UnkStruct_ov000_020b31f0 { diff --git a/include/Actor/ActorTable.inl b/include/Actor/ActorTable.inl index f4cf5c59..e8c334a3 100644 --- a/include/Actor/ActorTable.inl +++ b/include/Actor/ActorTable.inl @@ -188,7 +188,7 @@ DEFINE_ACTOR_TYPE('ITTD', ItemTornado) DEFINE_ACTOR_TYPE('ITWP', ITWP) DEFINE_ACTOR_TYPE('IWTS', IWTS) DEFINE_ACTOR_TYPE('JOLN', JOLN) -DEFINE_ACTOR_TYPE('KETH', KETH) +DEFINE_ACTOR_TYPE('KETH', Keese) DEFINE_ACTOR_TYPE('KEYB', KEYB) DEFINE_ACTOR_TYPE('KEYN', KEYN) DEFINE_ACTOR_TYPE('KEYT', KEYT) diff --git a/include/Actor/ActorUnkCANS.hpp b/include/Actor/ActorUnkCANS.hpp index 104931d8..b9ca41f6 100644 --- a/include/Actor/ActorUnkCANS.hpp +++ b/include/Actor/ActorUnkCANS.hpp @@ -41,7 +41,7 @@ public: UnkStruct_ov063_02162ea8(); /* 00 */ virtual ~UnkStruct_ov063_02162ea8(); - /* 08 */ virtual bool vfunc_08(const UnkStruct_ov031_020f3310 *param1) override; + /* 08 */ virtual bool vfunc_08(const UnkStruct_ov031_020f3310 *param1, unk32 param2) override; /* 0C */ virtual bool vfunc_0C(const UnkStruct_ov031_020e54d4 *param1, unk32 *param2, unk32 param3) override; }; diff --git a/include/Actor/ActorUnkKETH.hpp b/include/Actor/ActorUnkKETH.hpp deleted file mode 100644 index fd200873..00000000 --- a/include/Actor/ActorUnkKETH.hpp +++ /dev/null @@ -1,87 +0,0 @@ -//! TODO: This file was generated automatically and might contain errors - -#pragma once - -#include "Actor/Actor.hpp" -#include "Actor/ActorProfile.hpp" -#include "global.h" -#include "types.h" - -class ActorUnkKETH_C4 : public Actor_C4 { -public: - ActorUnkKETH_C4(Actor *param1); - - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; - /* 04 */ virtual bool vfunc_04() override; - /* 08 */ virtual void vfunc_08() override; - /* 0C */ virtual void vfunc_0C(unk32 param1) override; -}; - -class ActorUnkKETH : public Actor { -public: - /* 00 (base) */ - /* 94 */ - - ActorUnkKETH(); - - /* 4C */ virtual ~ActorUnkKETH() override; - - void func_ov032_0211dbcc(void); - void func_ov032_0211de0c(void); - void func_ov032_0211de20(void); - void func_ov032_0211de34(void); - void func_ov032_0211deac(void); - void func_ov032_0211ded0(void); - void func_ov032_0211e014(void); - void func_ov032_0211e0c0(void); - void func_ov032_0211e0d4(void); - void func_ov032_0211e308(void); - void func_ov032_0211e380(void); - void func_ov032_0211e40c(void); - void func_ov032_0211e420(void); - void func_ov032_0211e468(void); - void func_ov032_0211e778(void); - void func_ov032_0211e930(void); - void func_ov032_0211e9ec(void); - void func_ov032_0211eb60(void); - void func_ov032_0211ece8(void); - void func_ov032_0211ee5c(void); - void func_ov032_0211f054(void); - void func_ov032_0211f0a8(void); - void func_ov032_0211f1f0(void); - void func_ov032_0211f1f4(void); - void func_ov032_0211f300(void); - void func_ov032_0211f310(void); - void func_ov032_0211f3ac(void); - void func_ov032_0211f404(void); - void func_ov032_0211f4a4(void); - void func_ov032_0211f50c(void); - void func_ov032_0211f560(void); - void func_ov032_0211f58c(void); - void func_ov032_0211f604(void); - void func_ov032_0211f614(void); - void func_ov032_0211f6bc(void); - void func_ov032_0211f804(void); - void func_ov032_0211f93c(void); - void func_ov032_0211f9c4(void); - void func_ov032_0211fa4c(void); - void func_ov032_0211faf0(void); - void func_ov032_0211fb9c(void); - void func_ov032_0211fbb4(void); - void func_ov032_0211fbec(void); - void func_ov032_0211fc00(void); - void func_ov032_0211fc1c(void); - void func_ov032_0211fcc0(void); -}; - -class ActorProfileUnkKETH : public ActorProfile_Derived1 { -public: - /* 00 (base) */ - - ActorProfileUnkKETH(); - ~ActorProfileUnkKETH(); - - /* 0C */ virtual Actor *Create(); - - static ActorProfileUnkKETH *GetProfile(); -}; diff --git a/include/Actor/ActorUnkSWBM.hpp b/include/Actor/ActorUnkSWBM.hpp index be7f44f3..ccb6acaf 100644 --- a/include/Actor/ActorUnkSWBM.hpp +++ b/include/Actor/ActorUnkSWBM.hpp @@ -20,7 +20,7 @@ public: /* 04 */ // data_ov031_02113148 - /* 08 */ virtual bool vfunc_08(const UnkStruct_ov031_020f3310 *param1) override; + /* 08 */ virtual bool vfunc_08(const UnkStruct_ov031_020f3310 *param1, unk32 param2) override; /* 0C */ virtual bool vfunc_0C(const UnkStruct_ov031_020e54d4 *param1, unk32 *param2, unk32 param3) override; }; diff --git a/include/Render/ModelRender.hpp b/include/Render/ModelRender.hpp index bb4eb711..7c866566 100644 --- a/include/Render/ModelRender.hpp +++ b/include/Render/ModelRender.hpp @@ -58,7 +58,7 @@ public: /* 1C */ void func_01ffc634(VecFx32 *param1, UnkAngleStruct param2, VecFx32 *param3); - void func_01ffc6d4(UnkAngleStruct angleStruct, VecFx32 *pos); + VecFx32 *func_01ffc6d4(UnkAngleStruct angleStruct, VecFx32 *pos); void func_ov000_02057cb0(); unk32 func_ov000_02057f18(const void *param1); diff --git a/include/Unknown/UnkStruct_027e0cd8.hpp b/include/Unknown/UnkStruct_027e0cd8.hpp index 63e8b509..7f9e2580 100644 --- a/include/Unknown/UnkStruct_027e0cd8.hpp +++ b/include/Unknown/UnkStruct_027e0cd8.hpp @@ -4,8 +4,6 @@ #include "math.hpp" #include "types.h" -#include "Actor/Actor.hpp" -#include "MapObject/MapObjectManager.hpp" #include "Render/ModelRender.hpp" #include "Save/SaveFile.hpp" #include "Unknown/Common.hpp" @@ -13,7 +11,6 @@ #include "Unknown/UnkStruct_027e09a4.hpp" #include "profile.hpp" -#include #include class MapObject_20; diff --git a/include/Unknown/UnkStruct_027e0ce0.hpp b/include/Unknown/UnkStruct_027e0ce0.hpp index 8cf87b62..96cccc01 100644 --- a/include/Unknown/UnkStruct_027e0ce0.hpp +++ b/include/Unknown/UnkStruct_027e0ce0.hpp @@ -305,7 +305,7 @@ public: // data_ov000_020b2838 /* 00 */ virtual ~UnkStruct_027e0ce0_38_Base(); - /* 08 */ virtual bool vfunc_08(const UnkStruct_ov031_020f3310 *param1); + /* 08 */ virtual bool vfunc_08(const UnkStruct_ov031_020f3310 *param1, unk32 param2); /* 0C */ virtual bool vfunc_0C(const UnkStruct_ov031_020e54d4 *param1, unk32 *param2, unk32 param3); /* 10 */ virtual bool vfunc_10(ActorRef param1, unk32 param2); /* 14 */ diff --git a/include/Unknown/UnkStruct_ov000_020b19f0.hpp b/include/Unknown/UnkStruct_ov000_020b19f0.hpp index 9df2818f..bc9f5221 100644 --- a/include/Unknown/UnkStruct_ov000_020b19f0.hpp +++ b/include/Unknown/UnkStruct_ov000_020b19f0.hpp @@ -4,6 +4,9 @@ class UnkStruct_ov000_020b19f0 : public ModelRender_ov000_020b4d64 { public: + /* 00 (base) */ + /* 60 */ + UnkStruct_ov000_020b19f0(G3d_Model *pModel); /* 0C */ virtual void vfunc_0C() override; diff --git a/include/Unknown/UnkStruct_ov031_Items.hpp b/include/Unknown/UnkStruct_ov031_Items.hpp index 57c87049..12601743 100644 --- a/include/Unknown/UnkStruct_ov031_Items.hpp +++ b/include/Unknown/UnkStruct_ov031_Items.hpp @@ -21,7 +21,7 @@ public: UnkStruct_ov031_Items_00(); // data_ov000_020b30d0 - /* 08 */ virtual bool vfunc_08(const UnkStruct_ov031_020f3310 *param1) override; // func_ov000_020982d8 + /* 08 */ virtual bool vfunc_08(const UnkStruct_ov031_020f3310 *param1, unk32 param2) override; // func_ov000_020982d8 }; class UnkStruct_ov031_Items_01_Base { diff --git a/src/001_SceneInit/Player/PlayerLinkActor_001.cpp b/src/001_SceneInit/Player/PlayerLinkActor_001.cpp index eda28cea..b8cb7c16 100644 --- a/src/001_SceneInit/Player/PlayerLinkActor_001.cpp +++ b/src/001_SceneInit/Player/PlayerLinkActor_001.cpp @@ -3,6 +3,7 @@ #include "System/SysNew.hpp" #include "Unknown/UnkStruct_027e09a4.hpp" #include "Unknown/UnkStruct_027e0cd8.hpp" +#include "Unknown/UnkStruct_027e0ce0.hpp" #include "Unknown/UnkStruct_027e0d34.hpp" PlayerLinkActor::PlayerLinkActor(unk32 param1, ItemManager *pItemMgr, UnkStruct_027e0ce0_40 *param3, diff --git a/src/001_SceneInit/UnkStruct_027e0cd8_001.cpp b/src/001_SceneInit/UnkStruct_027e0cd8_001.cpp index 3aa38a14..e225b381 100644 --- a/src/001_SceneInit/UnkStruct_027e0cd8_001.cpp +++ b/src/001_SceneInit/UnkStruct_027e0cd8_001.cpp @@ -1,4 +1,5 @@ #include "Actor/ActorManager.hpp" +#include "MapObject/MapObjectManager.hpp" #include "Save/SaveManager.hpp" #include "System/OverlayManager.hpp" #include "System/SysNew.hpp" diff --git a/src/031_Land/Actor/ActorBomb.cpp b/src/031_Land/Actor/ActorBomb.cpp index eba3445e..9e65f145 100644 --- a/src/031_Land/Actor/ActorBomb.cpp +++ b/src/031_Land/Actor/ActorBomb.cpp @@ -839,13 +839,13 @@ ActorBomb_180::~ActorBomb_180() { } // non-matching (wrong instruction in condition) -bool ActorBomb_180::vfunc_08(const UnkStruct_ov031_020f3310 *param1) { +bool ActorBomb_180::vfunc_08(const UnkStruct_ov031_020f3310 *param1, unk32 param2) { if (((((u32) param1->mUnk_04->mUnk_24[param1->mUnk_00->mUnk_06]) >> 0x19) & 1) == 1) { return false; } VecFx16_Copy2VecFx32(¶m1->mUnk_08, &this->mUnk_0C); - return this->UnkStruct_ov031_Items_00::vfunc_08(param1); + return this->UnkStruct_ov031_Items_00::vfunc_08(param1, param2); } // non-matching @@ -864,11 +864,11 @@ bool ActorBomb_180::vfunc_10(ActorRef param1, unk32 param2) { } // non-matching (unreachable code ?) -bool ActorBomb_ov031_020e2134::vfunc_08(const UnkStruct_ov031_020f3310 *param1) { +bool ActorBomb_ov031_020e2134::vfunc_08(const UnkStruct_ov031_020f3310 *param1, unk32 param2) { if ((((u32) param1->mUnk_04->mUnk_24[param1->mUnk_00->mUnk_06] >> 0x9) & 0x7) == 0xA) { return false; } - return this->UnkStruct_ov031_Items_00::vfunc_08(param1); + return this->UnkStruct_ov031_Items_00::vfunc_08(param1, param2); } ActorBomb_19C::ActorBomb_19C(Actor *param1) : diff --git a/src/031_Land/Actor/ActorItemBoomerang.cpp b/src/031_Land/Actor/ActorItemBoomerang.cpp index 847af3a5..c4d1c6c6 100644 --- a/src/031_Land/Actor/ActorItemBoomerang.cpp +++ b/src/031_Land/Actor/ActorItemBoomerang.cpp @@ -1,5 +1,6 @@ #include "Actor/ActorItemBoomerang.hpp" +#include "MapObject/MapObjectManager.hpp" #include "MapObject/MapObjectUnkICEB.hpp" #include "System/SysNew.hpp" #include "Unknown/UnkStruct_027e09a8.hpp" @@ -17,7 +18,6 @@ extern "C" unk32 func_01ffb9cc(VecFx32 *, VecFx32 *); extern "C" void func_01ffe6c4(Actor **, ActorRef, VecFx32 *, VecFx32 *, s32, VecFx32 *, UnkStruct_ov031_Items_00 *); extern "C" void func_01ffedac(Vec2bCpp *, VecFx32 *); extern "C" bool func_ov000_0205aeac(); -extern "C" bool func_ov000_020982d8(); DECL_PROFILE(ActorProfileItemBoomerang); @@ -103,7 +103,7 @@ void ActorItemBoomerang::vfunc_20() { bool var2 = false; switch (this->mState) { - case ActorItemBoomerangState_0: + case ActorItemBoomerangState_0: { this->mUnk_A0.mUnk_0C.Init(this->mPos.x, this->mPos.y, this->mPos.z, FLOAT_TO_FX32(0.3f)); data_027e09c0->func_ov000_0207e58c(this->mRef, 0xC, 0x8, &this->mUnk_A0); @@ -175,7 +175,9 @@ void ActorItemBoomerang::vfunc_20() { } this->func_ov031_020e49b0(0x8D70); break; - case ActorItemBoomerangState_1: + } + + case ActorItemBoomerangState_1: { this->mUnk_A0.mUnk_0C.Init(this->mPos.x, this->mPos.y, this->mPos.z, FLOAT_TO_FX32(0.3f)); data_027e09c0->func_ov000_0207e58c(this->mRef, 0xC, 0x8, &this->mUnk_A0); @@ -224,6 +226,8 @@ void ActorItemBoomerang::vfunc_20() { func_01ff97c8(&sp48, 0x200); VecFx32_Add(&this->mVel, &sp48, &this->mVel); break; + } + default: break; } @@ -354,14 +358,14 @@ ActorItemBoomerang_11C::ActorItemBoomerang_11C(ActorItemBoomerang *param1) : ActorItemBoomerang_11C::~ActorItemBoomerang_11C() {} // non-matching -bool ActorItemBoomerang_11C::vfunc_08(const UnkStruct_ov031_020f3310 *param1) { +bool ActorItemBoomerang_11C::vfunc_08(const UnkStruct_ov031_020f3310 *param1, unk32 param2) { u32 var = param1->mUnk_04->mUnk_24[param1->mUnk_00->mUnk_06]; if (((var >> 0x18) & 1) == 1) { return false; } - return func_ov000_020982d8(); + return this->UnkStruct_ov031_Items_00::vfunc_08(param1, param2); } bool ActorItemBoomerang_11C::vfunc_0C(const UnkStruct_ov031_020e54d4 *param1, unk32 *param2, unk32 param3) { diff --git a/src/031_Land/Actor/ActorShotArrow.cpp b/src/031_Land/Actor/ActorShotArrow.cpp index 1bbbbd0e..b4b48d63 100644 --- a/src/031_Land/Actor/ActorShotArrow.cpp +++ b/src/031_Land/Actor/ActorShotArrow.cpp @@ -964,7 +964,7 @@ void ActorShotArrow_178::func_ov031_020f3304() { } // non-matching -bool ActorShotArrow_178::vfunc_08(const UnkStruct_ov031_020f3310 *param1) { +bool ActorShotArrow_178::vfunc_08(const UnkStruct_ov031_020f3310 *param1, unk32 param2) { u32 var = param1->mUnk_04->mUnk_24[param1->mUnk_00->mUnk_06]; if ((var >> 0x17 & 1) == 1) { diff --git a/src/031_Land/Actor/ActorUnkSKDO.cpp b/src/031_Land/Actor/ActorUnkSKDO.cpp index 7f4f3c2d..54fda5a2 100644 --- a/src/031_Land/Actor/ActorUnkSKDO.cpp +++ b/src/031_Land/Actor/ActorUnkSKDO.cpp @@ -5,7 +5,6 @@ #include "System/SysNew.hpp" #include "Unknown/UnkStruct_ov000_020b34c4.hpp" -extern "C" bool func_ov000_0209c348(); extern "C" fx32 func_01ffb9cc(VecFx32 *, VecFx32 *); DECL_PROFILE(ActorProfileUnkSKDO); @@ -49,7 +48,7 @@ void ActorUnkSKDO::vfunc_54(unk32 param1) { } bool ActorUnkSKDO_ov031_02115ce8::vfunc_00(MapObject *param1) { - if (func_ov000_0209c348()) { + if (this->UnkStruct_ov000_020b34c4::vfunc_00(param1)) { if (func_01ffb9cc(¶m1->mPos, &this->mUnk_08) < this->mUnk_14) { return true; } diff --git a/src/031_Land/Actor/ActorUnkSWBM.cpp b/src/031_Land/Actor/ActorUnkSWBM.cpp index 83bfb0fd..f902c0b5 100644 --- a/src/031_Land/Actor/ActorUnkSWBM.cpp +++ b/src/031_Land/Actor/ActorUnkSWBM.cpp @@ -22,7 +22,7 @@ extern "C" void FlushGfxQueue(); static const Cylinder data_ov031_02113114(FLOAT_TO_FX32(0.0f), FLOAT_TO_FX32(0.0f), FLOAT_TO_FX32(0.0f), FLOAT_TO_FX32(0.35f)); // non-matching -bool ActorUnkSWBM_94::vfunc_08(const UnkStruct_ov031_020f3310 *param1) { +bool ActorUnkSWBM_94::vfunc_08(const UnkStruct_ov031_020f3310 *param1, unk32 param2) { return (((u32) param1->mUnk_04->mUnk_24[param1->mUnk_00->mUnk_06] >> 0x16) & 0x1) != 0x1; } diff --git a/src/031_Land/MapObject/MapObjectChestBase.cpp b/src/031_Land/MapObject/MapObjectChestBase.cpp index 6cc84aa9..830bb882 100644 --- a/src/031_Land/MapObject/MapObjectChestBase.cpp +++ b/src/031_Land/MapObject/MapObjectChestBase.cpp @@ -1,4 +1,6 @@ #include "MapObject/MapObjectChestBase.hpp" + +#include "MapObject/MapObjectManager.hpp" #include "Unknown/UnkStruct_027e09a8.hpp" #include "Unknown/UnkStruct_027e0cd8.hpp" #include "Unknown/UnkStruct_027e0ce0.hpp" diff --git a/src/032_MapA1/Actor/ActorKeese.cpp b/src/032_MapA1/Actor/ActorKeese.cpp new file mode 100644 index 00000000..abbc4902 --- /dev/null +++ b/src/032_MapA1/Actor/ActorKeese.cpp @@ -0,0 +1,691 @@ +#define VECFX32_CTORS + +#include "Actor/ActorKeese.hpp" + +#include "Actor/ActorManager.hpp" +#include "Map/MapObjectId.hpp" +#include "MapObject/MapObjectUnkSKDI.hpp" +#include "System/Random.hpp" +#include "System/SysNew.hpp" +#include "Unknown/UnkStruct_027e09a8.hpp" +#include "Unknown/UnkStruct_027e09b4.hpp" +#include "Unknown/UnkStruct_027e0cd8.hpp" +#include "Unknown/UnkStruct_027e0cec.hpp" + +extern "C" u16 data_ov000_020aecf0[]; +extern "C" u16 data_ov000_020aecf4[]; +extern "C" unk32 data_ov000_020aecf8; +extern "C" unk32 data_ov000_020aecfc[]; + +extern "C" void *data_ov032_02121ed4; + +extern "C" bool func_01ff916c(fx32 *, unk32, unk32); +extern "C" unk32 func_01ff9258(fx32, fx32); +extern "C" fx16 func_01ffbbe0(fx32, fx32); +extern "C" void func_01fff05c(u32 *, UnkStruct_027e0cd8_0C_Base *, VecFx32 *); +extern "C" bool func_02016b8c(VecFx32 *, VecFx32 *, unk32, UnkAngleStruct, unk32, unk32); + +extern "C" s8 func_ov000_02059da4(UnkStruct_027e0960_TableEntry *, VecFx32 *param1); + +static const VecFx32 data_ov032_021224d8(FLOAT_TO_FX32(1.7f), FLOAT_TO_FX32(0.5f), FLOAT_TO_FX32(1.7f)); +static ActorUnkZLSL_AnimationTag data_ov032_021224e4 = {.index = 0, .name = "fly"}; +static ActorUnkZLSL_AnimationTag data_ov032_021224fc = {.index = 0, .name = "keeth", .unknown = 1}; +static PTMF data_ov032_0212258c[ActorKeeseState_Max] = { + ActorKeese::func_ov032_0211e9ec, // ActorKeeseState_0 + ActorKeese::func_ov032_0211ece8, // ActorKeeseState_1 + ActorKeese::func_ov032_0211f1f0, // ActorKeeseState_2 + ActorKeese::func_ov032_0211f054, // ActorKeeseState_3 + ActorKeese::func_ov032_0211f300, // ActorKeeseState_4 + ActorKeese::func_ov032_0211f3ac, // ActorKeeseState_5 + ActorKeese::func_ov032_0211f4a4, // ActorKeeseState_6 + ActorKeese::func_ov032_0211f560, // ActorKeeseState_7 + ActorKeese::func_ov032_0211f604, // ActorKeeseState_8 + ActorKeese::func_ov032_0211f6bc, // ActorKeeseState_9 +}; +static PTMF data_ov032_021225dc[ActorKeeseState_Max] = { + ActorKeese::func_ov032_0211eb60, // ActorKeeseState_0 + ActorKeese::func_ov032_0211ee5c, // ActorKeeseState_1 + ActorKeese::func_ov032_0211f1f4, // ActorKeeseState_2 + ActorKeese::func_ov032_0211f0a8, // ActorKeeseState_3 + ActorKeese::func_ov032_0211f310, // ActorKeeseState_4 + ActorKeese::func_ov032_0211f404, // ActorKeeseState_5 + ActorKeese::func_ov032_0211f50c, // ActorKeeseState_6 + ActorKeese::func_ov032_0211f58c, // ActorKeeseState_7 + ActorKeese::func_ov032_0211f614, // ActorKeeseState_8 + ActorKeese::func_ov032_0211f804, // ActorKeeseState_9 +}; + +DECL_PROFILE(ActorProfileKeese); + +Actor *ActorProfileKeese::Create() { + return new(HeapIndex_2) ActorKeese(); +} + +ActorProfileKeese::ActorProfileKeese() : + ActorProfile_Derived1(ActorId_Keese) { + this->mUnk_04.Init(FLOAT_TO_FX32(0.4f)); + + this->vfunc_04()->mUnk_15 = 0x1; +} + +ModelRender_ov032_02122568::ModelRender_ov032_02122568(G3d_Model *pModel) : + UnkStruct_ov000_020b3268(pModel), + mUnk_6C(this->ModelRenderBase::func_ov000_02057f18(&data_ov032_02121ed4)) {} + +// non-matching last instruction order +ActorKeese::ActorKeese() : + mUnk_0B0(G3d_GetModelPtr(GET_PROFILE(ActorProfileKeese)->vfunc_04()->mUnk_50)), + mUnk_120(&this->mUnk_0B0, GET_PROFILE(ActorProfileKeese)->vfunc_04()), + mUnk_1CC(&this->mUnk_0B0, GET_PROFILE(ActorProfileKeese)->vfunc_04()), + mUnk_228(0x0), + mUnk_22A(0x0), + mUnk_244(0x0), + mUnk_246(0x0), + mUnk_278(NULL), + mUnk_27C(-0x1), + mUnk_280(0x0), + mUnk_29C(0x0), + mUnk_2A0(0x0), + mUnk_2A4(0x0), + mUnk_2A8(0x0), + mUnk_2AC(this), + mUnk_2C4(FLOAT_TO_FX32(0.0f), FLOAT_TO_FX32(0.0f), FLOAT_TO_FX32(0.0f)), + mUnk_2D0(NULL), + mUnk_2D4(0x0) { + this->Actor::func_ov000_0209862c(0x4); + + SET_FLAGS(this->mFlags, ActorFlag_6, ActorFlag_9); + *(s16 *) &this->mUnk_44 &= ~0x20; + + this->mUnk_A4 = &data_ov032_021224d8; +} + +ActorKeese_2AC::ActorKeese_2AC(ActorKeese *param1) : + mUnk_08(param1), + mUnk_0C(FLOAT_TO_FX32(0.0f), FLOAT_TO_FX32(0.0f), FLOAT_TO_FX32(0.0f)) {} + +ActorKeese_2AC::~ActorKeese_2AC() { + this->mUnk_08 = NULL; +} + +bool ActorKeese_2AC::vfunc_08(const UnkStruct_ov031_020f3310 *param1, unk32 param2) { + VecFx16_Copy2VecFx32(¶m1->mUnk_08, &this->mUnk_0C); + return this->UnkStruct_ov031_Items_00::vfunc_08(param1, param2); +} + +// non-matching +bool ActorKeese_2AC::vfunc_0C(const UnkStruct_ov031_020e54d4 *param1, unk32 *param2, unk32 param3) {} + +bool ActorKeese::vfunc_18(unk32 param1) { + this->mUnk_0B0.func_ov000_02057c38(0x6, 0x2); + this->mUnk_0B0.func_ov000_0209a7b8(this, &ActorKeese::func_ov032_0211faf0); + + this->func_ov032_0211e0c0(); + this->func_ov032_0211e380(); + + this->mUnk_120.vfunc_1C(data_ov032_021224e4, 0x1000, 0x19A, 0x0); + + this->mUnk_2C = 0x0; + SET_FLAG(this->mFlags, ActorFlag_13); + + return true; +} + +void ActorKeese::func_ov032_0211e0c0() { + this->func_ov032_0211e0d4(this->mUnk_5C.mParams[0], 0x0); +} + +// non-matching (cf below) +void ActorKeese::func_ov032_0211e0d4(s16 param1, unk32 param2) { + if (this->mUnk_22A == param1) { + return; + } + + this->mUnk_22A = param1; + + switch (param1) { + case 0x0: + this->mUnk_1CC.func_ov000_02099ddc(data_ov032_021224fc, 0x1000, 0x0); + + this->mUnk_278.func_ov000_020a0334(); + + for (ActorKeese_284 *ptr = this->mUnk_284; ptr != this->mUnk_284 + ARRAY_LEN(this->mUnk_284); ++ptr) { + ptr->func_ov000_020a0334(); + } + break; + + case 0x1: { + this->mUnk_1CC.func_ov000_02099ddc(data_ov032_021224fc, 0x1000, 0x2000); + + // does not match add r4, r6, #0x284 then str r1 [r4, #0x4] + this->mUnk_284[0].mUnk_04 = 0xD045; + this->mUnk_284[0].mUnk_08 = 0x2; + this->mUnk_284[1].mUnk_04 = 0xD046; + this->mUnk_284[1].mUnk_08 = 0x2; + + UnkStruct_027e0cec *data = data_027e0cec; + for (ActorKeese_284 *ptr = this->mUnk_284; ptr != this->mUnk_284 + ARRAY_LEN(this->mUnk_284); ++ptr) { + data->func_ov000_020a0140(ptr, &this->mUnk_2C4); + } + + if (param2 != 0x0) { + data_027e09a8->func_ov000_02071b30(0x9823, &this->mPos, 0x0); + } + + this->mUnk_278.func_ov000_020a0334(); + break; + } + + case 0x2: + this->mUnk_1CC.func_ov000_02099ddc(data_ov032_021224fc, 0x1000, 0x1000); + + this->mUnk_27C = 0x877; + this->mUnk_280 = 0x2; + + data_027e0cec->func_ov000_020a0140(&this->mUnk_278, &this->mUnk_2C4); + + if (param2 != 0x0) { + data_027e09a8->func_ov000_02071b30(0x9822, &this->mPos, 0x0); + } + + for (ActorKeese_284 *ptr = this->mUnk_284; ptr != this->mUnk_284 + ARRAY_LEN(this->mUnk_284); ++ptr) { + ptr->func_ov000_020a0334(); + } + break; + + default: + break; + } +} + +void ActorKeese::func_ov032_0211e308() { + switch (this->mUnk_22A) { + case 0x1: { + UnkStruct_027e0cec *data = data_027e0cec; + for (ActorKeese_284 *ptr = this->mUnk_284; ptr != this->mUnk_284 + ARRAY_LEN(this->mUnk_284); ++ptr) { + data->func_ov000_020a0140(ptr, &this->mUnk_2C4); + } + break; + } + + case 0x2: + data_027e0cec->func_ov000_020a0140(&this->mUnk_278, &this->mUnk_2C4); + break; + + default: + break; + } +} + +void ActorKeese::func_ov032_0211e380() { + switch (this->mUnk_5C.mParams[1]) { + case 0x0: + this->SetState(ActorKeeseState_0); + break; + + case 0x1: { + u8 sp00 = this->mUnk_5C.mUnk_0E; + this->mUnk_22C.func_ov024_020d6680(&this->mPos, &sp00); + + this->mUnk_22C.mUnk_04 = func_ov000_02059da4(this->mUnk_22C.mUnk_00, &this->mPos); + + this->SetState(ActorKeeseState_1); + break; + } + + case 0x2: + this->SetState(ActorKeeseState_9); + break; + + default: + break; + } +} + +void ActorKeese::func_ov032_0211e40c() { + this->mUnk_2C = 0x0; + this->mUnk_228 = 0x0; +} + +void ActorKeese::SetState(ActorState state) { + this->func_ov032_0211e40c(); + + this->mState = state; + + CALL_PTMF(PTMF, data_ov032_0212258c[this->mState]); +} + +// non-matching +void ActorKeese::func_ov032_0211e468() {} + +void ActorKeese::vfunc_20() { + if (this->mState != ActorKeeseState_9 && !this->Actor_Derived2::func_ov017_020bef4c(0x4000) && this->mUnk_48 != 0x0) { + bool noReturn = true; + if (this->mState != ActorKeeseState_7 && this->mState != ActorKeeseState_6) { + noReturn = false; + } + if (!noReturn) { + return; + } + } + + this->mUnk_3C = &this->mUnk_248; + CALL_PTMF(PTMF, data_ov032_021225dc[this->mState]); + + if (this->mState == ActorKeeseState_9) { + return; + } + + this->Actor_Derived2::func_ov017_020bf894(&this->mUnk_268); + + if (this->mUnk_22A != 2) { + this->func_ov000_02098b8c(0x1, &this->mUnk_2AC); + } else { + this->func_ov000_02098b8c(0x0, &this->mUnk_2AC); + } + + this->func_ov032_0211e308(); + + if (this->mUnk_46 & 1) { + this->mVel.y = FLOAT_TO_FX32(0.0f); + } + + if ((this->mUnk_120.vfunc_28()->func_02015080(0x1000) != 0 || this->mUnk_120.vfunc_28()->func_02015080(0x9000) != 0) && + GET_FLAG(this->mFlags, ActorFlag_14)) { + switch (this->mUnk_22A) { + case 0x0: + data_027e09a8->func_ov000_02071b30(0x981F, &this->mPos, 0x0); + break; + + case 0x1: + data_027e09a8->func_ov000_02071b30(0x9821, &this->mPos, 0x0); + break; + + case 0x2: + data_027e09a8->func_ov000_02071b30(0x9820, &this->mPos, 0x0); + break; + + default: + data_027e09a8->func_ov000_02071b30(0x981F, &this->mPos, 0x0); + break; + } + } + + this->func_ov032_0211e468(); + + if (!GET_FLAG(this->mFlags, ActorFlag_14)) { + return; + } + + this->mUnk_120.vfunc_34(); +} + +// non-matching +void ActorKeese::vfunc_2C(unk32 param1) { + if (!this->func_01fff5d0(param1, 0x0)) { + this->mUnk_278.func_ov000_020a0334(); + + for (ActorKeese_284 *ptr = this->mUnk_284; ptr != this->mUnk_284 + ARRAY_LEN(this->mUnk_284); ++ptr) { + ptr->func_ov000_020a0334(); + } + + return; + } + + VecFx32 *og = this->mUnk_0B0.func_01ffc6d4(this->mAngleStruct, &this->mPos); + VecFx32 vec; + VecFx32_Init(og->x, og->y, og->z, &vec); + + data_027e09b4->func_ov017_020c08c4(&vec, 0x4CD, 0x4CD, 0x1F, 0x0, 0x1); +} + +// non-matching +void ActorKeese::func_ov032_0211e9ec() { + this->mUnk_52 = gRandom.Next32(0x1F) + 0x1E; + this->mUnk_50 = 0x0; + + u32 sp00; + + func_01fff05c(&sp00, data_027e0cd8->mUnk_0C, &this->mPos); + + bool var_r6 = false; + if ((*&sp00 & 0x1F) == 0xF && ((*&sp00 >> 5) & 3) == 2) { + var_r6 = true; + } + + fx32 unk = this->mUnk_5C.mInitialPos.y; + if (var_r6) { + unk = data_027e0cd8->mUnk_0C->vfunc_28(&this->mPos, 0x1, 0x0); + } + + this->mUnk_29C = unk + 0x800 + gRandom.Next32(0x99B) + 0xFFFFFB33; + gRandom.UpdateRandomValue(); + this->mUnk_2A4 = 0x19A; + if (this->mUnk_2A8 > 0) { + this->mUnk_2A8 = 0xFFFFF8E4; + } else { + this->mUnk_2A8 = 0x71C; + } +} + +void ActorKeese::func_ov032_0211eb60() { + if (this->mUnk_46 & 0x1C) { + this->mAngle = func_01ffbbe0(this->mUnk_2AC.mUnk_0C.x, this->mUnk_2AC.mUnk_0C.z); + } + + this->mAngle += this->mUnk_2A8; + + if (this->IsTimerOut()) { + this->func_ov032_0211e380(); + } + + func_01ff916c(&this->mUnk_2A0, this->mUnk_2A4, 0xA4); + func_01ff916c(&this->mPos.y, this->mUnk_29C, 0xA4); + + this->Actor::func_ov000_0209a008(this->mUnk_2A0, this->mAngle); + + if (this->IsTimerOut()) { + if (func_01ff9258(this->mPos.x - this->mUnk_5C.mInitialPos.x, this->mPos.z - this->mUnk_5C.mInitialPos.z) > 0x2000) { + this->SetState(ActorKeeseState_3); + return; + } + } + + if (this->func_ov032_0211f9c4()) { + this->SetState(ActorKeeseState_8); + return; + } + + VecFx32 *vec = data_027e0ce0->func_01fff148(0x0); + + if (!func_02016b8c(&this->mPos, vec, 0x3000, this->mAngleStruct, 0x1000, 0x1)) { + return; + } + + this->SetState(ActorKeeseState_2); +} + +// non-matching +void ActorKeese::func_ov032_0211ece8() {} +// non-matching +void ActorKeese::func_ov032_0211ee5c() {} + +void ActorKeese::func_ov032_0211f054() { + this->mUnk_52 = gRandom.Next32(0x1F) + 0x1E; + this->mUnk_50 = 0x0; +} + +void ActorKeese::func_ov032_0211f0a8() { + this->func_ov032_0211f93c(&this->mUnk_5C.mInitialPos, 0x38E); + + if (this->IsTimerOut()) { + VecFx32 *vec = data_027e0ce0->func_01fff148(0x0); + if (func_02016b8c(&this->mPos, vec, 0x3000, this->mAngleStruct, 0x1000, 0x1)) { + this->SetState(ActorKeeseState_2); + } + } + + if (this->func_ov032_0211f9c4()) { + this->SetState(ActorKeeseState_8); + } else { + if (this->IsTimerOut() && (this->mUnk_46 & 0x1C)) { + this->mAngle = func_01ffbbe0(this->mUnk_2AC.mUnk_0C.x, this->mUnk_2AC.mUnk_0C.z); + this->SetState(ActorKeeseState_0); + } else if (func_01ff9258(this->mUnk_5C.mInitialPos.x - this->mPos.x, this->mUnk_5C.mInitialPos.z - this->mPos.z) < + 0x800) { + this->SetState(ActorKeeseState_0); + } + } + this->func_ov000_0209a008(this->mUnk_2A0, this->mAngle); +} + +// non-matching +void ActorKeese::func_ov032_0211f1f0() {} +// non-matching +void ActorKeese::func_ov032_0211f1f4() { + bool val = this->func_ov032_0211f93c(data_027e0ce0->func_01fff148(0x0), 0xB6); + + if (this->mUnk_5C.mParams[1] == 0x1) { + VecFx32 sp00; + this->mUnk_22C.mUnk_00->mTable.GetPtr(this->mUnk_22C.mUnk_04)->vfunc_0C(&sp00); + + if (func_01ff9258(this->mPos.x - sp00.x, this->mPos.z - sp00.z) > 0x2000) { + this->func_ov032_0211e380(); + + this->Actor::func_ov000_0209a008(this->mUnk_2A0, this->mAngle); + return; + } + } + + if (func_01ff9258(this->mPos.x - this->mUnk_5C.mInitialPos.x, this->mPos.z - this->mUnk_5C.mInitialPos.z) > 0x2000) { + this->SetState(ActorKeeseState_3); + + this->Actor::func_ov000_0209a008(this->mUnk_2A0, this->mAngle); + return; + } + + if (this->func_ov032_0211f9c4()) { + this->SetState(ActorKeeseState_8); + } else if (val || this->mUnk_46 & 0x1C) { + this->func_ov032_0211e380(); + } + + this->Actor::func_ov000_0209a008(this->mUnk_2A0, this->mAngle); +} + +void ActorKeese::func_ov032_0211f300() { + this->mUnk_248.func_ov000_02097bec(); +} + +// non-matching (270 + 2) +void ActorKeese::func_ov032_0211f310() { + this->Actor_Derived2::func_ov000_020992dc(); + + if (GET_FLAG(this->mFlags, ActorFlag_5)) { + if (this->mUnk_48 <= 0x0) { + this->vfunc_54(0x0); + } else { + if (this->mUnk_268.mUnk_08 >= this->mUnk_268.mUnk_0A) { + this->func_ov032_0211e380(); + } else { + this->SetState(ActorKeeseState_6); + } + } + } + + this->Actor::func_ov000_02098838(); + + VecFx32_Copy(&this->mPos, &this->mPrevPos); + VecFx32_Add(&this->mPos, &this->mVel, &this->mPos); +} + +void ActorKeese::func_ov032_0211f3ac() { + this->Actor::func_ov017_020bf634(&this->mUnk_248.mUnk_10, data_ov000_020aecf4[0], data_ov000_020aecfc[0]); + + this->mUnk_248.func_ov000_02097bec(); + + this->mUnk_120.vfunc_28()->mUnk_04 = FLOAT_TO_FX32(1.2f); + this->mUnk_2C = 0x7B; +} + +void ActorKeese::func_ov032_0211f404() { + this->func_ov017_020bf688(); + + if (GET_FLAG(this->mFlags, ActorFlag_5)) { + if (this->mUnk_48 <= 0x0) { + this->Actor::func_ov000_020984d0(); + this->Actor::func_ov017_020bf3e0(0x1, FLOAT_TO_FX32(0.0f)); + + this->Actor_Derived2::func_ov000_020997c4(0x0); + } else { + this->func_ov032_0211e380(); + } + } + + if (!(this->mUnk_46 & 0x1)) { + this->mAngle += 0xE39; // DEG_TO_ANG leads to d/fflt, d/fadd d/ffix if non int value. E39 seems to be between 22 and 23 + } + + this->Actor::func_ov000_02098838(); + + VecFx32_Copy(&this->mPos, &this->mPrevPos); + VecFx32_Add(&this->mPos, &this->mVel, &this->mPos); +} + +void ActorKeese::func_ov032_0211f4a4() { + this->Actor_Derived2::func_ov000_02099450(&this->mUnk_268, &this->mUnk_248.mUnk_10, 0x0, data_ov000_020aecf0[0]); + + this->mUnk_2C = data_ov000_020aecf8; + + this->mUnk_248.func_ov000_02097bec(); + + this->mUnk_120.vfunc_28()->mUnk_04 = FLOAT_TO_FX32(0.8f); +} + +void ActorKeese::func_ov032_0211f50c() { + this->Actor_Derived2::func_ov000_020994a0(); + + if (GET_FLAG(this->mFlags, ActorFlag_5)) { + this->func_ov032_0211e380(); + } + + this->Actor::func_ov000_02098838(); + + VecFx32_Copy(&this->mPos, &this->mPrevPos); + VecFx32_Add(&this->mPos, &this->mVel, &this->mPos); +} + +void ActorKeese::func_ov032_0211f560() { + this->Actor_Derived2::func_ov000_02098f34(&this->mUnk_248.mUnk_10); + + this->vfunc_40(); + + this->mUnk_248.func_ov000_02097bec(); +} + +void ActorKeese::func_ov032_0211f58c() { + this->vfunc_44(); + + if (GET_FLAG(this->mFlags, ActorFlag_5)) { + VecFx32_Init(FLOAT_TO_FX32(0.0f), FLOAT_TO_FX32(0.0f), FLOAT_TO_FX32(0.0f), &this->mUnk_248.mUnk_10); + + this->mUnk_268.func_ov000_02099a0c(); + + this->SetState(ActorKeeseState_6); + } + + this->Actor::func_ov000_02098838(); + + VecFx32_Copy(&this->mPos, &this->mPrevPos); + VecFx32_Add(&this->mPos, &this->mVel, &this->mPos); +} + +void ActorKeese::func_ov032_0211f604() { + this->mUnk_2A4 = 0x19A; +} + +// non-matching +void ActorKeese::func_ov032_0211f614() {} +// non-matching +void ActorKeese::func_ov032_0211f6bc() {} + +extern "C" void func_ov017_020c26f8(unk32, VecFx32 *, unk32, unk32); + +// non-matching (instruction order) +void ActorKeese::func_ov032_0211f804() { + Actor *actor = gpActorManager->func_01fff3b4(this->mUnk_2D4); + + switch (this->mUnk_228) { + case 0x0: + if (actor != NULL) { + break; + } + + ++this->mUnk_228; + this->mUnk_52 = 0x1E; + this->mUnk_50 = 0x00; + break; + + case 0x1: { + if (!this->IsTimerOut()) { + return; + } + + VecFx32 vec = this->mPos; + vec.y -= FLOAT_TO_FX32(1.0f); + + func_ov017_020c26f8(0x1, &vec, 0x1, 0x2); + + ++this->mUnk_228; + this->mUnk_52 = 0xA; + this->mUnk_50 = 0x0; + break; + } + + case 0x2: + if (!this->IsTimerOut()) { + return; + } + + this->SetState(ActorKeeseState_9); + break; + + default: + break; + } +} + +// non-matching +bool ActorKeese::func_ov032_0211f93c(VecFx32 *param1, unk32 param2) {} + +// non-matching (vec should movs into r5) +bool ActorKeese::func_ov032_0211f9c4() { + if (this->mUnk_22A != 0x0) { + return false; + } + + UnkStruct_ov032_0212251c sp04; + + VecFx32 *vec = sp04.func_020170ac(&this->mPos); + if (vec == NULL || func_01ff9258(this->mPos.x - vec->x, this->mPos.z - vec->z) > 0x3000) { + return false; + } + + this->mUnk_2D0 = this->mUnk_38; + return true; +} + +// non-matching (stack size 0x14 expected but 0xC here) +bool ActorKeese::func_ov032_0211fa4c(unk32 param1) { + if (param1 == 0x1) { + return false; + } + + if (this->mUnk_22A != 0x1) { + if (this->mUnk_22A != 0x2) { + return false; + } + + data_027e0ce0->func_ov000_0208bc1c(param1, 0x1, 0x6, 0x0, 0x0, 0x0); + return true; + } + + data_027e0ce0->func_ov000_0208bc1c(param1, 0x1, 0x8, 0x0, 0x0, 0x0); + return true; +} + +// non-matching +void ActorKeese::func_ov032_0211faf0(void *param1, unk32 param2) {} + +UnkStruct_ov032_0212251c::UnkStruct_ov032_0212251c() : + UnkStruct_ov000_020b34c4(MapObjectId_SKDI) {} + +bool UnkStruct_ov032_0212251c::vfunc_00(MapObject *param1) { + // MapObjectUnkSKDI guessed with ctor and MapObjectUnkSKDI::vfunc_40 exists and returns number + return this->UnkStruct_ov000_020b34c4::vfunc_00(param1) && ((MapObjectUnkSKDI *) param1)->vfunc_40() == 0x1; +} + +ActorKeese_284::ActorKeese_284() : + UnkSystem7(NULL), + mUnk_04(-0x1), + mUnk_08(0x0) {} diff --git a/src/032_MapA1/Actor/ActorSpinut.cpp b/src/032_MapA1/Actor/ActorSpinut.cpp index 223ef37b..cd1e14c0 100644 --- a/src/032_MapA1/Actor/ActorSpinut.cpp +++ b/src/032_MapA1/Actor/ActorSpinut.cpp @@ -915,10 +915,9 @@ ActorSpinut_268::ActorSpinut_268() { ActorSpinut_268::~ActorSpinut_268() {} -// non-matching -bool ActorSpinut_268::vfunc_08(const UnkStruct_ov031_020f3310 *param1) { +bool ActorSpinut_268::vfunc_08(const UnkStruct_ov031_020f3310 *param1, unk32 param2) { VecFx16_Copy2VecFx32(¶m1->mUnk_08, &this->mUnk_08); - this->UnkStruct_ov031_Items_00::vfunc_08(param1); + this->UnkStruct_ov031_Items_00::vfunc_08(param1, param2); } void ActorSpinut_1BC::vfunc_3C() { diff --git a/src/032_MapA1/Actor/ActorUnkKETH.cpp b/src/032_MapA1/Actor/ActorUnkKETH.cpp deleted file mode 100644 index 61703de0..00000000 --- a/src/032_MapA1/Actor/ActorUnkKETH.cpp +++ /dev/null @@ -1,65 +0,0 @@ -//! TODO: This file was generated automatically and might contain errors - -#include "Actor/ActorUnkKETH.hpp" -#include "System/SysNew.hpp" - -DECL_PROFILE(ActorProfileUnkKETH); - -Actor *ActorProfileUnkKETH::Create() { - return new(HeapIndex_2) ActorUnkKETH(); -} - -ActorProfileUnkKETH::ActorProfileUnkKETH() : - ActorProfile_Derived1(ActorId_KETH) {} - -ActorUnkKETH::ActorUnkKETH() {} - -void ActorUnkKETH::func_ov032_0211dbcc(void) {} -void ActorUnkKETH::func_ov032_0211de0c(void) {} -void ActorUnkKETH::func_ov032_0211de20(void) {} -void ActorUnkKETH::func_ov032_0211de34(void) {} -void ActorUnkKETH::func_ov032_0211deac(void) {} -void ActorUnkKETH::func_ov032_0211ded0(void) {} -void ActorUnkKETH::func_ov032_0211e014(void) {} -void ActorUnkKETH::func_ov032_0211e0c0(void) {} -void ActorUnkKETH::func_ov032_0211e0d4(void) {} -void ActorUnkKETH::func_ov032_0211e308(void) {} -void ActorUnkKETH::func_ov032_0211e380(void) {} -void ActorUnkKETH::func_ov032_0211e40c(void) {} -void ActorUnkKETH::func_ov032_0211e420(void) {} -void ActorUnkKETH::func_ov032_0211e468(void) {} -void ActorUnkKETH::func_ov032_0211e778(void) {} -void ActorUnkKETH::func_ov032_0211e930(void) {} -void ActorUnkKETH::func_ov032_0211e9ec(void) {} -void ActorUnkKETH::func_ov032_0211eb60(void) {} -void ActorUnkKETH::func_ov032_0211ece8(void) {} -void ActorUnkKETH::func_ov032_0211ee5c(void) {} -void ActorUnkKETH::func_ov032_0211f054(void) {} -void ActorUnkKETH::func_ov032_0211f0a8(void) {} -void ActorUnkKETH::func_ov032_0211f1f0(void) {} -void ActorUnkKETH::func_ov032_0211f1f4(void) {} -void ActorUnkKETH::func_ov032_0211f300(void) {} -void ActorUnkKETH::func_ov032_0211f310(void) {} -void ActorUnkKETH::func_ov032_0211f3ac(void) {} -void ActorUnkKETH::func_ov032_0211f404(void) {} -void ActorUnkKETH::func_ov032_0211f4a4(void) {} -void ActorUnkKETH::func_ov032_0211f50c(void) {} -void ActorUnkKETH::func_ov032_0211f560(void) {} -void ActorUnkKETH::func_ov032_0211f58c(void) {} -void ActorUnkKETH::func_ov032_0211f604(void) {} -void ActorUnkKETH::func_ov032_0211f614(void) {} -void ActorUnkKETH::func_ov032_0211f6bc(void) {} -void ActorUnkKETH::func_ov032_0211f804(void) {} -void ActorUnkKETH::func_ov032_0211f93c(void) {} -void ActorUnkKETH::func_ov032_0211f9c4(void) {} -void ActorUnkKETH::func_ov032_0211fa4c(void) {} -void ActorUnkKETH::func_ov032_0211faf0(void) {} -void ActorUnkKETH::func_ov032_0211fb9c(void) {} -void ActorUnkKETH::func_ov032_0211fbb4(void) {} -void ActorUnkKETH::func_ov032_0211fbec(void) {} -void ActorUnkKETH::func_ov032_0211fc00(void) {} -void ActorUnkKETH::func_ov032_0211fc1c(void) {} -void ActorUnkKETH::func_ov032_0211fcc0(void) {} - -ActorUnkKETH::~ActorUnkKETH() {} -ActorProfileUnkKETH::~ActorProfileUnkKETH() {} diff --git a/src/063_Shrine/Actor/ActorUnkCANS.cpp b/src/063_Shrine/Actor/ActorUnkCANS.cpp index 347415f3..27743c7d 100644 --- a/src/063_Shrine/Actor/ActorUnkCANS.cpp +++ b/src/063_Shrine/Actor/ActorUnkCANS.cpp @@ -69,8 +69,6 @@ extern "C" unk32 func_ov000_02098d7c(ActorUnkCANS *param1, UnkStruct_ov063_02162 // Overlay 17 extern "C" void func_ov017_020bf050(ActorUnkCANS *param1, UnkStruct_ov063_02162e88 *param2, unk32 param3); -extern "C" void func_ov017_020bf634(ActorUnkCANS *param1, unk16 *param2, unk32 param3, unk32 param4); -extern "C" void func_ov017_020bf688(ActorUnkCANS *param1); // Overlay 26 #if IS_JP @@ -570,12 +568,12 @@ void ActorUnkCANS::func_ov063_02158db0(void) { } void ActorUnkCANS::func_ov063_021590c8(void) { - func_ov017_020bf634(this, (unk16 *) &mUnk_200.mUnk_10, this->func_ov063_0215a5bc(), this->func_ov063_0215a5d8()); + this->Actor::func_ov017_020bf634(&mUnk_200.mUnk_10, this->func_ov063_0215a5bc(), this->func_ov063_0215a5d8()); mUnk_200.func_ov000_02097bec(); } void ActorUnkCANS::func_ov063_02159100(void) { - func_ov017_020bf688(this); + this->Actor::func_ov017_020bf688(); if (!GET_FLAG(this->mFlags, ActorFlag_5)) { return; @@ -1216,18 +1214,10 @@ UnkStruct_ov063_02162ea8::UnkStruct_ov063_02162ea8() { UnkStruct_ov063_02162ea8::~UnkStruct_ov063_02162ea8() {} -// non-matching -bool UnkStruct_ov063_02162ea8::vfunc_08(const UnkStruct_ov031_020f3310 *param1) { - bool retVal = UnkStruct_ov031_Items_00::vfunc_08(param1); +bool UnkStruct_ov063_02162ea8::vfunc_08(const UnkStruct_ov031_020f3310 *param1, unk32 param2) { + bool retVal = UnkStruct_ov031_Items_00::vfunc_08(param1, param2); if (retVal && func_01ff9258(param1->mUnk_08.x, param1->mUnk_08.z) > 0) { - // VecFx16_Copy2VecFx32(¶m1->mUnk_08, &mUnk_08); - // Better match - unk16 tmp1 = param1->mUnk_08.x; - unk16 tmp3 = param1->mUnk_08.z; - unk16 tmp2 = param1->mUnk_08.y; - mUnk_08.x = tmp1; - mUnk_08.y = tmp2; - mUnk_08.z = tmp3; + VecFx16_Copy2VecFx32(¶m1->mUnk_08, &mUnk_08); } return retVal; } diff --git a/tools/configure.py b/tools/configure.py index fd4eedcc..8612b383 100755 --- a/tools/configure.py +++ b/tools/configure.py @@ -597,7 +597,7 @@ config.libs = [ GameLib( "Overlay 32", [ - Object("032_MapA1/Actor/ActorUnkKETH.cpp"), + Object("032_MapA1/Actor/ActorKeese.cpp"), Object("032_MapA1/Actor/ActorSpinut.cpp"), Object("032_MapA1/Actor/ActorFleeingSpinut.cpp"), Object("032_MapA1/Actor/ActorUnkNSSW.cpp"),