diff --git a/config/eur/arm9/overlays/ov000/symbols.txt b/config/eur/arm9/overlays/ov000/symbols.txt index 55c1a95b..7c3d9b4c 100644 --- a/config/eur/arm9/overlays/ov000/symbols.txt +++ b/config/eur/arm9/overlays/ov000/symbols.txt @@ -1381,7 +1381,7 @@ _ZN19func_ov000_0207b628D1Ev kind:function(arm,size=0x14) addr:0x0207b628 _ZN19func_ov000_0207b63cD0Ev kind:function(arm,size=0x1c) addr:0x0207b63c _ZN19func_ov000_0207b658D1Ev kind:function(arm,size=0x30) addr:0x0207b658 _ZN19func_ov000_0207b688D0Ev kind:function(arm,size=0x38) addr:0x0207b688 -_ZN24UnkStruct_ov031_Items_01D2Ev kind:function(arm,size=0x30) addr:0x0207b6c0 +_ZN29UnkStruct_ov031_Items_01_BaseD2Ev kind:function(arm,size=0x30) addr:0x0207b6c0 func_ov000_0207b6f0 kind:function(arm,size=0x1c) addr:0x0207b6f0 func_ov000_0207b70c kind:function(arm,size=0x10) addr:0x0207b70c _ZN24UnkStruct_ov031_Items_018vfunc_08Ev kind:function(arm,size=0x38) addr:0x0207b71c @@ -1410,8 +1410,8 @@ func_ov000_0207bc84 kind:function(arm,size=0x50) addr:0x0207bc84 func_ov000_0207bcd4 kind:function(arm,size=0x28) addr:0x0207bcd4 func_ov000_0207bcfc kind:function(arm,size=0x88) addr:0x0207bcfc func_ov000_0207bd84 kind:function(arm,size=0x260) addr:0x0207bd84 -func_ov000_0207bfe4 kind:function(arm,size=0x4) addr:0x0207bfe4 -_ZN19func_ov000_0207bfe8D0Ev kind:function(arm,size=0x14) addr:0x0207bfe8 +_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_0CEPK24UnkStruct_ov031_020e54d4ii kind:function(arm,size=0x8) addr:0x0207c008 @@ -3534,7 +3534,7 @@ _ZTV24UnkStruct_ov031_Items_01 kind:data(any) addr:0x020b27c0 data_ov000_020b27e4 kind:data(any) addr:0x020b27e4 data_ov000_020b2800 kind:data(any) addr:0x020b2800 data_ov000_020b281c kind:data(any) addr:0x020b281c -data_ov000_020b2838 kind:data(any) addr:0x020b2838 +_ZTV19data_ov000_020b2838 kind:data(any) addr:0x020b2830 data_ov000_020b2854 kind:data(any) addr:0x020b2854 _ZTV19data_ov000_020b287c kind:data(any) addr:0x020b2874 data_ov000_020b2890 kind:data(any) addr:0x020b2890 diff --git a/config/eur/arm9/overlays/ov026/relocs.txt b/config/eur/arm9/overlays/ov026/relocs.txt index cd67acbf..cc0489c8 100644 --- a/config/eur/arm9/overlays/ov026/relocs.txt +++ b/config/eur/arm9/overlays/ov026/relocs.txt @@ -493,7 +493,7 @@ from:0x020dc6ac kind:arm_call to:0x0205fc20 module:overlay(0) from:0x020dc6c4 kind:arm_call to:0x0205fc20 module:overlay(0) from:0x020dc6d8 kind:arm_call to:0x0202851c module:main from:0x020dc6dc kind:arm_call to:0x020f0d40 module:overlay(26) -from:0x020dc6ec kind:load to:0x020b2838 module:overlay(0) +from:0x020dc6ec kind:load to:0x020b2830 module:overlay(0) add:0x8 from:0x020dc6f0 kind:load to:0x0213562c module:overlay(26) from:0x020dc6f4 kind:load to:0x027e07d4 module:dtcm from:0x020dc6fc kind:load to:0x02135610 module:overlay(26) diff --git a/config/eur/arm9/overlays/ov031/delinks.txt b/config/eur/arm9/overlays/ov031/delinks.txt index 5e8f93df..61addfdc 100644 --- a/config/eur/arm9/overlays/ov031/delinks.txt +++ b/config/eur/arm9/overlays/ov031/delinks.txt @@ -93,16 +93,19 @@ src/031_Land/Actor/ActorUnkSCCN.cpp: .bss start:0x0211698c end:0x021169d8 src/031_Land/Actor/ActorPot.cpp: + complete .text start:0x020f0c00 end:0x020f0fcc .init start:0x021114a8 end:0x021114f8 .ctor start:0x021127cc end:0x021127d0 .data start:0x0211403c end:0x02114150 .bss start:0x021169d8 end:0x02116a24 -src/031_Land/Actor/ActorUnkNITF.cpp: +src/031_Land/Actor/ActorItemFlower.cpp: + complete .text start:0x020f0fcc end:0x020f1390 .init start:0x021114f8 end:0x02111548 .ctor start:0x021127d0 end:0x021127d4 + .data start:0x02114150 end:0x02114264 .bss start:0x02116a24 end:0x02116a70 src/031_Land/Actor/ActorShotArrow.cpp: diff --git a/config/eur/arm9/overlays/ov031/relocs.txt b/config/eur/arm9/overlays/ov031/relocs.txt index 6426b759..ff3e7aa4 100644 --- a/config/eur/arm9/overlays/ov031/relocs.txt +++ b/config/eur/arm9/overlays/ov031/relocs.txt @@ -2630,7 +2630,7 @@ from:0x020f09b4 kind:arm_call to:0x020984d0 module:overlay(0) from:0x020f09c4 kind:load to:0x027e0c90 module:dtcm from:0x020f09cc kind:load to:0x027e09a8 module:dtcm from:0x020f09dc kind:arm_call to:0x020982a8 module:overlay(0) -from:0x020f09f4 kind:load to:0x02113fb8 module:overlay(31) +from:0x020f09f4 kind:load to:0x02113fb0 module:overlay(31) add:0x8 from:0x020f0a08 kind:arm_call to:0x0207bffc module:overlay(0) from:0x020f0a24 kind:arm_call to:0x0207bffc module:overlay(0) from:0x020f0a2c kind:arm_call to:0x02011ff4 module:main @@ -4663,7 +4663,7 @@ from:0x02102ba0 kind:arm_call to:0x02011ff4 module:main from:0x02102bb4 kind:arm_call to:0x0209c9d8 module:overlay(0) from:0x02102bd0 kind:arm_call_thumb to:0x02057b54 module:overlay(0) from:0x02102bf0 kind:arm_call to:0x02102c00 module:overlay(31) -from:0x02102bfc kind:load to:0x0211578c module:overlay(31) +from:0x02102bfc kind:load to:0x02115784 module:overlay(31) add:0x8 from:0x02102c18 kind:arm_call to:0x02057c38 module:overlay(0) from:0x02102c28 kind:arm_call to:0x02057c38 module:overlay(0) from:0x02102c88 kind:arm_call to:0x0200f218 module:main diff --git a/config/eur/arm9/overlays/ov031/symbols.txt b/config/eur/arm9/overlays/ov031/symbols.txt index 07938147..20fe4188 100644 --- a/config/eur/arm9/overlays/ov031/symbols.txt +++ b/config/eur/arm9/overlays/ov031/symbols.txt @@ -788,7 +788,7 @@ func_ov031_020efec0 kind:function(arm,size=0x18) addr:0x020efec0 func_ov031_020efed8 kind:function(arm,size=0x2c) addr:0x020efed8 func_ov031_020eff04 kind:function(arm,size=0xb8) addr:0x020eff04 func_ov031_020effbc kind:function(arm,size=0xa0) addr:0x020effbc -func_ov031_020f005c kind:function(arm,size=0x4) addr:0x020f005c +_ZN20Actor_ov031_02113fd48vfunc_20Ev kind:function(arm,size=0x4) addr:0x020f005c _ZN20Actor_ov031_02113fd48vfunc_24Ev kind:function(arm,size=0x30) addr:0x020f0060 _ZN20Actor_ov031_02113fd48vfunc_60Ev kind:function(arm,size=0x4) addr:0x020f0090 _ZN20Actor_ov031_02113fd419func_ov031_020f0094Ev kind:function(arm,size=0x4) addr:0x020f0094 @@ -815,9 +815,9 @@ func_ov031_020f0740 kind:function(arm,size=0xe0) addr:0x020f0740 func_ov031_020f0820 kind:function(arm,size=0x1b0) addr:0x020f0820 func_ov031_020f09d0 kind:function(arm,size=0x28) addr:0x020f09d0 _ZN24UnkStruct_ov031_02113fb8D1Ev kind:function(arm,size=0x1c) addr:0x020f09f8 -_ZN19func_ov031_020f0a14D0Ev kind:function(arm,size=0x24) addr:0x020f0a14 -func_ov031_020f0a38 kind:function(arm,size=0x70) addr:0x020f0a38 -func_ov031_020f0aa8 kind:function(arm,size=0xb4) addr:0x020f0aa8 +_ZN24UnkStruct_ov031_02113fb8D0Ev kind:function(arm,size=0x24) addr:0x020f0a14 +_ZN24UnkStruct_ov031_02113fb88vfunc_0CEv kind:function(arm,size=0x70) addr:0x020f0a38 +_ZN24UnkStruct_ov031_02113fb88vfunc_08Ev kind:function(arm,size=0xb4) addr:0x020f0aa8 func_ov031_020f0b5c kind:function(arm,size=0x30) addr:0x020f0b5c _ZN19func_ov031_020f0b8cD0Ev kind:function(arm,size=0x1c) addr:0x020f0b8c _ZN19func_ov031_020f0ba8D1Ev kind:function(arm,size=0x28) addr:0x020f0ba8 @@ -846,30 +846,30 @@ _ZN8ActorPot19func_ov031_020f0f44Ev kind:function(arm,size=0xc) addr:0x020f0f44 _ZN8ActorPotD1Ev kind:function(arm,size=0x30) addr:0x020f0f50 _ZN8ActorPotD0Ev kind:function(arm,size=0x38) addr:0x020f0f80 _ZN15ActorProfilePotD1Ev kind:function(arm,size=0x14) addr:0x020f0fb8 -_ZN19ActorProfileUnkNITF10GetProfileEv kind:function(arm,size=0xc) addr:0x020f0fcc -_ZN19ActorProfileUnkNITF6CreateEv kind:function(arm,size=0x24) addr:0x020f0fd8 -_ZN19ActorProfileUnkNITFC1Ev kind:function(arm,size=0x30) addr:0x020f0ffc -_ZN12ActorUnkNITFC1Ev kind:function(arm,size=0x94) addr:0x020f102c -_ZN12ActorUnkNITF19func_ov031_020f10c0Ev kind:function(arm,size=0x14) addr:0x020f10c0 -_ZN12ActorUnkNITF19func_ov031_020f10d4Ev kind:function(arm,size=0x28) addr:0x020f10d4 -_ZN12ActorUnkNITF19func_ov031_020f10fcEv kind:function(arm,size=0x44) addr:0x020f10fc -_ZN12ActorUnkNITF19func_ov031_020f1140Ev kind:function(arm,size=0x38) addr:0x020f1140 -_ZN12ActorUnkNITF19func_ov031_020f1178Ev kind:function(arm,size=0x30) addr:0x020f1178 -_ZN12ActorUnkNITF19func_ov031_020f11a8Ev kind:function(arm,size=0xc) addr:0x020f11a8 -_ZN12ActorUnkNITF19func_ov031_020f11b4Ev kind:function(arm,size=0xc) addr:0x020f11b4 -_ZN12ActorUnkNITF19func_ov031_020f11c0Ev kind:function(arm,size=0xc) addr:0x020f11c0 -_ZN12ActorUnkNITF19func_ov031_020f11ccEv kind:function(arm,size=0xc) addr:0x020f11cc -_ZN12ActorUnkNITF19func_ov031_020f11d8Ev kind:function(arm,size=0xc) addr:0x020f11d8 -_ZN12ActorUnkNITF19func_ov031_020f11e4Ev kind:function(arm,size=0xc) addr:0x020f11e4 -_ZN12ActorUnkNITF19func_ov031_020f11f0Ev kind:function(arm,size=0xc) addr:0x020f11f0 -_ZN12ActorUnkNITF19func_ov031_020f11fcEv kind:function(arm,size=0xc) addr:0x020f11fc -_ZN12ActorUnkNITF19func_ov031_020f1208Ev kind:function(arm,size=0x14) addr:0x020f1208 -_ZN12ActorUnkNITF19func_ov031_020f121cEv kind:function(arm,size=0x14) addr:0x020f121c -_ZN12ActorUnkNITF19func_ov031_020f1230Ev kind:function(arm,size=0xd8) addr:0x020f1230 -_ZN12ActorUnkNITF19func_ov031_020f1308Ev kind:function(arm,size=0xc) addr:0x020f1308 -_ZN12ActorUnkNITFD1Ev kind:function(arm,size=0x30) addr:0x020f1314 -_ZN12ActorUnkNITFD0Ev kind:function(arm,size=0x38) addr:0x020f1344 -_ZN19ActorProfileUnkNITFD1Ev kind:function(arm,size=0x14) addr:0x020f137c +_ZN22ActorProfileItemFlower10GetProfileEv kind:function(arm,size=0xc) addr:0x020f0fcc +_ZN22ActorProfileItemFlower6CreateEv kind:function(arm,size=0x24) addr:0x020f0fd8 +_ZN22ActorProfileItemFlowerC1Ev kind:function(arm,size=0x30) addr:0x020f0ffc +_ZN15ActorItemFlowerC1Ev kind:function(arm,size=0x94) addr:0x020f102c +_ZN26ModelRender_ov031_0211578cD1Ev kind:function(arm,size=0x14) addr:0x020f10c0 +_ZN15ActorItemFlower8vfunc_18Ei kind:function(arm,size=0x28) addr:0x020f10d4 +_ZN15ActorItemFlower8vfunc_5CEs kind:function(arm,size=0x44) addr:0x020f10fc +_ZN15ActorItemFlower8vfunc_20Ev kind:function(arm,size=0x38) addr:0x020f1140 +_ZN15ActorItemFlower8vfunc_2CEi kind:function(arm,size=0x30) addr:0x020f1178 +_ZN15ActorItemFlower19func_ov031_020f11a8Ev kind:function(arm,size=0xc) addr:0x020f11a8 +_ZN15ActorItemFlower19func_ov031_020f11b4Ev kind:function(arm,size=0xc) addr:0x020f11b4 +_ZN15ActorItemFlower19func_ov031_020f11c0Ev kind:function(arm,size=0xc) addr:0x020f11c0 +_ZN15ActorItemFlower19func_ov031_020f11ccEv kind:function(arm,size=0xc) addr:0x020f11cc +_ZN15ActorItemFlower19func_ov031_020f11d8Ev kind:function(arm,size=0xc) addr:0x020f11d8 +_ZN15ActorItemFlower19func_ov031_020f11e4Ev kind:function(arm,size=0xc) addr:0x020f11e4 +_ZN15ActorItemFlower19func_ov031_020f11f0Ev kind:function(arm,size=0xc) addr:0x020f11f0 +_ZN15ActorItemFlower19func_ov031_020f11fcEv kind:function(arm,size=0xc) addr:0x020f11fc +_ZN15ActorItemFlower19func_ov031_020f1208Ev kind:function(arm,size=0x14) addr:0x020f1208 +_ZN15ActorItemFlower19func_ov031_020f121cEv kind:function(arm,size=0x14) addr:0x020f121c +_ZN15ActorItemFlower19func_ov031_020f1230Ev kind:function(arm,size=0xd8) addr:0x020f1230 +_ZN15ActorItemFlower19func_ov031_020f1308Ev kind:function(arm,size=0xc) addr:0x020f1308 +_ZN15ActorItemFlowerD1Ev kind:function(arm,size=0x30) addr:0x020f1314 +_ZN15ActorItemFlowerD0Ev kind:function(arm,size=0x38) addr:0x020f1344 +_ZN22ActorProfileItemFlowerD1Ev kind:function(arm,size=0x14) addr:0x020f137c _ZN21ActorProfileShotArrow10GetProfileEv kind:function(arm,size=0xc) addr:0x020f1390 _ZN21ActorProfileShotArrow6CreateEv kind:function(arm,size=0x24) addr:0x020f139c _ZN21ActorProfileShotArrowC1Ev kind:function(arm,size=0x44) addr:0x020f13c0 @@ -1524,7 +1524,7 @@ _ZN16MapObjectUnkBMFL19func_ov031_02102af4Ev kind:function(arm,size=0x70) addr:0 _ZN16MapObjectUnkBMFLD1Ev kind:function(arm,size=0x20) addr:0x02102b64 _ZN16MapObjectUnkBMFLD0Ev kind:function(arm,size=0x28) addr:0x02102b84 _ZN23MapObjectProfileUnkBMFLD1Ev kind:function(arm,size=0x14) addr:0x02102bac -func_ov031_02102bc0 kind:function(arm,size=0x40) addr:0x02102bc0 +_ZN26ModelRender_ov031_0211578cC1EPK10G3d_Model_ii kind:function(arm,size=0x40) addr:0x02102bc0 func_ov031_02102c00 kind:function(arm,size=0x30) addr:0x02102c00 func_ov031_02102c30 kind:function(arm,size=0x224) addr:0x02102c30 _ZN19func_ov031_02102e54D0Ev kind:function(arm,size=0x1c) addr:0x02102e54 @@ -2082,8 +2082,8 @@ __sinit_ActorUnkZLSL_ZSRS.cpp kind:function(arm,size=0x94) addr:0x02111308 __sinit_ActorHeart.cpp kind:function(arm,size=0x6c) addr:0x0211139c __sinit_ActorUnkRMTG.cpp kind:function(arm,size=0x50) addr:0x02111408 local __sinit_ActorUnkSCCN.cpp kind:function(arm,size=0x50) addr:0x02111458 -__sinit_ActorPot.cpp kind:function(arm,size=0x50) addr:0x021114a8 -__sinit_ActorUnkNITF.cpp kind:function(arm,size=0x50) addr:0x021114f8 +__sinit_ActorPot.cpp kind:function(arm,size=0x50) addr:0x021114a8 local +__sinit_ActorItemFlower.cpp kind:function(arm,size=0x50) addr:0x021114f8 local __sinit_ActorShotArrow.cpp kind:function(arm,size=0x50) addr:0x02111548 __sinit_ActorUnkATTG.cpp kind:function(arm,size=0x50) addr:0x02111598 __sinit_ActorUnkNTTZ.cpp kind:function(arm,size=0x50) addr:0x021115e8 local @@ -2146,8 +2146,8 @@ __sinit_MapObjectUnkSWFS.cpp kind:function(arm,size=0x70) addr:0x02112724 .p__sinit_ActorHeart.cpp kind:data(word) addr:0x021127c0 .p__sinit_ActorUnkRMTG.cpp kind:data(word) addr:0x021127c4 local .p__sinit_ActorUnkSCCN.cpp kind:data(word) addr:0x021127c8 -.p__sinit_ActorPot.cpp kind:data(word) addr:0x021127cc -.p__sinit_ActorUnkNITF.cpp kind:data(word) addr:0x021127d0 +.p__sinit_ActorPot.cpp kind:data(word) addr:0x021127cc local +.p__sinit_ActorItemFlower.cpp kind:data(word) addr:0x021127d0 local .p__sinit_ActorShotArrow.cpp kind:data(word) addr:0x021127d4 .p__sinit_ActorUnkATTG.cpp kind:data(word) addr:0x021127d8 .p__sinit_ActorUnkNTTZ.cpp kind:data(word) addr:0x021127dc local @@ -2337,16 +2337,16 @@ _ZTV19ActorProfileUnkSCCN kind:data(any) addr:0x02113eec _ZTV12MapObject_10 kind:data(any) addr:0x02113f10 _ZTV12ActorUnkSCCN kind:data(any) addr:0x02113f38 _ZTV19data_ov031_02113f9c kind:data(any) addr:0x02113f94 -data_ov031_02113fb8 kind:data(any) addr:0x02113fb8 +_ZTV19data_ov031_02113fb8 kind:data(any) addr:0x02113fb0 _ZTV19data_ov031_02113fcc kind:data(any) addr:0x02113fcc _ZTV15ActorProfilePot kind:data(any) addr:0x0211403c -data_ov031_02114060 kind:data(any) addr:0x02114060 -data_ov031_021140a0 kind:data(any) addr:0x021140a0 +data_ov031_02114060 kind:data(any) addr:0x02114060 local +data_ov031_021140a0 kind:data(any) addr:0x021140a0 local _ZTV8ActorPot kind:data(any) addr:0x021140e0 -_ZTV19data_ov031_02114150 kind:data(any) addr:0x02114150 -data_ov031_02114174 kind:data(any) addr:0x02114174 -data_ov031_021141b4 kind:data(any) addr:0x021141b4 -_ZTV19data_ov031_021141f4 kind:data(any) addr:0x021141f4 +_ZTV22ActorProfileItemFlower kind:data(any) addr:0x02114150 +data_ov031_02114174 kind:data(any) addr:0x02114174 local +data_ov031_021141b4 kind:data(any) addr:0x021141b4 local +_ZTV15ActorItemFlower kind:data(any) addr:0x021141f4 _ZTV18ActorShotArrow_194 kind:data(any) addr:0x02114264 _ZTV18ActorShotArrow_178 kind:data(any) addr:0x02114280 _ZTV21ActorProfileShotArrow kind:data(any) addr:0x0211429c @@ -2443,7 +2443,7 @@ _ZTV19data_ov031_021156b0 kind:data(any) addr:0x021156a8 data_ov031_021156cc kind:data(any) addr:0x021156cc data_ov031_0211570c kind:data(any) addr:0x0211570c data_ov031_02115728 kind:data(any) addr:0x02115728 -data_ov031_0211578c kind:data(any) addr:0x0211578c +_ZTV19data_ov031_0211578c kind:data(any) addr:0x02115784 data_ov031_021157b0 kind:data(any) addr:0x021157b0 local _ZTV31MapObjectProfileTreasureSpawned kind:data(any) addr:0x021157b8 _ZTV24MapObjectTreasureSpawned kind:data(any) addr:0x021157d4 @@ -2562,11 +2562,11 @@ _ZGVN15ProfileInstanceI19ActorProfileUnkSCCNE8sProfileE kind:bss addr:0x0211698c @10842 kind:bss addr:0x02116990 _ZN15ProfileInstanceI19ActorProfileUnkSCCNE8sProfileE kind:bss addr:0x0211699c _ZGVN15ProfileInstanceI15ActorProfilePotE8sProfileE kind:bss addr:0x021169d8 -@10848 kind:bss addr:0x021169dc +@10848 kind:bss addr:0x021169dc local _ZN15ProfileInstanceI15ActorProfilePotE8sProfileE kind:bss addr:0x021169e8 -_ZGVN15ProfileInstanceI19ActorProfileUnkNITFE8sProfileE kind:bss addr:0x02116a24 -@10854 kind:bss addr:0x02116a28 -_ZN15ProfileInstanceI19ActorProfileUnkNITFE8sProfileE kind:bss addr:0x02116a34 +_ZGVN15ProfileInstanceI22ActorProfileItemFlowerE8sProfileE kind:bss addr:0x02116a24 +@10854 kind:bss addr:0x02116a28 local +_ZN15ProfileInstanceI22ActorProfileItemFlowerE8sProfileE kind:bss addr:0x02116a34 _ZGVN15ProfileInstanceI21ActorProfileShotArrowE8sProfileE kind:bss addr:0x02116a70 @10860 kind:bss addr:0x02116a74 _ZN15ProfileInstanceI21ActorProfileShotArrowE8sProfileE kind:bss addr:0x02116a80 diff --git a/config/eur/arm9/overlays/ov070/relocs.txt b/config/eur/arm9/overlays/ov070/relocs.txt index 6b023fe6..89c6b1aa 100644 --- a/config/eur/arm9/overlays/ov070/relocs.txt +++ b/config/eur/arm9/overlays/ov070/relocs.txt @@ -79,7 +79,7 @@ from:0x0213f960 kind:arm_call to:0x02098488 module:overlay(0) from:0x0213f968 kind:arm_call to:0x02011ff4 module:main from:0x0213f97c kind:arm_call to:0x02097724 module:overlay(0) from:0x0213f9d0 kind:load to:0x0214e904 module:overlay(70) -from:0x0213f9d4 kind:load to:0x020b2838 module:overlay(0) +from:0x0213f9d4 kind:load to:0x020b2830 module:overlay(0) add:0x8 from:0x0213f9d8 kind:load to:0x0214e918 module:overlay(70) from:0x0213f9e4 kind:arm_call to:0x0207bffc module:overlay(0) from:0x0213fab0 kind:arm_call to:0x01ff9258 module:itcm diff --git a/config/jp/arm9/overlays/ov000/symbols.txt b/config/jp/arm9/overlays/ov000/symbols.txt index 146819c4..84212d7e 100644 --- a/config/jp/arm9/overlays/ov000/symbols.txt +++ b/config/jp/arm9/overlays/ov000/symbols.txt @@ -73,7 +73,7 @@ func_ov000_02058db0 kind:function(arm,size=0x3c) addr:0x02058db0 func_ov000_02058dec kind:function(arm,size=0x38) addr:0x02058dec func_ov000_020578a4 kind:function(arm,size=0x20) addr:0x02058e24 func_ov000_02058e44 kind:function(arm,size=0x24) addr:0x02058e44 -func_ov000_02058e68 kind:function(thumb,size=0x20) addr:0x02058e68 +_ZN26ModelRender_ov000_020b198cC1EP10G3d_Model_c kind:function(thumb,size=0x20) addr:0x02058e68 func_ov000_02058e88 kind:function(arm,size=0x34) addr:0x02058e88 func_ov000_02058ebc kind:function(arm,size=0xa4) addr:0x02058ebc _ZN19func_ov000_02058f60D1Ev kind:function(arm,size=0x14) addr:0x02058f60 @@ -1379,7 +1379,7 @@ _ZN19func_ov000_0207cce0D1Ev kind:function(arm,size=0x14) addr:0x0207cce0 _ZN19func_ov000_0207ccf4D0Ev kind:function(arm,size=0x1c) addr:0x0207ccf4 _ZN19func_ov000_0207cd10D1Ev kind:function(arm,size=0x30) addr:0x0207cd10 _ZN19func_ov000_0207cd40D0Ev kind:function(arm,size=0x38) addr:0x0207cd40 -_ZN24UnkStruct_ov031_Items_01D2Ev kind:function(arm,size=0x30) addr:0x0207cd78 +_ZN29UnkStruct_ov031_Items_01_BaseD2Ev kind:function(arm,size=0x30) addr:0x0207cd78 func_ov000_0207cda8 kind:function(arm,size=0x1c) addr:0x0207cda8 func_ov000_0207cdc4 kind:function(arm,size=0x10) addr:0x0207cdc4 _ZN24UnkStruct_ov031_Items_018vfunc_08Ev kind:function(arm,size=0x38) addr:0x0207cdd4 diff --git a/config/jp/arm9/overlays/ov031/delinks.txt b/config/jp/arm9/overlays/ov031/delinks.txt index 7a195990..bc01a210 100644 --- a/config/jp/arm9/overlays/ov031/delinks.txt +++ b/config/jp/arm9/overlays/ov031/delinks.txt @@ -92,15 +92,19 @@ src/031_Land/Actor/ActorUnkSCCN.cpp: .bss start:0x0211872c end:0x02118778 src/031_Land/Actor/ActorPot.cpp: + complete .text start:0x020f25fc end:0x020f29c8 .init start:0x02113218 end:0x02113268 .ctor start:0x02114558 end:0x0211455c + .data start:0x02115ddc end:0x02115ef0 .bss start:0x02118778 end:0x021187c4 -src/031_Land/Actor/ActorUnkNITF.cpp: +src/031_Land/Actor/ActorItemFlower.cpp: + complete .text start:0x020f29c8 end:0x020f2d8c .init start:0x02113268 end:0x021132b8 .ctor start:0x0211455c end:0x02114560 + .data start:0x02115ef0 end:0x02116004 .bss start:0x021187c4 end:0x02118810 src/031_Land/Actor/ActorShotArrow.cpp: diff --git a/config/jp/arm9/overlays/ov031/symbols.txt b/config/jp/arm9/overlays/ov031/symbols.txt index 3b8be194..7aefdd1b 100644 --- a/config/jp/arm9/overlays/ov031/symbols.txt +++ b/config/jp/arm9/overlays/ov031/symbols.txt @@ -780,41 +780,41 @@ _ZN12ActorUnkSCCN8vfunc_18Ei kind:function(arm,size=0x1d8) addr:0x020f149c _ZN12ActorUnkSCCND1Ev kind:function(arm,size=0x20) addr:0x020f1674 _ZN12ActorUnkSCCND0Ev kind:function(arm,size=0x28) addr:0x020f1694 _ZN19ActorProfileUnkSCCND1Ev kind:function(arm,size=0x14) addr:0x020f16bc -func_ov031_020f16d0 kind:function(arm,size=0x98) addr:0x020f16d0 -func_ov031_020f1768 kind:function(arm,size=0x60) addr:0x020f1768 -func_ov031_020f17c8 kind:function(arm,size=0x3c) addr:0x020f17c8 -func_ov031_020f1804 kind:function(arm,size=0xb8) addr:0x020f1804 +_ZN20Actor_ov031_02113fd4C2Ev kind:function(arm,size=0x98) addr:0x020f16d0 +_ZN20Actor_ov031_02113fd48vfunc_18Ei kind:function(arm,size=0x60) addr:0x020f1768 +_ZN20Actor_ov031_02113fd44GrabE15ActorGrabParams kind:function(arm,size=0x3c) addr:0x020f17c8 +_ZN20Actor_ov031_02113fd44DropE15ActorGrabParamsPK7VecFx32 kind:function(arm,size=0xb8) addr:0x020f1804 func_ov031_020f18bc kind:function(arm,size=0x18) addr:0x020f18bc func_ov031_020f18d4 kind:function(arm,size=0x2c) addr:0x020f18d4 func_ov031_020f1900 kind:function(arm,size=0xb8) addr:0x020f1900 func_ov031_020f19b8 kind:function(arm,size=0xa0) addr:0x020f19b8 func_ov031_020f1a58 kind:function(arm,size=0x4) addr:0x020f1a58 -func_ov031_020f1a5c kind:function(arm,size=0x30) addr:0x020f1a5c -func_ov031_020f1a8c kind:function(arm,size=0x4) addr:0x020f1a8c -func_ov031_020f1a90 kind:function(arm,size=0x4) addr:0x020f1a90 -func_ov031_020f1a94 kind:function(arm,size=0x4) addr:0x020f1a94 -func_ov031_020f1a98 kind:function(arm,size=0x4) addr:0x020f1a98 -func_ov031_020f1a9c kind:function(arm,size=0x24) addr:0x020f1a9c -func_ov031_020f1ac0 kind:function(arm,size=0xd4) addr:0x020f1ac0 -func_ov031_020f1b94 kind:function(arm,size=0x14) addr:0x020f1b94 -func_ov031_020f1ba8 kind:function(arm,size=0x74) addr:0x020f1ba8 -func_ov031_020f1c1c kind:function(arm,size=0x24) addr:0x020f1c1c -func_ov031_020f1c40 kind:function(arm,size=0x64) addr:0x020f1c40 -func_ov031_020f1ca4 kind:function(arm,size=0x20) addr:0x020f1ca4 -func_ov031_020f1cc4 kind:function(arm,size=0x188) addr:0x020f1cc4 -func_ov031_020f1e4c kind:function(arm,size=0x58) addr:0x020f1e4c -func_ov031_020f1ea4 kind:function(arm,size=0x34) addr:0x020f1ea4 -func_ov031_020f1ed8 kind:function(arm,size=0x38) addr:0x020f1ed8 -func_ov031_020f1f10 kind:function(arm,size=0x124) addr:0x020f1f10 +_ZN20Actor_ov031_02113fd48vfunc_24Ev kind:function(arm,size=0x30) addr:0x020f1a5c +_ZN20Actor_ov031_02113fd48vfunc_60Ev kind:function(arm,size=0x4) addr:0x020f1a8c +_ZN20Actor_ov031_02113fd419func_ov031_020f0094Ev kind:function(arm,size=0x4) addr:0x020f1a90 +_ZN20Actor_ov031_02113fd419func_ov031_020f0098Ev kind:function(arm,size=0x4) addr:0x020f1a94 +_ZN20Actor_ov031_02113fd419func_ov031_020f009cEv kind:function(arm,size=0x4) addr:0x020f1a98 +_ZN20Actor_ov031_02113fd419func_ov031_020f00a0Ev kind:function(arm,size=0x24) addr:0x020f1a9c +_ZN20Actor_ov031_02113fd419func_ov031_020f00c4Ev kind:function(arm,size=0xd4) addr:0x020f1ac0 +_ZN20Actor_ov031_02113fd419func_ov031_020f0198Ev kind:function(arm,size=0x14) addr:0x020f1b94 +_ZN20Actor_ov031_02113fd419func_ov031_020f01acEv kind:function(arm,size=0x74) addr:0x020f1ba8 +_ZN20Actor_ov031_02113fd419func_ov031_020f0220Ev kind:function(arm,size=0x24) addr:0x020f1c1c +_ZN20Actor_ov031_02113fd419func_ov031_020f0244Ev kind:function(arm,size=0x64) addr:0x020f1c40 +_ZN20Actor_ov031_02113fd48vfunc_40Ev kind:function(arm,size=0x20) addr:0x020f1ca4 +_ZN20Actor_ov031_02113fd48vfunc_44Ev kind:function(arm,size=0x188) addr:0x020f1cc4 +_ZN20Actor_ov031_02113fd419func_ov031_020f0450Ei kind:function(arm,size=0x58) addr:0x020f1e4c +_ZN20Actor_ov031_02113fd419func_ov031_020f04a8Ev kind:function(arm,size=0x34) addr:0x020f1ea4 +_ZN20Actor_ov031_02113fd419func_ov031_020f04dcEv kind:function(arm,size=0x38) addr:0x020f1ed8 +_ZN20Actor_ov031_02113fd419func_ov031_020f0514Ev kind:function(arm,size=0x124) addr:0x020f1f10 func_ov031_020f2034 kind:function(arm,size=0x14) addr:0x020f2034 -func_ov031_020f2048 kind:function(arm,size=0x8) addr:0x020f2048 -func_ov031_020f2050 kind:function(arm,size=0x8) addr:0x020f2050 -func_ov031_020f2058 kind:function(arm,size=0x24) addr:0x020f2058 +_ZN20Actor_ov031_02113fd48vfunc_54Ev kind:function(arm,size=0x8) addr:0x020f2048 +_ZN20Actor_ov031_02113fd48vfunc_58Ev kind:function(arm,size=0x8) addr:0x020f2050 +_ZN20Actor_ov031_02113fd48vfunc_64Ev kind:function(arm,size=0x24) addr:0x020f2058 func_ov031_020f207c kind:function(arm,size=0xc0) addr:0x020f207c func_ov031_020f213c kind:function(arm,size=0xe0) addr:0x020f213c func_ov031_020f221c kind:function(arm,size=0x1b0) addr:0x020f221c func_ov031_020f23cc kind:function(arm,size=0x28) addr:0x020f23cc -_ZN19func_ov031_020f23f4D1Ev kind:function(arm,size=0x1c) addr:0x020f23f4 +_ZN24UnkStruct_ov031_02113fb8D1Ev kind:function(arm,size=0x1c) addr:0x020f23f4 _ZN19func_ov031_020f2410D0Ev kind:function(arm,size=0x24) addr:0x020f2410 func_ov031_020f2434 kind:function(arm,size=0x70) addr:0x020f2434 func_ov031_020f24a4 kind:function(arm,size=0xb4) addr:0x020f24a4 @@ -846,30 +846,30 @@ _ZN8ActorPot19func_ov031_020f0f44Ev kind:function(arm,size=0xc) addr:0x020f2940 _ZN8ActorPotD1Ev kind:function(arm,size=0x30) addr:0x020f294c _ZN8ActorPotD0Ev kind:function(arm,size=0x38) addr:0x020f297c _ZN15ActorProfilePotD1Ev kind:function(arm,size=0x14) addr:0x020f29b4 -_ZN19ActorProfileUnkNITF10GetProfileEv kind:function(arm,size=0xc) addr:0x020f29c8 -_ZN19ActorProfileUnkNITF6CreateEv kind:function(arm,size=0x24) addr:0x020f29d4 -_ZN19ActorProfileUnkNITFC1Ev kind:function(arm,size=0x30) addr:0x020f29f8 -_ZN12ActorUnkNITFC1Ev kind:function(arm,size=0x94) addr:0x020f2a28 -_ZN12ActorUnkNITF19func_ov031_020f10c0Ev kind:function(arm,size=0x14) addr:0x020f2abc -_ZN12ActorUnkNITF19func_ov031_020f10d4Ev kind:function(arm,size=0x28) addr:0x020f2ad0 -_ZN12ActorUnkNITF19func_ov031_020f10fcEv kind:function(arm,size=0x44) addr:0x020f2af8 -_ZN12ActorUnkNITF19func_ov031_020f1140Ev kind:function(arm,size=0x38) addr:0x020f2b3c -_ZN12ActorUnkNITF19func_ov031_020f1178Ev kind:function(arm,size=0x30) addr:0x020f2b74 -_ZN12ActorUnkNITF19func_ov031_020f11a8Ev kind:function(arm,size=0xc) addr:0x020f2ba4 -_ZN12ActorUnkNITF19func_ov031_020f11b4Ev kind:function(arm,size=0xc) addr:0x020f2bb0 -_ZN12ActorUnkNITF19func_ov031_020f11c0Ev kind:function(arm,size=0xc) addr:0x020f2bbc -_ZN12ActorUnkNITF19func_ov031_020f11ccEv kind:function(arm,size=0xc) addr:0x020f2bc8 -_ZN12ActorUnkNITF19func_ov031_020f11d8Ev kind:function(arm,size=0xc) addr:0x020f2bd4 -_ZN12ActorUnkNITF19func_ov031_020f11e4Ev kind:function(arm,size=0xc) addr:0x020f2be0 -_ZN12ActorUnkNITF19func_ov031_020f11f0Ev kind:function(arm,size=0xc) addr:0x020f2bec -_ZN12ActorUnkNITF19func_ov031_020f11fcEv kind:function(arm,size=0xc) addr:0x020f2bf8 -_ZN12ActorUnkNITF19func_ov031_020f1208Ev kind:function(arm,size=0x14) addr:0x020f2c04 -_ZN12ActorUnkNITF19func_ov031_020f121cEv kind:function(arm,size=0x14) addr:0x020f2c18 -_ZN12ActorUnkNITF19func_ov031_020f1230Ev kind:function(arm,size=0xd8) addr:0x020f2c2c -_ZN12ActorUnkNITF19func_ov031_020f1308Ev kind:function(arm,size=0xc) addr:0x020f2d04 -_ZN12ActorUnkNITFD1Ev kind:function(arm,size=0x30) addr:0x020f2d10 -_ZN12ActorUnkNITFD0Ev kind:function(arm,size=0x38) addr:0x020f2d40 -_ZN19ActorProfileUnkNITFD1Ev kind:function(arm,size=0x14) addr:0x020f2d78 +_ZN22ActorProfileItemFlower10GetProfileEv kind:function(arm,size=0xc) addr:0x020f29c8 +_ZN22ActorProfileItemFlower6CreateEv kind:function(arm,size=0x24) addr:0x020f29d4 +_ZN22ActorProfileItemFlowerC1Ev kind:function(arm,size=0x30) addr:0x020f29f8 +_ZN15ActorItemFlowerC1Ev kind:function(arm,size=0x94) addr:0x020f2a28 +_ZN26ModelRender_ov031_0211578cD1Ev kind:function(arm,size=0x14) addr:0x020f2abc +_ZN15ActorItemFlower8vfunc_18Ei kind:function(arm,size=0x28) addr:0x020f2ad0 +_ZN15ActorItemFlower8vfunc_5CEs kind:function(arm,size=0x44) addr:0x020f2af8 +_ZN15ActorItemFlower8vfunc_20Ev kind:function(arm,size=0x38) addr:0x020f2b3c +_ZN15ActorItemFlower8vfunc_2CEi kind:function(arm,size=0x30) addr:0x020f2b74 +_ZN15ActorItemFlower19func_ov031_020f11a8Ev kind:function(arm,size=0xc) addr:0x020f2ba4 +_ZN15ActorItemFlower19func_ov031_020f11b4Ev kind:function(arm,size=0xc) addr:0x020f2bb0 +_ZN15ActorItemFlower19func_ov031_020f11c0Ev kind:function(arm,size=0xc) addr:0x020f2bbc +_ZN15ActorItemFlower19func_ov031_020f11ccEv kind:function(arm,size=0xc) addr:0x020f2bc8 +_ZN15ActorItemFlower19func_ov031_020f11d8Ev kind:function(arm,size=0xc) addr:0x020f2bd4 +_ZN15ActorItemFlower19func_ov031_020f11e4Ev kind:function(arm,size=0xc) addr:0x020f2be0 +_ZN15ActorItemFlower19func_ov031_020f11f0Ev kind:function(arm,size=0xc) addr:0x020f2bec +_ZN15ActorItemFlower19func_ov031_020f11fcEv kind:function(arm,size=0xc) addr:0x020f2bf8 +_ZN15ActorItemFlower19func_ov031_020f1208Ev kind:function(arm,size=0x14) addr:0x020f2c04 +_ZN15ActorItemFlower19func_ov031_020f121cEv kind:function(arm,size=0x14) addr:0x020f2c18 +_ZN15ActorItemFlower19func_ov031_020f1230Ev kind:function(arm,size=0xd8) addr:0x020f2c2c +_ZN15ActorItemFlower19func_ov031_020f1308Ev kind:function(arm,size=0xc) addr:0x020f2d04 +_ZN15ActorItemFlowerD1Ev kind:function(arm,size=0x30) addr:0x020f2d10 +_ZN15ActorItemFlowerD0Ev kind:function(arm,size=0x38) addr:0x020f2d40 +_ZN22ActorProfileItemFlowerD1Ev kind:function(arm,size=0x14) addr:0x020f2d78 _ZN21ActorProfileShotArrow10GetProfileEv kind:function(arm,size=0xc) addr:0x020f2d8c _ZN21ActorProfileShotArrow6CreateEv kind:function(arm,size=0x24) addr:0x020f2d98 _ZN21ActorProfileShotArrowC1Ev kind:function(arm,size=0x44) addr:0x020f2dbc @@ -1523,7 +1523,7 @@ _ZN16MapObjectUnkBMFL19func_ov031_02102af4Ev kind:function(arm,size=0x70) addr:0 _ZN16MapObjectUnkBMFLD1Ev kind:function(arm,size=0x20) addr:0x021048c0 _ZN16MapObjectUnkBMFLD0Ev kind:function(arm,size=0x28) addr:0x021048e0 _ZN23MapObjectProfileUnkBMFLD1Ev kind:function(arm,size=0x14) addr:0x02104908 -func_ov031_0210491c kind:function(arm,size=0x40) addr:0x0210491c +_ZN26ModelRender_ov031_0211578cC1EPK10G3d_Model_ii kind:function(arm,size=0x40) addr:0x0210491c func_ov031_0210495c kind:function(arm,size=0x30) addr:0x0210495c func_ov031_0210498c kind:function(arm,size=0x224) addr:0x0210498c _ZN19func_ov031_02104bb0D0Ev kind:function(arm,size=0x1c) addr:0x02104bb0 @@ -2079,8 +2079,8 @@ __sinit_ActorUnkZLSL_ZSRS.cpp kind:function(arm,size=0x94) addr:0x02113078 __sinit_ActorHeart.cpp kind:function(arm,size=0x6c) addr:0x0211310c __sinit_ActorUnkRMTG.cpp kind:function(arm,size=0x50) addr:0x02113178 local __sinit_ActorUnkSCCN.cpp kind:function(arm,size=0x50) addr:0x021131c8 -__sinit_ActorPot.cpp kind:function(arm,size=0x50) addr:0x02113218 -__sinit_ActorUnkNITF.cpp kind:function(arm,size=0x50) addr:0x02113268 +__sinit_ActorPot.cpp kind:function(arm,size=0x50) addr:0x02113218 local +__sinit_ActorItemFlower.cpp kind:function(arm,size=0x50) addr:0x02113268 local __sinit_ActorShotArrow.cpp kind:function(arm,size=0x50) addr:0x021132b8 __sinit_ActorUnkATTG.cpp kind:function(arm,size=0x50) addr:0x02113308 __sinit_ActorUnkNTTZ.cpp kind:function(arm,size=0x50) addr:0x02113358 local @@ -2143,8 +2143,8 @@ __sinit_MapObjectUnkSWFS.cpp kind:function(arm,size=0x70) addr:0x021144b0 .p__sinit_ActorHeart.cpp kind:data(word) addr:0x0211454c .p__sinit_ActorUnkRMTG.cpp kind:data(word) addr:0x02114550 local .p__sinit_ActorUnkSCCN.cpp kind:data(word) addr:0x02114554 -.p__sinit_ActorPot.cpp kind:data(word) addr:0x02114558 -.p__sinit_ActorUnkNITF.cpp kind:data(word) addr:0x0211455c +.p__sinit_ActorPot.cpp kind:data(word) addr:0x02114558 local +.p__sinit_ActorItemFlower.cpp kind:data(word) addr:0x0211455c local .p__sinit_ActorShotArrow.cpp kind:data(word) addr:0x02114560 .p__sinit_ActorUnkATTG.cpp kind:data(word) addr:0x02114564 .p__sinit_ActorUnkNTTZ.cpp kind:data(word) addr:0x02114568 local @@ -2335,15 +2335,14 @@ _ZTV12ActorUnkSCCN kind:data(any) addr:0x02115cd8 _ZTV19data_ov031_02115d3c kind:data(any) addr:0x02115d34 data_ov031_02115d58 kind:data(any) addr:0x02115d58 _ZTV19data_ov031_02115d6c kind:data(any) addr:0x02115d6c -_ZTV19data_ov031_02115ddc kind:data(any) addr:0x02115ddc -data_ov031_02115e00 kind:data(any) addr:0x02115e00 -data_ov031_02115e40 kind:data(any) addr:0x02115e40 -_ZTV19data_ov031_02115e80 kind:data(any) addr:0x02115e80 -_ZTV19data_ov031_02115ef0 kind:data(any) addr:0x02115ef0 -data_ov031_02115f14 kind:data(any) addr:0x02115f14 -data_ov031_02115f54 kind:data(any) addr:0x02115f54 -data_ov031_02115f94 kind:data(any) addr:0x02115f94 ambiguous -_ZTV19data_ov031_02115f94 kind:data(any) addr:0x02115f94 +_ZTV15ActorProfilePot kind:data(any) addr:0x02115ddc +data_ov031_02114060 kind:data(any) addr:0x02115e00 local +data_ov031_021140a0 kind:data(any) addr:0x02115e40 local +_ZTV8ActorPot kind:data(any) addr:0x02115e80 +_ZTV22ActorProfileItemFlower kind:data(any) addr:0x02115ef0 +data_ov031_02114174 kind:data(any) addr:0x02115f14 local +data_ov031_021141b4 kind:data(any) addr:0x02115f54 local +_ZTV15ActorItemFlower kind:data(any) addr:0x02115f94 _ZTV18ActorShotArrow_194 kind:data(any) addr:0x02116004 _ZTV18ActorShotArrow_178 kind:data(any) addr:0x02116020 _ZTV21ActorProfileShotArrow kind:data(any) addr:0x0211603c @@ -2557,11 +2556,11 @@ _ZGVN15ProfileInstanceI19ActorProfileUnkSCCNE8sProfileE kind:bss addr:0x0211872c @30842 kind:bss addr:0x02118730 _ZN15ProfileInstanceI19ActorProfileUnkSCCNE8sProfileE kind:bss addr:0x0211873c _ZGVN15ProfileInstanceI15ActorProfilePotE8sProfileE kind:bss addr:0x02118778 -@30848 kind:bss addr:0x0211877c +@30848 kind:bss addr:0x0211877c local _ZN15ProfileInstanceI15ActorProfilePotE8sProfileE kind:bss addr:0x02118788 -_ZGVN15ProfileInstanceI19ActorProfileUnkNITFE8sProfileE kind:bss addr:0x021187c4 -@30854 kind:bss addr:0x021187c8 -_ZN15ProfileInstanceI19ActorProfileUnkNITFE8sProfileE kind:bss addr:0x021187d4 +_ZGVN15ProfileInstanceI22ActorProfileItemFlowerE8sProfileE kind:bss addr:0x021187c4 +@30854 kind:bss addr:0x021187c8 local +_ZN15ProfileInstanceI22ActorProfileItemFlowerE8sProfileE kind:bss addr:0x021187d4 _ZGVN15ProfileInstanceI21ActorProfileShotArrowE8sProfileE kind:bss addr:0x02118810 @30860 kind:bss addr:0x02118814 _ZN15ProfileInstanceI21ActorProfileShotArrowE8sProfileE kind:bss addr:0x02118820 diff --git a/include/Actor/ActorItemFlower.hpp b/include/Actor/ActorItemFlower.hpp new file mode 100644 index 00000000..cea479a4 --- /dev/null +++ b/include/Actor/ActorItemFlower.hpp @@ -0,0 +1,70 @@ +#pragma once + +#include "Actor/Actor.hpp" +#include "Actor/ActorProfile.hpp" +#include "ActorPot.hpp" +#include "global.h" +#include "types.h" + +class ModelRender_ov031_0211578c : public ModelRender { +public: + /* 00 (base) */ + /* 60 */ + + ModelRender_ov031_0211578c(const G3d_Model *model, unk32 param1, unk32 param2); + + // data_ov031_0211578c + /* 1C */ virtual void vfunc_1C(UnkSystem4_vfunc_1C *param1) override; +}; + +enum ActorItemFlowerState_ { + ActorItemFlowerState_0 = 0, + ActorItemFlowerState_1 = 1, + ActorItemFlowerState_2 = 2, + ActorItemFlowerState_3 = 3, + ActorItemFlowerState_4 = 4, + ActorItemFlowerState_5 = 5, + ActorItemFlowerState_6 = 6, + ActorItemFlowerState_7 = 7, + ActorItemFlowerState_Max, +}; + +class ActorItemFlower : public Actor_ov031_02113fd4 { +public: + /* 000 (base) */ + /* 110 */ ModelRender_ov031_0211578c mUnk_110; + /* 170 */ STRUCT_PAD(0x170, 0x17C); + /* 17C */ + + ActorItemFlower(); + + /* 18 */ bool vfunc_18(unk32 param1); + /* 20 */ virtual void vfunc_20() override; + /* 2C */ virtual void vfunc_2C(unk32 param1) override; + /* 5C */ virtual void vfunc_5C(ActorState state) override; + + void func_ov031_020f11a8(); + void func_ov031_020f11b4(); + void func_ov031_020f11c0(); + void func_ov031_020f11cc(); + void func_ov031_020f11d8(); + void func_ov031_020f11e4(); + void func_ov031_020f11f0(); + void func_ov031_020f11fc(); + void func_ov031_020f1208(); + void func_ov031_020f121c(); + void func_ov031_020f1230(); + void func_ov031_020f1308(); +}; + +class ActorProfileItemFlower : public ActorProfile { +public: + /* 00 (base) */ + /* 3A */ + + ActorProfileItemFlower(); + + /* 0C */ virtual Actor *Create(); + + static ActorProfileItemFlower *GetProfile(); +}; diff --git a/include/Actor/ActorPot.hpp b/include/Actor/ActorPot.hpp index b6b53873..b7afd0b0 100644 --- a/include/Actor/ActorPot.hpp +++ b/include/Actor/ActorPot.hpp @@ -21,18 +21,18 @@ enum ActorPotState_ { class UnkStruct_ov000_020b2838 { public: // data_ov000_020b2838 - /* 00 */ virtual void vfunc_00(); // func_ov000_0207bfe4 - /* 04 */ virtual ~UnkStruct_ov000_020b2838(); // func_ov000_0207bfe8 - /* 08 */ virtual void vfunc_08(); // func_ov000_0207c000 - /* 0C */ virtual void vfunc_0C(); // func_ov000_0207c008 + /* 00 */ virtual void vfunc_00(); + /* 04 */ virtual ~UnkStruct_ov000_020b2838(); + /* 08 */ virtual void vfunc_08(); // to link func_ov000_0207c000 + /* 0C */ virtual void vfunc_0C(); // to link func_ov000_0207c008 }; -class UnkStruct_ov031_02113fb8 : UnkStruct_ov000_020b2838 { +class UnkStruct_ov031_02113fb8 : public UnkStruct_ov000_020b2838 { public: // data_ov031_02113fb8 - /* 00 */ virtual ~UnkStruct_ov031_02113fb8() override; // func_ov031_020f09f8 & func_ov031_020f0a14 - /* 08 */ virtual void vfunc_08() override; // func_ov031_020f0aa8 - /* 0C */ virtual void vfunc_0C() override; // func_ov031_020f0a38 + /* 00 */ virtual ~UnkStruct_ov031_02113fb8() override; + /* 08 */ virtual void vfunc_08() override; + /* 0C */ virtual void vfunc_0C() override; }; class Actor_ov031_02113fd4 : public Actor { @@ -49,18 +49,18 @@ public: Actor_ov031_02113fd4(); // data_ov031_02113fd4 - /* 18 */ virtual bool vfunc_18(unk32 param1) override; // func_ov031_020efd6c - /* 20 */ virtual void vfunc_20() override; // func_ov031_020f005c - /* 24 */ virtual void vfunc_24() override; // func_ov031_020f0060 - /* 38 */ virtual bool Grab(ActorGrabParams grabParams) override; // func_ov031_020efdcc - /* 3C */ virtual bool Drop(ActorGrabParams grabParams, const VecFx32 *pVel) override; // func_ov031_020efe08 - /* 40 */ virtual void vfunc_40() override; // func_ov031_020f02a8 - /* 44 */ virtual void vfunc_44() override; // func_ov031_020f02c - /* 54 */ virtual void vfunc_54(); // func_ov031_020f064c - /* 58 */ virtual void vfunc_58(); // func_ov031_020f0654 - /* 5C */ virtual void vfunc_5C(ActorState param1) = 0; - /* 60 */ virtual void vfunc_60(); // func_ov031_020f0090 - /* 64 */ virtual void vfunc_64(); // func_ov031_020f065c + /* 18 */ virtual bool vfunc_18(unk32 param1) override; + /* 20 */ virtual void vfunc_20() override; + /* 24 */ virtual void vfunc_24() override; + /* 38 */ virtual bool Grab(ActorGrabParams grabParams) override; + /* 3C */ virtual bool Drop(ActorGrabParams grabParams, const VecFx32 *pVel) override; + /* 40 */ virtual void vfunc_40() override; + /* 44 */ virtual void vfunc_44() override; + /* 54 */ virtual void vfunc_54(); + /* 58 */ virtual void vfunc_58(); + /* 5C */ virtual void vfunc_5C(ActorState state) = 0; + /* 60 */ virtual void vfunc_60(); + /* 64 */ virtual void vfunc_64(); void func_ov031_020f0094(); void func_ov031_020f0098(); @@ -86,10 +86,10 @@ public: ActorPot(); - /* 18 */ virtual bool vfunc_18(unk32 param1) override; // func_ov031_020f0d04 - /* 20 */ virtual void vfunc_20() override; // func_ov031_020f0d80 - /* 2C */ virtual void vfunc_2C(unk32 param1) override; // func_ov031_020f0db8 - /* 5C */ virtual void vfunc_5C(ActorState param1) override; // func_ov031_020f0d2c + /* 18 */ virtual bool vfunc_18(unk32 param1) override; + /* 20 */ virtual void vfunc_20() override; + /* 2C */ virtual void vfunc_2C(unk32 param1) override; + /* 5C */ virtual void vfunc_5C(ActorState state) override; void func_ov031_020f0cf0(); void func_ov031_020f0de8(); diff --git a/include/Actor/ActorTable.inl b/include/Actor/ActorTable.inl index 2abb91b1..b96fe5c7 100644 --- a/include/Actor/ActorTable.inl +++ b/include/Actor/ActorTable.inl @@ -248,7 +248,7 @@ DEFINE_ACTOR_TYPE('NCMB', NCMB) DEFINE_ACTOR_TYPE('NCWA', NCWA) DEFINE_ACTOR_TYPE('NFSP', NFSP) DEFINE_ACTOR_TYPE('NICO', NICO) -DEFINE_ACTOR_TYPE('NITF', NITF) +DEFINE_ACTOR_TYPE('NITF', ItemFlower) DEFINE_ACTOR_TYPE('NLTR', NLTR) DEFINE_ACTOR_TYPE('NORE', NORE) DEFINE_ACTOR_TYPE('NPWC', NPWC) diff --git a/include/Actor/ActorUnkNITF.hpp b/include/Actor/ActorUnkNITF.hpp deleted file mode 100644 index be1b35d6..00000000 --- a/include/Actor/ActorUnkNITF.hpp +++ /dev/null @@ -1,58 +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 ActorUnkNITF_C4 : public Actor_C4 { -public: - ActorUnkNITF_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 ActorUnkNITF : public Actor { -public: - /* 00 (base) */ - /* 94 */ - - ActorUnkNITF(); - - /* 4C */ virtual ~ActorUnkNITF() override; - - void func_ov031_020f10c0(void); - void func_ov031_020f10d4(void); - void func_ov031_020f10fc(void); - void func_ov031_020f1140(void); - void func_ov031_020f1178(void); - void func_ov031_020f11a8(void); - void func_ov031_020f11b4(void); - void func_ov031_020f11c0(void); - void func_ov031_020f11cc(void); - void func_ov031_020f11d8(void); - void func_ov031_020f11e4(void); - void func_ov031_020f11f0(void); - void func_ov031_020f11fc(void); - void func_ov031_020f1208(void); - void func_ov031_020f121c(void); - void func_ov031_020f1230(void); - void func_ov031_020f1308(void); -}; - -class ActorProfileUnkNITF : public ActorProfile { -public: - /* 00 (base) */ - - ActorProfileUnkNITF(); - ~ActorProfileUnkNITF(); - - /* 0C */ virtual Actor *Create(); - - static ActorProfileUnkNITF *GetProfile(); -}; diff --git a/include/Render/ModelRender.hpp b/include/Render/ModelRender.hpp index 0ee7f1e4..e0b29582 100644 --- a/include/Render/ModelRender.hpp +++ b/include/Render/ModelRender.hpp @@ -127,7 +127,6 @@ public: ModelRender_ov000_020b198c(G3d_Model *pModel, unk8 param2); // data_ov000_020b198c - /* 00 */ virtual ~ModelRender_ov000_020b198c() override {} /* 08 */ virtual void vfunc_08(G3d_Model *pModel) override; // func_ov000_02057908 /* 0C */ virtual void vfunc_0C() override; // func_ov000_0205793c /* 10 */ virtual void vfunc_10(VecFx32 *param1, Mat3p *param2, VecFx32 *param3) override; diff --git a/include/Unknown/UnkStruct_ov031_Items.hpp b/include/Unknown/UnkStruct_ov031_Items.hpp index 53fb0846..57c87049 100644 --- a/include/Unknown/UnkStruct_ov031_Items.hpp +++ b/include/Unknown/UnkStruct_ov031_Items.hpp @@ -58,7 +58,6 @@ public: } // data_ov000_020b27c8 - /* 00 */ virtual ~UnkStruct_ov031_Items_01(); /* 08 */ virtual void vfunc_08(); /* 0C */ virtual bool vfunc_0C(Actor *param1, VecFx32 *vector); /* 10 */ virtual void vfunc_10(Actor *actor); diff --git a/src/031_Land/Actor/ActorItemFlower.cpp b/src/031_Land/Actor/ActorItemFlower.cpp new file mode 100644 index 00000000..ce7f2cca --- /dev/null +++ b/src/031_Land/Actor/ActorItemFlower.cpp @@ -0,0 +1,126 @@ +#include "Actor/ActorItemFlower.hpp" + +#include "Map/MapObjectId.hpp" +#include "MapObject/MapObjectProfile.hpp" +#include "System/SysNew.hpp" +#include "Unknown/UnkStruct_027e09a8.hpp" +#include "Unknown/UnkStruct_027e0cec.hpp" +#include "Unknown/UnkStruct_ov000_020b5d34.hpp" + +static PTMF data_ov031_021141b4[ActorItemFlowerState_Max] = { + ActorItemFlower::func_ov031_020f11b4, // ActorItemFlowerState_0 + ActorItemFlower::func_ov031_020f11cc, // ActorItemFlowerState_1 + ActorItemFlower::func_ov031_020f11e4, // ActorItemFlowerState_2 + ActorItemFlower::func_ov031_020f11fc, // ActorItemFlowerState_3 + ActorItemFlower::func_ov031_020f121c, // ActorItemFlowerState_4 + ActorItemFlower::func_ov031_020f1308, // ActorItemFlowerState_5 + ActorItemFlower::func_ov031_020f0244, // ActorItemFlowerState_6 + ActorItemFlower::func_ov031_020f0514, // ActorItemFlowerState_7 +}; + +static PTMF data_ov031_02114174[ActorItemFlowerState_Max] = { + ActorItemFlower::func_ov031_020f11a8, // ActorItemFlowerState_0 + ActorItemFlower::func_ov031_020f11c0, // ActorItemFlowerState_1 + ActorItemFlower::func_ov031_020f11d8, // ActorItemFlowerState_2 + ActorItemFlower::func_ov031_020f11f0, // ActorItemFlowerState_3 + ActorItemFlower::func_ov031_020f1208, // ActorItemFlowerState_4 + ActorItemFlower::func_ov031_020f1230, // ActorItemFlowerState_5 + ActorItemFlower::func_ov031_020f0220, // ActorItemFlowerState_6 + ActorItemFlower::func_ov031_020f04dc, // ActorItemFlowerState_7 +}; + +DECL_PROFILE(ActorProfileItemFlower); + +Actor *ActorProfileItemFlower::Create() { + return new(HeapIndex_2) ActorItemFlower(); +} + +ActorProfileItemFlower::ActorProfileItemFlower() : + ActorProfile(ActorId_ItemFlower) { + this->mUnk_04.size = FLOAT_TO_FX32(0.25f); +} + +ActorItemFlower::ActorItemFlower() : + mUnk_110(G3d_GetModelPtr(data_ov000_020b5d34.GetProfileFromId(MapObjectId_ITFL)->vfunc_04()->mUnk_50), 0x1, 0x1) {} + +bool ActorItemFlower::vfunc_18(unk32 param1) { + this->Actor_ov031_02113fd4::vfunc_18(param1); + this->vfunc_5C(ActorItemFlowerState_0); + return true; +} + +void ActorItemFlower::vfunc_5C(ActorState state) { + this->mState = state; + this->mUnk_EC = 0x0; + + CALL_PTMF(PTMF, data_ov031_02114174[this->mState]); +} + +void ActorItemFlower::vfunc_20() { + CALL_PTMF(PTMF, data_ov031_021141b4[this->mState]); +} + +void ActorItemFlower::vfunc_2C(unk32 param1) { + if (!this->func_01fff5d0(param1, 0x0)) { + return; + } + this->mUnk_110.vfunc_18(&this->mPos); +} + +void ActorItemFlower::func_ov031_020f11a8() { + this->Actor_ov031_02113fd4::func_ov031_020f0094(); +} + +void ActorItemFlower::func_ov031_020f11b4() { + this->Actor_ov031_02113fd4::func_ov031_020f0098(); +} + +void ActorItemFlower::func_ov031_020f11c0() { + this->Actor_ov031_02113fd4::func_ov031_020f009c(); +} + +void ActorItemFlower::func_ov031_020f11cc() { + this->Actor_ov031_02113fd4::func_ov031_020f00a0(); +} + +void ActorItemFlower::func_ov031_020f11d8() { + this->Actor_ov031_02113fd4::func_ov031_020f009c(); +} + +void ActorItemFlower::func_ov031_020f11e4() { + this->Actor_ov031_02113fd4::func_ov031_020f00c4(); +} + +void ActorItemFlower::func_ov031_020f11f0() { + this->Actor_ov031_02113fd4::func_ov031_020f0198(); +} + +void ActorItemFlower::func_ov031_020f11fc() { + this->Actor_ov031_02113fd4::func_ov031_020f01ac(); +} + +void ActorItemFlower::func_ov031_020f1208() { + this->vfunc_40(); +} + +void ActorItemFlower::func_ov031_020f121c() { + this->vfunc_44(); +} + +void ActorItemFlower::func_ov031_020f1230() { + data_027e09a8->func_ov000_02071b30(0x102, &this->mPos, 0x0); + data_027e09a8->func_ov000_02071eac(&this->mPos); + + VecFx32 vecSp08; + VecFx32_Init(this->mPos.x, this->mPos.y + FLOAT_TO_FX32(0.5f), this->mPos.z, &vecSp08); + + data_027e0cec->func_ov000_0209feac(0x875, &vecSp08, 0x4, 0x0, 0x0); + data_027e0cec->func_ov000_0209feac(0x876, &vecSp08, 0x4, 0x0, 0x0); + data_027e0cec->func_ov000_0209feac(0x821, &vecSp08, 0x4, 0x0, 0x0); + + this->Actor_ov031_02113fd4::func_ov031_020f0450(0x0); +} + +void ActorItemFlower::func_ov031_020f1308() { + this->Actor_ov031_02113fd4::func_ov031_020f04a8(); +} diff --git a/src/031_Land/Actor/ActorPot.cpp b/src/031_Land/Actor/ActorPot.cpp index 423d99d9..ccb93c03 100644 --- a/src/031_Land/Actor/ActorPot.cpp +++ b/src/031_Land/Actor/ActorPot.cpp @@ -6,7 +6,7 @@ #include "Unknown/UnkStruct_027e0cec.hpp" #include "Unknown/UnkStruct_ov000_020b5d34.hpp" -static PTMF data_ov031_021140a0[0x8] = { +static PTMF data_ov031_021140a0[ActorPotState_Max] = { ActorPot::func_ov031_020f0df4, // ActorPotState_0 ActorPot::func_ov031_020f0e0c, // ActorPotState_1 ActorPot::func_ov031_020f0e24, // ActorPotState_2 @@ -17,7 +17,7 @@ static PTMF data_ov031_021140a0[0x8] = { ActorPot::func_ov031_020f0514 // ActorPotState_7 }; -static PTMF data_ov031_02114060[0x8] = { +static PTMF data_ov031_02114060[ActorPotState_Max] = { ActorPot::func_ov031_020f0de8, // ActorPotState_0 ActorPot::func_ov031_020f0e00, // ActorPotState_1 ActorPot::func_ov031_020f0e18, // ActorPotState_2 @@ -50,9 +50,9 @@ bool ActorPot::vfunc_18(unk32 param1) { return true; } -void ActorPot::vfunc_5C(ActorState param1) { +void ActorPot::vfunc_5C(ActorState state) { this->mUnk_EC = 0x0; - this->mState = param1; + this->mState = state; this->vfunc_60(); diff --git a/src/031_Land/Actor/ActorUnkNITF.cpp b/src/031_Land/Actor/ActorUnkNITF.cpp deleted file mode 100644 index f4ce9f7a..00000000 --- a/src/031_Land/Actor/ActorUnkNITF.cpp +++ /dev/null @@ -1,36 +0,0 @@ -//! TODO: This file was generated automatically and might contain errors - -#include "Actor/ActorUnkNITF.hpp" -#include "System/SysNew.hpp" - -DECL_PROFILE(ActorProfileUnkNITF); - -Actor *ActorProfileUnkNITF::Create() { - return new(HeapIndex_2) ActorUnkNITF(); -} - -ActorProfileUnkNITF::ActorProfileUnkNITF() : - ActorProfile(ActorId_NITF) {} - -ActorUnkNITF::ActorUnkNITF() {} - -void ActorUnkNITF::func_ov031_020f10c0(void) {} -void ActorUnkNITF::func_ov031_020f10d4(void) {} -void ActorUnkNITF::func_ov031_020f10fc(void) {} -void ActorUnkNITF::func_ov031_020f1140(void) {} -void ActorUnkNITF::func_ov031_020f1178(void) {} -void ActorUnkNITF::func_ov031_020f11a8(void) {} -void ActorUnkNITF::func_ov031_020f11b4(void) {} -void ActorUnkNITF::func_ov031_020f11c0(void) {} -void ActorUnkNITF::func_ov031_020f11cc(void) {} -void ActorUnkNITF::func_ov031_020f11d8(void) {} -void ActorUnkNITF::func_ov031_020f11e4(void) {} -void ActorUnkNITF::func_ov031_020f11f0(void) {} -void ActorUnkNITF::func_ov031_020f11fc(void) {} -void ActorUnkNITF::func_ov031_020f1208(void) {} -void ActorUnkNITF::func_ov031_020f121c(void) {} -void ActorUnkNITF::func_ov031_020f1230(void) {} -void ActorUnkNITF::func_ov031_020f1308(void) {} - -ActorUnkNITF::~ActorUnkNITF() {} -ActorProfileUnkNITF::~ActorProfileUnkNITF() {} diff --git a/tools/configure.py b/tools/configure.py index b75dc899..77697dfb 100755 --- a/tools/configure.py +++ b/tools/configure.py @@ -483,7 +483,7 @@ config.libs = [ Object("031_Land/Actor/ActorItemTornado.cpp"), Object("031_Land/Actor/ActorUnkMLCK.cpp"), Object("031_Land/Actor/ActorUnkNFSP.cpp"), - Object("031_Land/Actor/ActorUnkNITF.cpp"), + Object("031_Land/Actor/ActorItemFlower.cpp"), Object("031_Land/Actor/ActorUnkNORE.cpp"), Object("031_Land/Actor/ActorUnkNTTZ.cpp"), Object("031_Land/Actor/ActorPot.cpp"),