diff --git a/config/eur/arm9/overlays/ov000/delinks.txt b/config/eur/arm9/overlays/ov000/delinks.txt index aab601c62..6da9a53dd 100644 --- a/config/eur/arm9/overlays/ov000/delinks.txt +++ b/config/eur/arm9/overlays/ov000/delinks.txt @@ -65,7 +65,7 @@ src/000_Second/MapObject/MapObjectProfile.cpp: .data start:0x020b34c8 end:0x020b3560 .bss start:0x020b5d30 end:0x020b6114 -src/000_Second/MapObject/MapObjectProfile_Derived2_20.cpp: +src/000_Second/UnkActorFileSystem/UnkActorFileSystem1.cpp: complete .text start:0x0209ce08 end:0x0209cfe0 .data start:0x020b3560 end:0x020b3588 diff --git a/config/eur/arm9/overlays/ov000/relocs.txt b/config/eur/arm9/overlays/ov000/relocs.txt index 646ff1ac8..5b77fa6e3 100644 --- a/config/eur/arm9/overlays/ov000/relocs.txt +++ b/config/eur/arm9/overlays/ov000/relocs.txt @@ -4707,7 +4707,7 @@ from:0x0208447a kind:thumb_call to:0x020872bc module:overlay(0) from:0x0208451c kind:thumb_call_arm to:0x02085b00 module:overlay(0) from:0x0208452a kind:thumb_call_arm to:0x02085b00 module:overlay(0) from:0x02084548 kind:load to:0x020b2a50 module:overlay(0) -from:0x0208454c kind:load to:0x020b27c8 module:overlay(0) +from:0x0208454c kind:load to:0x020b27c0 add:0x8 module:overlay(0) from:0x02084550 kind:load to:0x020ab4dc module:overlay(0) from:0x02084554 kind:load to:0x027e09a4 module:dtcm from:0x02084574 kind:thumb_call_arm to:0x0207ede8 module:overlay(0) diff --git a/config/eur/arm9/overlays/ov000/symbols.txt b/config/eur/arm9/overlays/ov000/symbols.txt index e27a4b3b9..d035da24d 100644 --- a/config/eur/arm9/overlays/ov000/symbols.txt +++ b/config/eur/arm9/overlays/ov000/symbols.txt @@ -144,20 +144,20 @@ _ZN19func_ov000_02058390D0Ev kind:function(arm,size=0x1c) addr:0x02058390 _ZN19func_ov000_020583acD2Ev kind:function(arm,size=0x14) addr:0x020583ac func_ov000_020583c0 kind:function(arm,size=0x138) addr:0x020583c0 func_ov000_020584f8 kind:function(arm,size=0x48) addr:0x020584f8 -_ZN33MapObjectProfile_Derived2_20_BaseC2EPKcPvS2_S2_ii kind:function(thumb,size=0x84) addr:0x02058540 +_ZN23UnkActorFileSystem_BaseC2EPKcPvS2_S2_ii kind:function(thumb,size=0x84) addr:0x02058540 func_ov000_020585c4 kind:function(thumb,size=0x14) addr:0x020585c4 -_ZN33MapObjectProfile_Derived2_20_BaseD1Ev kind:function(thumb,size=0x48) addr:0x020585d8 -_ZN33MapObjectProfile_Derived2_20_BaseD0Ev kind:function(thumb,size=0x4c) addr:0x02058620 -_ZN33MapObjectProfile_Derived2_20_BaseD2Ev kind:function(thumb,size=0x48) addr:0x0205866c -_ZN33MapObjectProfile_Derived2_20_Base19func_ov000_020586b4Eiiii kind:function(thumb,size=0x23c) addr:0x020586b4 -_ZN33MapObjectProfile_Derived2_20_Base19func_ov000_020588f0Ev kind:function(thumb,size=0x10) addr:0x020588f0 -_ZN33MapObjectProfile_Derived2_20_Base19func_ov000_02058900Ev kind:function(thumb,size=0x12) addr:0x02058900 -_ZN33MapObjectProfile_Derived2_20_Base19func_ov000_02058914Ei kind:function(thumb,size=0xd0) addr:0x02058914 -_ZN33MapObjectProfile_Derived2_20_Base19func_ov000_020589e4Ev kind:function(thumb,size=0x40) addr:0x020589e4 -_ZN33MapObjectProfile_Derived2_20_Base19func_ov000_02058a24Ev kind:function(arm,size=0x34) addr:0x02058a24 -_ZN33MapObjectProfile_Derived2_20_Base19func_ov000_02058a58Ev kind:function(arm,size=0x2c) addr:0x02058a58 -_ZN33MapObjectProfile_Derived2_20_Base19func_ov000_02058a84EiPKc kind:function(arm,size=0x2c) addr:0x02058a84 -_ZN33MapObjectProfile_Derived2_20_Base19func_ov000_02058ab0Ev kind:function(arm,size=0xe8) addr:0x02058ab0 +_ZN23UnkActorFileSystem_BaseD1Ev kind:function(thumb,size=0x48) addr:0x020585d8 +_ZN23UnkActorFileSystem_BaseD0Ev kind:function(thumb,size=0x4c) addr:0x02058620 +_ZN23UnkActorFileSystem_BaseD2Ev kind:function(thumb,size=0x48) addr:0x0205866c +_ZN23UnkActorFileSystem_Base19func_ov000_020586b4Eiiii kind:function(thumb,size=0x23c) addr:0x020586b4 +_ZN23UnkActorFileSystem_Base19func_ov000_020588f0Ev kind:function(thumb,size=0x10) addr:0x020588f0 +_ZN23UnkActorFileSystem_Base19func_ov000_02058900Ev kind:function(thumb,size=0x12) addr:0x02058900 +_ZN23UnkActorFileSystem_Base19func_ov000_02058914Ei kind:function(thumb,size=0xd0) addr:0x02058914 +_ZN23UnkActorFileSystem_Base19func_ov000_020589e4Ev kind:function(thumb,size=0x40) addr:0x020589e4 +_ZN23UnkActorFileSystem_Base19func_ov000_02058a24Ev kind:function(arm,size=0x34) addr:0x02058a24 +_ZN23UnkActorFileSystem_Base19func_ov000_02058a58Ev kind:function(arm,size=0x2c) addr:0x02058a58 +_ZN23UnkActorFileSystem_Base19func_ov000_02058a84EiPKc kind:function(arm,size=0x2c) addr:0x02058a84 +_ZN23UnkActorFileSystem_Base19func_ov000_02058ab0Ev kind:function(arm,size=0xe8) addr:0x02058ab0 func_ov000_02058b98 kind:function(thumb,size=0x1c) addr:0x02058b98 func_ov000_02058bb4 kind:function(arm,size=0x34) addr:0x02058bb4 func_ov000_02058be8 kind:function(arm,size=0x14) addr:0x02058be8 @@ -236,7 +236,7 @@ func_ov000_0205a3fc kind:function(arm,size=0x130) addr:0x0205a3fc func_ov000_0205a52c kind:function(arm,size=0xfc) addr:0x0205a52c func_ov000_0205a628 kind:function(arm,size=0x10) addr:0x0205a628 func_ov000_0205a638 kind:function(arm,size=0x14) addr:0x0205a638 -func_ov000_0205a64c kind:function(arm,size=0x44) addr:0x0205a64c +_ZN21Actor_UnkSystem6_BaseC2EiPv kind:function(arm,size=0x44) addr:0x0205a64c func_ov000_0205a690 kind:function(arm,size=0x48) addr:0x0205a690 func_ov000_0205a6d8 kind:function(arm,size=0x48) addr:0x0205a6d8 func_ov000_0205a720 kind:function(arm,size=0x18) addr:0x0205a720 @@ -1379,9 +1379,9 @@ func_ov000_0207b518 kind:function(arm,size=0xd8) addr:0x0207b518 func_ov000_0207b5f0 kind:function(arm,size=0x38) addr:0x0207b5f0 _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 -_ZN19func_ov000_0207b6c0D2Ev kind:function(arm,size=0x30) addr:0x0207b6c0 +_ZN16Actor_UnkSystem3D1Ev kind:function(arm,size=0x30) addr:0x0207b658 +_ZN16Actor_UnkSystem3D0Ev kind:function(arm,size=0x38) addr:0x0207b688 +_ZN16Actor_UnkSystem3D2Ev 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 func_ov000_0207b71c kind:function(arm,size=0x38) addr:0x0207b71c @@ -1412,10 +1412,10 @@ 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 -func_ov000_0207bffc kind:function(arm,size=0x4) addr:0x0207bffc -func_ov000_0207c000 kind:function(arm,size=0x8) addr:0x0207c000 +_ZN16Actor_UnkSystem1D2Ev kind:function(arm,size=0x4) addr:0x0207bffc +_ZN16Actor_UnkSystem19vfunc2_08Ev kind:function(arm,size=0x8) addr:0x0207c000 func_ov000_0207c008 kind:function(arm,size=0x8) addr:0x0207c008 -func_ov000_0207c010 kind:function(arm,size=0x8) addr:0x0207c010 +_ZN16Actor_UnkSystem19vfunc2_10Ev kind:function(arm,size=0x8) addr:0x0207c010 _ZN17MapObject_10_BaseC2Ev kind:function(arm,size=0x30) addr:0x0207c018 func_ov000_0207c048 kind:function(arm,size=0x30) addr:0x0207c048 func_ov000_0207c078 kind:function(arm,size=0x38) addr:0x0207c078 @@ -1489,10 +1489,10 @@ func_ov000_0207eb40 kind:function(arm,size=0x4c) addr:0x0207eb40 func_ov000_0207eb8c kind:function(arm,size=0x68) addr:0x0207eb8c func_ov000_0207ebf4 kind:function(arm,size=0x74) addr:0x0207ebf4 func_ov000_0207ec68 kind:function(arm,size=0x20) addr:0x0207ec68 -func_ov000_0207ec88 kind:function(arm,size=0x20) addr:0x0207ec88 -_ZN19func_ov000_0207eca8D1Ev kind:function(arm,size=0x30) addr:0x0207eca8 -_ZN19func_ov000_0207ecd8D0Ev kind:function(arm,size=0x38) addr:0x0207ecd8 -_ZN19func_ov000_0207ed10D2Ev kind:function(arm,size=0x30) addr:0x0207ed10 +_ZN16Actor_UnkSystem4C1Ev kind:function(arm,size=0x20) addr:0x0207ec88 +_ZN16Actor_UnkSystem4D1Ev kind:function(arm,size=0x30) addr:0x0207eca8 +_ZN16Actor_UnkSystem4D0Ev kind:function(arm,size=0x38) addr:0x0207ecd8 +_ZN16Actor_UnkSystem4D2Ev kind:function(arm,size=0x30) addr:0x0207ed10 func_ov000_0207ed40 kind:function(arm,size=0x44) addr:0x0207ed40 func_ov000_0207ed84 kind:function(arm,size=0x8) addr:0x0207ed84 func_ov000_0207ed8c kind:function(arm,size=0x20) addr:0x0207ed8c @@ -2273,14 +2273,14 @@ _ZN12ActorProfile8vfunc_10Ev kind:function(arm,size=0x4) addr:0x02097810 _ZN12ActorProfile8vfunc_14Ev kind:function(arm,size=0x4) addr:0x02097814 _ZN12ActorProfile8vfunc_18Ev kind:function(arm,size=0x4) addr:0x02097818 func_ov000_0209781c kind:function(arm,size=0x7c) addr:0x0209781c -_ZN21ActorProfile_Derived1C2E7ActorId kind:function(arm,size=0x30) addr:0x02097898 +_ZN21ActorProfile_Derived1C2Ej kind:function(arm,size=0x30) addr:0x02097898 func_ov000_020978c8 kind:function(arm,size=0x14) addr:0x020978c8 _ZN21ActorProfile_Derived1C2E7ActorIdS0_ kind:function(arm,size=0x30) addr:0x020978dc _ZN21ActorProfile_Derived1D2Ev kind:function(arm,size=0x38) addr:0x0209790c -func_ov000_02097944 kind:function(arm,size=0x8) addr:0x02097944 -func_ov000_0209794c kind:function(arm,size=0x20) addr:0x0209794c -func_ov000_0209796c kind:function(arm,size=0x2c) addr:0x0209796c -func_ov000_02097998 kind:function(arm,size=0x1c) addr:0x02097998 +_ZN21ActorProfile_Derived18vfunc_04Ev kind:function(arm,size=0x8) addr:0x02097944 +_ZN21ActorProfile_Derived18vfunc_10Ev kind:function(arm,size=0x20) addr:0x0209794c +_ZN21ActorProfile_Derived18vfunc_14Ev kind:function(arm,size=0x2c) addr:0x0209796c +_ZN21ActorProfile_Derived18vfunc_18Ev kind:function(arm,size=0x1c) addr:0x02097998 func_ov000_020979b4 kind:function(arm,size=0x30) addr:0x020979b4 func_ov000_020979e4 kind:function(arm,size=0x8) addr:0x020979e4 func_ov000_020979ec kind:function(arm,size=0x2c) addr:0x020979ec @@ -2541,12 +2541,12 @@ _ZN25MapObjectProfile_Derived119func_ov000_0209ccd8Eij kind:function(arm,size=0x _ZN25MapObjectProfile_Derived18vfunc_08Ev kind:function(arm,size=0x1c) addr:0x0209cd60 _ZN25MapObjectProfile_Derived18vfunc_0CEv kind:function(arm,size=0x44) addr:0x0209cd7c _ZN25MapObjectProfile_Derived18vfunc_10Ev kind:function(arm,size=0x48) addr:0x0209cdc0 -_ZN28MapObjectProfile_Derived2_20C1Ej kind:function(arm,size=0x70) addr:0x0209ce08 -_ZN28MapObjectProfile_Derived2_20D1Ev kind:function(arm,size=0x38) addr:0x0209ce78 -_ZN28MapObjectProfile_Derived2_20D0Ev kind:function(arm,size=0x40) addr:0x0209ceb0 -_ZN28MapObjectProfile_Derived2_2019func_ov000_0209cef0Ev kind:function(arm,size=0xbc) addr:0x0209cef0 -_ZN28MapObjectProfile_Derived2_2019func_ov000_0209cfacEv kind:function(arm,size=0x30) addr:0x0209cfac -_ZN28MapObjectProfile_Derived2_2019func_ov000_0209cfdcEii kind:function(arm,size=0x4) addr:0x0209cfdc +_ZN19UnkActorFileSystem1C1Ej kind:function(arm,size=0x70) addr:0x0209ce08 +_ZN19UnkActorFileSystem1D1Ev kind:function(arm,size=0x38) addr:0x0209ce78 +_ZN19UnkActorFileSystem1D0Ev kind:function(arm,size=0x40) addr:0x0209ceb0 +_ZN19UnkActorFileSystem119func_ov000_0209cef0Ev kind:function(arm,size=0xbc) addr:0x0209cef0 +_ZN19UnkActorFileSystem119func_ov000_0209cfacEv kind:function(arm,size=0x30) addr:0x0209cfac +_ZN19UnkActorFileSystem119func_ov000_0209cfdcEii kind:function(arm,size=0x4) addr:0x0209cfdc _ZN9MapObjectC2Ev kind:function(arm,size=0xb4) addr:0x0209cfe0 _ZN9MapObjectD1Ev kind:function(arm,size=0x4) addr:0x0209d094 _ZN9MapObjectD0Ev kind:function(arm,size=0x14) addr:0x0209d098 @@ -2679,7 +2679,7 @@ func_ov000_020a00d4 kind:function(arm,size=0x3c) addr:0x020a00d4 _ZN18UnkStruct_027e0cec19func_ov000_020a0110EP22UnkStruct_PlayerGet_ec kind:function(arm,size=0x30) addr:0x020a0110 func_ov000_020a0140 kind:function(arm,size=0xe0) addr:0x020a0140 _ZN18UnkStruct_027e0cec19func_ov000_020a0220EPvS0_ kind:function(arm,size=0xb4) addr:0x020a0220 -_ZN22UnkStruct_PlayerGet_ecD1Ev kind:function(arm,size=0x30) addr:0x020a02d4 +_ZN15UnkSystem7_BaseD1Ev kind:function(arm,size=0x30) addr:0x020a02d4 _ZN15ActorUnkEFIK_9819func_ov000_020a0304Ev kind:function(arm,size=0x30) addr:0x020a0304 _ZN15ActorUnkEFIK_9819func_ov000_020a0334Ev kind:function(arm,size=0x38) addr:0x020a0334 func_ov000_020a036c kind:function(arm,size=0x20) addr:0x020a036c @@ -3535,7 +3535,7 @@ data_ov000_020b2718 kind:data(any) addr:0x020b2718 data_ov000_020b2744 kind:data(any) addr:0x020b2744 data_ov000_020b2770 kind:data(any) addr:0x020b2770 data_ov000_020b279c kind:data(any) addr:0x020b279c -data_ov000_020b27c8 kind:data(any) addr:0x020b27c8 +_ZTV25Actor_UnkSystem3_Derived1 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 @@ -3690,7 +3690,7 @@ _ZTV25MapObjectProfile_Derived3 kind:data(any) addr:0x020b34e4 _ZTV25MapObjectProfile_Derived2 kind:data(any) addr:0x020b3500 _ZTV16MapObjectProfile kind:data(any) addr:0x020b351c _ZTV25MapObjectProfile_Derived1 kind:data(any) addr:0x020b3538 -_ZTV28MapObjectProfile_Derived2_20 kind:data(any) addr:0x020b3560 +_ZTV19UnkActorFileSystem1 kind:data(any) addr:0x020b3560 @1608 kind:data(byte[7]) addr:0x020b3570 local @1626 kind:data(byte[8]) addr:0x020b3578 local @1627 kind:data(byte[5]) addr:0x020b3580 local diff --git a/config/eur/arm9/overlays/ov026/delinks.txt b/config/eur/arm9/overlays/ov026/delinks.txt index be36993ed..d95d2d760 100644 --- a/config/eur/arm9/overlays/ov026/delinks.txt +++ b/config/eur/arm9/overlays/ov026/delinks.txt @@ -107,6 +107,9 @@ src/026_Train/Actor/ActorUnkTRCB.cpp: .ctor start:0x0213521c end:0x02135220 .bss start:0x021403d8 end:0x02140424 +src/026_Train/Actor/Actor_Derived.cpp: + .text start:0x02110c7c end:0x021110a0 + src/026_Train/Actor/ActorUnkTHER.cpp: .text start:0x021110a0 end:0x02111334 .init start:0x02134a10 end:0x02134a60 @@ -117,13 +120,14 @@ src/026_Train/Actor/ActorUnkTRUP.cpp: .text start:0x02111334 end:0x02111640 .init start:0x02134a60 end:0x02134ab0 .ctor start:0x02135224 end:0x02135228 - .bss start:0x02140470 end:0x021405c4 + .bss start:0x02140470 end:0x021404f0 src/026_Train/Actor/ActorUnkKLTR.cpp: .text start:0x02111640 end:0x02113d3c .init start:0x02134ab0 end:0x02134b00 .ctor start:0x02135228 end:0x0213522c - .bss start:0x021405c4 end:0x021406c4 + .data start:0x02137820 end:0x021378a8 + .bss start:0x021404f0 end:0x021406bc src/026_Train/Actor/ActorUnkTRTT.cpp: .text start:0x02113d3c end:0x021165f0 @@ -201,10 +205,11 @@ src/026_Train/Actor/ActorUnkTCOW_WCAS.cpp: .text start:0x02127f84 end:0x0212b8b8 .init start:0x02135040 end:0x021350f4 .ctor start:0x02135260 end:0x02135264 - .bss start:0x02141574 end:0x02141830 + .bss start:0x02141574 end:0x0214174c src/026_Train/Actor/ActorUnkDKTR.cpp: - .text start:0x0212b8b8 end:0x0212e458 + .text start:0x0212b8b8 end:0x0212e488 .init start:0x021350f4 end:0x02135144 .ctor start:0x02135264 end:0x02135268 - .bss start:0x02141830 end:0x02141928 + .data start:0x02138ae4 end:0x02138b8c + .bss start:0x0214174c end:0x02141928 diff --git a/config/eur/arm9/overlays/ov026/relocs.txt b/config/eur/arm9/overlays/ov026/relocs.txt index 53dcaf047..8ae1c97e0 100644 --- a/config/eur/arm9/overlays/ov026/relocs.txt +++ b/config/eur/arm9/overlays/ov026/relocs.txt @@ -3056,7 +3056,7 @@ from:0x020f416c kind:arm_call to:0x020d54b0 module:overlay(24) from:0x020f4174 kind:arm_call to:0x020f4230 module:overlay(26) from:0x020f4180 kind:load to:0x02135c54 module:overlay(26) from:0x020f4184 kind:load to:0x02135cd4 module:overlay(26) -from:0x020f4188 kind:load to:0x02135c60 module:overlay(26) +from:0x020f4188 kind:load to:0x02135c58 add:0x8 module:overlay(26) from:0x020f418c kind:load to:0x020f3c18 module:overlay(26) from:0x020f4190 kind:load to:0x020f419c module:overlay(26) from:0x020f4194 kind:load to:0x020f26b0 module:overlay(26) @@ -3112,7 +3112,7 @@ from:0x020f4558 kind:arm_call to:0x020d5938 module:overlay(24) from:0x020f4560 kind:arm_call to:0x020f4588 module:overlay(26) from:0x020f456c kind:load to:0x02135d18 module:overlay(26) from:0x020f4570 kind:load to:0x02135d24 module:overlay(26) -from:0x020f4574 kind:load to:0x02135c60 module:overlay(26) +from:0x020f4574 kind:load to:0x02135c58 add:0x8 module:overlay(26) from:0x020f4578 kind:load to:0x020f3c18 module:overlay(26) from:0x020f457c kind:load to:0x020f419c module:overlay(26) from:0x020f4580 kind:load to:0x020f26b0 module:overlay(26) @@ -4079,7 +4079,7 @@ from:0x020ff574 kind:arm_call to:0x020ff498 module:overlay(26) from:0x020ff584 kind:arm_call to:0x0205a64c module:overlay(0) from:0x020ff5a8 kind:arm_call to:0x0203d160 module:main from:0x020ff5c4 kind:arm_call to:0x0203d160 module:main -from:0x020ff5f0 kind:load to:0x02135c60 module:overlay(26) +from:0x020ff5f0 kind:load to:0x02135c58 add:0x8 module:overlay(26) from:0x020ff5f4 kind:load to:0x020f33a4 module:overlay(26) from:0x020ff5f8 kind:load to:0x020ff604 module:overlay(26) from:0x020ff5fc kind:load to:0x020f3390 module:overlay(26) @@ -4134,7 +4134,7 @@ from:0x0210022c kind:arm_call to:0x020ff498 module:overlay(26) from:0x0210023c kind:arm_call to:0x0205a64c module:overlay(0) from:0x02100260 kind:arm_call to:0x0203d160 module:main from:0x0210027c kind:arm_call to:0x0203d160 module:main -from:0x021002a4 kind:load to:0x02135c60 module:overlay(26) +from:0x021002a4 kind:load to:0x02135c58 add:0x8 module:overlay(26) from:0x021002a8 kind:load to:0x020f3c18 module:overlay(26) from:0x021002ac kind:load to:0x020f419c module:overlay(26) from:0x021002b0 kind:load to:0x020f26b0 module:overlay(26) @@ -5045,7 +5045,7 @@ from:0x021092b8 kind:arm_call to:0x0209c8b4 module:overlay(0) from:0x021092cc kind:arm_call to:0x0210e168 module:overlay(26) from:0x021092e4 kind:arm_call to:0x0205a64c module:overlay(0) from:0x0210930c kind:load to:0x02136a88 module:overlay(26) -from:0x02109310 kind:load to:0x02135c60 module:overlay(26) +from:0x02109310 kind:load to:0x02135c58 add:0x8 module:overlay(26) from:0x02109324 kind:arm_call_thumb to:0x02057bd4 module:overlay(0) from:0x0210932c kind:arm_call to:0x02016694 module:main from:0x02109334 kind:arm_call to:0x0210bb14 module:overlay(26) @@ -5730,7 +5730,7 @@ from:0x0210f1e4 kind:arm_call to:0x020fbcbc module:overlay(26) from:0x0210f214 kind:arm_call to:0x02103170 module:overlay(26) from:0x0210f250 kind:arm_call to:0x02103fa8 module:overlay(26) from:0x0210f25c kind:load to:0x0213739c add:0x8 module:overlay(26) -from:0x0210f260 kind:load to:0x020b27c8 module:overlay(0) +from:0x0210f260 kind:load to:0x020b27c0 add:0x8 module:overlay(0) from:0x0210f2f8 kind:load to:0x02140280 module:overlay(26) from:0x0210f2fc kind:load to:0x02137358 module:overlay(26) from:0x0210f300 kind:load to:0x021402d0 module:overlay(26) @@ -6040,8 +6040,8 @@ from:0x02111800 kind:arm_call to:0x0209862c module:overlay(0) from:0x02111824 kind:arm_call to:0x0210136c module:overlay(26) from:0x02111830 kind:arm_call to:0x020ee538 module:overlay(26) from:0x0211183c kind:load to:0x02137844 add:0x8 module:overlay(26) -from:0x02111840 kind:load to:0x020b27c8 module:overlay(0) -from:0x02111844 kind:load to:0x02135c60 module:overlay(26) +from:0x02111840 kind:load to:0x020b27c0 add:0x8 module:overlay(0) +from:0x02111844 kind:load to:0x02135c58 add:0x8 module:overlay(26) from:0x02111848 kind:load to:0x020f3c18 module:overlay(26) from:0x0211184c kind:load to:0x020f419c module:overlay(26) from:0x02111850 kind:load to:0x020f26b0 module:overlay(26) @@ -7729,7 +7729,7 @@ from:0x0212230c kind:arm_call to:0x021227a4 module:overlay(26) from:0x02122324 kind:arm_call to:0x02122dec module:overlay(26) from:0x02122340 kind:load to:0x021384d8 add:0x8 module:overlay(26) from:0x02122344 kind:load to:0x021412c4 module:overlay(26) -from:0x0212234c kind:load to:0x020b27c8 module:overlay(0) +from:0x0212234c kind:load to:0x020b27c0 add:0x8 module:overlay(0) from:0x0212235c kind:arm_call to:0x0207ede8 module:overlay(0) from:0x02122364 kind:arm_call to:0x0207b6c0 module:overlay(0) from:0x0212236c kind:arm_call to:0x020a02d4 module:overlay(0) @@ -7949,7 +7949,7 @@ from:0x02123ee4 kind:load to:0x02141490 module:overlay(26) from:0x02123ee8 kind:load to:0x021386c0 module:overlay(26) from:0x02123eec kind:load to:0x02135b24 module:overlay(26) from:0x02123ef0 kind:load to:0x02135c8c module:overlay(26) -from:0x02123ef8 kind:load to:0x020b27c8 module:overlay(0) +from:0x02123ef8 kind:load to:0x020b27c0 add:0x8 module:overlay(0) from:0x02123efc kind:load to:0x02141484 module:overlay(26) from:0x02123f08 kind:arm_call_thumb to:0x02057bd4 module:overlay(0) from:0x02123f28 kind:arm_call to:0x0212769c module:overlay(26) @@ -8861,9 +8861,9 @@ from:0x0212bb08 kind:arm_call to:0x0209862c module:overlay(0) from:0x0212bb2c kind:arm_call to:0x02101c54 module:overlay(26) from:0x0212bb38 kind:arm_call to:0x020ee538 module:overlay(26) from:0x0212bb44 kind:load to:0x02138b08 add:0x8 module:overlay(26) -from:0x0212bb48 kind:load to:0x02138b78 module:overlay(26) -from:0x0212bb4c kind:load to:0x020b27c8 module:overlay(0) -from:0x0212bb50 kind:load to:0x02135c60 module:overlay(26) +from:0x0212bb48 kind:load to:0x02138b08 add:0x70 module:overlay(26) +from:0x0212bb4c kind:load to:0x020b27c0 add:0x8 module:overlay(0) +from:0x0212bb50 kind:load to:0x02135c58 add:0x8 module:overlay(26) from:0x0212bb54 kind:load to:0x020f3c18 module:overlay(26) from:0x0212bb58 kind:load to:0x020f419c module:overlay(26) from:0x0212bb5c kind:load to:0x020f26b0 module:overlay(26) diff --git a/config/eur/arm9/overlays/ov026/symbols.txt b/config/eur/arm9/overlays/ov026/symbols.txt index 24bb3e25e..a465d2aaf 100644 --- a/config/eur/arm9/overlays/ov026/symbols.txt +++ b/config/eur/arm9/overlays/ov026/symbols.txt @@ -468,13 +468,13 @@ func_ov026_020ee124 kind:function(arm,size=0xc) addr:0x020ee124 func_ov026_020ee130 kind:function(arm,size=0x98) addr:0x020ee130 func_ov026_020ee1c8 kind:function(arm,size=0x98) addr:0x020ee1c8 func_ov026_020ee260 kind:function(arm,size=0x14) addr:0x020ee260 -func_ov026_020ee274 kind:function(arm,size=0x14) addr:0x020ee274 +_ZN16Actor_UnkSystem2D1Ev kind:function(arm,size=0x14) addr:0x020ee274 func_ov026_020ee288 kind:function(arm,size=0x58) addr:0x020ee288 func_ov026_020ee2e0 kind:function(arm,size=0x10) addr:0x020ee2e0 func_ov026_020ee2f0 kind:function(arm,size=0x164) addr:0x020ee2f0 func_ov026_020ee454 kind:function(arm,size=0xb0) addr:0x020ee454 func_ov026_020ee504 kind:function(arm,size=0x34) addr:0x020ee504 -func_ov026_020ee538 kind:function(arm,size=0x1c) addr:0x020ee538 +_ZN16Actor_UnkSystem219func_ov026_020ee538Ei kind:function(arm,size=0x1c) addr:0x020ee538 func_ov026_020ee554 kind:function(arm,size=0x214) addr:0x020ee554 func_ov026_020ee768 kind:function(arm,size=0x1f8) addr:0x020ee768 func_ov026_020ee960 kind:function(arm,size=0x80) addr:0x020ee960 @@ -598,7 +598,7 @@ func_ov026_020f2230 kind:function(arm,size=0x370) addr:0x020f2230 func_ov026_020f25a0 kind:function(arm,size=0x2c) addr:0x020f25a0 func_ov026_020f25cc kind:function(arm,size=0xd0) addr:0x020f25cc func_ov026_020f269c kind:function(arm,size=0x14) addr:0x020f269c -func_ov026_020f26b0 kind:function(arm,size=0x14) addr:0x020f26b0 +_ZN16Actor_UnkSystem8D1Ev kind:function(arm,size=0x14) addr:0x020f26b0 func_ov026_020f26c4 kind:function(arm,size=0xb4) addr:0x020f26c4 func_ov026_020f2778 kind:function(arm,size=0x48) addr:0x020f2778 func_ov026_020f27c0 kind:function(arm,size=0x30) addr:0x020f27c0 @@ -634,7 +634,7 @@ func_ov026_020f3a28 kind:function(arm,size=0x8) addr:0x020f3a28 _ZN19func_ov026_020f3a30D1Ev kind:function(arm,size=0xb0) addr:0x020f3a30 _ZN19func_ov026_020f3ae0D0Ev kind:function(arm,size=0xb8) addr:0x020f3ae0 func_ov026_020f3b98 kind:function(arm,size=0x80) addr:0x020f3b98 -func_ov026_020f3c18 kind:function(arm,size=0x14) addr:0x020f3c18 +_ZN16Actor_UnkSystem7D1Ev kind:function(arm,size=0x14) addr:0x020f3c18 func_ov026_020f3c2c kind:function(arm,size=0x28) addr:0x020f3c2c func_ov026_020f3c54 kind:function(arm,size=0x1b4) addr:0x020f3c54 func_ov026_020f3e08 kind:function(arm,size=0x4) addr:0x020f3e08 @@ -649,8 +649,8 @@ func_ov026_020f3ff4 kind:function(arm,size=0x8) addr:0x020f3ff4 _ZN19func_ov026_020f3ffcD1Ev kind:function(arm,size=0x6c) addr:0x020f3ffc _ZN19func_ov026_020f4068D0Ev kind:function(arm,size=0x74) addr:0x020f4068 func_ov026_020f40dc kind:function(arm,size=0xc0) addr:0x020f40dc -func_ov026_020f419c kind:function(arm,size=0x40) addr:0x020f419c -func_ov026_020f41dc kind:function(arm,size=0x54) addr:0x020f41dc +_ZN16Actor_UnkSystem7C1Ev kind:function(arm,size=0x40) addr:0x020f419c +_ZN16Actor_UnkSystem8C1Ev kind:function(arm,size=0x54) addr:0x020f41dc func_ov026_020f4230 kind:function(arm,size=0x28) addr:0x020f4230 func_ov026_020f4258 kind:function(arm,size=0x20) addr:0x020f4258 func_ov026_020f4278 kind:function(arm,size=0x10) addr:0x020f4278 @@ -848,7 +848,7 @@ func_ov026_020f8f2c kind:function(arm,size=0x1c) addr:0x020f8f2c func_ov026_020f8f48 kind:function(arm,size=0x3c) addr:0x020f8f48 func_ov026_020f8f84 kind:function(arm,size=0x98) addr:0x020f8f84 func_ov026_020f901c kind:function(arm,size=0x94) addr:0x020f901c -func_ov026_020f90b0 kind:function(arm,size=0x78) addr:0x020f90b0 +_ZN16Actor_UnkSystem2C1Eii kind:function(arm,size=0x78) addr:0x020f90b0 func_ov026_020f9128 kind:function(arm,size=0x84) addr:0x020f9128 func_ov026_020f91ac kind:function(arm,size=0x50) addr:0x020f91ac func_ov026_020f91fc kind:function(arm,size=0xc) addr:0x020f91fc @@ -870,32 +870,32 @@ func_ov026_020fa0ac kind:function(arm,size=0xd0) addr:0x020fa0ac func_ov026_020fa17c kind:function(arm,size=0x68) addr:0x020fa17c func_ov026_020fa1e4 kind:function(arm,size=0xec) addr:0x020fa1e4 func_ov026_020fa2d0 kind:function(arm,size=0x88) addr:0x020fa2d0 -func_ov026_020fa358 kind:function(arm,size=0x14) addr:0x020fa358 +_ZN16Actor_UnkSystem219func_ov026_020fa358Ev kind:function(arm,size=0x14) addr:0x020fa358 func_ov026_020fa36c kind:function(arm,size=0x24) addr:0x020fa36c func_ov026_020fa390 kind:function(arm,size=0xc) addr:0x020fa390 func_ov026_020fa39c kind:function(arm,size=0x8) addr:0x020fa39c func_ov026_020fa3a4 kind:function(arm,size=0x3c) addr:0x020fa3a4 func_ov026_020fa3e0 kind:function(arm,size=0x8c) addr:0x020fa3e0 -func_ov026_020fa46c kind:function(arm,size=0x34) addr:0x020fa46c +_ZN16Actor_UnkSystem219func_ov026_020fa46cEit kind:function(arm,size=0x34) addr:0x020fa46c func_ov026_020fa4a0 kind:function(arm,size=0xbc) addr:0x020fa4a0 -func_ov026_020fa55c kind:function(arm,size=0x6c) addr:0x020fa55c +_ZN16Actor_UnkSystem219func_ov026_020fa55cEv kind:function(arm,size=0x6c) addr:0x020fa55c func_ov026_020fa5c8 kind:function(arm,size=0x18) addr:0x020fa5c8 func_ov026_020fa5e0 kind:function(arm,size=0x30) addr:0x020fa5e0 func_ov026_020fa610 kind:function(arm,size=0x3c) addr:0x020fa610 func_ov026_020fa64c kind:function(arm,size=0x90) addr:0x020fa64c func_ov026_020fa6dc kind:function(arm,size=0x60) addr:0x020fa6dc -func_ov026_020fa73c kind:function(arm,size=0x40) addr:0x020fa73c -func_ov026_020fa77c kind:function(arm,size=0x44) addr:0x020fa77c -func_ov026_020fa7c0 kind:function(arm,size=0x1c) addr:0x020fa7c0 +_ZN16Actor_UnkSystem219func_ov026_020fa73cEv kind:function(arm,size=0x40) addr:0x020fa73c +_ZN16Actor_UnkSystem219func_ov026_020fa77cEb kind:function(arm,size=0x44) addr:0x020fa77c +_ZN16Actor_UnkSystem219func_ov026_020fa7c0Ev kind:function(arm,size=0x1c) addr:0x020fa7c0 func_ov026_020fa7dc kind:function(arm,size=0x18) addr:0x020fa7dc -func_ov026_020fa7f4 kind:function(arm,size=0x44) addr:0x020fa7f4 -func_ov026_020fa838 kind:function(arm,size=0x48) addr:0x020fa838 +_ZN16Actor_UnkSystem219func_ov026_020fa7f4Ev kind:function(arm,size=0x44) addr:0x020fa7f4 +_ZN16Actor_UnkSystem219func_ov026_020fa838Eih kind:function(arm,size=0x48) addr:0x020fa838 func_ov026_020fa880 kind:function(arm,size=0x74) addr:0x020fa880 func_ov026_020fa8f4 kind:function(arm,size=0x2c) addr:0x020fa8f4 func_ov026_020fa920 kind:function(arm,size=0xbc) addr:0x020fa920 func_ov026_020fa9dc kind:function(arm,size=0xa8) addr:0x020fa9dc func_ov026_020faa84 kind:function(arm,size=0x1ac) addr:0x020faa84 -func_ov026_020fac30 kind:function(arm,size=0x278) addr:0x020fac30 +_ZN16Actor_UnkSystem219func_ov026_020fac30Ejiii kind:function(arm,size=0x278) addr:0x020fac30 func_ov026_020faea8 kind:function(arm,size=0xf0) addr:0x020faea8 func_ov026_020faf98 kind:function(arm,size=0x34) addr:0x020faf98 func_ov026_020fafcc kind:function(arm,size=0x80) addr:0x020fafcc @@ -904,7 +904,7 @@ func_ov026_020fb084 kind:function(arm,size=0x20) addr:0x020fb084 func_ov026_020fb0a4 kind:function(arm,size=0x40) addr:0x020fb0a4 func_ov026_020fb0e4 kind:function(arm,size=0xec) addr:0x020fb0e4 func_ov026_020fb1d0 kind:function(arm,size=0x4c) addr:0x020fb1d0 -func_ov026_020fb21c kind:function(arm,size=0x60) addr:0x020fb21c +_ZN16Actor_UnkStruct1C1Ev kind:function(arm,size=0x60) addr:0x020fb21c func_ov026_020fb27c kind:function(arm,size=0x54) addr:0x020fb27c func_ov026_020fb2d0 kind:function(arm,size=0xdc) addr:0x020fb2d0 func_ov026_020fb3ac kind:function(arm,size=0x6c) addr:0x020fb3ac @@ -946,12 +946,12 @@ func_ov026_020fd228 kind:function(arm,size=0x64) addr:0x020fd228 func_ov026_020fd28c kind:function(arm,size=0x2ac) addr:0x020fd28c func_ov026_020fd538 kind:function(arm,size=0x118) addr:0x020fd538 func_ov026_020fd650 kind:function(arm,size=0x40) addr:0x020fd650 -func_ov026_020fd690 kind:function(arm,size=0x154) addr:0x020fd690 +_ZN19Actor_UnkSystem10_2C1Ev kind:function(arm,size=0x154) addr:0x020fd690 func_ov026_020fd7e4 kind:function(arm,size=0x4e0) addr:0x020fd7e4 func_ov026_020fdcc4 kind:function(arm,size=0xf8) addr:0x020fdcc4 func_ov026_020fddbc kind:function(arm,size=0x130) addr:0x020fddbc func_ov026_020fdeec kind:function(arm,size=0xf8) addr:0x020fdeec -func_ov026_020fdfe4 kind:function(arm,size=0xf0) addr:0x020fdfe4 +_ZN17Actor_UnkSystem10C1Ev kind:function(arm,size=0xf0) addr:0x020fdfe4 func_ov026_020fe0d4 kind:function(arm,size=0x428) addr:0x020fe0d4 func_ov026_020fe4fc kind:function(arm,size=0x110) addr:0x020fe4fc func_ov026_020fe60c kind:function(arm,size=0x110) addr:0x020fe60c @@ -966,7 +966,7 @@ func_ov026_020ff0ac kind:function(arm,size=0x354) addr:0x020ff0ac func_ov026_020ff400 kind:function(arm,size=0x2c) addr:0x020ff400 func_ov026_020ff42c kind:function(arm,size=0x50) addr:0x020ff42c _ZN19func_ov026_020ff47cD0Ev kind:function(arm,size=0x1c) addr:0x020ff47c -func_ov026_020ff498 kind:function(arm,size=0x18) addr:0x020ff498 +_ZN16Actor_UnkSystem5C1Ev kind:function(arm,size=0x18) addr:0x020ff498 func_ov026_020ff4b0 kind:function(arm,size=0xb8) addr:0x020ff4b0 func_ov026_020ff568 kind:function(arm,size=0x9c) addr:0x020ff568 func_ov026_020ff604 kind:function(arm,size=0x40) addr:0x020ff604 @@ -993,13 +993,13 @@ func_ov026_02100d90 kind:function(arm,size=0x38c) addr:0x02100d90 func_ov026_0210111c kind:function(arm,size=0x19c) addr:0x0210111c func_ov026_021012b8 kind:function(arm,size=0x90) addr:0x021012b8 func_ov026_02101348 kind:function(arm,size=0x24) addr:0x02101348 -func_ov026_0210136c kind:function(arm,size=0x36c) addr:0x0210136c -func_ov026_021016d8 kind:function(arm,size=0x168) addr:0x021016d8 +_ZN16Actor_UnkSystem519func_ov026_0210136cEi kind:function(arm,size=0x36c) addr:0x0210136c +_ZN16Actor_UnkSystem519func_ov026_021016d8Ei kind:function(arm,size=0x168) addr:0x021016d8 func_ov026_02101840 kind:function(arm,size=0x50) addr:0x02101840 -func_ov026_02101890 kind:function(arm,size=0x384) addr:0x02101890 +_ZN16Actor_UnkSystem519func_ov026_02101890Eii kind:function(arm,size=0x384) addr:0x02101890 func_ov026_02101c14 kind:function(arm,size=0x28) addr:0x02101c14 func_ov026_02101c3c kind:function(arm,size=0x18) addr:0x02101c3c -func_ov026_02101c54 kind:function(arm,size=0x354) addr:0x02101c54 +_ZN16Actor_UnkSystem519func_ov026_02101c54Ei kind:function(arm,size=0x354) addr:0x02101c54 func_ov026_02101fa8 kind:function(arm,size=0x168) addr:0x02101fa8 func_ov026_02102110 kind:function(arm,size=0x50) addr:0x02102110 func_ov026_02102160 kind:function(arm,size=0x39c) addr:0x02102160 @@ -1082,11 +1082,11 @@ func_ov026_0210534c kind:function(arm,size=0xd4) addr:0x0210534c func_ov026_02105420 kind:function(arm,size=0x10) addr:0x02105420 func_ov026_02105430 kind:function(arm,size=0x14) addr:0x02105430 func_ov026_02105444 kind:function(arm,size=0x24) addr:0x02105444 -func_ov026_02105468 kind:function(arm,size=0x20) addr:0x02105468 +_ZN18Actor_UnkSystem9_219func_ov026_02105468Ei kind:function(arm,size=0x20) addr:0x02105468 func_ov026_02105488 kind:function(arm,size=0x164) addr:0x02105488 func_ov026_021055ec kind:function(arm,size=0x80) addr:0x021055ec -func_ov026_0210566c kind:function(arm,size=0x38) addr:0x0210566c -func_ov026_021056a4 kind:function(arm,size=0x38) addr:0x021056a4 +_ZN18Actor_UnkSystem9_2C1Ev kind:function(arm,size=0x38) addr:0x0210566c +_ZN16Actor_UnkSystem9C1Ev kind:function(arm,size=0x38) addr:0x021056a4 func_ov026_021056dc kind:function(arm,size=0x38) addr:0x021056dc func_ov026_02105714 kind:function(arm,size=0x1c) addr:0x02105714 func_ov026_02105730 kind:function(arm,size=0x4) addr:0x02105730 @@ -1538,28 +1538,28 @@ _ZN12ActorUnkTRCB19func_ov026_021109d4Ev kind:function(arm,size=0x184) addr:0x02 _ZN12ActorUnkTRCBD1Ev kind:function(arm,size=0x84) addr:0x02110b58 _ZN12ActorUnkTRCBD0Ev kind:function(arm,size=0x8c) addr:0x02110bdc _ZN19ActorProfileUnkTRCBD1Ev kind:function(arm,size=0x14) addr:0x02110c68 -func_ov026_02110c7c kind:function(arm,size=0x28) addr:0x02110c7c -func_ov026_02110ca4 kind:function(arm,size=0x20) addr:0x02110ca4 -func_ov026_02110cc4 kind:function(arm,size=0x1c) addr:0x02110cc4 -func_ov026_02110ce0 kind:function(arm,size=0x34) addr:0x02110ce0 -func_ov026_02110d14 kind:function(arm,size=0x24) addr:0x02110d14 -func_ov026_02110d38 kind:function(arm,size=0x30) addr:0x02110d38 -func_ov026_02110d68 kind:function(arm,size=0x14) addr:0x02110d68 -func_ov026_02110d7c kind:function(arm,size=0x30) addr:0x02110d7c -func_ov026_02110dac kind:function(arm,size=0x30) addr:0x02110dac -func_ov026_02110ddc kind:function(arm,size=0x5c) addr:0x02110ddc -func_ov026_02110e38 kind:function(arm,size=0x38) addr:0x02110e38 -func_ov026_02110e70 kind:function(arm,size=0x48) addr:0x02110e70 -func_ov026_02110eb8 kind:function(arm,size=0x2c) addr:0x02110eb8 -func_ov026_02110ee4 kind:function(arm,size=0x44) addr:0x02110ee4 -func_ov026_02110f28 kind:function(arm,size=0x40) addr:0x02110f28 -func_ov026_02110f68 kind:function(arm,size=0x64) addr:0x02110f68 -func_ov026_02110fcc kind:function(arm,size=0x48) addr:0x02110fcc -_ZN19func_ov026_02111014D1Ev kind:function(arm,size=0x14) addr:0x02111014 -_ZN19func_ov026_02111028D0Ev kind:function(arm,size=0x1c) addr:0x02111028 -func_ov026_02111044 kind:function(arm,size=0x2c) addr:0x02111044 -_ZN19func_ov026_02111070D1Ev kind:function(arm,size=0x14) addr:0x02111070 -_ZN19func_ov026_02111084D0Ev kind:function(arm,size=0x1c) addr:0x02111084 +_ZN14Actor_Derived1C2Ev kind:function(arm,size=0x28) addr:0x02110c7c +_ZN14Actor_Derived119func_ov026_02110ca4Ev kind:function(arm,size=0x20) addr:0x02110ca4 +_ZN14Actor_Derived18vfunc_54Ev kind:function(arm,size=0x1c) addr:0x02110cc4 +_ZN14Actor_Derived18vfunc_58Ev kind:function(arm,size=0x34) addr:0x02110ce0 +_ZN14Actor_Derived119func_ov026_02110d14Ev kind:function(arm,size=0x24) addr:0x02110d14 +_ZN14Actor_Derived119func_ov026_02110d38Ev kind:function(arm,size=0x30) addr:0x02110d38 +_ZN14Actor_Derived119func_ov026_02110d68Ev kind:function(arm,size=0x14) addr:0x02110d68 +_ZN14Actor_Derived119func_ov026_02110d7cEv kind:function(arm,size=0x30) addr:0x02110d7c +_ZN14Actor_Derived119func_ov026_02110dacEv kind:function(arm,size=0x30) addr:0x02110dac +_ZN14Actor_Derived119func_ov026_02110ddcEv kind:function(arm,size=0x5c) addr:0x02110ddc +_ZN14Actor_Derived119func_ov026_02110e38Ev kind:function(arm,size=0x38) addr:0x02110e38 +_ZN14Actor_Derived119func_ov026_02110e70Ev kind:function(arm,size=0x48) addr:0x02110e70 +_ZN14Actor_Derived119func_ov026_02110eb8Ev kind:function(arm,size=0x2c) addr:0x02110eb8 +_ZN14Actor_Derived119func_ov026_02110ee4Ev kind:function(arm,size=0x44) addr:0x02110ee4 +_ZN14Actor_Derived119func_ov026_02110f28Ev kind:function(arm,size=0x40) addr:0x02110f28 +_ZN14Actor_Derived119func_ov026_02110f68Ev kind:function(arm,size=0x64) addr:0x02110f68 +_ZN14Actor_Derived119func_ov026_02110fccEv kind:function(arm,size=0x48) addr:0x02110fcc +_ZN14Actor_Derived1D1Ev kind:function(arm,size=0x14) addr:0x02111014 +_ZN14Actor_Derived1D0Ev kind:function(arm,size=0x1c) addr:0x02111028 +_ZN14Actor_Derived2C2Ev kind:function(arm,size=0x2c) addr:0x02111044 +_ZN14Actor_Derived2D1Ev kind:function(arm,size=0x14) addr:0x02111070 +_ZN14Actor_Derived2D0Ev kind:function(arm,size=0x1c) addr:0x02111084 _ZN19ActorProfileUnkTHER10GetProfileEv kind:function(arm,size=0xc) addr:0x021110a0 _ZN19ActorProfileUnkTHER6CreateEv kind:function(arm,size=0x24) addr:0x021110ac _ZN19ActorProfileUnkTHERC1Ev kind:function(arm,size=0x38) addr:0x021110d0 @@ -1589,15 +1589,15 @@ _ZN12ActorUnkKLTR19func_ov026_021116e0Ev kind:function(arm,size=0x10) addr:0x021 _ZN12ActorUnkKLTRC1Ev kind:function(arm,size=0x16c) addr:0x021116f0 _ZN12ActorUnkKLTRD1Ev kind:function(arm,size=0x88) addr:0x0211185c _ZN12ActorUnkKLTRD0Ev kind:function(arm,size=0x90) addr:0x021118e4 -_ZN12ActorUnkKLTR19func_ov026_02111974Ev kind:function(arm,size=0x8) addr:0x02111974 -_ZN12ActorUnkKLTR19func_ov026_0211197cEv kind:function(arm,size=0x108) addr:0x0211197c -_ZN12ActorUnkKLTR19func_ov026_02111a84Ev kind:function(arm,size=0x20) addr:0x02111a84 -_ZN12ActorUnkKLTR19func_ov026_02111aa4Ev kind:function(arm,size=0x20) addr:0x02111aa4 +_ZN12ActorUnkKLTR8vfunc_18Ei kind:function(arm,size=0x8) addr:0x02111974 +_ZN12ActorUnkKLTR8vfunc_1cEv kind:function(arm,size=0x108) addr:0x0211197c +_ZN12ActorUnkKLTR8vfunc_20Ev kind:function(arm,size=0x20) addr:0x02111a84 +_ZN12ActorUnkKLTR8vfunc_24Ev kind:function(arm,size=0x20) addr:0x02111aa4 _ZN12ActorUnkKLTR19func_ov026_02111ac4Ev kind:function(arm,size=0x144) addr:0x02111ac4 _ZN12ActorUnkKLTR19func_ov026_02111c08Ev kind:function(arm,size=0x148) addr:0x02111c08 _ZN12ActorUnkKLTR19func_ov026_02111d50Ev kind:function(arm,size=0x4) addr:0x02111d50 -_ZN12ActorUnkKLTR19func_ov026_02111d54Ev kind:function(arm,size=0x1e8) addr:0x02111d54 -_ZN12ActorUnkKLTR19func_ov026_02111f3cEv kind:function(arm,size=0xf0) addr:0x02111f3c +_ZN12ActorUnkKLTR8vfunc_2cEi kind:function(arm,size=0x1e8) addr:0x02111d54 +_ZN12ActorUnkKLTR8vfunc_30Ev kind:function(arm,size=0xf0) addr:0x02111f3c _ZN12ActorUnkKLTR19func_ov026_0211202cEv kind:function(arm,size=0x30) addr:0x0211202c _ZN12ActorUnkKLTR19func_ov026_0211205cEv kind:function(arm,size=0x2c) addr:0x0211205c _ZN12ActorUnkKLTR19func_ov026_02112088Ev kind:function(arm,size=0x84) addr:0x02112088 @@ -2130,19 +2130,19 @@ _ZN12ActorUnkDKTR19func_ov026_0212b958Ev kind:function(arm,size=0x5c) addr:0x021 _ZN12ActorUnkDKTRC1Ev kind:function(arm,size=0x1b4) addr:0x0212b9b4 _ZN12ActorUnkDKTRD1Ev kind:function(arm,size=0x90) addr:0x0212bb68 _ZN12ActorUnkDKTRD0Ev kind:function(arm,size=0x98) addr:0x0212bbf8 -_ZN12ActorUnkDKTR19func_ov026_0212bc90Ev kind:function(arm,size=0x8) addr:0x0212bc90 -_ZN12ActorUnkDKTR19func_ov026_0212bc98Ev kind:function(arm,size=0x108) addr:0x0212bc98 -_ZN12ActorUnkDKTR19func_ov026_0212bda0Ev kind:function(arm,size=0x20) addr:0x0212bda0 -_ZN12ActorUnkDKTR19func_ov026_0212bdc0Ev kind:function(arm,size=0x20) addr:0x0212bdc0 +_ZN12ActorUnkDKTR8vfunc_18Ei kind:function(arm,size=0x8) addr:0x0212bc90 +_ZN12ActorUnkDKTR8vfunc_1cEv kind:function(arm,size=0x108) addr:0x0212bc98 +_ZN12ActorUnkDKTR8vfunc_20Ev kind:function(arm,size=0x20) addr:0x0212bda0 +_ZN12ActorUnkDKTR8vfunc_24Ev kind:function(arm,size=0x20) addr:0x0212bdc0 _ZN12ActorUnkDKTR19func_ov026_0212bde0Ev kind:function(arm,size=0x20c) addr:0x0212bde0 _ZN12ActorUnkDKTR19func_ov026_0212bfecEv kind:function(arm,size=0x148) addr:0x0212bfec _ZN12ActorUnkDKTR19func_ov026_0212c134Ev kind:function(arm,size=0x4) addr:0x0212c134 -_ZN12ActorUnkDKTR19func_ov026_0212c138Ev kind:function(arm,size=0x170) addr:0x0212c138 -_ZN12ActorUnkDKTR19func_ov026_0212c2a8Ev kind:function(arm,size=0xf0) addr:0x0212c2a8 +_ZN12ActorUnkDKTR8vfunc_2cEi kind:function(arm,size=0x170) addr:0x0212c138 +_ZN12ActorUnkDKTR8vfunc_30Ev kind:function(arm,size=0xf0) addr:0x0212c2a8 _ZN12ActorUnkDKTR19func_ov026_0212c398Ev kind:function(arm,size=0x30) addr:0x0212c398 _ZN12ActorUnkDKTR19func_ov026_0212c3c8Ev kind:function(arm,size=0x2c) addr:0x0212c3c8 _ZN12ActorUnkDKTR19func_ov026_0212c3f4Ev kind:function(arm,size=0x84) addr:0x0212c3f4 -_ZN12ActorUnkDKTR19func_ov026_0212c478Ev kind:function(arm,size=0xf4) addr:0x0212c478 +_ZN12ActorUnkDKTR9vfunc2_0CEv kind:function(arm,size=0xf4) addr:0x0212c478 _ZN12ActorUnkDKTR19func_ov026_0212c56cEv kind:function(arm,size=0xb8) addr:0x0212c56c _ZN12ActorUnkDKTR19func_ov026_0212c624Ev kind:function(arm,size=0x3f4) addr:0x0212c624 _ZN12ActorUnkDKTR19func_ov026_0212ca18Ev kind:function(arm,size=0x34c) addr:0x0212ca18 @@ -2179,9 +2179,9 @@ _ZN12ActorUnkDKTR19func_ov026_0212e178Ev kind:function(arm,size=0x100) addr:0x02 _ZN12ActorUnkDKTR19func_ov026_0212e278Ev kind:function(arm,size=0x3c) addr:0x0212e278 _ZN12ActorUnkDKTR19func_ov026_0212e2b4Ev kind:function(arm,size=0x190) addr:0x0212e2b4 _ZN19ActorProfileUnkDKTRD1Ev kind:function(arm,size=0x14) addr:0x0212e444 -func_ov026_0212e458 kind:function(arm,size=0x10) addr:0x0212e458 -func_ov026_0212e468 kind:function(arm,size=0x10) addr:0x0212e468 -func_ov026_0212e478 kind:function(arm,size=0x10) addr:0x0212e478 +_ZThn152_N12ActorUnkDKTRD0Ev kind:function(arm,size=0x10) addr:0x0212e458 +_ZThn152_N12ActorUnkDKTR9vfunc2_0CEv kind:function(arm,size=0x10) addr:0x0212e468 +_ZThn152_N12ActorUnkDKTRD1Ev kind:function(arm,size=0x10) addr:0x0212e478 func_ov026_0212e488 kind:function(arm,size=0xb0) addr:0x0212e488 func_ov026_0212e538 kind:function(arm,size=0x14) addr:0x0212e538 func_ov026_0212e54c kind:function(arm,size=0x54) addr:0x0212e54c @@ -2646,7 +2646,7 @@ data_ov026_02135bc0 kind:data(any) addr:0x02135bc0 data_ov026_02135c04 kind:data(any) addr:0x02135c04 data_ov026_02135c10 kind:data(any) addr:0x02135c10 data_ov026_02135c54 kind:data(any) addr:0x02135c54 -data_ov026_02135c60 kind:data(any) addr:0x02135c60 +_ZTV16Actor_UnkSystem6 kind:data(any) addr:0x02135c58 data_ov026_02135c8c kind:data(any) addr:0x02135c8c data_ov026_02135cd4 kind:data(any) addr:0x02135cd4 data_ov026_02135d18 kind:data(any) addr:0x02135d18 @@ -2793,8 +2793,8 @@ _ZTV19data_ov026_02137654 kind:data(any) addr:0x02137654 _ZTV19data_ov026_021376b8 kind:data(any) addr:0x021376b8 _ZTV19data_ov026_021376dc kind:data(any) addr:0x021376dc data_ov026_02137740 kind:data(any) addr:0x02137740 -_ZTV19data_ov026_02137820 kind:data(any) addr:0x02137820 -_ZTV19data_ov026_02137844 kind:data(any) addr:0x02137844 +_ZTV19ActorProfileUnkKLTR kind:data(any) addr:0x02137820 +_ZTV12ActorUnkKLTR kind:data(any) addr:0x02137844 data_ov026_021378a8 kind:data(any) addr:0x021378a8 data_ov026_021378cc kind:data(any) addr:0x021378cc _ZTV19data_ov026_021378e0 kind:data(any) addr:0x021378e0 @@ -2891,9 +2891,8 @@ data_ov026_021389cc kind:data(any) addr:0x021389cc data_ov026_021389e4 kind:data(any) addr:0x021389e4 data_ov026_021389fc kind:data(any) addr:0x021389fc data_ov026_02138a14 kind:data(any) addr:0x02138a14 -_ZTV19data_ov026_02138ae4 kind:data(any) addr:0x02138ae4 -_ZTV19data_ov026_02138b08 kind:data(any) addr:0x02138b08 -data_ov026_02138b78 kind:data(any) addr:0x02138b78 +_ZTV19ActorProfileUnkDKTR kind:data(any) addr:0x02138ae4 +_ZTV12ActorUnkDKTR kind:data(any) addr:0x02138b08 data_ov026_02138b8c kind:data(any) addr:0x02138b8c data_ov026_02138b90 kind:data(any) addr:0x02138b90 data_ov026_02138b9c kind:data(any) addr:0x02138b9c @@ -3099,8 +3098,8 @@ data_ov026_021404e0 kind:bss addr:0x021404e0 data_ov026_021404e4 kind:bss addr:0x021404e4 data_ov026_021404e8 kind:bss addr:0x021404e8 data_ov026_021404ec kind:bss addr:0x021404ec -data_ov026_021404f0 kind:bss addr:0x021404f0 -data_ov026_021404f4 kind:bss addr:0x021404f4 +_ZGVN15ProfileInstanceI19ActorProfileUnkKLTRE8sProfileE kind:bss addr:0x021404f0 +@10290 kind:bss addr:0x021404f4 data_ov026_02140500 kind:bss addr:0x02140500 data_ov026_02140504 kind:bss addr:0x02140504 data_ov026_02140514 kind:bss addr:0x02140514 @@ -3114,8 +3113,8 @@ data_ov026_02140584 kind:bss addr:0x02140584 data_ov026_02140594 kind:bss addr:0x02140594 data_ov026_021405a4 kind:bss addr:0x021405a4 data_ov026_021405b4 kind:bss addr:0x021405b4 -_ZGVN15ProfileInstanceI19ActorProfileUnkKLTRE8sProfileE kind:bss addr:0x021405c4 -@10290 kind:bss addr:0x021405d4 +data_ov026_021405c4 kind:bss addr:0x021405c4 +data_ov026_021405d4 kind:bss addr:0x021405d4 _ZN15ProfileInstanceI19ActorProfileUnkKLTRE8sProfileE kind:bss addr:0x021405e4 data_ov026_021406bc kind:bss addr:0x021406bc _ZGVN15ProfileInstanceI19ActorProfileUnkTRTTE8sProfileE kind:bss addr:0x021406c4 @@ -3184,8 +3183,8 @@ data_ov026_0214173c kind:bss addr:0x0214173c data_ov026_02141740 kind:bss addr:0x02141740 data_ov026_02141744 kind:bss addr:0x02141744 data_ov026_02141748 kind:bss addr:0x02141748 -data_ov026_0214174c kind:bss addr:0x0214174c -data_ov026_02141750 kind:bss addr:0x02141750 +_ZGVN15ProfileInstanceI19ActorProfileUnkDKTRE8sProfileE kind:bss addr:0x0214174c +@10374 kind:bss addr:0x02141750 data_ov026_0214175c kind:bss addr:0x0214175c data_ov026_02141760 kind:bss addr:0x02141760 data_ov026_02141764 kind:bss addr:0x02141764 @@ -3206,8 +3205,8 @@ data_ov026_021417f0 kind:bss addr:0x021417f0 data_ov026_02141800 kind:bss addr:0x02141800 data_ov026_02141810 kind:bss addr:0x02141810 data_ov026_02141820 kind:bss addr:0x02141820 -_ZGVN15ProfileInstanceI19ActorProfileUnkDKTRE8sProfileE kind:bss addr:0x02141830 -@10374 kind:bss addr:0x02141840 +data_ov026_02141830 kind:bss addr:0x02141830 +data_ov026_02141840 kind:bss addr:0x02141840 _ZN15ProfileInstanceI19ActorProfileUnkDKTRE8sProfileE kind:bss addr:0x02141850 data_ov026_02141928 kind:bss addr:0x02141928 data_ov026_0214192c kind:bss addr:0x0214192c diff --git a/config/eur/arm9/overlays/ov027/relocs.txt b/config/eur/arm9/overlays/ov027/relocs.txt index 5aa619523..d08149d4d 100644 --- a/config/eur/arm9/overlays/ov027/relocs.txt +++ b/config/eur/arm9/overlays/ov027/relocs.txt @@ -583,7 +583,7 @@ from:0x02145304 kind:arm_call to:0x0210253c module:overlay(26) from:0x02145320 kind:arm_call to:0x0210136c module:overlay(26) from:0x0214532c kind:arm_call to:0x020ee538 module:overlay(26) from:0x02145338 kind:load to:0x02148d80 add:0x8 module:overlay(27) -from:0x0214533c kind:load to:0x020b27c8 module:overlay(0) +from:0x0214533c kind:load to:0x020b27c0 add:0x8 module:overlay(0) from:0x02145340 kind:load to:0x02148400 module:overlay(27) from:0x02145344 kind:load to:0x02145398 module:overlay(27) from:0x02145348 kind:load to:0x02145358 module:overlay(27) diff --git a/config/eur/arm9/overlays/ov030/relocs.txt b/config/eur/arm9/overlays/ov030/relocs.txt index f749a53e4..bf2a14066 100644 --- a/config/eur/arm9/overlays/ov030/relocs.txt +++ b/config/eur/arm9/overlays/ov030/relocs.txt @@ -1415,7 +1415,7 @@ from:0x0214de8c kind:arm_call to:0x0209862c module:overlay(0) from:0x0214deb0 kind:arm_call to:0x0210136c module:overlay(26) from:0x0214debc kind:arm_call to:0x020ee538 module:overlay(26) from:0x0214dec8 kind:load to:0x02151cf4 add:0x8 module:overlay(30) -from:0x0214decc kind:load to:0x020b27c8 module:overlay(0) +from:0x0214decc kind:load to:0x020b27c0 add:0x8 module:overlay(0) from:0x0214ded0 kind:load to:0x0215104c module:overlay(30) from:0x0214ded4 kind:load to:0x0214df28 module:overlay(30) from:0x0214ded8 kind:load to:0x0214dee8 module:overlay(30) diff --git a/config/eur/arm9/overlays/ov031/relocs.txt b/config/eur/arm9/overlays/ov031/relocs.txt index 7c34877cc..a533cffdb 100644 --- a/config/eur/arm9/overlays/ov031/relocs.txt +++ b/config/eur/arm9/overlays/ov031/relocs.txt @@ -1146,7 +1146,7 @@ from:0x020e36b4 kind:load to:0x027e0ce4 module:dtcm from:0x020e36b8 kind:load to:0x027e0ce8 module:dtcm from:0x020e36c8 kind:arm_call to:0x02098388 module:overlay(0) from:0x020e3730 kind:load to:0x02112d84 add:0x8 module:overlay(31) -from:0x020e3734 kind:load to:0x020b27c8 module:overlay(0) +from:0x020e3734 kind:load to:0x020b27c0 add:0x8 module:overlay(0) from:0x020e3738 kind:load to:0x02112d4c module:overlay(31) from:0x020e3744 kind:arm_call to:0x0207bffc module:overlay(0) from:0x020e378c kind:arm_call to:0x01ffb6e4 module:itcm @@ -1447,7 +1447,7 @@ from:0x020e5b04 kind:load to:0x02110a88 module:overlay(31) from:0x020e5b08 kind:load to:0x027e0ce0 module:dtcm from:0x020e5b0c kind:load to:0x02112ff4 module:overlay(31) from:0x020e5b10 kind:load to:0x02112fd8 module:overlay(31) -from:0x020e5b14 kind:load to:0x020b27c8 module:overlay(0) +from:0x020e5b14 kind:load to:0x020b27c0 add:0x8 module:overlay(0) from:0x020e5b18 kind:load to:0x020a02d4 module:overlay(0) from:0x020e5b1c kind:load to:0x020e5704 module:overlay(31) from:0x020e5b28 kind:arm_call to:0x0207bffc module:overlay(0) diff --git a/config/eur/arm9/overlays/ov043/relocs.txt b/config/eur/arm9/overlays/ov043/relocs.txt index 4a9a518fa..512a66ac9 100644 --- a/config/eur/arm9/overlays/ov043/relocs.txt +++ b/config/eur/arm9/overlays/ov043/relocs.txt @@ -381,7 +381,7 @@ from:0x02126aa0 kind:load to:0x0212d248 add:0x8 module:overlay(43) from:0x02126aa4 kind:load to:0x0212dca0 module:overlay(43) from:0x02126aa8 kind:load to:0x0212d204 module:overlay(43) from:0x02126aac kind:load to:0x0212d1bc module:overlay(43) -from:0x02126ab0 kind:load to:0x020b27c8 module:overlay(0) +from:0x02126ab0 kind:load to:0x020b27c0 add:0x8 module:overlay(0) from:0x02126ab4 kind:load to:0x027e07d4 module:dtcm from:0x02126abc kind:load to:0x0212d178 module:overlay(43) from:0x02126ac8 kind:arm_call_thumb to:0x0209a248 module:overlay(0) diff --git a/config/eur/arm9/overlays/ov048/relocs.txt b/config/eur/arm9/overlays/ov048/relocs.txt index a92034cb5..31b195a1e 100644 --- a/config/eur/arm9/overlays/ov048/relocs.txt +++ b/config/eur/arm9/overlays/ov048/relocs.txt @@ -10,7 +10,7 @@ from:0x02130608 kind:arm_call to:0x02098388 module:overlay(0) from:0x0213062c kind:arm_call to:0x0207edac module:overlay(0) from:0x02130664 kind:arm_call to:0x020982a8 module:overlay(0) from:0x0213069c kind:load to:0x021375f8 add:0x8 module:overlay(48) -from:0x021306a0 kind:load to:0x020b27c8 module:overlay(0) +from:0x021306a0 kind:load to:0x020b27c0 add:0x8 module:overlay(0) from:0x021306a4 kind:load to:0x021375e4 module:overlay(48) from:0x021306b0 kind:arm_call to:0x0207bffc module:overlay(0) from:0x021306c8 kind:arm_call to:0x0207bffc module:overlay(0) @@ -256,7 +256,7 @@ from:0x02132280 kind:load to:0x02137c70 module:overlay(48) from:0x02132284 kind:load to:0x0213771c module:overlay(48) from:0x0213228c kind:load to:0x02131000 module:overlay(48) from:0x02132290 kind:load to:0x021320c0 module:overlay(48) -from:0x02132294 kind:load to:0x020b27c8 module:overlay(0) +from:0x02132294 kind:load to:0x020b27c0 add:0x8 module:overlay(0) from:0x021322b8 kind:arm_call to:0x020a0334 module:overlay(0) from:0x021322d4 kind:arm_call to:0x0207e254 module:overlay(0) from:0x021322dc kind:arm_call to:0x0207b6c0 module:overlay(0) diff --git a/config/eur/arm9/overlays/ov052/relocs.txt b/config/eur/arm9/overlays/ov052/relocs.txt index 52fce6a35..a908a48b0 100644 --- a/config/eur/arm9/overlays/ov052/relocs.txt +++ b/config/eur/arm9/overlays/ov052/relocs.txt @@ -319,7 +319,7 @@ from:0x021334e0 kind:load to:0x021361e8 add:0x8 module:overlay(52) from:0x021334e4 kind:load to:0x02136840 module:overlay(52) from:0x021334e8 kind:load to:0x021361a4 module:overlay(52) from:0x021334ec kind:load to:0x0213615c module:overlay(52) -from:0x021334f0 kind:load to:0x020b27c8 module:overlay(0) +from:0x021334f0 kind:load to:0x020b27c0 add:0x8 module:overlay(0) from:0x021334f4 kind:load to:0x027e07d4 module:dtcm from:0x021334fc kind:load to:0x02136118 module:overlay(52) from:0x02133508 kind:arm_call_thumb to:0x0209a248 module:overlay(0) diff --git a/config/eur/arm9/overlays/ov059/relocs.txt b/config/eur/arm9/overlays/ov059/relocs.txt index 1289f2664..8e087721c 100644 --- a/config/eur/arm9/overlays/ov059/relocs.txt +++ b/config/eur/arm9/overlays/ov059/relocs.txt @@ -522,7 +522,7 @@ from:0x0215c7dc kind:load to:0x0216384c add:0x8 module:overlay(59) from:0x0215c7e0 kind:load to:0x0216449c module:overlay(59) from:0x0215c7e4 kind:load to:0x021637a8 module:overlay(59) from:0x0215c7e8 kind:load to:0x02163514 module:overlay(59) -from:0x0215c7ec kind:load to:0x020b27c8 module:overlay(0) +from:0x0215c7ec kind:load to:0x020b27c0 add:0x8 module:overlay(0) from:0x0215c7f0 kind:load to:0x02164490 module:overlay(59) from:0x0215c7fc kind:arm_call_thumb to:0x02057bd4 module:overlay(0) from:0x0215c828 kind:arm_call to:0x02057c38 module:overlay(0) @@ -1018,7 +1018,7 @@ from:0x02160e80 kind:load to:0x02163bdc add:0x8 module:overlay(59) from:0x02160e8c kind:arm_call to:0x02098388 module:overlay(0) from:0x02160f24 kind:arm_call_thumb to:0x02057a24 module:overlay(0) from:0x02160f54 kind:load to:0x02163c50 add:0x8 module:overlay(59) -from:0x02160f58 kind:load to:0x020b27c8 module:overlay(0) +from:0x02160f58 kind:load to:0x020b27c0 add:0x8 module:overlay(0) from:0x02160f5c kind:load to:0x02164678 module:overlay(59) from:0x02160f88 kind:arm_call to:0x02160f94 module:overlay(59) from:0x02160fcc kind:load to:0x02163c00 module:overlay(59) diff --git a/config/eur/arm9/overlays/ov068/relocs.txt b/config/eur/arm9/overlays/ov068/relocs.txt index 016ddc954..d91d37780 100644 --- a/config/eur/arm9/overlays/ov068/relocs.txt +++ b/config/eur/arm9/overlays/ov068/relocs.txt @@ -816,7 +816,7 @@ from:0x0215ebb4 kind:load to:0x021632c0 add:0x8 module:overlay(68) from:0x0215ebb8 kind:load to:0x0216434c module:overlay(68) from:0x0215ebbc kind:load to:0x0216323c module:overlay(68) from:0x0215ebc0 kind:load to:0x0216278c module:overlay(68) -from:0x0215ebc4 kind:load to:0x020b27c8 module:overlay(0) +from:0x0215ebc4 kind:load to:0x020b27c0 add:0x8 module:overlay(0) from:0x0215ebd0 kind:arm_call_thumb to:0x02057bd4 module:overlay(0) from:0x0215ebf8 kind:arm_call to:0x02057c38 module:overlay(0) from:0x0215ec08 kind:arm_call to:0x0209a7b8 module:overlay(0) diff --git a/config/eur/arm9/overlays/ov070/relocs.txt b/config/eur/arm9/overlays/ov070/relocs.txt index fcc984493..84faf8ce1 100644 --- a/config/eur/arm9/overlays/ov070/relocs.txt +++ b/config/eur/arm9/overlays/ov070/relocs.txt @@ -1090,7 +1090,7 @@ from:0x02147f80 kind:arm_call to:0x020982a8 module:overlay(0) from:0x02147fe8 kind:arm_call to:0x0209862c module:overlay(0) from:0x02148000 kind:load to:0x0214f32c add:0x8 module:overlay(70) from:0x02148004 kind:load to:0x021505a4 module:overlay(70) -from:0x02148008 kind:load to:0x020b27c8 module:overlay(0) +from:0x02148008 kind:load to:0x020b27c0 add:0x8 module:overlay(0) from:0x0214800c kind:load to:0x0214f274 module:overlay(70) from:0x02148018 kind:arm_call to:0x0207bffc module:overlay(0) from:0x02148060 kind:arm_call to:0x021482cc module:overlay(70) diff --git a/config/eur/arm9/overlays/ov071/relocs.txt b/config/eur/arm9/overlays/ov071/relocs.txt index acc081404..f047b5d84 100644 --- a/config/eur/arm9/overlays/ov071/relocs.txt +++ b/config/eur/arm9/overlays/ov071/relocs.txt @@ -1216,7 +1216,7 @@ from:0x0215c498 kind:load to:0x02163c14 module:overlay(71) from:0x0215c49c kind:load to:0x02163c24 module:overlay(71) from:0x0215c4a0 kind:load to:0x0216464c add:0x8 module:overlay(71) from:0x0215c4a4 kind:load to:0x02163c34 module:overlay(71) -from:0x0215c4a8 kind:load to:0x020b27c8 module:overlay(0) +from:0x0215c4a8 kind:load to:0x020b27c0 add:0x8 module:overlay(0) from:0x0215c4ac kind:load to:0x02163c44 module:overlay(71) from:0x0215c4b0 kind:load to:0x02165134 module:overlay(71) from:0x0215c4b4 kind:load to:0x02163bcc module:overlay(71) diff --git a/config/eur/arm9/overlays/ov075/relocs.txt b/config/eur/arm9/overlays/ov075/relocs.txt index ff88ff4db..10efa0792 100644 --- a/config/eur/arm9/overlays/ov075/relocs.txt +++ b/config/eur/arm9/overlays/ov075/relocs.txt @@ -1475,7 +1475,7 @@ from:0x0215e650 kind:arm_call to:0x0215fa9c module:overlay(75) from:0x0215e660 kind:load to:0x02163208 add:0x8 module:overlay(75) from:0x0215e664 kind:load to:0x021635f4 module:overlay(75) from:0x0215e668 kind:load to:0x021631c8 module:overlay(75) -from:0x0215e66c kind:load to:0x020b27c8 module:overlay(0) +from:0x0215e66c kind:load to:0x020b27c0 add:0x8 module:overlay(0) from:0x0215e670 kind:load to:0x021635e8 module:overlay(75) from:0x0215e678 kind:load to:0x027e0130 module:dtcm from:0x0215e67c kind:load to:0x027e07d4 module:dtcm diff --git a/config/eur/arm9/overlays/ov087/relocs.txt b/config/eur/arm9/overlays/ov087/relocs.txt index 4c8c60c3f..45edd79ff 100644 --- a/config/eur/arm9/overlays/ov087/relocs.txt +++ b/config/eur/arm9/overlays/ov087/relocs.txt @@ -688,7 +688,7 @@ from:0x0215b3a0 kind:arm_call_thumb to:0x0205778c module:overlay(0) from:0x0215b3b4 kind:arm_call to:0x02097bb8 module:overlay(0) from:0x0215b400 kind:arm_call to:0x01ffa06c module:itcm from:0x0215b41c kind:load to:0x02162620 add:0x8 module:overlay(87) -from:0x0215b420 kind:load to:0x020b27c8 module:overlay(0) +from:0x0215b420 kind:load to:0x020b27c0 add:0x8 module:overlay(0) from:0x0215b424 kind:load to:0x02162c18 module:overlay(87) from:0x0215b428 kind:load to:0x021625dc module:overlay(87) from:0x0215b42c kind:load to:0x02162228 module:overlay(87) diff --git a/config/eur/arm9/overlays/ov091/relocs.txt b/config/eur/arm9/overlays/ov091/relocs.txt index d359483ba..aa2ecca36 100644 --- a/config/eur/arm9/overlays/ov091/relocs.txt +++ b/config/eur/arm9/overlays/ov091/relocs.txt @@ -978,7 +978,7 @@ from:0x0216dbbc kind:arm_call to:0x02103fa8 module:overlay(26) from:0x0216dbcc kind:load to:0x02177a30 add:0x8 module:overlay(91) from:0x0216dbd0 kind:load to:0x02178b80 module:overlay(91) from:0x0216dbd4 kind:load to:0x021779ec module:overlay(91) -from:0x0216dbd8 kind:load to:0x020b27c8 module:overlay(0) +from:0x0216dbd8 kind:load to:0x020b27c0 add:0x8 module:overlay(0) from:0x0216dbe4 kind:arm_call_thumb to:0x0209a248 module:overlay(0) from:0x0216dc84 kind:load to:0x02178b5c module:overlay(91) from:0x0216dc88 kind:load to:0x021779a0 module:overlay(91) @@ -1752,7 +1752,7 @@ from:0x02175e5c kind:arm_call to:0x01ffa06c module:itcm from:0x02175e68 kind:load to:0x0217801c add:0x8 module:overlay(91) from:0x02175e6c kind:load to:0x02178ed4 module:overlay(91) from:0x02175e70 kind:load to:0x020b1960 add:0x8 module:overlay(0) -from:0x02175e74 kind:load to:0x020b27c8 module:overlay(0) +from:0x02175e74 kind:load to:0x020b27c0 add:0x8 module:overlay(0) from:0x02175eb0 kind:arm_call to:0x021314c0 module:overlay(26) from:0x02175ec8 kind:arm_call to:0x021314c0 module:overlay(26) from:0x02175edc kind:arm_call to:0x01ffb714 module:itcm diff --git a/config/eur/arm9/overlays/ov092/relocs.txt b/config/eur/arm9/overlays/ov092/relocs.txt index c78739438..da7685169 100644 --- a/config/eur/arm9/overlays/ov092/relocs.txt +++ b/config/eur/arm9/overlays/ov092/relocs.txt @@ -2092,7 +2092,7 @@ from:0x02178d34 kind:arm_call to:0x020fbcbc module:overlay(26) from:0x02178d64 kind:arm_call to:0x02103170 module:overlay(26) from:0x02178da0 kind:arm_call to:0x02103fa8 module:overlay(26) from:0x02178dac kind:load to:0x0217cf68 add:0x8 module:overlay(92) -from:0x02178db0 kind:load to:0x020b27c8 module:overlay(0) +from:0x02178db0 kind:load to:0x020b27c0 add:0x8 module:overlay(0) from:0x02178e48 kind:load to:0x0217e0a4 module:overlay(92) from:0x02178e4c kind:load to:0x0217cf24 module:overlay(92) from:0x02178e50 kind:load to:0x0217e0f4 module:overlay(92) diff --git a/config/eur/arm9/overlays/ov094/relocs.txt b/config/eur/arm9/overlays/ov094/relocs.txt index 2446d762a..44097d217 100644 --- a/config/eur/arm9/overlays/ov094/relocs.txt +++ b/config/eur/arm9/overlays/ov094/relocs.txt @@ -1178,7 +1178,7 @@ from:0x0216fb40 kind:arm_call to:0x020fbcbc module:overlay(26) from:0x0216fb70 kind:arm_call to:0x02103170 module:overlay(26) from:0x0216fbac kind:arm_call to:0x02103fa8 module:overlay(26) from:0x0216fbb8 kind:load to:0x02177dc4 add:0x8 module:overlay(94) -from:0x0216fbbc kind:load to:0x020b27c8 module:overlay(0) +from:0x0216fbbc kind:load to:0x020b27c0 add:0x8 module:overlay(0) from:0x0216fbc8 kind:arm_call_thumb to:0x0209a248 module:overlay(0) from:0x0216fc68 kind:load to:0x02178f24 module:overlay(94) from:0x0216fc6c kind:load to:0x02177d80 module:overlay(94) diff --git a/config/eur/arm9/overlays/ov096/relocs.txt b/config/eur/arm9/overlays/ov096/relocs.txt index 201275a5b..ada0b15fb 100644 --- a/config/eur/arm9/overlays/ov096/relocs.txt +++ b/config/eur/arm9/overlays/ov096/relocs.txt @@ -186,7 +186,7 @@ from:0x0217b11c kind:load to:0x0217e090 add:0x8 module:overlay(96) from:0x0217b120 kind:load to:0x0217e334 module:overlay(96) from:0x0217b124 kind:load to:0x0217e020 module:overlay(96) from:0x0217b128 kind:load to:0x0217e04c module:overlay(96) -from:0x0217b12c kind:load to:0x020b27c8 module:overlay(0) +from:0x0217b12c kind:load to:0x020b27c0 add:0x8 module:overlay(0) from:0x0217b138 kind:arm_call_thumb to:0x02057bd4 module:overlay(0) from:0x0217b14c kind:arm_call_thumb to:0x0209a248 module:overlay(0) from:0x0217b160 kind:arm_call to:0x0207bffc module:overlay(0) diff --git a/config/jp/arm9/overlays/ov000/delinks.txt b/config/jp/arm9/overlays/ov000/delinks.txt index 47ad7540a..8662ec810 100644 --- a/config/jp/arm9/overlays/ov000/delinks.txt +++ b/config/jp/arm9/overlays/ov000/delinks.txt @@ -64,7 +64,7 @@ src/000_Second/MapObject/MapObjectProfile.cpp: .data start:0x020b4cc8 end:0x020b4d60 .bss start:0x020b7540 end:0x020b7924 -src/000_Second/MapObject/MapObjectProfile_Derived2_20.cpp: +src/000_Second/UnkActorFileSystem/UnkActorFileSystem1.cpp: complete .text start:0x0209e5cc end:0x0209e7a4 .data start:0x020b4d60 end:0x020b4d88 diff --git a/config/jp/arm9/overlays/ov000/relocs.txt b/config/jp/arm9/overlays/ov000/relocs.txt index 03d26ad87..7b15086b3 100644 --- a/config/jp/arm9/overlays/ov000/relocs.txt +++ b/config/jp/arm9/overlays/ov000/relocs.txt @@ -4708,7 +4708,7 @@ from:0x02085b36 kind:thumb_call to:0x02088990 module:overlay(0) from:0x02085bec kind:thumb_call_arm to:0x020871d4 module:overlay(0) from:0x02085bfa kind:thumb_call_arm to:0x020871d4 module:overlay(0) from:0x02085c18 kind:load to:0x020b4250 module:overlay(0) -from:0x02085c1c kind:load to:0x020b3fc8 module:overlay(0) +from:0x02085c1c kind:load to:0x020b3fc0 add:0x8 module:overlay(0) from:0x02085c20 kind:load to:0x020accdc module:overlay(0) from:0x02085c24 kind:load to:0x027e09a4 module:dtcm from:0x02085c44 kind:thumb_call_arm to:0x020804a0 module:overlay(0) diff --git a/config/jp/arm9/overlays/ov000/symbols.txt b/config/jp/arm9/overlays/ov000/symbols.txt index 2866c5a3a..e459f97cd 100644 --- a/config/jp/arm9/overlays/ov000/symbols.txt +++ b/config/jp/arm9/overlays/ov000/symbols.txt @@ -144,20 +144,20 @@ _ZN19func_ov000_02059910D0Ev kind:function(arm,size=0x1c) addr:0x02059910 _ZN19func_ov000_0205992cD2Ev kind:function(arm,size=0x14) addr:0x0205992c func_ov000_02059940 kind:function(arm,size=0x138) addr:0x02059940 func_ov000_02059a78 kind:function(arm,size=0x48) addr:0x02059a78 -_ZN33MapObjectProfile_Derived2_20_BaseC2EPKcPvS2_S2_ii kind:function(thumb,size=0x84) addr:0x02059ac0 +_ZN23UnkActorFileSystem_BaseC2EPKcPvS2_S2_ii kind:function(thumb,size=0x84) addr:0x02059ac0 func_ov000_02059b44 kind:function(thumb,size=0x14) addr:0x02059b44 -_ZN33MapObjectProfile_Derived2_20_BaseD1Ev kind:function(thumb,size=0x48) addr:0x02059b58 -_ZN33MapObjectProfile_Derived2_20_BaseD0Ev kind:function(thumb,size=0x4c) addr:0x02059ba0 -_ZN33MapObjectProfile_Derived2_20_BaseD2Ev kind:function(thumb,size=0x48) addr:0x02059bec -_ZN33MapObjectProfile_Derived2_20_Base19func_ov000_020586b4Eiiii kind:function(thumb,size=0x23c) addr:0x02059c34 -_ZN33MapObjectProfile_Derived2_20_Base19func_ov000_020588f0Ev kind:function(thumb,size=0x10) addr:0x02059e70 -_ZN33MapObjectProfile_Derived2_20_Base19func_ov000_02058900Ev kind:function(thumb,size=0x12) addr:0x02059e80 -_ZN33MapObjectProfile_Derived2_20_Base19func_ov000_02058914Ei kind:function(thumb,size=0xd0) addr:0x02059e94 -_ZN33MapObjectProfile_Derived2_20_Base19func_ov000_020589e4Ev kind:function(thumb,size=0x40) addr:0x02059f64 -_ZN33MapObjectProfile_Derived2_20_Base19func_ov000_02058a24Ev kind:function(arm,size=0x34) addr:0x02059fa4 -_ZN33MapObjectProfile_Derived2_20_Base19func_ov000_02058a58Ev kind:function(arm,size=0x2c) addr:0x02059fd8 -_ZN33MapObjectProfile_Derived2_20_Base19func_ov000_02058a84EiPKc kind:function(arm,size=0x2c) addr:0x0205a004 -_ZN33MapObjectProfile_Derived2_20_Base19func_ov000_02058ab0Ev kind:function(arm,size=0xe8) addr:0x0205a030 +_ZN23UnkActorFileSystem_BaseD1Ev kind:function(thumb,size=0x48) addr:0x02059b58 +_ZN23UnkActorFileSystem_BaseD0Ev kind:function(thumb,size=0x4c) addr:0x02059ba0 +_ZN23UnkActorFileSystem_BaseD2Ev kind:function(thumb,size=0x48) addr:0x02059bec +_ZN23UnkActorFileSystem_Base19func_ov000_020586b4Eiiii kind:function(thumb,size=0x23c) addr:0x02059c34 +_ZN23UnkActorFileSystem_Base19func_ov000_020588f0Ev kind:function(thumb,size=0x10) addr:0x02059e70 +_ZN23UnkActorFileSystem_Base19func_ov000_02058900Ev kind:function(thumb,size=0x12) addr:0x02059e80 +_ZN23UnkActorFileSystem_Base19func_ov000_02058914Ei kind:function(thumb,size=0xd0) addr:0x02059e94 +_ZN23UnkActorFileSystem_Base19func_ov000_020589e4Ev kind:function(thumb,size=0x40) addr:0x02059f64 +_ZN23UnkActorFileSystem_Base19func_ov000_02058a24Ev kind:function(arm,size=0x34) addr:0x02059fa4 +_ZN23UnkActorFileSystem_Base19func_ov000_02058a58Ev kind:function(arm,size=0x2c) addr:0x02059fd8 +_ZN23UnkActorFileSystem_Base19func_ov000_02058a84EiPKc kind:function(arm,size=0x2c) addr:0x0205a004 +_ZN23UnkActorFileSystem_Base19func_ov000_02058ab0Ev kind:function(arm,size=0xe8) addr:0x0205a030 func_ov000_0205a118 kind:function(thumb,size=0x1c) addr:0x0205a118 func_ov000_0205a134 kind:function(arm,size=0x34) addr:0x0205a134 func_ov000_0205a168 kind:function(arm,size=0x14) addr:0x0205a168 @@ -236,7 +236,7 @@ func_ov000_0205b984 kind:function(arm,size=0x130) addr:0x0205b984 func_ov000_0205bab4 kind:function(arm,size=0xfc) addr:0x0205bab4 func_ov000_0205bbb0 kind:function(arm,size=0x10) addr:0x0205bbb0 func_ov000_0205bbc0 kind:function(arm,size=0x14) addr:0x0205bbc0 -func_ov000_0205bbd4 kind:function(arm,size=0x44) addr:0x0205bbd4 +_ZN21Actor_UnkSystem6_BaseC2EiPv kind:function(arm,size=0x44) addr:0x0205bbd4 func_ov000_0205bc18 kind:function(arm,size=0x48) addr:0x0205bc18 func_ov000_0205bc60 kind:function(arm,size=0x48) addr:0x0205bc60 func_ov000_0205bca8 kind:function(arm,size=0x18) addr:0x0205bca8 @@ -1377,9 +1377,9 @@ func_ov000_0207cbd0 kind:function(arm,size=0xd8) addr:0x0207cbd0 func_ov000_0207cca8 kind:function(arm,size=0x38) addr:0x0207cca8 _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 -_ZN19func_ov000_0207cd78D2Ev kind:function(arm,size=0x30) addr:0x0207cd78 +_ZN16Actor_UnkSystem3D1Ev kind:function(arm,size=0x30) addr:0x0207cd10 +_ZN16Actor_UnkSystem3D0Ev kind:function(arm,size=0x38) addr:0x0207cd40 +_ZN16Actor_UnkSystem3D2Ev 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 func_ov000_0207cdd4 kind:function(arm,size=0x38) addr:0x0207cdd4 @@ -1410,10 +1410,10 @@ func_ov000_0207d3b4 kind:function(arm,size=0x88) addr:0x0207d3b4 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 -func_ov000_0207d6b4 kind:function(arm,size=0x4) addr:0x0207d6b4 -func_ov000_0207d6b8 kind:function(arm,size=0x8) addr:0x0207d6b8 +_ZN16Actor_UnkSystem1D2Ev kind:function(arm,size=0x4) addr:0x0207d6b4 +_ZN16Actor_UnkSystem19vfunc2_08Ev kind:function(arm,size=0x8) addr:0x0207d6b8 func_ov000_0207d6c0 kind:function(arm,size=0x8) addr:0x0207d6c0 -func_ov000_0207d6c8 kind:function(arm,size=0x8) addr:0x0207d6c8 +_ZN16Actor_UnkSystem19vfunc2_10Ev kind:function(arm,size=0x8) addr:0x0207d6c8 _ZN17MapObject_10_BaseC2Ev kind:function(arm,size=0x30) addr:0x0207d6d0 func_ov000_0207d700 kind:function(arm,size=0x30) addr:0x0207d700 func_ov000_0207d730 kind:function(arm,size=0x38) addr:0x0207d730 @@ -1487,10 +1487,10 @@ func_ov000_020801f8 kind:function(arm,size=0x4c) addr:0x020801f8 func_ov000_02080244 kind:function(arm,size=0x68) addr:0x02080244 func_ov000_020802ac kind:function(arm,size=0x74) addr:0x020802ac func_ov000_02080320 kind:function(arm,size=0x20) addr:0x02080320 -func_ov000_02080340 kind:function(arm,size=0x20) addr:0x02080340 -_ZN19func_ov000_02080360D1Ev kind:function(arm,size=0x30) addr:0x02080360 -_ZN19func_ov000_02080390D0Ev kind:function(arm,size=0x38) addr:0x02080390 -_ZN19func_ov000_020803c8D2Ev kind:function(arm,size=0x30) addr:0x020803c8 +_ZN16Actor_UnkSystem4C1Ev kind:function(arm,size=0x20) addr:0x02080340 +_ZN16Actor_UnkSystem4D1Ev kind:function(arm,size=0x30) addr:0x02080360 +_ZN16Actor_UnkSystem4D0Ev kind:function(arm,size=0x38) addr:0x02080390 +_ZN16Actor_UnkSystem4D2Ev kind:function(arm,size=0x30) addr:0x020803c8 func_ov000_020803f8 kind:function(arm,size=0x44) addr:0x020803f8 func_ov000_0208043c kind:function(arm,size=0x8) addr:0x0208043c func_ov000_02080444 kind:function(arm,size=0x20) addr:0x02080444 @@ -2270,14 +2270,14 @@ _ZN12ActorProfile8vfunc_10Ev kind:function(arm,size=0x4) addr:0x02098fb8 _ZN12ActorProfile8vfunc_14Ev kind:function(arm,size=0x4) addr:0x02098fbc _ZN12ActorProfile8vfunc_18Ev kind:function(arm,size=0x4) addr:0x02098fc0 func_ov000_02098fc4 kind:function(arm,size=0x7c) addr:0x02098fc4 -_ZN21ActorProfile_Derived1C2E7ActorId kind:function(arm,size=0x30) addr:0x02099040 +_ZN21ActorProfile_Derived1C2Ej kind:function(arm,size=0x30) addr:0x02099040 func_ov000_02099070 kind:function(arm,size=0x14) addr:0x02099070 _ZN21ActorProfile_Derived1C2E7ActorIdS0_ kind:function(arm,size=0x30) addr:0x02099084 _ZN21ActorProfile_Derived1D2Ev kind:function(arm,size=0x38) addr:0x020990b4 -func_ov000_020990ec kind:function(arm,size=0x8) addr:0x020990ec -func_ov000_020990f4 kind:function(arm,size=0x20) addr:0x020990f4 -func_ov000_02099114 kind:function(arm,size=0x2c) addr:0x02099114 -func_ov000_02099140 kind:function(arm,size=0x1c) addr:0x02099140 +_ZN21ActorProfile_Derived18vfunc_04Ev kind:function(arm,size=0x8) addr:0x020990ec +_ZN21ActorProfile_Derived18vfunc_10Ev kind:function(arm,size=0x20) addr:0x020990f4 +_ZN21ActorProfile_Derived18vfunc_14Ev kind:function(arm,size=0x2c) addr:0x02099114 +_ZN21ActorProfile_Derived18vfunc_18Ev kind:function(arm,size=0x1c) addr:0x02099140 func_ov000_0209915c kind:function(arm,size=0x30) addr:0x0209915c func_ov000_0209918c kind:function(arm,size=0x8) addr:0x0209918c func_ov000_02099194 kind:function(arm,size=0x2c) addr:0x02099194 @@ -2537,12 +2537,12 @@ _ZN25MapObjectProfile_Derived119func_ov000_0209ccd8Eij kind:function(arm,size=0x _ZN25MapObjectProfile_Derived18vfunc_08Ev kind:function(arm,size=0x1c) addr:0x0209e524 _ZN25MapObjectProfile_Derived18vfunc_0CEv kind:function(arm,size=0x44) addr:0x0209e540 _ZN25MapObjectProfile_Derived18vfunc_10Ev kind:function(arm,size=0x48) addr:0x0209e584 -_ZN28MapObjectProfile_Derived2_20C1Ej kind:function(arm,size=0x70) addr:0x0209e5cc -_ZN28MapObjectProfile_Derived2_20D1Ev kind:function(arm,size=0x38) addr:0x0209e63c -_ZN28MapObjectProfile_Derived2_20D0Ev kind:function(arm,size=0x40) addr:0x0209e674 -_ZN28MapObjectProfile_Derived2_2019func_ov000_0209cef0Ev kind:function(arm,size=0xbc) addr:0x0209e6b4 -_ZN28MapObjectProfile_Derived2_2019func_ov000_0209cfacEv kind:function(arm,size=0x30) addr:0x0209e770 -_ZN28MapObjectProfile_Derived2_2019func_ov000_0209cfdcEii kind:function(arm,size=0x4) addr:0x0209e7a0 +_ZN19UnkActorFileSystem1C1Ej kind:function(arm,size=0x70) addr:0x0209e5cc +_ZN19UnkActorFileSystem1D1Ev kind:function(arm,size=0x38) addr:0x0209e63c +_ZN19UnkActorFileSystem1D0Ev kind:function(arm,size=0x40) addr:0x0209e674 +_ZN19UnkActorFileSystem119func_ov000_0209cef0Ev kind:function(arm,size=0xbc) addr:0x0209e6b4 +_ZN19UnkActorFileSystem119func_ov000_0209cfacEv kind:function(arm,size=0x30) addr:0x0209e770 +_ZN19UnkActorFileSystem119func_ov000_0209cfdcEii kind:function(arm,size=0x4) addr:0x0209e7a0 _ZN9MapObjectC2Ev kind:function(arm,size=0xb4) addr:0x0209e7a4 _ZN9MapObjectD1Ev kind:function(arm,size=0x4) addr:0x0209e858 _ZN9MapObjectD0Ev kind:function(arm,size=0x14) addr:0x0209e85c @@ -2677,7 +2677,7 @@ func_ov000_020a18ac kind:function(arm,size=0x3c) addr:0x020a18ac _ZN18UnkStruct_027e0cec19func_ov000_020a0110EP22UnkStruct_PlayerGet_ec kind:function(arm,size=0x30) addr:0x020a18e8 func_ov000_020a1918 kind:function(arm,size=0xe0) addr:0x020a1918 _ZN18UnkStruct_027e0cec19func_ov000_020a0220EPvS0_ kind:function(arm,size=0xb4) addr:0x020a19f8 -_ZN22UnkStruct_PlayerGet_ecD1Ev kind:function(arm,size=0x30) addr:0x020a1aac +_ZN15UnkSystem7_BaseD1Ev kind:function(arm,size=0x30) addr:0x020a1aac _ZN15ActorUnkEFIK_9819func_ov000_020a0304Ev kind:function(arm,size=0x30) addr:0x020a1adc _ZN15ActorUnkEFIK_9819func_ov000_020a0334Ev kind:function(arm,size=0x38) addr:0x020a1b0c func_ov000_020a1b44 kind:function(arm,size=0x20) addr:0x020a1b44 @@ -3535,7 +3535,7 @@ data_ov000_020b3f18 kind:data(any) addr:0x020b3f18 data_ov000_020b3f44 kind:data(any) addr:0x020b3f44 data_ov000_020b3f70 kind:data(any) addr:0x020b3f70 data_ov000_020b3f9c kind:data(any) addr:0x020b3f9c -data_ov000_020b3fc8 kind:data(any) addr:0x020b3fc8 +_ZTV25Actor_UnkSystem3_Derived1 kind:data(any) addr:0x020b3fc0 data_ov000_020b3fe4 kind:data(any) addr:0x020b3fe4 data_ov000_020b4000 kind:data(any) addr:0x020b4000 data_ov000_020b401c kind:data(any) addr:0x020b401c @@ -3690,7 +3690,7 @@ _ZTV25MapObjectProfile_Derived3 kind:data(any) addr:0x020b4ce4 _ZTV25MapObjectProfile_Derived2 kind:data(any) addr:0x020b4d00 _ZTV16MapObjectProfile kind:data(any) addr:0x020b4d1c _ZTV25MapObjectProfile_Derived1 kind:data(any) addr:0x020b4d38 -_ZTV28MapObjectProfile_Derived2_20 kind:data(any) addr:0x020b4d60 +_ZTV19UnkActorFileSystem1 kind:data(any) addr:0x020b4d60 @1608 kind:data(byte[7]) addr:0x020b4d70 local @1626 kind:data(byte[8]) addr:0x020b4d78 local @1627 kind:data(byte[5]) addr:0x020b4d80 local diff --git a/config/jp/arm9/overlays/ov026/delinks.txt b/config/jp/arm9/overlays/ov026/delinks.txt index 52025f774..fbc6fc44a 100644 --- a/config/jp/arm9/overlays/ov026/delinks.txt +++ b/config/jp/arm9/overlays/ov026/delinks.txt @@ -107,6 +107,9 @@ src/026_Train/Actor/ActorUnkTRCB.cpp: .ctor start:0x02137594 end:0x02137598 .bss start:0x02142758 end:0x021427a4 +src/026_Train/Actor/Actor_Derived.cpp: + .text start:0x02112ed4 end:0x021132f8 + src/026_Train/Actor/ActorUnkTHER.cpp: .text start:0x021132f8 end:0x0211358c .init start:0x02136d88 end:0x02136dd8 @@ -117,13 +120,14 @@ src/026_Train/Actor/ActorUnkTRUP.cpp: .text start:0x0211358c end:0x02113898 .init start:0x02136dd8 end:0x02136e28 .ctor start:0x0213759c end:0x021375a0 - .bss start:0x021427f0 end:0x02142944 + .bss start:0x021427f0 end:0x02142870 src/026_Train/Actor/ActorUnkKLTR.cpp: .text start:0x02113898 end:0x02115f94 .init start:0x02136e28 end:0x02136e78 .ctor start:0x021375a0 end:0x021375a4 - .bss start:0x02142944 end:0x02142a44 + .data start:0x02139ba0 end:0x02139c28 + .bss start:0x02142870 end:0x02142a3c src/026_Train/Actor/ActorUnkTRTT.cpp: .text start:0x02115f94 end:0x02118848 @@ -201,10 +205,11 @@ src/026_Train/Actor/ActorUnkTCOW_WCAS.cpp: .text start:0x0212a28c end:0x0212dbc0 .init start:0x021373b8 end:0x0213746c .ctor start:0x021375d8 end:0x021375dc - .bss start:0x021438f4 end:0x02143bb0 + .bss start:0x021438f4 end:0x02143acc src/026_Train/Actor/ActorUnkDKTR.cpp: - .text start:0x0212dbc0 end:0x0213077c + .text start:0x0212dbc0 end:0x021307ac .init start:0x0213746c end:0x021374bc .ctor start:0x021375dc end:0x021375e0 - .bss start:0x02143bb0 end:0x02143ca8 + .data start:0x0213ae64 end:0x0213af0c + .bss start:0x02143acc end:0x02143ca8 diff --git a/config/jp/arm9/overlays/ov026/relocs.txt b/config/jp/arm9/overlays/ov026/relocs.txt index 29cee2c93..8cca447b8 100644 --- a/config/jp/arm9/overlays/ov026/relocs.txt +++ b/config/jp/arm9/overlays/ov026/relocs.txt @@ -3090,7 +3090,7 @@ from:0x020f609c kind:arm_call to:0x020d6e54 module:overlay(24) from:0x020f60a4 kind:arm_call to:0x020f6160 module:overlay(26) from:0x020f60b0 kind:load to:0x02137fd4 module:overlay(26) from:0x020f60b4 kind:load to:0x02138054 module:overlay(26) -from:0x020f60b8 kind:load to:0x02137fe0 module:overlay(26) +from:0x020f60b8 kind:load to:0x02137fd8 add:0x8 module:overlay(26) from:0x020f60bc kind:load to:0x020f5b48 module:overlay(26) from:0x020f60c0 kind:load to:0x020f60cc module:overlay(26) from:0x020f60c4 kind:load to:0x020f45e0 module:overlay(26) @@ -3146,7 +3146,7 @@ from:0x020f6488 kind:arm_call to:0x020d72dc module:overlay(24) from:0x020f6490 kind:arm_call to:0x020f64b8 module:overlay(26) from:0x020f649c kind:load to:0x02138098 module:overlay(26) from:0x020f64a0 kind:load to:0x021380a4 module:overlay(26) -from:0x020f64a4 kind:load to:0x02137fe0 module:overlay(26) +from:0x020f64a4 kind:load to:0x02137fd8 add:0x8 module:overlay(26) from:0x020f64a8 kind:load to:0x020f5b48 module:overlay(26) from:0x020f64ac kind:load to:0x020f60cc module:overlay(26) from:0x020f64b0 kind:load to:0x020f45e0 module:overlay(26) @@ -4141,7 +4141,7 @@ from:0x021017c4 kind:arm_call to:0x021016e8 module:overlay(26) from:0x021017d4 kind:arm_call to:0x0205bbd4 module:overlay(0) from:0x021017f8 kind:arm_call to:0x0203e690 module:main from:0x02101814 kind:arm_call to:0x0203e690 module:main -from:0x02101840 kind:load to:0x02137fe0 module:overlay(26) +from:0x02101840 kind:load to:0x02137fd8 add:0x8 module:overlay(26) from:0x02101844 kind:load to:0x020f52d4 module:overlay(26) from:0x02101848 kind:load to:0x02101854 module:overlay(26) from:0x0210184c kind:load to:0x020f52c0 module:overlay(26) @@ -4196,7 +4196,7 @@ from:0x0210247c kind:arm_call to:0x021016e8 module:overlay(26) from:0x0210248c kind:arm_call to:0x0205bbd4 module:overlay(0) from:0x021024b0 kind:arm_call to:0x0203e690 module:main from:0x021024cc kind:arm_call to:0x0203e690 module:main -from:0x021024f4 kind:load to:0x02137fe0 module:overlay(26) +from:0x021024f4 kind:load to:0x02137fd8 add:0x8 module:overlay(26) from:0x021024f8 kind:load to:0x020f5b48 module:overlay(26) from:0x021024fc kind:load to:0x020f60cc module:overlay(26) from:0x02102500 kind:load to:0x020f45e0 module:overlay(26) @@ -5107,7 +5107,7 @@ from:0x0210b514 kind:arm_call to:0x0209e078 module:overlay(0) from:0x0210b528 kind:arm_call to:0x021103c4 module:overlay(26) from:0x0210b540 kind:arm_call to:0x0205bbd4 module:overlay(0) from:0x0210b568 kind:load to:0x02138e08 module:overlay(26) -from:0x0210b56c kind:load to:0x02137fe0 module:overlay(26) +from:0x0210b56c kind:load to:0x02137fd8 add:0x8 module:overlay(26) from:0x0210b580 kind:arm_call_thumb to:0x02059154 module:overlay(0) from:0x0210b588 kind:arm_call to:0x0201662c module:main from:0x0210b590 kind:arm_call to:0x0210dd70 module:overlay(26) @@ -5792,7 +5792,7 @@ from:0x02111440 kind:arm_call to:0x020fdf0c module:overlay(26) from:0x02111470 kind:arm_call to:0x021053c0 module:overlay(26) from:0x021114ac kind:arm_call to:0x021061f8 module:overlay(26) from:0x021114b8 kind:load to:0x0213971c add:0x8 module:overlay(26) -from:0x021114bc kind:load to:0x020b3fc8 module:overlay(0) +from:0x021114bc kind:load to:0x020b3fc0 add:0x8 module:overlay(0) from:0x02111554 kind:load to:0x02142600 module:overlay(26) from:0x02111558 kind:load to:0x021396d8 module:overlay(26) from:0x0211155c kind:load to:0x02142650 module:overlay(26) @@ -6102,8 +6102,8 @@ from:0x02113a58 kind:arm_call to:0x02099dd4 module:overlay(0) from:0x02113a7c kind:arm_call to:0x021035bc module:overlay(26) from:0x02113a88 kind:arm_call to:0x020f0468 module:overlay(26) from:0x02113a94 kind:load to:0x02139bc4 add:0x8 module:overlay(26) -from:0x02113a98 kind:load to:0x020b3fc8 module:overlay(0) -from:0x02113a9c kind:load to:0x02137fe0 module:overlay(26) +from:0x02113a98 kind:load to:0x020b3fc0 add:0x8 module:overlay(0) +from:0x02113a9c kind:load to:0x02137fd8 add:0x8 module:overlay(26) from:0x02113aa0 kind:load to:0x020f5b48 module:overlay(26) from:0x02113aa4 kind:load to:0x020f60cc module:overlay(26) from:0x02113aa8 kind:load to:0x020f45e0 module:overlay(26) @@ -7791,7 +7791,7 @@ from:0x02124570 kind:arm_call to:0x02124a08 module:overlay(26) from:0x02124588 kind:arm_call to:0x02125050 module:overlay(26) from:0x021245a4 kind:load to:0x0213a858 add:0x8 module:overlay(26) from:0x021245a8 kind:load to:0x02143644 module:overlay(26) -from:0x021245b0 kind:load to:0x020b3fc8 module:overlay(0) +from:0x021245b0 kind:load to:0x020b3fc0 add:0x8 module:overlay(0) from:0x021245c0 kind:arm_call to:0x020804a0 module:overlay(0) from:0x021245c8 kind:arm_call to:0x0207cd78 module:overlay(0) from:0x021245d0 kind:arm_call to:0x020a1aac module:overlay(0) @@ -8011,7 +8011,7 @@ from:0x02126158 kind:load to:0x02143810 module:overlay(26) from:0x0212615c kind:load to:0x0213aa40 module:overlay(26) from:0x02126160 kind:load to:0x02137ea4 module:overlay(26) from:0x02126164 kind:load to:0x0213800c module:overlay(26) -from:0x0212616c kind:load to:0x020b3fc8 module:overlay(0) +from:0x0212616c kind:load to:0x020b3fc0 add:0x8 module:overlay(0) from:0x02126170 kind:load to:0x02143804 module:overlay(26) from:0x02126174 kind:load to:0x021437f0 module:overlay(26) from:0x02126180 kind:arm_call_thumb to:0x02059154 module:overlay(0) @@ -8922,9 +8922,9 @@ from:0x0212de10 kind:arm_call to:0x02099dd4 module:overlay(0) from:0x0212de34 kind:arm_call to:0x02103ea4 module:overlay(26) from:0x0212de40 kind:arm_call to:0x020f0468 module:overlay(26) from:0x0212de4c kind:load to:0x0213ae88 add:0x8 module:overlay(26) -from:0x0212de50 kind:load to:0x0213aef8 module:overlay(26) -from:0x0212de54 kind:load to:0x020b3fc8 module:overlay(0) -from:0x0212de58 kind:load to:0x02137fe0 module:overlay(26) +from:0x0212de50 kind:load to:0x0213ae88 add:0x70 module:overlay(26) +from:0x0212de54 kind:load to:0x020b3fc0 add:0x8 module:overlay(0) +from:0x0212de58 kind:load to:0x02137fd8 add:0x8 module:overlay(26) from:0x0212de5c kind:load to:0x020f5b48 module:overlay(26) from:0x0212de60 kind:load to:0x020f60cc module:overlay(26) from:0x0212de64 kind:load to:0x020f45e0 module:overlay(26) diff --git a/config/jp/arm9/overlays/ov026/symbols.txt b/config/jp/arm9/overlays/ov026/symbols.txt index a05c43f73..47d22aa1f 100644 --- a/config/jp/arm9/overlays/ov026/symbols.txt +++ b/config/jp/arm9/overlays/ov026/symbols.txt @@ -469,13 +469,13 @@ func_ov026_020f0054 kind:function(arm,size=0xc) addr:0x020f0054 func_ov026_020f0060 kind:function(arm,size=0x98) addr:0x020f0060 func_ov026_020f00f8 kind:function(arm,size=0x98) addr:0x020f00f8 func_ov026_020f0190 kind:function(arm,size=0x14) addr:0x020f0190 -func_ov026_020f01a4 kind:function(arm,size=0x14) addr:0x020f01a4 +_ZN16Actor_UnkSystem2D1Ev kind:function(arm,size=0x14) addr:0x020f01a4 func_ov026_020f01b8 kind:function(arm,size=0x58) addr:0x020f01b8 func_ov026_020f0210 kind:function(arm,size=0x10) addr:0x020f0210 func_ov026_020f0220 kind:function(arm,size=0x164) addr:0x020f0220 func_ov026_020f0384 kind:function(arm,size=0xb0) addr:0x020f0384 func_ov026_020f0434 kind:function(arm,size=0x34) addr:0x020f0434 -func_ov026_020f0468 kind:function(arm,size=0x1c) addr:0x020f0468 +_ZN16Actor_UnkSystem219func_ov026_020ee538Ei kind:function(arm,size=0x1c) addr:0x020f0468 func_ov026_020f0484 kind:function(arm,size=0x214) addr:0x020f0484 func_ov026_020f0698 kind:function(arm,size=0x1f8) addr:0x020f0698 func_ov026_020f0890 kind:function(arm,size=0x80) addr:0x020f0890 @@ -599,7 +599,7 @@ func_ov026_020f4160 kind:function(arm,size=0x370) addr:0x020f4160 func_ov026_020f44d0 kind:function(arm,size=0x2c) addr:0x020f44d0 func_ov026_020f44fc kind:function(arm,size=0xd0) addr:0x020f44fc func_ov026_020f45cc kind:function(arm,size=0x14) addr:0x020f45cc -func_ov026_020f45e0 kind:function(arm,size=0x14) addr:0x020f45e0 +_ZN16Actor_UnkSystem8D1Ev kind:function(arm,size=0x14) addr:0x020f45e0 func_ov026_020f45f4 kind:function(arm,size=0xb4) addr:0x020f45f4 func_ov026_020f46a8 kind:function(arm,size=0x48) addr:0x020f46a8 func_ov026_020f46f0 kind:function(arm,size=0x30) addr:0x020f46f0 @@ -635,7 +635,7 @@ func_ov026_020f5958 kind:function(arm,size=0x8) addr:0x020f5958 _ZN19func_ov026_020f5960D1Ev kind:function(arm,size=0xb0) addr:0x020f5960 _ZN19func_ov026_020f5a10D0Ev kind:function(arm,size=0xb8) addr:0x020f5a10 func_ov026_020f5ac8 kind:function(arm,size=0x80) addr:0x020f5ac8 -func_ov026_020f5b48 kind:function(arm,size=0x14) addr:0x020f5b48 +_ZN16Actor_UnkSystem7D1Ev kind:function(arm,size=0x14) addr:0x020f5b48 func_ov026_020f5b5c kind:function(arm,size=0x28) addr:0x020f5b5c func_ov026_020f5b84 kind:function(arm,size=0x1b4) addr:0x020f5b84 func_ov026_020f5d38 kind:function(arm,size=0x4) addr:0x020f5d38 @@ -650,8 +650,8 @@ func_ov026_020f5f24 kind:function(arm,size=0x8) addr:0x020f5f24 _ZN19func_ov026_020f5f2cD1Ev kind:function(arm,size=0x6c) addr:0x020f5f2c _ZN19func_ov026_020f5f98D0Ev kind:function(arm,size=0x74) addr:0x020f5f98 func_ov026_020f600c kind:function(arm,size=0xc0) addr:0x020f600c -func_ov026_020f60cc kind:function(arm,size=0x40) addr:0x020f60cc -func_ov026_020f610c kind:function(arm,size=0x54) addr:0x020f610c +_ZN16Actor_UnkSystem7C1Ev kind:function(arm,size=0x40) addr:0x020f60cc +_ZN16Actor_UnkSystem8C1Ev kind:function(arm,size=0x54) addr:0x020f610c func_ov026_020f6160 kind:function(arm,size=0x28) addr:0x020f6160 func_ov026_020f6188 kind:function(arm,size=0x20) addr:0x020f6188 func_ov026_020f61a8 kind:function(arm,size=0x10) addr:0x020f61a8 @@ -849,7 +849,7 @@ func_ov026_020fae64 kind:function(arm,size=0x1c) addr:0x020fae64 func_ov026_020fae80 kind:function(arm,size=0x3c) addr:0x020fae80 func_ov026_020faebc kind:function(arm,size=0x98) addr:0x020faebc func_ov026_020faf54 kind:function(arm,size=0x94) addr:0x020faf54 -func_ov026_020fafe8 kind:function(arm,size=0x78) addr:0x020fafe8 +_ZN16Actor_UnkSystem2C1Eii kind:function(arm,size=0x78) addr:0x020fafe8 func_ov026_020fb060 kind:function(arm,size=0x84) addr:0x020fb060 func_ov026_020fb0e4 kind:function(arm,size=0x50) addr:0x020fb0e4 func_ov026_020fb134 kind:function(arm,size=0xc) addr:0x020fb134 @@ -908,7 +908,7 @@ func_ov026_020fd2ac kind:function(arm,size=0x20) addr:0x020fd2ac func_ov026_020fd2cc kind:function(arm,size=0x40) addr:0x020fd2cc func_ov026_020fd30c kind:function(arm,size=0xec) addr:0x020fd30c func_ov026_020fd3f8 kind:function(arm,size=0x4c) addr:0x020fd3f8 -func_ov026_020fd444 kind:function(arm,size=0x60) addr:0x020fd444 +_ZN16Actor_UnkStruct1C1Ev kind:function(arm,size=0x60) addr:0x020fd444 func_ov026_020fd4a4 kind:function(arm,size=0x54) addr:0x020fd4a4 func_ov026_020fd4f8 kind:function(arm,size=0xdc) addr:0x020fd4f8 func_ov026_020fd5d4 kind:function(arm,size=0x6c) addr:0x020fd5d4 @@ -950,12 +950,12 @@ func_ov026_020ff478 kind:function(arm,size=0x64) addr:0x020ff478 func_ov026_020ff4dc kind:function(arm,size=0x2ac) addr:0x020ff4dc func_ov026_020ff788 kind:function(arm,size=0x118) addr:0x020ff788 func_ov026_020ff8a0 kind:function(arm,size=0x40) addr:0x020ff8a0 -func_ov026_020ff8e0 kind:function(arm,size=0x154) addr:0x020ff8e0 +_ZN19Actor_UnkSystem10_2C1Ev kind:function(arm,size=0x154) addr:0x020ff8e0 func_ov026_020ffa34 kind:function(arm,size=0x4e0) addr:0x020ffa34 func_ov026_020fff14 kind:function(arm,size=0xf8) addr:0x020fff14 func_ov026_0210000c kind:function(arm,size=0x130) addr:0x0210000c func_ov026_0210013c kind:function(arm,size=0xf8) addr:0x0210013c -func_ov026_02100234 kind:function(arm,size=0xf0) addr:0x02100234 +_ZN17Actor_UnkSystem10C1Ev kind:function(arm,size=0xf0) addr:0x02100234 func_ov026_02100324 kind:function(arm,size=0x428) addr:0x02100324 func_ov026_0210074c kind:function(arm,size=0x110) addr:0x0210074c func_ov026_0210085c kind:function(arm,size=0x110) addr:0x0210085c @@ -970,7 +970,7 @@ func_ov026_021012fc kind:function(arm,size=0x354) addr:0x021012fc func_ov026_02101650 kind:function(arm,size=0x2c) addr:0x02101650 func_ov026_0210167c kind:function(arm,size=0x50) addr:0x0210167c _ZN19func_ov026_021016ccD0Ev kind:function(arm,size=0x1c) addr:0x021016cc -func_ov026_021016e8 kind:function(arm,size=0x18) addr:0x021016e8 +_ZN16Actor_UnkSystem5C1Ev kind:function(arm,size=0x18) addr:0x021016e8 func_ov026_02101700 kind:function(arm,size=0xb8) addr:0x02101700 func_ov026_021017b8 kind:function(arm,size=0x9c) addr:0x021017b8 func_ov026_02101854 kind:function(arm,size=0x40) addr:0x02101854 @@ -997,13 +997,13 @@ func_ov026_02102fe0 kind:function(arm,size=0x38c) addr:0x02102fe0 func_ov026_0210336c kind:function(arm,size=0x19c) addr:0x0210336c func_ov026_02103508 kind:function(arm,size=0x90) addr:0x02103508 func_ov026_02103598 kind:function(arm,size=0x24) addr:0x02103598 -func_ov026_021035bc kind:function(arm,size=0x36c) addr:0x021035bc +_ZN16Actor_UnkSystem519func_ov026_0210136cEi kind:function(arm,size=0x36c) addr:0x021035bc func_ov026_02103928 kind:function(arm,size=0x168) addr:0x02103928 func_ov026_02103a90 kind:function(arm,size=0x50) addr:0x02103a90 func_ov026_02103ae0 kind:function(arm,size=0x384) addr:0x02103ae0 func_ov026_02103e64 kind:function(arm,size=0x28) addr:0x02103e64 func_ov026_02103e8c kind:function(arm,size=0x18) addr:0x02103e8c -func_ov026_02103ea4 kind:function(arm,size=0x354) addr:0x02103ea4 +_ZN16Actor_UnkSystem519func_ov026_02101c54Ei kind:function(arm,size=0x354) addr:0x02103ea4 func_ov026_021041f8 kind:function(arm,size=0x168) addr:0x021041f8 func_ov026_02104360 kind:function(arm,size=0x50) addr:0x02104360 func_ov026_021043b0 kind:function(arm,size=0x39c) addr:0x021043b0 @@ -1090,8 +1090,8 @@ func_ov026_021076a0 kind:function(arm,size=0x24) addr:0x021076a0 func_ov026_021076c4 kind:function(arm,size=0x20) addr:0x021076c4 func_ov026_021076e4 kind:function(arm,size=0x164) addr:0x021076e4 func_ov026_02107848 kind:function(arm,size=0x80) addr:0x02107848 -func_ov026_021078c8 kind:function(arm,size=0x38) addr:0x021078c8 -func_ov026_02107900 kind:function(arm,size=0x38) addr:0x02107900 +_ZN18Actor_UnkSystem9_2C1Ev kind:function(arm,size=0x38) addr:0x021078c8 +_ZN16Actor_UnkSystem9C1Ev kind:function(arm,size=0x38) addr:0x02107900 func_ov026_02107938 kind:function(arm,size=0x38) addr:0x02107938 func_ov026_02107970 kind:function(arm,size=0x1c) addr:0x02107970 func_ov026_0210798c kind:function(arm,size=0x4) addr:0x0210798c @@ -1543,28 +1543,28 @@ _ZN12ActorUnkTRCB19func_ov026_021109d4Ev kind:function(arm,size=0x184) addr:0x02 _ZN12ActorUnkTRCBD1Ev kind:function(arm,size=0x84) addr:0x02112db0 _ZN12ActorUnkTRCBD0Ev kind:function(arm,size=0x8c) addr:0x02112e34 _ZN19ActorProfileUnkTRCBD1Ev kind:function(arm,size=0x14) addr:0x02112ec0 -func_ov026_02112ed4 kind:function(arm,size=0x28) addr:0x02112ed4 -func_ov026_02112efc kind:function(arm,size=0x20) addr:0x02112efc -func_ov026_02112f1c kind:function(arm,size=0x1c) addr:0x02112f1c -func_ov026_02112f38 kind:function(arm,size=0x34) addr:0x02112f38 -func_ov026_02112f6c kind:function(arm,size=0x24) addr:0x02112f6c -func_ov026_02112f90 kind:function(arm,size=0x30) addr:0x02112f90 -func_ov026_02112fc0 kind:function(arm,size=0x14) addr:0x02112fc0 -func_ov026_02112fd4 kind:function(arm,size=0x30) addr:0x02112fd4 -func_ov026_02113004 kind:function(arm,size=0x30) addr:0x02113004 -func_ov026_02113034 kind:function(arm,size=0x5c) addr:0x02113034 -func_ov026_02113090 kind:function(arm,size=0x38) addr:0x02113090 -func_ov026_021130c8 kind:function(arm,size=0x48) addr:0x021130c8 -func_ov026_02113110 kind:function(arm,size=0x2c) addr:0x02113110 -func_ov026_0211313c kind:function(arm,size=0x44) addr:0x0211313c -func_ov026_02113180 kind:function(arm,size=0x40) addr:0x02113180 -func_ov026_021131c0 kind:function(arm,size=0x64) addr:0x021131c0 -func_ov026_02113224 kind:function(arm,size=0x48) addr:0x02113224 -_ZN19func_ov026_0211326cD1Ev kind:function(arm,size=0x14) addr:0x0211326c -_ZN19func_ov026_02113280D0Ev kind:function(arm,size=0x1c) addr:0x02113280 -func_ov026_0211329c kind:function(arm,size=0x2c) addr:0x0211329c -_ZN19func_ov026_021132c8D1Ev kind:function(arm,size=0x14) addr:0x021132c8 -_ZN19func_ov026_021132dcD0Ev kind:function(arm,size=0x1c) addr:0x021132dc +_ZN14Actor_Derived1C2Ev kind:function(arm,size=0x28) addr:0x02112ed4 +_ZN14Actor_Derived119func_ov026_02110ca4Ev kind:function(arm,size=0x20) addr:0x02112efc +_ZN14Actor_Derived18vfunc_54Ev kind:function(arm,size=0x1c) addr:0x02112f1c +_ZN14Actor_Derived18vfunc_58Ev kind:function(arm,size=0x34) addr:0x02112f38 +_ZN14Actor_Derived119func_ov026_02110d14Ev kind:function(arm,size=0x24) addr:0x02112f6c +_ZN14Actor_Derived119func_ov026_02110d38Ev kind:function(arm,size=0x30) addr:0x02112f90 +_ZN14Actor_Derived119func_ov026_02110d68Ev kind:function(arm,size=0x14) addr:0x02112fc0 +_ZN14Actor_Derived119func_ov026_02110d7cEv kind:function(arm,size=0x30) addr:0x02112fd4 +_ZN14Actor_Derived119func_ov026_02110dacEv kind:function(arm,size=0x30) addr:0x02113004 +_ZN14Actor_Derived119func_ov026_02110ddcEv kind:function(arm,size=0x5c) addr:0x02113034 +_ZN14Actor_Derived119func_ov026_02110e38Ev kind:function(arm,size=0x38) addr:0x02113090 +_ZN14Actor_Derived119func_ov026_02110e70Ev kind:function(arm,size=0x48) addr:0x021130c8 +_ZN14Actor_Derived119func_ov026_02110eb8Ev kind:function(arm,size=0x2c) addr:0x02113110 +_ZN14Actor_Derived119func_ov026_02110ee4Ev kind:function(arm,size=0x44) addr:0x0211313c +_ZN14Actor_Derived119func_ov026_02110f28Ev kind:function(arm,size=0x40) addr:0x02113180 +_ZN14Actor_Derived119func_ov026_02110f68Ev kind:function(arm,size=0x64) addr:0x021131c0 +_ZN14Actor_Derived119func_ov026_02110fccEv kind:function(arm,size=0x48) addr:0x02113224 +_ZN14Actor_Derived1D1Ev kind:function(arm,size=0x14) addr:0x0211326c +_ZN14Actor_Derived1D0Ev kind:function(arm,size=0x1c) addr:0x02113280 +_ZN14Actor_Derived2C2Ev kind:function(arm,size=0x2c) addr:0x0211329c +_ZN14Actor_Derived2D1Ev kind:function(arm,size=0x14) addr:0x021132c8 +_ZN14Actor_Derived2D0Ev kind:function(arm,size=0x1c) addr:0x021132dc _ZN19ActorProfileUnkTHER10GetProfileEv kind:function(arm,size=0xc) addr:0x021132f8 _ZN19ActorProfileUnkTHER6CreateEv kind:function(arm,size=0x24) addr:0x02113304 _ZN19ActorProfileUnkTHERC1Ev kind:function(arm,size=0x38) addr:0x02113328 @@ -1594,15 +1594,15 @@ _ZN12ActorUnkKLTR19func_ov026_021116e0Ev kind:function(arm,size=0x10) addr:0x021 _ZN12ActorUnkKLTRC1Ev kind:function(arm,size=0x16c) addr:0x02113948 _ZN12ActorUnkKLTRD1Ev kind:function(arm,size=0x88) addr:0x02113ab4 _ZN12ActorUnkKLTRD0Ev kind:function(arm,size=0x90) addr:0x02113b3c -_ZN12ActorUnkKLTR19func_ov026_02111974Ev kind:function(arm,size=0x8) addr:0x02113bcc -_ZN12ActorUnkKLTR19func_ov026_0211197cEv kind:function(arm,size=0x108) addr:0x02113bd4 -_ZN12ActorUnkKLTR19func_ov026_02111a84Ev kind:function(arm,size=0x20) addr:0x02113cdc -_ZN12ActorUnkKLTR19func_ov026_02111aa4Ev kind:function(arm,size=0x20) addr:0x02113cfc +_ZN12ActorUnkKLTR8vfunc_18Ei kind:function(arm,size=0x8) addr:0x02113bcc +_ZN12ActorUnkKLTR8vfunc_1cEv kind:function(arm,size=0x108) addr:0x02113bd4 +_ZN12ActorUnkKLTR8vfunc_20Ev kind:function(arm,size=0x20) addr:0x02113cdc +_ZN12ActorUnkKLTR8vfunc_24Ev kind:function(arm,size=0x20) addr:0x02113cfc _ZN12ActorUnkKLTR19func_ov026_02111ac4Ev kind:function(arm,size=0x144) addr:0x02113d1c _ZN12ActorUnkKLTR19func_ov026_02111c08Ev kind:function(arm,size=0x148) addr:0x02113e60 _ZN12ActorUnkKLTR19func_ov026_02111d50Ev kind:function(arm,size=0x4) addr:0x02113fa8 -_ZN12ActorUnkKLTR19func_ov026_02111d54Ev kind:function(arm,size=0x1e8) addr:0x02113fac -_ZN12ActorUnkKLTR19func_ov026_02111f3cEv kind:function(arm,size=0xf0) addr:0x02114194 +_ZN12ActorUnkKLTR8vfunc_2cEi kind:function(arm,size=0x1e8) addr:0x02113fac +_ZN12ActorUnkKLTR8vfunc_30Ev kind:function(arm,size=0xf0) addr:0x02114194 _ZN12ActorUnkKLTR19func_ov026_0211202cEv kind:function(arm,size=0x30) addr:0x02114284 _ZN12ActorUnkKLTR19func_ov026_0211205cEv kind:function(arm,size=0x2c) addr:0x021142b4 _ZN12ActorUnkKLTR19func_ov026_02112088Ev kind:function(arm,size=0x84) addr:0x021142e0 @@ -2135,19 +2135,19 @@ _ZN12ActorUnkDKTR19func_ov026_0212b958Ev kind:function(arm,size=0x5c) addr:0x021 _ZN12ActorUnkDKTRC1Ev kind:function(arm,size=0x1b4) addr:0x0212dcbc _ZN12ActorUnkDKTRD1Ev kind:function(arm,size=0x90) addr:0x0212de70 _ZN12ActorUnkDKTRD0Ev kind:function(arm,size=0x98) addr:0x0212df00 -_ZN12ActorUnkDKTR19func_ov026_0212bc90Ev kind:function(arm,size=0x8) addr:0x0212df98 -_ZN12ActorUnkDKTR19func_ov026_0212bc98Ev kind:function(arm,size=0x108) addr:0x0212dfa0 -_ZN12ActorUnkDKTR19func_ov026_0212bda0Ev kind:function(arm,size=0x20) addr:0x0212e0a8 -_ZN12ActorUnkDKTR19func_ov026_0212bdc0Ev kind:function(arm,size=0x20) addr:0x0212e0c8 +_ZN12ActorUnkDKTR8vfunc_18Ei kind:function(arm,size=0x8) addr:0x0212df98 +_ZN12ActorUnkDKTR8vfunc_1cEv kind:function(arm,size=0x108) addr:0x0212dfa0 +_ZN12ActorUnkDKTR8vfunc_20Ev kind:function(arm,size=0x20) addr:0x0212e0a8 +_ZN12ActorUnkDKTR8vfunc_24Ev kind:function(arm,size=0x20) addr:0x0212e0c8 _ZN12ActorUnkDKTR19func_ov026_0212bde0Ev kind:function(arm,size=0x20c) addr:0x0212e0e8 _ZN12ActorUnkDKTR19func_ov026_0212bfecEv kind:function(arm,size=0x148) addr:0x0212e2f4 _ZN12ActorUnkDKTR19func_ov026_0212c134Ev kind:function(arm,size=0x4) addr:0x0212e43c -_ZN12ActorUnkDKTR19func_ov026_0212c138Ev kind:function(arm,size=0x170) addr:0x0212e440 -_ZN12ActorUnkDKTR19func_ov026_0212c2a8Ev kind:function(arm,size=0x10c) addr:0x0212e5b0 +_ZN12ActorUnkDKTR8vfunc_2cEi kind:function(arm,size=0x170) addr:0x0212e440 +_ZN12ActorUnkDKTR8vfunc_30Ev kind:function(arm,size=0x10c) addr:0x0212e5b0 _ZN12ActorUnkDKTR19func_ov026_0212c398Ev kind:function(arm,size=0x30) addr:0x0212e6bc _ZN12ActorUnkDKTR19func_ov026_0212c3c8Ev kind:function(arm,size=0x2c) addr:0x0212e6ec _ZN12ActorUnkDKTR19func_ov026_0212c3f4Ev kind:function(arm,size=0x84) addr:0x0212e718 -_ZN12ActorUnkDKTR19func_ov026_0212c478Ev kind:function(arm,size=0xf4) addr:0x0212e79c +_ZN12ActorUnkDKTR9vfunc2_0CEv kind:function(arm,size=0xf4) addr:0x0212e79c _ZN12ActorUnkDKTR19func_ov026_0212c56cEv kind:function(arm,size=0xb8) addr:0x0212e890 _ZN12ActorUnkDKTR19func_ov026_0212c624Ev kind:function(arm,size=0x3f4) addr:0x0212e948 _ZN12ActorUnkDKTR19func_ov026_0212ca18Ev kind:function(arm,size=0x34c) addr:0x0212ed3c @@ -2184,9 +2184,9 @@ _ZN12ActorUnkDKTR19func_ov026_0212e178Ev kind:function(arm,size=0x100) addr:0x02 _ZN12ActorUnkDKTR19func_ov026_0212e278Ev kind:function(arm,size=0x3c) addr:0x0213059c _ZN12ActorUnkDKTR19func_ov026_0212e2b4Ev kind:function(arm,size=0x190) addr:0x021305d8 _ZN19ActorProfileUnkDKTRD1Ev kind:function(arm,size=0x14) addr:0x02130768 -func_ov026_0213077c kind:function(arm,size=0x10) addr:0x0213077c -func_ov026_0213078c kind:function(arm,size=0x10) addr:0x0213078c -func_ov026_0213079c kind:function(arm,size=0x10) addr:0x0213079c +_ZThn152_N12ActorUnkDKTRD0Ev kind:function(arm,size=0x10) addr:0x0213077c +_ZThn152_N12ActorUnkDKTR9vfunc2_0CEv kind:function(arm,size=0x10) addr:0x0213078c +_ZThn152_N12ActorUnkDKTRD1Ev kind:function(arm,size=0x10) addr:0x0213079c func_ov026_021307ac kind:function(arm,size=0xb0) addr:0x021307ac func_ov026_0213085c kind:function(arm,size=0x14) addr:0x0213085c func_ov026_02130870 kind:function(arm,size=0x54) addr:0x02130870 @@ -2650,7 +2650,7 @@ data_ov026_02137f40 kind:data(any) addr:0x02137f40 data_ov026_02137f84 kind:data(any) addr:0x02137f84 data_ov026_02137f90 kind:data(any) addr:0x02137f90 data_ov026_02137fd4 kind:data(any) addr:0x02137fd4 -data_ov026_02137fe0 kind:data(any) addr:0x02137fe0 +_ZTV16Actor_UnkSystem6 kind:data(any) addr:0x02137fd8 data_ov026_0213800c kind:data(any) addr:0x0213800c data_ov026_02138054 kind:data(any) addr:0x02138054 data_ov026_02138098 kind:data(any) addr:0x02138098 @@ -2796,8 +2796,8 @@ _ZTV19data_ov026_021399d4 kind:data(any) addr:0x021399d4 _ZTV19data_ov026_02139a38 kind:data(any) addr:0x02139a38 _ZTV19data_ov026_02139a5c kind:data(any) addr:0x02139a5c data_ov026_02139ac0 kind:data(any) addr:0x02139ac0 -_ZTV19data_ov026_02139ba0 kind:data(any) addr:0x02139ba0 -_ZTV19data_ov026_02139bc4 kind:data(any) addr:0x02139bc4 +_ZTV19ActorProfileUnkKLTR kind:data(any) addr:0x02139ba0 +_ZTV12ActorUnkKLTR kind:data(any) addr:0x02139bc4 data_ov026_02139c28 kind:data(any) addr:0x02139c28 data_ov026_02139c4c kind:data(any) addr:0x02139c4c _ZTV19data_ov026_02139c60 kind:data(any) addr:0x02139c60 @@ -2895,9 +2895,8 @@ data_ov026_0213ad4c kind:data(any) addr:0x0213ad4c data_ov026_0213ad64 kind:data(any) addr:0x0213ad64 data_ov026_0213ad7c kind:data(any) addr:0x0213ad7c data_ov026_0213ad94 kind:data(any) addr:0x0213ad94 -_ZTV19data_ov026_0213ae64 kind:data(any) addr:0x0213ae64 -_ZTV19data_ov026_0213ae88 kind:data(any) addr:0x0213ae88 -data_ov026_0213aef8 kind:data(any) addr:0x0213aef8 +_ZTV19ActorProfileUnkDKTR kind:data(any) addr:0x0213ae64 +_ZTV12ActorUnkDKTR kind:data(any) addr:0x0213ae88 data_ov026_0213af0c kind:data(any) addr:0x0213af0c data_ov026_0213af10 kind:data(any) addr:0x0213af10 data_ov026_0213af1c kind:data(any) addr:0x0213af1c @@ -3108,8 +3107,8 @@ data_ov026_02142860 kind:bss addr:0x02142860 data_ov026_02142864 kind:bss addr:0x02142864 data_ov026_02142868 kind:bss addr:0x02142868 data_ov026_0214286c kind:bss addr:0x0214286c -data_ov026_02142870 kind:bss addr:0x02142870 -data_ov026_02142874 kind:bss addr:0x02142874 +_ZGVN15ProfileInstanceI19ActorProfileUnkKLTRE8sProfileE kind:bss addr:0x02142870 +@30289 kind:bss addr:0x02142874 data_ov026_02142880 kind:bss addr:0x02142880 data_ov026_02142884 kind:bss addr:0x02142884 data_ov026_02142894 kind:bss addr:0x02142894 @@ -3123,8 +3122,8 @@ data_ov026_02142904 kind:bss addr:0x02142904 data_ov026_02142914 kind:bss addr:0x02142914 data_ov026_02142924 kind:bss addr:0x02142924 data_ov026_02142934 kind:bss addr:0x02142934 -_ZGVN15ProfileInstanceI19ActorProfileUnkKLTRE8sProfileE kind:bss addr:0x02142944 -@30289 kind:bss addr:0x02142954 +data_ov026_02142944 kind:bss addr:0x02142944 +data_ov026_02142954 kind:bss addr:0x02142954 _ZN15ProfileInstanceI19ActorProfileUnkKLTRE8sProfileE kind:bss addr:0x02142964 data_ov026_02142a3c kind:bss addr:0x02142a3c _ZGVN15ProfileInstanceI19ActorProfileUnkTRTTE8sProfileE kind:bss addr:0x02142a44 @@ -3192,8 +3191,8 @@ data_ov026_02143abc kind:bss addr:0x02143abc data_ov026_02143ac0 kind:bss addr:0x02143ac0 data_ov026_02143ac4 kind:bss addr:0x02143ac4 data_ov026_02143ac8 kind:bss addr:0x02143ac8 -data_ov026_02143acc kind:bss addr:0x02143acc -data_ov026_02143ad0 kind:bss addr:0x02143ad0 +_ZGVN15ProfileInstanceI19ActorProfileUnkDKTRE8sProfileE kind:bss addr:0x02143acc +@30373 kind:bss addr:0x02143ad0 data_ov026_02143adc kind:bss addr:0x02143adc data_ov026_02143ae0 kind:bss addr:0x02143ae0 data_ov026_02143ae4 kind:bss addr:0x02143ae4 @@ -3214,8 +3213,8 @@ data_ov026_02143b70 kind:bss addr:0x02143b70 data_ov026_02143b80 kind:bss addr:0x02143b80 data_ov026_02143b90 kind:bss addr:0x02143b90 data_ov026_02143ba0 kind:bss addr:0x02143ba0 -_ZGVN15ProfileInstanceI19ActorProfileUnkDKTRE8sProfileE kind:bss addr:0x02143bb0 -@30373 kind:bss addr:0x02143bc0 +data_ov026_02143bb0 kind:bss addr:0x02143bb0 +data_ov026_02143bc0 kind:bss addr:0x02143bc0 _ZN15ProfileInstanceI19ActorProfileUnkDKTRE8sProfileE kind:bss addr:0x02143bd0 data_ov026_02143ca8 kind:bss addr:0x02143ca8 data_ov026_02143cac kind:bss addr:0x02143cac diff --git a/config/jp/arm9/overlays/ov027/relocs.txt b/config/jp/arm9/overlays/ov027/relocs.txt index f9792ed9c..cb255ab0b 100644 --- a/config/jp/arm9/overlays/ov027/relocs.txt +++ b/config/jp/arm9/overlays/ov027/relocs.txt @@ -585,7 +585,7 @@ from:0x0214769c kind:arm_call to:0x0210478c module:overlay(26) from:0x021476b8 kind:arm_call to:0x021035bc module:overlay(26) from:0x021476c4 kind:arm_call to:0x020f0468 module:overlay(26) from:0x021476d0 kind:load to:0x0214b120 add:0x8 module:overlay(27) -from:0x021476d4 kind:load to:0x020b3fc8 module:overlay(0) +from:0x021476d4 kind:load to:0x020b3fc0 add:0x8 module:overlay(0) from:0x021476d8 kind:load to:0x0214a7a0 module:overlay(27) from:0x021476dc kind:load to:0x02147730 module:overlay(27) from:0x021476e0 kind:load to:0x021476f0 module:overlay(27) diff --git a/config/jp/arm9/overlays/ov030/relocs.txt b/config/jp/arm9/overlays/ov030/relocs.txt index 42484b1a6..c84d19757 100644 --- a/config/jp/arm9/overlays/ov030/relocs.txt +++ b/config/jp/arm9/overlays/ov030/relocs.txt @@ -1418,7 +1418,7 @@ from:0x02150234 kind:arm_call to:0x02099dd4 module:overlay(0) from:0x02150258 kind:arm_call to:0x021035bc module:overlay(26) from:0x02150264 kind:arm_call to:0x020f0468 module:overlay(26) from:0x02150270 kind:load to:0x02154094 add:0x8 module:overlay(30) -from:0x02150274 kind:load to:0x020b3fc8 module:overlay(0) +from:0x02150274 kind:load to:0x020b3fc0 add:0x8 module:overlay(0) from:0x02150278 kind:load to:0x021533ec module:overlay(30) from:0x0215027c kind:load to:0x021502d0 module:overlay(30) from:0x02150280 kind:load to:0x02150290 module:overlay(30) diff --git a/config/jp/arm9/overlays/ov031/relocs.txt b/config/jp/arm9/overlays/ov031/relocs.txt index 84dc1cdeb..1fb4b2a0a 100644 --- a/config/jp/arm9/overlays/ov031/relocs.txt +++ b/config/jp/arm9/overlays/ov031/relocs.txt @@ -1147,7 +1147,7 @@ from:0x020e50a0 kind:load to:0x027e0ce4 module:dtcm from:0x020e50a4 kind:load to:0x027e0ce8 module:dtcm from:0x020e50b4 kind:arm_call to:0x02099b30 module:overlay(0) from:0x020e511c kind:load to:0x02114b24 add:0x8 module:overlay(31) -from:0x020e5120 kind:load to:0x020b3fc8 module:overlay(0) +from:0x020e5120 kind:load to:0x020b3fc0 add:0x8 module:overlay(0) from:0x020e5124 kind:load to:0x02114aec module:overlay(31) from:0x020e5130 kind:arm_call to:0x0207d6b4 module:overlay(0) from:0x020e5178 kind:arm_call to:0x01ffb6e4 module:itcm @@ -1448,7 +1448,7 @@ from:0x020e74f0 kind:load to:0x021127f8 module:overlay(31) from:0x020e74f4 kind:load to:0x027e0ce0 module:dtcm from:0x020e74f8 kind:load to:0x02114d94 module:overlay(31) from:0x020e74fc kind:load to:0x02114d78 module:overlay(31) -from:0x020e7500 kind:load to:0x020b3fc8 module:overlay(0) +from:0x020e7500 kind:load to:0x020b3fc0 add:0x8 module:overlay(0) from:0x020e7504 kind:load to:0x020a1aac module:overlay(0) from:0x020e7508 kind:load to:0x020e70f0 module:overlay(31) from:0x020e7514 kind:arm_call to:0x0207d6b4 module:overlay(0) diff --git a/config/jp/arm9/overlays/ov043/relocs.txt b/config/jp/arm9/overlays/ov043/relocs.txt index 294c94579..5eb3d9718 100644 --- a/config/jp/arm9/overlays/ov043/relocs.txt +++ b/config/jp/arm9/overlays/ov043/relocs.txt @@ -381,7 +381,7 @@ from:0x02128860 kind:load to:0x0212f028 add:0x8 module:overlay(43) from:0x02128864 kind:load to:0x0212fa80 module:overlay(43) from:0x02128868 kind:load to:0x0212efe4 module:overlay(43) from:0x0212886c kind:load to:0x0212ef9c module:overlay(43) -from:0x02128870 kind:load to:0x020b3fc8 module:overlay(0) +from:0x02128870 kind:load to:0x020b3fc0 add:0x8 module:overlay(0) from:0x02128874 kind:load to:0x027e07d4 module:dtcm from:0x0212887c kind:load to:0x0212ef58 module:overlay(43) from:0x02128888 kind:arm_call_thumb to:0x0209ba14 module:overlay(0) diff --git a/config/jp/arm9/overlays/ov048/relocs.txt b/config/jp/arm9/overlays/ov048/relocs.txt index 5008e53e5..64390ce87 100644 --- a/config/jp/arm9/overlays/ov048/relocs.txt +++ b/config/jp/arm9/overlays/ov048/relocs.txt @@ -10,7 +10,7 @@ from:0x02132028 kind:arm_call to:0x02099b30 module:overlay(0) from:0x0213204c kind:arm_call to:0x02080464 module:overlay(0) from:0x02132084 kind:arm_call to:0x02099a50 module:overlay(0) from:0x021320bc kind:load to:0x02139098 add:0x8 module:overlay(48) -from:0x021320c0 kind:load to:0x020b3fc8 module:overlay(0) +from:0x021320c0 kind:load to:0x020b3fc0 add:0x8 module:overlay(0) from:0x021320c4 kind:load to:0x02139084 module:overlay(48) from:0x021320d0 kind:arm_call to:0x0207d6b4 module:overlay(0) from:0x021320e8 kind:arm_call to:0x0207d6b4 module:overlay(0) @@ -260,7 +260,7 @@ from:0x02133ce4 kind:load to:0x02139710 module:overlay(48) from:0x02133ce8 kind:load to:0x021391bc module:overlay(48) from:0x02133cf0 kind:load to:0x02132a20 module:overlay(48) from:0x02133cf4 kind:load to:0x02133b24 module:overlay(48) -from:0x02133cf8 kind:load to:0x020b3fc8 module:overlay(0) +from:0x02133cf8 kind:load to:0x020b3fc0 add:0x8 module:overlay(0) from:0x02133d1c kind:arm_call to:0x020a1b0c module:overlay(0) from:0x02133d38 kind:arm_call to:0x0207f90c module:overlay(0) from:0x02133d40 kind:arm_call to:0x0207cd78 module:overlay(0) diff --git a/config/jp/arm9/overlays/ov052/relocs.txt b/config/jp/arm9/overlays/ov052/relocs.txt index 7206f4658..c141cfca7 100644 --- a/config/jp/arm9/overlays/ov052/relocs.txt +++ b/config/jp/arm9/overlays/ov052/relocs.txt @@ -319,7 +319,7 @@ from:0x02134f00 kind:load to:0x02137e68 add:0x8 module:overlay(52) from:0x02134f04 kind:load to:0x02138540 module:overlay(52) from:0x02134f08 kind:load to:0x02137e24 module:overlay(52) from:0x02134f0c kind:load to:0x02137ddc module:overlay(52) -from:0x02134f10 kind:load to:0x020b3fc8 module:overlay(0) +from:0x02134f10 kind:load to:0x020b3fc0 add:0x8 module:overlay(0) from:0x02134f14 kind:load to:0x027e07d4 module:dtcm from:0x02134f1c kind:load to:0x02137d98 module:overlay(52) from:0x02134f28 kind:arm_call_thumb to:0x0209ba14 module:overlay(0) diff --git a/config/jp/arm9/overlays/ov059/relocs.txt b/config/jp/arm9/overlays/ov059/relocs.txt index 0009856ff..4f46956d0 100644 --- a/config/jp/arm9/overlays/ov059/relocs.txt +++ b/config/jp/arm9/overlays/ov059/relocs.txt @@ -522,7 +522,7 @@ from:0x0215e51c kind:load to:0x021655ac add:0x8 module:overlay(59) from:0x0215e520 kind:load to:0x021661fc module:overlay(59) from:0x0215e524 kind:load to:0x02165508 module:overlay(59) from:0x0215e528 kind:load to:0x02165274 module:overlay(59) -from:0x0215e52c kind:load to:0x020b3fc8 module:overlay(0) +from:0x0215e52c kind:load to:0x020b3fc0 add:0x8 module:overlay(0) from:0x0215e530 kind:load to:0x021661f0 module:overlay(59) from:0x0215e53c kind:arm_call_thumb to:0x02059154 module:overlay(0) from:0x0215e568 kind:arm_call to:0x020591b8 module:overlay(0) @@ -1018,7 +1018,7 @@ from:0x02162bec kind:load to:0x0216593c add:0x8 module:overlay(59) from:0x02162bf8 kind:arm_call to:0x02099b30 module:overlay(0) from:0x02162c90 kind:arm_call_thumb to:0x02058fa4 module:overlay(0) from:0x02162cc0 kind:load to:0x021659b0 add:0x8 module:overlay(59) -from:0x02162cc4 kind:load to:0x020b3fc8 module:overlay(0) +from:0x02162cc4 kind:load to:0x020b3fc0 add:0x8 module:overlay(0) from:0x02162cc8 kind:load to:0x021663d8 module:overlay(59) from:0x02162cf4 kind:arm_call to:0x02162d00 module:overlay(59) from:0x02162d38 kind:load to:0x02165960 module:overlay(59) diff --git a/config/jp/arm9/overlays/ov068/relocs.txt b/config/jp/arm9/overlays/ov068/relocs.txt index a7efcfc34..7e58450de 100644 --- a/config/jp/arm9/overlays/ov068/relocs.txt +++ b/config/jp/arm9/overlays/ov068/relocs.txt @@ -834,7 +834,7 @@ from:0x02160c18 kind:load to:0x02165320 add:0x8 module:overlay(68) from:0x02160c1c kind:load to:0x021663ac module:overlay(68) from:0x02160c20 kind:load to:0x0216529c module:overlay(68) from:0x02160c24 kind:load to:0x021647ec module:overlay(68) -from:0x02160c28 kind:load to:0x020b3fc8 module:overlay(0) +from:0x02160c28 kind:load to:0x020b3fc0 add:0x8 module:overlay(0) from:0x02160c34 kind:arm_call_thumb to:0x02059154 module:overlay(0) from:0x02160c5c kind:arm_call to:0x020591b8 module:overlay(0) from:0x02160c6c kind:arm_call to:0x0209bf84 module:overlay(0) diff --git a/config/jp/arm9/overlays/ov070/relocs.txt b/config/jp/arm9/overlays/ov070/relocs.txt index 47f6cd1f3..d1d95d0df 100644 --- a/config/jp/arm9/overlays/ov070/relocs.txt +++ b/config/jp/arm9/overlays/ov070/relocs.txt @@ -1090,7 +1090,7 @@ from:0x02149d08 kind:arm_call to:0x02099a50 module:overlay(0) from:0x02149d70 kind:arm_call to:0x02099dd4 module:overlay(0) from:0x02149d88 kind:load to:0x0215134c add:0x8 module:overlay(70) from:0x02149d8c kind:load to:0x021525c4 module:overlay(70) -from:0x02149d90 kind:load to:0x020b3fc8 module:overlay(0) +from:0x02149d90 kind:load to:0x020b3fc0 add:0x8 module:overlay(0) from:0x02149d94 kind:load to:0x02151294 module:overlay(70) from:0x02149da0 kind:arm_call to:0x0207d6b4 module:overlay(0) from:0x02149de8 kind:arm_call to:0x0214a054 module:overlay(70) diff --git a/config/jp/arm9/overlays/ov071/relocs.txt b/config/jp/arm9/overlays/ov071/relocs.txt index 3ab4ee942..4436b67b8 100644 --- a/config/jp/arm9/overlays/ov071/relocs.txt +++ b/config/jp/arm9/overlays/ov071/relocs.txt @@ -1230,7 +1230,7 @@ from:0x0215e680 kind:load to:0x02165e74 module:overlay(71) from:0x0215e684 kind:load to:0x02165e84 module:overlay(71) from:0x0215e688 kind:load to:0x021668ac add:0x8 module:overlay(71) from:0x0215e68c kind:load to:0x02165e94 module:overlay(71) -from:0x0215e690 kind:load to:0x020b3fc8 module:overlay(0) +from:0x0215e690 kind:load to:0x020b3fc0 add:0x8 module:overlay(0) from:0x0215e694 kind:load to:0x02165ea4 module:overlay(71) from:0x0215e698 kind:load to:0x02167394 module:overlay(71) from:0x0215e69c kind:load to:0x02165e2c module:overlay(71) diff --git a/config/jp/arm9/overlays/ov075/relocs.txt b/config/jp/arm9/overlays/ov075/relocs.txt index 1d44183bb..c22f773b0 100644 --- a/config/jp/arm9/overlays/ov075/relocs.txt +++ b/config/jp/arm9/overlays/ov075/relocs.txt @@ -1479,7 +1479,7 @@ from:0x02160634 kind:arm_call to:0x02161a80 module:overlay(75) from:0x02160644 kind:load to:0x02165208 add:0x8 module:overlay(75) from:0x02160648 kind:load to:0x021655f4 module:overlay(75) from:0x0216064c kind:load to:0x021651c8 module:overlay(75) -from:0x02160650 kind:load to:0x020b3fc8 module:overlay(0) +from:0x02160650 kind:load to:0x020b3fc0 add:0x8 module:overlay(0) from:0x02160654 kind:load to:0x021655e8 module:overlay(75) from:0x0216065c kind:load to:0x027e0130 module:dtcm from:0x02160660 kind:load to:0x027e07d4 module:dtcm diff --git a/config/jp/arm9/overlays/ov087/relocs.txt b/config/jp/arm9/overlays/ov087/relocs.txt index f633dd75e..fa5b07d7c 100644 --- a/config/jp/arm9/overlays/ov087/relocs.txt +++ b/config/jp/arm9/overlays/ov087/relocs.txt @@ -688,7 +688,7 @@ from:0x0215d3f4 kind:arm_call_thumb to:0x02058d0c module:overlay(0) from:0x0215d408 kind:arm_call to:0x02099360 module:overlay(0) from:0x0215d454 kind:arm_call to:0x01ffa06c module:itcm from:0x0215d470 kind:load to:0x02164680 add:0x8 module:overlay(87) -from:0x0215d474 kind:load to:0x020b3fc8 module:overlay(0) +from:0x0215d474 kind:load to:0x020b3fc0 add:0x8 module:overlay(0) from:0x0215d478 kind:load to:0x02164c78 module:overlay(87) from:0x0215d47c kind:load to:0x0216463c module:overlay(87) from:0x0215d480 kind:load to:0x02164288 module:overlay(87) diff --git a/config/jp/arm9/overlays/ov091/relocs.txt b/config/jp/arm9/overlays/ov091/relocs.txt index 115aa3a90..96da9951a 100644 --- a/config/jp/arm9/overlays/ov091/relocs.txt +++ b/config/jp/arm9/overlays/ov091/relocs.txt @@ -978,7 +978,7 @@ from:0x0216fe1c kind:arm_call to:0x021061f8 module:overlay(26) from:0x0216fe2c kind:load to:0x02179cd0 add:0x8 module:overlay(91) from:0x0216fe30 kind:load to:0x0217ae20 module:overlay(91) from:0x0216fe34 kind:load to:0x02179c8c module:overlay(91) -from:0x0216fe38 kind:load to:0x020b3fc8 module:overlay(0) +from:0x0216fe38 kind:load to:0x020b3fc0 add:0x8 module:overlay(0) from:0x0216fe44 kind:arm_call_thumb to:0x0209ba14 module:overlay(0) from:0x0216fee4 kind:load to:0x0217adfc module:overlay(91) from:0x0216fee8 kind:load to:0x02179c40 module:overlay(91) @@ -1751,7 +1751,7 @@ from:0x02178100 kind:arm_call to:0x01ffa06c module:itcm from:0x0217810c kind:load to:0x0217a2bc add:0x8 module:overlay(91) from:0x02178110 kind:load to:0x0217b174 module:overlay(91) from:0x02178114 kind:load to:0x020b3160 add:0x8 module:overlay(0) -from:0x02178118 kind:load to:0x020b3fc8 module:overlay(0) +from:0x02178118 kind:load to:0x020b3fc0 add:0x8 module:overlay(0) from:0x02178154 kind:arm_call to:0x021337e4 module:overlay(26) from:0x0217816c kind:arm_call to:0x021337e4 module:overlay(26) from:0x02178180 kind:arm_call to:0x01ffb714 module:itcm diff --git a/config/jp/arm9/overlays/ov092/relocs.txt b/config/jp/arm9/overlays/ov092/relocs.txt index bd676cc30..7beda0464 100644 --- a/config/jp/arm9/overlays/ov092/relocs.txt +++ b/config/jp/arm9/overlays/ov092/relocs.txt @@ -2104,7 +2104,7 @@ from:0x0217b138 kind:arm_call to:0x020fdf0c module:overlay(26) from:0x0217b168 kind:arm_call to:0x021053c0 module:overlay(26) from:0x0217b1a4 kind:arm_call to:0x021061f8 module:overlay(26) from:0x0217b1b0 kind:load to:0x0217f394 add:0x8 module:overlay(92) -from:0x0217b1b4 kind:load to:0x020b3fc8 module:overlay(0) +from:0x0217b1b4 kind:load to:0x020b3fc0 add:0x8 module:overlay(0) from:0x0217b24c kind:load to:0x021804e4 module:overlay(92) from:0x0217b250 kind:load to:0x0217f350 module:overlay(92) from:0x0217b254 kind:load to:0x02180534 module:overlay(92) diff --git a/config/jp/arm9/overlays/ov094/relocs.txt b/config/jp/arm9/overlays/ov094/relocs.txt index ffcdda7f7..ffd0bf152 100644 --- a/config/jp/arm9/overlays/ov094/relocs.txt +++ b/config/jp/arm9/overlays/ov094/relocs.txt @@ -1179,7 +1179,7 @@ from:0x02171db8 kind:arm_call to:0x020fdf0c module:overlay(26) from:0x02171de8 kind:arm_call to:0x021053c0 module:overlay(26) from:0x02171e24 kind:arm_call to:0x021061f8 module:overlay(26) from:0x02171e30 kind:load to:0x0217a084 add:0x8 module:overlay(94) -from:0x02171e34 kind:load to:0x020b3fc8 module:overlay(0) +from:0x02171e34 kind:load to:0x020b3fc0 add:0x8 module:overlay(0) from:0x02171e40 kind:arm_call_thumb to:0x0209ba14 module:overlay(0) from:0x02171ee0 kind:load to:0x0217b1e4 module:overlay(94) from:0x02171ee4 kind:load to:0x0217a040 module:overlay(94) diff --git a/config/jp/arm9/overlays/ov096/relocs.txt b/config/jp/arm9/overlays/ov096/relocs.txt index 3eec4e809..c2f1a2087 100644 --- a/config/jp/arm9/overlays/ov096/relocs.txt +++ b/config/jp/arm9/overlays/ov096/relocs.txt @@ -187,7 +187,7 @@ from:0x0217d3e4 kind:load to:0x02180350 add:0x8 module:overlay(96) from:0x0217d3e8 kind:load to:0x021805f4 module:overlay(96) from:0x0217d3ec kind:load to:0x021802e0 module:overlay(96) from:0x0217d3f0 kind:load to:0x0218030c module:overlay(96) -from:0x0217d3f4 kind:load to:0x020b3fc8 module:overlay(0) +from:0x0217d3f4 kind:load to:0x020b3fc0 add:0x8 module:overlay(0) from:0x0217d400 kind:arm_call_thumb to:0x02059154 module:overlay(0) from:0x0217d414 kind:arm_call_thumb to:0x0209ba14 module:overlay(0) from:0x0217d428 kind:arm_call to:0x0207d6b4 module:overlay(0) diff --git a/include/Actor/Actor.hpp b/include/Actor/Actor.hpp index 4489a935d..286ee1481 100644 --- a/include/Actor/Actor.hpp +++ b/include/Actor/Actor.hpp @@ -206,6 +206,48 @@ class Actor : public SysObject { void func_ov017_020bf5c4(Vec3p *param1, unk32 param2, unk32 param3, unk32 param4, unk32 param5); }; +class Actor_Derived1 : public Actor { +public: + /* 94 */ unk32 mUnk_94; + /* 98 */ + + Actor_Derived1(); // func_ov026_02110c7c + + // data_ov026_02137570 + /* 4C */ virtual ~Actor_Derived1() override {} + /* 54 */ virtual void vfunc_54(); + /* 58 */ virtual void vfunc_58(); + /* 5C */ + + void func_ov026_02110ca4(); + void func_ov026_02110d14(); + void func_ov026_02110d38(); + void func_ov026_02110d68(); + void func_ov026_02110d7c(); + void func_ov026_02110dac(); + void func_ov026_02110ddc(); + void func_ov026_02110e38(); + void func_ov026_02110e70(); + void func_ov026_02110eb8(); + void func_ov026_02110ee4(); + void func_ov026_02110f28(); + void func_ov026_02110f68(); + void func_ov026_02110fcc(); +}; + +class Actor_Derived2 : public Actor_Derived1 { +public: + /* 00 (base) */ + /* 98 */ unk16 mUnk_98; + /* 9A */ unk16 mUnk_9A; + /* 9C */ + + Actor_Derived2(); // func_ov026_02111044 + + // data_ov026_021375d4 + /* 4C */ virtual ~Actor_Derived2() override; +}; + struct Actor_c4_stack { unk32 param1; unk32 param2; @@ -242,4 +284,378 @@ class Actor_c4 : public Actor_c4_Base { Actor_c4_Base(¶m1->mRef, 0) {} }; +class Actor_9c { +public: + /* 00 (vtable) */ + /* 04 */ unk32 mUnk_04; + /* 08 */ unk32 mUnk_08; + /* 0C */ unk32 mUnk_0C; + /* 10 */ unk32 mUnk_10; + /* 14 */ unk32 mUnk_14; + /* 18 */ unk32 mUnk_18; + /* 1C */ unk32 mUnk_1C; + /* 20 */ + + /* 00 */ virtual void vfunc_00(); // corresponds to func_ov000_02097c14 + /* 04 */ virtual void vfunc_04(); // corresponds to func_ov000_02097c20 + /* 08 */ + + Actor_9c(); + void func_ov000_02097bec(); +}; + +class Actor_UnkSystem1_Base { +public: + /* 00 */ unk32 mUnk_00; + /* 04 */ unk32 mUnk_04; + /* 08 */ unk32 mUnk_08; + /* 0C */ + + Actor_UnkSystem1_Base() { + this->mUnk_00 = 0; + this->mUnk_04 = 0; + this->mUnk_08 = 0; + } +}; + +class Actor_UnkSystem1 : public Actor_UnkSystem1_Base { +public: + /* 00 (vtable) */ + /* 04 (base) */ + /* 10 */ + + Actor_UnkSystem1() {} + + /* 00 */ virtual ~Actor_UnkSystem1(); + /* 08 */ virtual void vfunc2_08(); // func_ov000_0207c000 + /* 0C */ virtual void vfunc2_0C(); + /* 10 */ virtual void vfunc2_10(); // func_ov000_0207c010 + /* 14 */ +}; + +class Actor_UnkSystem2_Base { +public: + /* 000 */ unk32 mUnk_000; + /* 004 */ unk32 mUnk_004; + /* 008 */ unk32 mUnk_008; + /* 00C */ unk32 mUnk_00C; + /* 010 */ unk32 mUnk_010; + /* 014 */ unk32 mUnk_014; + /* 018 */ unk32 mUnk_018; + /* 01C */ unk32 mUnk_01C[4]; + /* 02C */ unk32 mUnk_02C[4]; + /* 03C */ unk32 mUnk_03C; + /* 040 */ unk32 mUnk_040; + /* 044 */ Vec3p mUnk_044[4]; + /* 074 */ Vec3p mUnk_074[4]; + /* 0A4 */ Vec3p mUnk_0A4[4]; + /* 0D4 */ Vec3p mUnk_0D4[4]; + /* 104 */ unk32 mUnk_104; + /* 108 */ unk32 mUnk_108; + /* 10C */ unk32 mUnk_10C; + /* 110 */ unk8 mUnk_110[0x70]; + /* 180 */ unk8 mUnk_180; + /* 181 */ unk8 mUnk_181; + /* 182 */ bool mUnk_182; + /* 183 */ unk8 mUnk_183; + /* 184 */ STRUCT_PAD(0x184, 0x1C4); // unsure if this is here + + Actor_UnkSystem2_Base(); // func_ov026_020ee130 +}; + +class Actor_UnkSystem2 : public Actor_UnkSystem2_Base { +public: + /* 000 (base) */ + /* 1C4 */ unk32 mUnk_1C4; + /* 1C8 */ unk32 mUnk_1C8; + /* 1CC */ unk32 mUnk_1CC; + /* 1D0 */ unk32 mUnk_1D0; + /* 1D4 */ union { + struct { + u8 mUnk_1D4_0 : 1; + u8 mUnk_1D4_1 : 1; + u8 mUnk_1D4_2 : 1; + u8 mUnk_1D4_3 : 1; + u8 mUnk_1D4_4 : 1; + u8 mUnk_1D4_5 : 1; + u8 mUnk_1D4_6 : 1; + u8 mUnk_1D4_7 : 1; + }; + u8 mUnk_1D4; + }; + /* 1D8 */ unk32 mUnk_1D8; + /* 1DC */ unk32 mUnk_1DC; + /* 1E0 */ unk32 mUnk_1E0; + /* 1E4 */ unk16 mUnk_1E4; + /* 1E6 */ unk16 mUnk_1E6; + /* 1E8 */ unk32 mUnk_1E8; + /* 1EC */ + + Actor_UnkSystem2(unk32 param1, unk32 param2); // func_ov026_020f90b0 + ~Actor_UnkSystem2(); + + void func_ov026_020ee538(unk32 param1); + void func_ov026_020f93d4(unk32, u16); + Vec3p *func_ov026_020f9ecc(void); + Vec3p *func_ov026_020f9ec4(void); + bool func_ov026_020fa358(void); + bool func_ov026_020fa46c(unk32, u16); + bool func_ov026_020fa55c(void); + unk32 func_ov026_020fa73c(); + void func_ov026_020fa77c(bool); + unk32 func_ov026_020fa7c0(void); + unk32 func_ov026_020fa7f4(void); + bool func_ov026_020fac30(u32, unk32, unk32, unk32); + void func_ov026_020fa838(unk32, u8); + bool func_ov026_020fb0a4(void); +}; + +class Actor_UnkStruct1 { +public: + /* 00 */ unk16 mUnk_00; + /* 02 */ unk16 mUnk_02; + /* 04 */ unk16 mUnk_04; + /* 06 */ unk16 mUnk_06; + /* 08 */ unk16 mUnk_08; + /* 0A */ unk16 mUnk_0A; + /* 0C */ unk32 mUnk_0C; + /* 10 */ unk32 mUnk_10; + /* 14 */ unk32 mUnk_14; + /* 18 */ unk32 mUnk_18; + /* 1C */ unk32 mUnk_1C; + /* 20 */ + + Actor_UnkStruct1(); // func_ov026_020fb21c +}; + +class Actor_UnkSystem3_Base { +public: + /* 00 */ unk32 mUnk_00; + /* 04 */ unk16 mUnk_04; + /* 06 */ unk16 mUnk_06; + /* 08 */ unk32 mUnk_08; + /* 0C */ unk32 mUnk_0C; + /* 10 */ unk32 mUnk_10; + /* 14 */ unk32 mUnk_14; + /* 18 */ unk32 mUnk_18; + /* 1C */ unk32 mUnk_1C; + /* 20 */ unk32 mUnk_20; + /* 28 */ unk32 mUnk_24; + /* 28 */ + + Actor_UnkSystem3_Base() { + this->mUnk_00 = 0; + this->mUnk_04 = 0; + this->mUnk_08 = 0; + this->mUnk_0C = 0; + this->mUnk_10 = 0; + this->mUnk_14 = 0; + this->mUnk_18 = 0; + this->mUnk_1C = 0; + this->mUnk_20 = 0; + this->mUnk_24 = 0; + } +}; + +class Actor_UnkSystem3 : public Actor_UnkSystem3_Base { +public: + /* 00 (vtable) */ + /* 30 */ + + Actor_UnkSystem3() {} + + // data_ov000_020b27c8 + /* 00 */ virtual ~Actor_UnkSystem3(); // func_ov000_0207b934 & func_ov000_0207b948 + /* 08 */ virtual void vfunc_08(); // func_ov000_0207b71c + /* 0C */ virtual void vfunc_0C(); // func_ov000_0207b754 + /* 10 */ virtual void vfunc_10(); // func_ov000_0207b70c + /* 14 */ +}; + +class Actor_UnkSystem3_Derived1 : public Actor_UnkSystem3 { +public: + Actor_UnkSystem3_Derived1() {} +}; + +class Actor_UnkSystem4 { +public: + /* 00 (vtable) */ + /* 04 */ unk32 mUnk_04; + /* 08 */ unk32 mUnk_08; + /* 0C */ unk32 mUnk_0C; + /* 10 */ + + Actor_UnkSystem4(); // func_ov000_0207ec88 + + // data_ov000_020b287c + /* 00 */ virtual ~Actor_UnkSystem4(); // func_ov000_0207eca8 & func_ov000_0207ecd8 + /* 08 */ virtual void vfunc_08(); // func_ov000_0207ed84 + /* 0C */ +}; + +class Actor_UnkSystem5 { +public: + /* 00 */ unk32 mUnk_00; + /* 04 */ unk32 mUnk_04; + /* 08 */ unk32 mUnk_08; + /* 0C */ + + Actor_UnkSystem5(); // func_ov026_020ff498 + + void func_ov026_0210136c(unk32 param1); + unk32 func_ov026_021016d8(unk32); + void func_ov026_02101890(unk32, unk32); + void func_ov026_02101c54(unk32 param1); +}; + +class Actor_UnkSystem6_Base : public UnkSystem4 { +public: + /* 00 (base) */ + /* 60 */ unk32 mUnk_60; + /* 64 */ unk32 mUnk_64; + /* 68 */ void *mUnk_68; + /* 6C */ + + Actor_UnkSystem6_Base(unk32 param1, void *param2); // func_ov000_0205a64c + + // data_ov000_020b1be4 + /* 00 */ virtual ~Actor_UnkSystem6_Base() {} // func_ov000_0205a804 & func_ov000_0205a818 + /* 08 */ virtual void vfunc_08(unk32 param1); + /* 1C */ virtual void vfunc_1C(UnkSystem4_vfunc_1C *param1); +}; + +class Actor_UnkSystem6 : public Actor_UnkSystem6_Base { +public: + /* 00 (base) */ + /* 6C */ unk32 mUnk_6C; + /* 70 */ + + Actor_UnkSystem6(unk32 param1) : + Actor_UnkSystem6_Base(param1, &mUnk_6C) {} +}; + +class Actor_UnkSystem7 { +public: + /* 00 */ STRUCT_PAD(0x00, 0x6C); + /* 6C */ + + Actor_UnkSystem7(); // func_ov026_020f419c + ~Actor_UnkSystem7(); // func_ov026_020f3c18 +}; + +class Actor_UnkSystem8 { +public: + /* 00 */ STRUCT_PAD(0x00, 0xCC); + /* CC */ + + Actor_UnkSystem8(); // func_ov026_020f41dc + ~Actor_UnkSystem8(); // func_ov026_020f26b0 +}; + +class Actor_UnkSystem9_Base_F0_00 : public UnkStruct_ov019_020d24c8_28_258_00 { +public: + /* 00 (base) */ + /* 08 */ unk32 mUnk_08; + /* 0C */ +}; + +class Actor_UnkSystem9_Base_F0 { +public: + /* 00 */ Actor_UnkSystem9_Base_F0_00 mUnk_00; + /* 0C */ Actor_UnkSystem9_Base_F0_00 mUnk_0C; + /* 18 */ Actor_UnkSystem9_Base_F0_00 mUnk_18; + /* 24 */ Actor_UnkSystem9_Base_F0_00 mUnk_24; + /* 30 */ Actor_UnkSystem9_Base_F0_00 mUnk_30; + /* 3C */ Actor_UnkSystem9_Base_F0_00 mUnk_3C; + /* 48 */ Actor_UnkSystem9_Base_F0_00 mUnk_48; + /* 54 */ Actor_UnkSystem9_Base_F0_00 mUnk_54; + /* 60 */ Actor_UnkSystem9_Base_F0_00 mUnk_60; + /* 6C */ Actor_UnkSystem9_Base_F0_00 mUnk_6C; + /* 78 */ Actor_UnkSystem9_Base_F0_00 mUnk_78; + /* 84 */ Actor_UnkSystem9_Base_F0_00 mUnk_84; + /* 90 */ unk32 mUnk_90; + /* 94 */ unk32 mUnk_94; + /* 98 */ unk32 mUnk_98; + /* 9C */ unk32 mUnk_9C; + /* A0 */ unk32 mUnk_A0; + /* A4 */ unk8 mUnk_A4; + /* A5 */ unk8 mUnk_A5; // pad? + /* A6 */ unk8 mUnk_A6; // pad? + /* A7 */ unk8 mUnk_A7; // pad? + /* A8 */ + + Actor_UnkSystem9_Base_F0(); // func_ov026_020d9618 +}; + +class Actor_UnkSystem9_Base { +public: + /* 000 */ UnkSubStruct19 mUnk_000; + /* 078 */ UnkSubStruct19 mUnk_078; + /* 0F0 */ Actor_UnkSystem9_Base_F0 mUnk_0F0; + /* 198 */ + + Actor_UnkSystem9_Base(); // func_ov026_02105444 +}; + +class Actor_UnkSystem9 : public Actor_UnkSystem9_Base { +public: + /* 000 (base) */ + /* 198 */ + + Actor_UnkSystem9(); // func_ov026_021056a4 +}; + +class Actor_UnkSystem9_2 : public Actor_UnkSystem9_Base { +public: + /* 000 (base) */ + /* 198 */ + + Actor_UnkSystem9_2(); // func_ov026_0210566c + void func_ov026_02105468(unk32); +}; + +//! TODO: fill members +class Actor_UnkSystem10 { +public: + /* 00 */ unk32 mUnk_00; + + Actor_UnkSystem10(); // func_ov026_020fd690 +}; + +//! TODO: fill members +class Actor_UnkSystem10_2 { +public: + /* 00 */ unk32 mUnk_00; + + Actor_UnkSystem10_2(); // func_ov026_020fd690 +}; + +struct Actor_UnkStruct4 { + /* 00 */ unk32 mUnk_00; + /* 04 */ unk32 mUnk_04; + /* 08 */ unk32 mUnk_08; + /* 0C */ union { + u8 mUnk_0C[4]; + u32 mUnk_0C_32; + }; + /* 10 */ Actor_UnkSystem5 mUnk_10; + + Actor_UnkStruct4() : + mUnk_0C_32(0) {} +}; + +struct Actor_UnkStruct5 { + /* 000 */ Actor_UnkSystem6 mUnk_000; + /* 070 */ STRUCT_PAD(0x70, 0xFC); + /* 0FC */ Actor_UnkSystem7 mUnk_0FC[2]; + /* 1D4 */ Actor_UnkSystem8 mUnk_1D4[1]; + /* 2A0 */ unk32 mUnk_2A0; + /* 2A4 */ STRUCT_PAD(0x2A4, 0x620); + /* 620 */ + + Actor_UnkStruct5() : + mUnk_000(0x0C), + mUnk_2A0(0) {} +}; + extern UnkStruct_ov000_020b539c data_ov000_020b539c_eur; diff --git a/include/Actor/ActorProfile.hpp b/include/Actor/ActorProfile.hpp index b5a5515ff..dfadacbb4 100644 --- a/include/Actor/ActorProfile.hpp +++ b/include/Actor/ActorProfile.hpp @@ -3,6 +3,7 @@ #include "Actor/ActorId.hpp" #include "Physics/Cylinder.hpp" #include "System/SysNew.hpp" +#include "Unknown/UnkActorFileSystem.hpp" #include "profile.hpp" #include "types.h" @@ -12,7 +13,8 @@ class ActorProfile : public SysObject { public: /* 00 (vtable) */ /* 04 */ Cylinder mUnk_04; - /* 14 */ unk8 mUnk_14[0x18 - 0x14]; + /* 14 */ unk8 mUnk_14[2]; + /* 14 */ unk8 mUnk_16[2]; /* 18 */ unk8 mUnk_18; /* 19 */ unk8 mUnk_19; /* 1A */ unk16 mUnk_1A; @@ -26,13 +28,15 @@ class ActorProfile : public SysObject { /* 34 */ unk32 mUnk_34; /* 38 */ u8 mUnk_38; /* 39 */ unk8 mUnk_39; - /* 3A */ + /* 3A */ unk8 mUnk_3A; + /* 3B */ unk8 mUnk_3B; + /* 3C */ ActorProfile(ActorId actorId); ~ActorProfile(); /* 00 */ virtual Actor *Create() = 0; - /* 04 */ virtual void vfunc_04(); + /* 04 */ virtual unk32 vfunc_04(); /* 08 */ virtual void vfunc_08(); /* 0C */ virtual void vfunc_0c(); /* 10 */ virtual void vfunc_10(); @@ -47,12 +51,15 @@ class ActorProfile : public SysObject { class ActorProfile_Derived1 : public ActorProfile { public: /* 00 (base) */ + /* 3C */ UnkActorFileSystem2 mUnk_3C; + /* D4 */ unk32 mUnk_D4; + /* D8 */ ActorProfile_Derived1(ActorId actorId); ActorProfile_Derived1(ActorId actorId1, ActorId actorId2); ~ActorProfile_Derived1(); - /* 04 */ virtual void vfunc_04() override; + /* 04 */ virtual unk32 vfunc_04() override; /* 10 */ virtual void vfunc_10() override; /* 14 */ virtual void vfunc_14() override; /* 18 */ virtual void vfunc_18() override; diff --git a/include/Actor/ActorRupee.hpp b/include/Actor/ActorRupee.hpp index 7153d4833..cc4408ee7 100644 --- a/include/Actor/ActorRupee.hpp +++ b/include/Actor/ActorRupee.hpp @@ -19,19 +19,6 @@ enum RupeeId_ { /* 7 */ RupeeId_7, }; -class Actor_9c { -public: - /* 00 (vtable) */ - /* 04 */ - - /* 00 */ virtual void vfunc_00(); // corresponds to func_ov000_02097c14 - /* 04 */ virtual void vfunc_04(); // corresponds to func_ov000_02097c20 - /* 08 */ - - Actor_9c(); - void func_ov000_02097bec(); -}; - class ActorRupee_c4 : public Actor_c4 { public: ActorRupee_c4(Actor *param1); @@ -50,13 +37,6 @@ class ActorRupee : public Actor { /* 98 */ u16 mUnk_98; /* 9A */ u16 mUnk_9A; /* 9C */ Actor_9c mUnk_9C; - /* A0 */ unk32 mUnk_A0; - /* A4 */ unk32 mUnk_A4; - /* A8 */ unk32 mUnk_A8; - /* AC */ unk32 mUnk_AC; - /* B0 */ unk32 mUnk_B0; - /* B4 */ unk32 mUnk_B4; - /* B8 */ unk32 mUnk_B8; /* BC */ unk32 mUnk_BC; /* C0 */ unk32 mUnk_C0; /* C4 */ ActorRupee_c4 mUnk_C4; diff --git a/include/Actor/ActorUnkDKTR.hpp b/include/Actor/ActorUnkDKTR.hpp index b1f2c96b7..b837f82fc 100644 --- a/include/Actor/ActorUnkDKTR.hpp +++ b/include/Actor/ActorUnkDKTR.hpp @@ -7,6 +7,8 @@ #include "global.h" #include "types.h" +class ActorUnkDKTR; + class ActorUnkDKTR_c4 : public Actor_c4 { public: ActorUnkDKTR_c4(Actor *param1); @@ -17,29 +19,61 @@ class ActorUnkDKTR_c4 : public Actor_c4 { /* 0C */ virtual void vfunc_0c(unk32 param1) override; }; -class ActorUnkDKTR : public Actor { +class ActorUnkDKTR : public Actor_Derived1, public Actor_UnkSystem1 { public: - /* 00 (base) */ - /* 94 */ + /* 000 (base) */ + /* 0A8 */ Actor_UnkSystem2 *mUnk_0A8; + /* 0AC */ Actor_UnkSystem2 mUnk_0AC; + /* 298 */ Actor_UnkStruct1 mUnk_298; + /* 2B8 */ Actor_9c mUnk_2B8; + /* 2D8 */ Actor_UnkSystem3_Derived1 mUnk_2D8; + /* 304 */ unk8 mUnk_304; // bool? + /* 305 */ unk8 mUnk_305; // pad? + /* 306 */ unk8 mUnk_306; // pad? + /* 307 */ unk8 mUnk_307; // pad? + /* 308 */ Actor_UnkSystem4 mUnk_308; + /* 318 */ Actor_UnkStruct4 mUnk_318; + /* 334 */ Actor_UnkStruct5 mUnk_334; + /* 954 */ Actor_UnkSystem9 mUnk_954; + /* AEC */ Actor_UnkSystem10 mUnk_AEC; + /* AF0 */ UnkSystem7_Base mUnk_AF0[1]; + /* AF4 */ STRUCT_PAD(0xAF4, 0xB30); + /* B30 */ unk32 mUnk_B30; + /* B34 */ unk32 mUnk_B34; + /* B38 */ unk16 mUnk_B38; + /* B3A */ u8 mUnk_B3A; + /* B3B */ unk8 mUnk_B3B; // bool? + /* B3C */ unk8 mUnk_B3C; // bool? + /* B3D */ unk8 mUnk_B3D; // bool? + /* B3E */ unk8 mUnk_B3E; // bool? + /* B3F */ unk8 mUnk_B3F; // bool? + /* B40 */ unk8 mUnk_B40; // bool? + /* B41 */ unk8 mUnk_B41; // pad? + /* B42 */ unk8 mUnk_B42; // pad? + /* B43 */ unk8 mUnk_B43; // pad? + /* B44 */ unk32 mUnk_B44; + /* B48 */ ActorUnkDKTR(); + // data_ov026_02138b10 + /* 18 */ virtual bool vfunc_18(unk32 param1) override; + /* 1C */ virtual void vfunc_1c() override; + /* 20 */ virtual void vfunc_20() override; + /* 24 */ virtual void vfunc_24() override; + /* 2C */ virtual void vfunc_2c(unk32 param1) override; + /* 30 */ virtual void vfunc_30() override; /* 4C */ virtual ~ActorUnkDKTR() override; + /* 0C */ virtual void vfunc2_0C() override; + // /* 5C */ virtual void vfunc_5C(); void func_ov026_0212b958(void); - void func_ov026_0212bc90(void); - void func_ov026_0212bc98(void); - void func_ov026_0212bda0(void); - void func_ov026_0212bdc0(void); void func_ov026_0212bde0(void); void func_ov026_0212bfec(void); void func_ov026_0212c134(void); - void func_ov026_0212c138(void); - void func_ov026_0212c2a8(void); void func_ov026_0212c398(void); void func_ov026_0212c3c8(void); void func_ov026_0212c3f4(void); - void func_ov026_0212c478(void); void func_ov026_0212c56c(void); void func_ov026_0212c624(void); void func_ov026_0212ca18(void); @@ -80,6 +114,7 @@ class ActorUnkDKTR : public Actor { class ActorProfileUnkDKTR : public ActorProfile_Derived1 { public: /* 00 (base) */ + /* D4 */ ActorProfileUnkDKTR(); ~ActorProfileUnkDKTR(); diff --git a/include/Actor/ActorUnkKLTR.hpp b/include/Actor/ActorUnkKLTR.hpp index 594e762e6..86f5047af 100644 --- a/include/Actor/ActorUnkKLTR.hpp +++ b/include/Actor/ActorUnkKLTR.hpp @@ -17,59 +17,77 @@ class ActorUnkKLTR_c4 : public Actor_c4 { /* 0C */ virtual void vfunc_0c(unk32 param1) override; }; -class ActorUnkKLTR : public Actor { +class ActorUnkKLTR : public Actor_Derived1, public Actor_UnkSystem1_Base { public: - /* 00 (base) */ - /* 94 */ + /* 000 (base) */ + /* 0A4 */ Actor_UnkSystem2 *mUnk_0A4; + /* 0A8 */ Actor_UnkSystem2 mUnk_0A8; + /* 294 */ Actor_UnkStruct1 mUnk_294; + /* 2B4 */ Actor_9c mUnk_2B4; + /* 2D4 */ Actor_UnkSystem3_Derived1 mUnk_2D4; + /* 304 */ bool mUnk_300; + /* 305 */ unk8 mUnk_301; // pad? + /* 306 */ unk8 mUnk_302; // pad? + /* 307 */ unk8 mUnk_303; // pad? + /* 304 */ Actor_UnkSystem4 mUnk_304; + /* 314 */ Actor_UnkStruct4 mUnk_314; + /* 318 */ Actor_UnkStruct5 mUnk_330; + /* 950 */ unk32 mUnk_950; + /* 954 */ unk32 mUnk_954; + /* 958 */ Actor_UnkSystem9_2 mUnk_958; + /* AF0 */ Actor_UnkSystem10_2 mUnk_AF0; + /* AF4 */ UnkSystem7_Base mUnk_AF4[4]; + /* B04 */ STRUCT_PAD(0xB04, 0xB14); + /* B14 */ unk32 mUnk_B14; ActorUnkKLTR(); + /* 18 */ virtual bool vfunc_18(unk32 param1) override; + /* 1C */ virtual void vfunc_1c() override; + /* 20 */ virtual void vfunc_20() override; + /* 24 */ virtual void vfunc_24() override; + /* 2C */ virtual void vfunc_2c(unk32 param1) override; + /* 30 */ virtual void vfunc_30() override; /* 4C */ virtual ~ActorUnkKLTR() override; void func_ov026_021116e0(void); - void func_ov026_02111974(void); - void func_ov026_0211197c(void); - void func_ov026_02111a84(void); - void func_ov026_02111aa4(void); void func_ov026_02111ac4(void); void func_ov026_02111c08(void); void func_ov026_02111d50(void); - void func_ov026_02111d54(void); - void func_ov026_02111f3c(void); void func_ov026_0211202c(void); void func_ov026_0211205c(void); void func_ov026_02112088(void); void func_ov026_0211210c(void); void func_ov026_02112328(void); - void func_ov026_021127e8(void); + bool func_ov026_021127e8(void); void func_ov026_02112850(void); void func_ov026_02112944(void); - void func_ov026_02112bd4(void); - void func_ov026_02112ca8(void); + bool func_ov026_02112bd4(void); + bool func_ov026_02112ca8(void); void func_ov026_02112cbc(void); void func_ov026_02112cc0(void); void func_ov026_02112e28(void); - void func_ov026_02112ecc(void); + bool func_ov026_02112ecc(void); void func_ov026_02112f08(void); - void func_ov026_02112fb0(void); + bool func_ov026_02112fb0(void); void func_ov026_02112fec(void); - void func_ov026_02112ff8(void); + bool func_ov026_02112ff8(void); void func_ov026_02113040(void); - void func_ov026_02113118(void); + bool func_ov026_02113118(void); void func_ov026_02113204(void); void func_ov026_021132c0(void); void func_ov026_02113304(void); - void func_ov026_021133b0(void); + bool func_ov026_021133b0(void); void func_ov026_0211340c(void); - void func_ov026_021134c8(void); + bool func_ov026_021134c8(void); void func_ov026_0211350c(void); - void func_ov026_021135b8(void); + bool func_ov026_021135b8(void); void func_ov026_021135e4(void); - void func_ov026_02113704(void); + bool func_ov026_02113704(void); void func_ov026_02113718(void); void func_ov026_02113784(void); void func_ov026_0211391c(void); - void func_ov026_02113a40(void); + bool func_ov026_02113a40(void); void func_ov026_02113a5c(void); void func_ov026_02113b5c(void); void func_ov026_02113b98(void); diff --git a/include/MapObject/MapObjectProfile.hpp b/include/MapObject/MapObjectProfile.hpp index a9854c513..37eb1af21 100644 --- a/include/MapObject/MapObjectProfile.hpp +++ b/include/MapObject/MapObjectProfile.hpp @@ -1,17 +1,17 @@ #pragma once #include "Map/MapObjectId.hpp" -#include "MapObject/MapObjectProfile_Derived2_20.hpp" #include "Physics/Cylinder.hpp" #include "System/SysNew.hpp" #include "Unknown/Common.hpp" +#include "Unknown/UnkActorFileSystem.hpp" #include "Unknown/UnkStruct_ov000_020b4f84.hpp" #include "profile.hpp" #include "types.h" class MapObject; class MapObject_20; -class MapObjectProfile_Derived2_20; +class UnkActorFileSystem_Base; class MapObjectProfile : public SysObject { public: @@ -36,7 +36,7 @@ class MapObjectProfile : public SysObject { // data_ov000_020b3524 /* 00 */ virtual MapObject *Create() = 0; - /* 04 */ virtual MapObjectProfile_Derived2_20 *vfunc_04(); + /* 04 */ virtual UnkActorFileSystem_Base *vfunc_04(); /* 08 */ virtual void vfunc_08(); /* 0C */ virtual void vfunc_0C(); /* 10 */ virtual void vfunc_10(); @@ -53,7 +53,7 @@ class MapObjectProfile : public SysObject { class MapObjectProfile_Derived1 : public MapObjectProfile { public: /* 00 (base) */ - /* 20 */ MapObjectProfile_Derived2_20 *mUnk_20[16]; + /* 20 */ UnkActorFileSystem_Base *mUnk_20[16]; /* 60 */ unk32 mUnk_60; /* 64 */ unk16 mUnk_64; /* 66 */ unk16 mUnk_66; @@ -62,12 +62,12 @@ class MapObjectProfile_Derived1 : public MapObjectProfile { MapObjectProfile_Derived1(MapObjectId mapObjId, unk32 param2, unk32 param3); // func_ov000_0209cb4c // data_ov000_020b3540 - /* 04 */ virtual MapObjectProfile_Derived2_20 *vfunc_04(); + /* 04 */ virtual UnkActorFileSystem_Base *vfunc_04(); /* 08 */ virtual void vfunc_08(); /* 0C */ virtual void vfunc_0C(); /* 10 */ virtual void vfunc_10(); /* 14 */ virtual ~MapObjectProfile_Derived1(); - /* 1C */ virtual MapObjectProfile_Derived2_20 *vfunc_1C(unk32 param1); + /* 1C */ virtual UnkActorFileSystem_Base *vfunc_1C(unk32 param1); void func_ov000_0209ccd8(unk32 param1, u32 param2); }; @@ -75,14 +75,14 @@ class MapObjectProfile_Derived1 : public MapObjectProfile { class MapObjectProfile_Derived2 : public MapObjectProfile { public: /* 00 (base) */ - /* 20 */ MapObjectProfile_Derived2_20 mUnk_20; + /* 20 */ UnkActorFileSystem1 mUnk_20; /* D4 */ MapObjectProfile_Derived2(MapObjectId mapObjId1, MapObjectId mapObjId2); // func_ov000_0209c9a8 ~MapObjectProfile_Derived2(); // data_ov000_020b3508 - /* 04 */ virtual MapObjectProfile_Derived2_20 *vfunc_04() override; + /* 04 */ virtual UnkActorFileSystem_Base *vfunc_04() override; /* 08 */ virtual void vfunc_08() override; /* 0C */ virtual void vfunc_0C() override; /* 10 */ virtual void vfunc_10() override; @@ -91,14 +91,14 @@ class MapObjectProfile_Derived2 : public MapObjectProfile { class MapObjectProfile_Derived3 : public MapObjectProfile { public: /* 00 (base) */ - /* 20 */ MapObjectProfile_Derived2_20 *mUnk_20; + /* 20 */ UnkActorFileSystem_Base *mUnk_20; /* 24 */ MapObjectProfile_Derived3(MapObjectId mapObjId1, MapObjectId mapObjId2); // func_ov000_0209ca88 ~MapObjectProfile_Derived3() {} // data_ov000_020b34ec - /* 04 */ virtual MapObjectProfile_Derived2_20 *vfunc_04() override; + /* 04 */ virtual UnkActorFileSystem_Base *vfunc_04() override; /* 08 */ virtual void vfunc_08() override; }; diff --git a/include/Player/PlayerGet.hpp b/include/Player/PlayerGet.hpp index c02f791af..a873fc1c6 100644 --- a/include/Player/PlayerGet.hpp +++ b/include/Player/PlayerGet.hpp @@ -51,19 +51,6 @@ class UnkStruct_PlayerGet_74 : public UnkStruct_PlayerGet_74_base { } }; -class UnkStruct_PlayerGet_ec { -public: - /* 00 */ unk32 *mUnk_00; - /* 04 */ - - UnkStruct_PlayerGet_ec(unk32 *param1) { - this->mUnk_00 = param1; - } - - UnkStruct_PlayerGet_ec(); - ~UnkStruct_PlayerGet_ec(); -}; - class UnkStruct_PlayerGet_50 { public: unk32 func_01ff8fa8(); diff --git a/include/Unknown/Common.hpp b/include/Unknown/Common.hpp index a88a71be1..63e209198 100644 --- a/include/Unknown/Common.hpp +++ b/include/Unknown/Common.hpp @@ -970,3 +970,43 @@ class UnkSystem6 { /* 18 */ virtual void vfunc_18(); /* 1C */ }; + +struct UnkSystem7_UnkStruct_00 { + /* 00 */ STRUCT_PAD(0x00, 0x24); + /* 24 */ unk32 mUnk_24; + /* 28 */ STRUCT_PAD(0x28, 0xA4); + /* A4 */ unk16 mUnk_A4; +}; + +class UnkSystem7_Base { +public: + /* 00 */ UnkSystem7_UnkStruct_00 *mUnk_00; + /* 04 */ + + ~UnkSystem7_Base(); +}; + +class UnkSystem7 : public UnkSystem7_Base { +public: + /* 00 (base) */ + /* 04 */ + + UnkSystem7() {} + UnkSystem7(UnkSystem7_UnkStruct_00 *param1) { + this->mUnk_00 = param1; + } + + void func_ov000_020a0304(void); + void func_ov000_020a0334(); +}; + +class UnkStruct_PlayerGet_ec : public UnkSystem7 { +public: + /* 00 (base) */ + /* 04 */ + + UnkStruct_PlayerGet_ec(UnkSystem7_UnkStruct_00 *param1) : + UnkSystem7(param1) {} + + UnkStruct_PlayerGet_ec(); +}; diff --git a/include/MapObject/MapObjectProfile_Derived2_20.hpp b/include/Unknown/UnkActorFileSystem.hpp similarity index 57% rename from include/MapObject/MapObjectProfile_Derived2_20.hpp rename to include/Unknown/UnkActorFileSystem.hpp index 816032e08..2d6f434bd 100644 --- a/include/MapObject/MapObjectProfile_Derived2_20.hpp +++ b/include/Unknown/UnkActorFileSystem.hpp @@ -1,30 +1,31 @@ #pragma once +#include "Actor/ActorId.hpp" #include "Map/MapObjectId.hpp" #include "Unknown/Common.hpp" #include "types.h" -class MapObjectProfile_Derived2_20_Base_18 { +class UnkActorFileSystem_Base_18 { public: /* 00 */ unk32 mUnk_00; /* 04 */ unk32 mUnk_04; /* 08 */ - MapObjectProfile_Derived2_20_Base_18(); // func_02016620 + UnkActorFileSystem_Base_18(); // func_02016620 }; -class MapObjectProfile_Derived2_20_Base_20 { +class UnkActorFileSystem_Base_20 { public: /* 00 */ void *mUnk_00; /* 04 */ void *mUnk_04; /* 08 */ unk32 mUnk_08; /* 0C */ - MapObjectProfile_Derived2_20_Base_20(unk32 param1, unk32 param2, unk32 param3, unk32 param4, - unk32 param5); // func_020153fc + UnkActorFileSystem_Base_20(unk32 param1, unk32 param2, unk32 param3, unk32 param4, + unk32 param5); // func_020153fc }; -class MapObjectProfile_Derived2_20_Base_50 { +class UnkActorFileSystem_Base_50 { public: /* 00 */ unk32 mUnk_00; /* 04 */ unk32 mUnk_04; @@ -37,11 +38,11 @@ class MapObjectProfile_Derived2_20_Base_50 { /* 0C */ u16 mUnk_0E; /* 10 */ - MapObjectProfile_Derived2_20_Base_50(); - ~MapObjectProfile_Derived2_20_Base_50(); + UnkActorFileSystem_Base_50(); + ~UnkActorFileSystem_Base_50(); }; -class MapObjectProfile_Derived2_20_Base_54 { +class UnkActorFileSystem_Base_54 { public: /* 00 */ unk32 mUnk_00; /* 04 */ unk32 mUnk_04; @@ -49,11 +50,11 @@ class MapObjectProfile_Derived2_20_Base_54 { /* 0C */ unk32 mUnk_0C; /* 10 */ - MapObjectProfile_Derived2_20_Base_54(); - ~MapObjectProfile_Derived2_20_Base_54(); + UnkActorFileSystem_Base_54(); + ~UnkActorFileSystem_Base_54(); }; -class MapObjectProfile_Derived2_20_Base { +class UnkActorFileSystem_Base { public: /* 00 (vtable) */ /* 04 */ const char *mUnk_04; @@ -64,19 +65,19 @@ class MapObjectProfile_Derived2_20_Base { /* 15 */ unk8 mUnk_15; // bool? /* 16 */ unk8 mUnk_16; // bool? /* 17 */ unk8 mUnk_17; // pad? - /* 18 */ MapObjectProfile_Derived2_20_Base_18 mUnk_18; - /* 20 */ MapObjectProfile_Derived2_20_Base_20 mUnk_20; + /* 18 */ UnkActorFileSystem_Base_18 mUnk_18; + /* 20 */ UnkActorFileSystem_Base_20 mUnk_20; /* 2C */ UnkFileSystem3 mUnk_2C; /* 3C */ UnkFileSystem5 mUnk_3C; - /* 50 */ MapObjectProfile_Derived2_20_Base_50 *mUnk_50; - /* 54 */ MapObjectProfile_Derived2_20_Base_54 mUnk_54[4]; + /* 50 */ UnkActorFileSystem_Base_50 *mUnk_50; + /* 54 */ UnkActorFileSystem_Base_54 mUnk_54[4]; /* 94 */ - MapObjectProfile_Derived2_20_Base(const char *directory, void *param2, void *param3, void *param4, unk32 param5, - unk32 param6); // func_ov000_02058540 + UnkActorFileSystem_Base(const char *directory, void *param2, void *param3, void *param4, unk32 param5, + unk32 param6); // func_ov000_02058540 // data_ov000_020b1b14 - /* 00 */ virtual ~MapObjectProfile_Derived2_20_Base(); + /* 00 */ virtual ~UnkActorFileSystem_Base(); /* 08 */ void func_ov000_020586b4(unk32 param1, unk32 param2, unk32 param3, unk32 param4); @@ -90,7 +91,7 @@ class MapObjectProfile_Derived2_20_Base { void func_ov000_02058ab0(void); }; -class MapObjectProfile_Derived2_20 : public MapObjectProfile_Derived2_20_Base { +class UnkActorFileSystem1 : public UnkActorFileSystem_Base { public: /* 00 (base) */ /* 94 */ unk16 mUnk_94; @@ -104,13 +105,26 @@ class MapObjectProfile_Derived2_20 : public MapObjectProfile_Derived2_20_Base { /* B3 */ unk8 mUnk_B3; // pad? /* B4 */ - MapObjectProfile_Derived2_20(); - MapObjectProfile_Derived2_20(MapObjectId mapObjId2); // func_ov000_0209ce08 + UnkActorFileSystem1(); + UnkActorFileSystem1(MapObjectId mapObjId2); // func_ov000_0209ce08 // data_ov000_020b3568 - /* 00 */ virtual ~MapObjectProfile_Derived2_20() override; + /* 00 */ virtual ~UnkActorFileSystem1() override; void func_ov000_0209cef0(); void func_ov000_0209cfac(); void func_ov000_0209cfdc(unk32 param1, unk32 param2); }; + +class UnkActorFileSystem2 : public UnkActorFileSystem_Base { +public: + /* 00 (base) */ + /* 94 */ unk16 mUnk_94; + /* 96 */ unk16 mUnk_96; + /* 98 */ + + UnkActorFileSystem2(ActorId actorId2); // func_ov000_02097af8 + + // data_ov000_020b3084 + /* 00 */ virtual ~UnkActorFileSystem2() override; +}; diff --git a/src/000_Second/MapObject/MapObjectMiniBlocks.cpp b/src/000_Second/MapObject/MapObjectMiniBlocks.cpp index e974483ba..abac4d429 100644 --- a/src/000_Second/MapObject/MapObjectMiniBlocks.cpp +++ b/src/000_Second/MapObject/MapObjectMiniBlocks.cpp @@ -76,8 +76,7 @@ ARM bool MapObjectMiniBlocks::vfunc_00(void) { break; } - MapObjectProfile_Derived2_20_Base_50 *ptr = - GET_PROFILE(MapObjectProfileMiniBlocks)->vfunc_1C(this->mUnk_20.mUnk_00[1])->mUnk_50; + UnkActorFileSystem_Base_50 *ptr = GET_PROFILE(MapObjectProfileMiniBlocks)->vfunc_1C(this->mUnk_20.mUnk_00[1])->mUnk_50; void *var_r1; if (ptr != NULL) { u16 *temp_r1 = (u16 *) ((u8 *) ptr + 8); diff --git a/src/000_Second/MapObject/MapObjectProfile.cpp b/src/000_Second/MapObject/MapObjectProfile.cpp index 1ee4e414e..b40a71879 100644 --- a/src/000_Second/MapObject/MapObjectProfile.cpp +++ b/src/000_Second/MapObject/MapObjectProfile.cpp @@ -57,7 +57,7 @@ ARM MapObjectProfile::~MapObjectProfile() { MapObject_20::func_ov000_0209c7ac(this->mMapObjId); } -ARM MapObjectProfile_Derived2_20 *MapObjectProfile::vfunc_04() { +ARM UnkActorFileSystem_Base *MapObjectProfile::vfunc_04() { return NULL; } @@ -105,7 +105,7 @@ ARM MapObjectProfile_Derived2::~MapObjectProfile_Derived2() { this->vfunc_10(); } -ARM MapObjectProfile_Derived2_20 *MapObjectProfile_Derived2::vfunc_04() { +ARM UnkActorFileSystem_Base *MapObjectProfile_Derived2::vfunc_04() { return &this->mUnk_20; } @@ -131,7 +131,7 @@ ARM MapObjectProfile_Derived3::MapObjectProfile_Derived3(MapObjectId mapObjId1, this->mUnk_14 = mapObjId2; } -ARM MapObjectProfile_Derived2_20 *MapObjectProfile_Derived3::vfunc_04() { +ARM UnkActorFileSystem_Base *MapObjectProfile_Derived3::vfunc_04() { return this->mUnk_20; } @@ -156,12 +156,12 @@ ARM MapObjectProfile_Derived1::MapObjectProfile_Derived1(MapObjectId mapObjId, u MapObjectProfile(mapObjId), mUnk_60(param3), mUnk_64(param2) { - for (MapObjectProfile_Derived2_20 **ptr = this->mUnk_20; ptr != &this->mUnk_20[ARRAY_LEN(this->mUnk_20)]; ptr++) { + for (UnkActorFileSystem_Base **ptr = this->mUnk_20; ptr != &this->mUnk_20[ARRAY_LEN(this->mUnk_20)]; ptr++) { *ptr = NULL; } } -ARM MapObjectProfile_Derived2_20 *MapObjectProfile_Derived1::vfunc_04() { +ARM UnkActorFileSystem_Base *MapObjectProfile_Derived1::vfunc_04() { if (this->mUnk_64 >= 0) { return this->mUnk_20[this->mUnk_64]; } @@ -169,7 +169,7 @@ ARM MapObjectProfile_Derived2_20 *MapObjectProfile_Derived1::vfunc_04() { return NULL; } -ARM MapObjectProfile_Derived2_20 *MapObjectProfile_Derived1::vfunc_1C(unk32 param1) { +ARM UnkActorFileSystem_Base *MapObjectProfile_Derived1::vfunc_1C(unk32 param1) { if (param1 >= 0) { return this->mUnk_20[param1]; } @@ -178,16 +178,16 @@ ARM MapObjectProfile_Derived2_20 *MapObjectProfile_Derived1::vfunc_1C(unk32 para } ARM MapObjectProfile_Derived1::~MapObjectProfile_Derived1() { - for (MapObjectProfile_Derived2_20 **ptr = this->mUnk_20; ptr != &this->mUnk_20[ARRAY_LEN(this->mUnk_20)]; ptr++) { + for (UnkActorFileSystem_Base **ptr = this->mUnk_20; ptr != &this->mUnk_20[ARRAY_LEN(this->mUnk_20)]; ptr++) { delete *ptr; } } ARM void MapObjectProfile_Derived1::func_ov000_0209ccd8(unk32 param1, u32 param2) { if (this->mUnk_20[param1] == NULL) { - MapObjectProfile_Derived2_20 *ptr = new(HeapIndex_1) MapObjectProfile_Derived2_20(param2); - MapObjectProfile_Derived2_20 **ppUnk_20 = this->mUnk_20; - ppUnk_20[param1] = ptr; + UnkActorFileSystem1 *ptr = new(HeapIndex_1) UnkActorFileSystem1(param2); + UnkActorFileSystem1 **ppUnk_20 = (UnkActorFileSystem1 **) this->mUnk_20; + ppUnk_20[param1] = ptr; ppUnk_20[param1]->func_ov000_0209cfdc(0, 0); ppUnk_20[param1]->func_ov000_020586b4(0, 0, 0, 0); ppUnk_20[param1]->func_ov000_02058ab0(); @@ -201,7 +201,7 @@ ARM void MapObjectProfile_Derived1::vfunc_08() { } ARM void MapObjectProfile_Derived1::vfunc_0C() { - for (MapObjectProfile_Derived2_20 **ptr = this->mUnk_20; ptr != &this->mUnk_20[ARRAY_LEN(this->mUnk_20)]; ptr++) { + for (UnkActorFileSystem_Base **ptr = this->mUnk_20; ptr != &this->mUnk_20[ARRAY_LEN(this->mUnk_20)]; ptr++) { if (*ptr != NULL && (*ptr)->mUnk_20.mUnk_04 != NULL) { (*ptr)->func_ov000_02058914(0); } @@ -209,7 +209,7 @@ ARM void MapObjectProfile_Derived1::vfunc_0C() { } ARM void MapObjectProfile_Derived1::vfunc_10() { - for (MapObjectProfile_Derived2_20 **ptr = this->mUnk_20; ptr != &this->mUnk_20[ARRAY_LEN(this->mUnk_20)]; ptr++) { + for (UnkActorFileSystem_Base **ptr = this->mUnk_20; ptr != &this->mUnk_20[ARRAY_LEN(this->mUnk_20)]; ptr++) { if (*ptr != NULL) { delete *ptr; *ptr = NULL; diff --git a/src/000_Second/MapObject/MapObjectSwitchStep.cpp b/src/000_Second/MapObject/MapObjectSwitchStep.cpp index a6e8fff78..428d72981 100644 --- a/src/000_Second/MapObject/MapObjectSwitchStep.cpp +++ b/src/000_Second/MapObject/MapObjectSwitchStep.cpp @@ -88,7 +88,7 @@ ARM MapObjectSwitchStep::MapObjectSwitchStep() : this->mUnk_EA = 0; this->mUnk_EB = 0; - MapObjectProfile_Derived2_20_Base_50 *ptr = GET_PROFILE_20_50(MapObjectProfileSwitchStep); + UnkActorFileSystem_Base_50 *ptr = GET_PROFILE_20_50(MapObjectProfileSwitchStep); void *var_r1; if (ptr != NULL) { u8 *temp_r1 = (u8 *) ptr + 8; @@ -113,8 +113,8 @@ ARM MapObjectSwitchStep::MapObjectSwitchStep() : this->mUnk_40.vfunc_08((unk32) var_r1); this->mUnk_A4.mUnk_00 = this->mUnk_40.mUnk_04; - MapObjectProfile_Derived2_20 *temp_r6 = GET_PROFILE_20(MapObjectProfileSwitchStep); - unk32 temp_r5 = temp_r6->func_ov000_02058a24(); + UnkActorFileSystem_Base *temp_r6 = GET_PROFILE_20(MapObjectProfileSwitchStep); + unk32 temp_r5 = temp_r6->func_ov000_02058a24(); this->mUnk_A4.func_ov000_020577a4(temp_r6->func_ov000_02058a84(3, data_ov000_020af550), temp_r5, 1); this->mUnk_10 = GET_PROFILE_D4(MapObjectProfileSwitchStep); diff --git a/src/000_Second/MapObject/MapObjectProfile_Derived2_20.cpp b/src/000_Second/UnkActorFileSystem/UnkActorFileSystem1.cpp similarity index 67% rename from src/000_Second/MapObject/MapObjectProfile_Derived2_20.cpp rename to src/000_Second/UnkActorFileSystem/UnkActorFileSystem1.cpp index 2b9cf27db..492aa8885 100644 --- a/src/000_Second/MapObject/MapObjectProfile_Derived2_20.cpp +++ b/src/000_Second/UnkActorFileSystem/UnkActorFileSystem1.cpp @@ -1,4 +1,4 @@ -#include "MapObject/MapObjectProfile_Derived2_20.hpp" +#include "Unknown/UnkActorFileSystem.hpp" #include @@ -7,8 +7,8 @@ void func_02015ea8(u32 resourceId, void *); unk32 func_02012fa8(const char *); } -ARM MapObjectProfile_Derived2_20::MapObjectProfile_Derived2_20(MapObjectId mapObjId2) : - MapObjectProfile_Derived2_20_Base("MapObj", &mUnk_94, &mUnk_94, &mUnk_94, 0, 0), +ARM UnkActorFileSystem1::UnkActorFileSystem1(MapObjectId mapObjId2) : + UnkActorFileSystem_Base("MapObj", &mUnk_94, &mUnk_94, &mUnk_94, 0, 0), mUnk_94(0), mUnk_98(0), mUnk_B0(false), @@ -16,12 +16,12 @@ ARM MapObjectProfile_Derived2_20::MapObjectProfile_Derived2_20(MapObjectId mapOb func_02015ea8(mapObjId2, &this->mUnk_94); } -ARM MapObjectProfile_Derived2_20::~MapObjectProfile_Derived2_20() { +ARM UnkActorFileSystem1::~UnkActorFileSystem1() { this->func_ov000_020589e4(); this->func_ov000_0209cfac(); } -ARM void MapObjectProfile_Derived2_20::func_ov000_0209cef0() { +ARM void UnkActorFileSystem1::func_ov000_0209cef0() { char path[32 + 1]; size_t curLength; @@ -48,11 +48,11 @@ ARM void MapObjectProfile_Derived2_20::func_ov000_0209cef0() { } } -ARM void MapObjectProfile_Derived2_20::func_ov000_0209cfac() { +ARM void UnkActorFileSystem1::func_ov000_0209cfac() { if (this->mUnk_B0) { this->mUnk_9C.vfunc_0C(); this->mUnk_B0 = false; } } -ARM void MapObjectProfile_Derived2_20::func_ov000_0209cfdc(unk32 param1, unk32 param2) {} +ARM void UnkActorFileSystem1::func_ov000_0209cfdc(unk32 param1, unk32 param2) {} diff --git a/src/026_Train/Actor/ActorUnkDKTR.cpp b/src/026_Train/Actor/ActorUnkDKTR.cpp index 334467186..c616935d2 100644 --- a/src/026_Train/Actor/ActorUnkDKTR.cpp +++ b/src/026_Train/Actor/ActorUnkDKTR.cpp @@ -10,24 +10,56 @@ ARM Actor *ActorProfileUnkDKTR::Create() { } ARM ActorProfileUnkDKTR::ActorProfileUnkDKTR() : - ActorProfile_Derived1(ActorId_DKTR) {} + ActorProfile_Derived1(ActorId_DKTR) { + for (s8 i = 0; i < ARRAY_LEN(this->mUnk_16); i++) { + this->mUnk_16[i] = 2; + } -ARM ActorUnkDKTR::ActorUnkDKTR() {} + this->mUnk_04.pos.x = FLOAT_TO_Q20(0.0f); + this->mUnk_04.pos.y = FLOAT_TO_Q20(0.25f); + this->mUnk_04.pos.z = FLOAT_TO_Q20(0.0f); + this->mUnk_04.size = FLOAT_TO_Q20(0.25f); + + this->mUnk_3C.mUnk_15 = 1; +} + +ARM ActorUnkDKTR::ActorUnkDKTR() : + mUnk_0A8((Actor_UnkSystem2 *) &mUnk_0AC), + mUnk_0AC(1, 0), + mUnk_304(0) { + this->mUnk_B30 = 0x79; + this->mUnk_B34 = 0; + this->mUnk_B38 = 0; + this->mUnk_B3A = -1; + this->mUnk_B3B = 0; + this->mUnk_B3C = 0; + this->mUnk_B3D = 0; + this->mUnk_B3E = 0x2B; + this->mUnk_B3F = 0; + this->mUnk_B40 = 0; + this->mUnk_B44 = 0; + this->func_ov000_0209862c(4); + this->mUnk_48 = 5; + this->mUnk_318.mUnk_10.func_ov026_02101c54(GET_PROFILE(ActorProfileUnkDKTR)->vfunc_04()); + this->mUnk_0A8->func_ov026_020ee538(this->mUnk_318.mUnk_10.mUnk_00); +} + +ARM ActorUnkDKTR::~ActorUnkDKTR() {} ARM void ActorUnkDKTR::func_ov026_0212b958(void) {} -ARM void ActorUnkDKTR::func_ov026_0212bc90(void) {} -ARM void ActorUnkDKTR::func_ov026_0212bc98(void) {} -ARM void ActorUnkDKTR::func_ov026_0212bda0(void) {} -ARM void ActorUnkDKTR::func_ov026_0212bdc0(void) {} +ARM bool ActorUnkDKTR::vfunc_18(unk32 param1) {} +ARM void ActorUnkDKTR::vfunc_1c(void) {} +ARM void ActorUnkDKTR::vfunc_20(void) {} +ARM void ActorUnkDKTR::vfunc_24(void) {} ARM void ActorUnkDKTR::func_ov026_0212bde0(void) {} ARM void ActorUnkDKTR::func_ov026_0212bfec(void) {} ARM void ActorUnkDKTR::func_ov026_0212c134(void) {} -ARM void ActorUnkDKTR::func_ov026_0212c138(void) {} -ARM void ActorUnkDKTR::func_ov026_0212c2a8(void) {} +ARM void ActorUnkDKTR::vfunc_2c(unk32 param1) {} +ARM void ActorUnkDKTR::vfunc_30(void) {} ARM void ActorUnkDKTR::func_ov026_0212c398(void) {} ARM void ActorUnkDKTR::func_ov026_0212c3c8(void) {} ARM void ActorUnkDKTR::func_ov026_0212c3f4(void) {} -ARM void ActorUnkDKTR::func_ov026_0212c478(void) {} +ARM void ActorUnkDKTR::vfunc2_0C(void) {} ARM void ActorUnkDKTR::func_ov026_0212c56c(void) {} ARM void ActorUnkDKTR::func_ov026_0212c624(void) {} ARM void ActorUnkDKTR::func_ov026_0212ca18(void) {} @@ -64,5 +96,4 @@ ARM void ActorUnkDKTR::func_ov026_0212e178(void) {} ARM void ActorUnkDKTR::func_ov026_0212e278(void) {} ARM void ActorUnkDKTR::func_ov026_0212e2b4(void) {} -ARM ActorUnkDKTR::~ActorUnkDKTR() {} ARM ActorProfileUnkDKTR::~ActorProfileUnkDKTR() {} diff --git a/src/026_Train/Actor/ActorUnkKLTR.cpp b/src/026_Train/Actor/ActorUnkKLTR.cpp index 20730b2ba..65d5b2a08 100644 --- a/src/026_Train/Actor/ActorUnkKLTR.cpp +++ b/src/026_Train/Actor/ActorUnkKLTR.cpp @@ -1,7 +1,14 @@ //! TODO: This file was generated automatically and might contain errors #include "Actor/ActorUnkKLTR.hpp" +#include "System/Random.hpp" #include "System/SysNew.hpp" +#include "Unknown/UnkStruct_027e09a8.hpp" + +extern "C" { +void func_ov026_02102934(unk32); +bool func_ov026_02132010(u16); +}; ARM DECL_PROFILE(ActorProfileUnkKLTR); @@ -10,57 +17,248 @@ ARM Actor *ActorProfileUnkKLTR::Create() { } ARM ActorProfileUnkKLTR::ActorProfileUnkKLTR() : - ActorProfile_Derived1(ActorId_KLTR) {} + ActorProfile_Derived1(ActorId_KLTR) { + for (s8 i = 0; i < ARRAY_LEN(this->mUnk_16); i++) { + this->mUnk_16[i] = 2; + } + + this->mUnk_04.pos.x = FLOAT_TO_Q20(0.0f); + this->mUnk_04.pos.y = FLOAT_TO_Q20(0.25f); + this->mUnk_04.pos.z = FLOAT_TO_Q20(0.0f); + this->mUnk_04.size = FLOAT_TO_Q20(0.25f); + + this->mUnk_3C.mUnk_15 = 1; +} + +ARM void ActorUnkKLTR::func_ov026_021116e0(void) { + func_ov026_02102934(1); +} -ARM ActorUnkKLTR::ActorUnkKLTR() {} +ARM ActorUnkKLTR::ActorUnkKLTR() : + mUnk_0A4(&mUnk_0A8), + mUnk_0A8(1, 0), + mUnk_300(0) { + this->mUnk_B14 = 0; + this->func_ov000_0209862c(4); + this->mUnk_48 = 5; + this->mUnk_314.mUnk_10.func_ov026_0210136c(GET_PROFILE(ActorProfileUnkKLTR)->vfunc_04()); + this->mUnk_0A4->func_ov026_020ee538(this->mUnk_314.mUnk_10.mUnk_00); +} + +ARM ActorUnkKLTR::~ActorUnkKLTR() {} + +ARM bool ActorUnkKLTR::vfunc_18(unk32 param1) { + return true; +} + +ARM void ActorUnkKLTR::vfunc_1c(void) {} + +ARM void ActorUnkKLTR::vfunc_20(void) { + this->func_ov026_02111ac4(); + this->func_ov026_02111c08(); + this->func_ov026_02111d50(); +} + +ARM void ActorUnkKLTR::vfunc_24(void) { + this->func_ov026_02111ac4(); + this->func_ov026_02111c08(); + this->func_ov026_02111d50(); +} -ARM void ActorUnkKLTR::func_ov026_021116e0(void) {} -ARM void ActorUnkKLTR::func_ov026_02111974(void) {} -ARM void ActorUnkKLTR::func_ov026_0211197c(void) {} -ARM void ActorUnkKLTR::func_ov026_02111a84(void) {} -ARM void ActorUnkKLTR::func_ov026_02111aa4(void) {} ARM void ActorUnkKLTR::func_ov026_02111ac4(void) {} ARM void ActorUnkKLTR::func_ov026_02111c08(void) {} ARM void ActorUnkKLTR::func_ov026_02111d50(void) {} -ARM void ActorUnkKLTR::func_ov026_02111d54(void) {} -ARM void ActorUnkKLTR::func_ov026_02111f3c(void) {} -ARM void ActorUnkKLTR::func_ov026_0211202c(void) {} -ARM void ActorUnkKLTR::func_ov026_0211205c(void) {} -ARM void ActorUnkKLTR::func_ov026_02112088(void) {} +ARM void ActorUnkKLTR::vfunc_2c(unk32 param1) {} +ARM void ActorUnkKLTR::vfunc_30(void) {} + +ARM void ActorUnkKLTR::func_ov026_0211202c(void) { + if (!this->mUnk_0A8.mUnk_182) { + return; + } + unk32 tmp = this->mUnk_0A8.func_ov026_020fa7f4(); + this->mUnk_958.func_ov026_02105468(tmp); +} + +ARM void ActorUnkKLTR::func_ov026_0211205c(void) { + if (!this->mUnk_0A8.mUnk_182) { + return; + } + unk32 tmp = this->mUnk_0A8.func_ov026_020fa7f4(); + this->mUnk_314.mUnk_10.func_ov026_021016d8(tmp); +} + +ARM void ActorUnkKLTR::func_ov026_02112088(void) { + this->mUnk_314.mUnk_0C[0] = this->mUnk_314.mUnk_0C[0] & ~0x02; + + for (u32 i = 0; i < 2; i++) { + unk32 var_r0; + unk32 value = this->mUnk_0A8.func_ov026_020fac30(this->mRef.Get32(), (i + 1) << 12, 0x333, 1); + + if ((value | ((u32) (this->mUnk_314.mUnk_0C[0] << 0x1E) >> 0x1F)) != 0) { + var_r0 = 1; + } else { + var_r0 = 0; + } + + this->mUnk_314.mUnk_0C[0] = (*(volatile u8 *) &this->mUnk_314.mUnk_0C[0] & ~2) | ((u32) (var_r0 << 0x1F) >> 0x1E); + } +} + ARM void ActorUnkKLTR::func_ov026_0211210c(void) {} + ARM void ActorUnkKLTR::func_ov026_02112328(void) {} -ARM void ActorUnkKLTR::func_ov026_021127e8(void) {} + +ARM bool ActorUnkKLTR::func_ov026_021127e8(void) { + bool tmp = this->func_ov000_02098a60(1); + if (!tmp) { + tmp = this->func_ov000_02098a60(0); + if (tmp) { + return true; + } + if (this->mUnk_76 == 0 && (this->mUnk_6E == 0 || func_ov026_02132010(this->mUnk_6E))) { + return true; + } + } + return false; +} + ARM void ActorUnkKLTR::func_ov026_02112850(void) {} + ARM void ActorUnkKLTR::func_ov026_02112944(void) {} -ARM void ActorUnkKLTR::func_ov026_02112bd4(void) {} -ARM void ActorUnkKLTR::func_ov026_02112ca8(void) {} + +ARM bool ActorUnkKLTR::func_ov026_02112bd4(void) { + if (this->mUnk_300 != 0) { + bool res1 = this->mUnk_0A8.func_ov026_020fa55c(); + if (!res1) { + this->mUnk_300 = 0; + return false; + } + return res1; + } + + bool res2 = this->mUnk_0A8.func_ov026_020fa55c(); + if (!res2) { + return res2; + } + + u32 randomHighWord = gRandom.ConditionalNext32(0); + + if (randomHighWord & 0x80000000) { + this->mUnk_0A4->mUnk_03C = 1; + } else { + this->mUnk_0A4->mUnk_03C = 3; + } + + if (this->mUnk_0A8.func_ov026_020fa358()) { + if (!this->mUnk_0A8.func_ov026_020fa46c(this->mUnk_0A8.func_ov026_020fa73c(), this->mUnk_70)) { + this->mUnk_0A8.func_ov026_020fa77c(!this->mUnk_0A8.func_ov026_020fa73c()); + } + } + + this->mUnk_300 = 1; + return true; +} + +ARM bool ActorUnkKLTR::func_ov026_02112ca8(void) { + *(u8 *) &this->mUnk_314.mUnk_0C[0] |= 0x18; + return true; +} + ARM void ActorUnkKLTR::func_ov026_02112cbc(void) {} + ARM void ActorUnkKLTR::func_ov026_02112cc0(void) {} + ARM void ActorUnkKLTR::func_ov026_02112e28(void) {} -ARM void ActorUnkKLTR::func_ov026_02112ecc(void) {} + +ARM bool ActorUnkKLTR::func_ov026_02112ecc(void) { + unk32 tmp = this->mUnk_0A8.func_ov026_020fa7c0(); + this->mUnk_314.mUnk_10.func_ov026_02101890(7, tmp); + u8 tmp2 = this->mUnk_314.mUnk_0C[0] & ~0x8; + this->mUnk_314.mUnk_0C[0] = tmp2 & ~0x10; + return true; +} + ARM void ActorUnkKLTR::func_ov026_02112f08(void) {} -ARM void ActorUnkKLTR::func_ov026_02112fb0(void) {} -ARM void ActorUnkKLTR::func_ov026_02112fec(void) {} -ARM void ActorUnkKLTR::func_ov026_02112ff8(void) {} + +ARM bool ActorUnkKLTR::func_ov026_02112fb0(void) { + unk32 tmp = this->mUnk_0A8.func_ov026_020fa7c0(); + this->mUnk_314.mUnk_10.func_ov026_02101890(0, tmp); + u8 tmp2 = this->mUnk_314.mUnk_0C[0] & ~0x8; + this->mUnk_314.mUnk_0C[0] = tmp2 & ~0x10; + return true; +} + +ARM void ActorUnkKLTR::func_ov026_02112fec(void) { + this->func_ov026_02112328(); +} + +ARM bool ActorUnkKLTR::func_ov026_02112ff8(void) { + this->mUnk_314.mUnk_10.func_ov026_02101890(1, !this->mUnk_0A8.mUnk_1D4_0); + u8 tmp2 = this->mUnk_314.mUnk_0C[0] & ~0x8; + this->mUnk_314.mUnk_0C[0] = tmp2 & ~0x10; + return true; +} + ARM void ActorUnkKLTR::func_ov026_02113040(void) {} -ARM void ActorUnkKLTR::func_ov026_02113118(void) {} + +ARM bool ActorUnkKLTR::func_ov026_02113118(void) {} + ARM void ActorUnkKLTR::func_ov026_02113204(void) {} + ARM void ActorUnkKLTR::func_ov026_021132c0(void) {} + ARM void ActorUnkKLTR::func_ov026_02113304(void) {} -ARM void ActorUnkKLTR::func_ov026_021133b0(void) {} + +ARM bool ActorUnkKLTR::func_ov026_021133b0(void) { + unk32 tmp = this->mUnk_0A8.func_ov026_020fa7c0(); + this->mUnk_314.mUnk_10.func_ov026_02101890(2, tmp); + data_027e09a8->func_ov000_02071b30(0x9c03, &this->mPos, 0); + u8 tmp2 = this->mUnk_314.mUnk_0C[0] & ~0x8; + this->mUnk_314.mUnk_0C[0] = tmp2 & ~0x10; + return true; +} + ARM void ActorUnkKLTR::func_ov026_0211340c(void) {} -ARM void ActorUnkKLTR::func_ov026_021134c8(void) {} + +ARM bool ActorUnkKLTR::func_ov026_021134c8(void) { + this->mUnk_48 = 5; + unk32 tmp = this->mUnk_0A8.func_ov026_020fa7c0(); + this->mUnk_314.mUnk_10.func_ov026_02101890(6, tmp); + u8 bVar1 = this->mUnk_314.mUnk_0C[0] & ~0x8; + this->mUnk_314.mUnk_0C[0] = bVar1 | 0x10; + return true; +} + ARM void ActorUnkKLTR::func_ov026_0211350c(void) {} -ARM void ActorUnkKLTR::func_ov026_021135b8(void) {} + +ARM bool ActorUnkKLTR::func_ov026_021135b8(void) { + u8 bVar1 = this->mUnk_314.mUnk_0C[0] & ~0x8; + this->mUnk_314.mUnk_0C[0] = bVar1 | 0x10; + this->mUnk_0A8.func_ov026_020fa838(0, this->mUnk_314.mUnk_0C[0]); + return true; +} + ARM void ActorUnkKLTR::func_ov026_021135e4(void) {} -ARM void ActorUnkKLTR::func_ov026_02113704(void) {} + +ARM bool ActorUnkKLTR::func_ov026_02113704(void) { + this->mUnk_314.mUnk_0C[0] |= 0x18; + return true; +} + ARM void ActorUnkKLTR::func_ov026_02113718(void) {} + ARM void ActorUnkKLTR::func_ov026_02113784(void) {} + ARM void ActorUnkKLTR::func_ov026_0211391c(void) {} -ARM void ActorUnkKLTR::func_ov026_02113a40(void) {} + +ARM bool ActorUnkKLTR::func_ov026_02113a40(void) { + u8 tmp = this->mUnk_314.mUnk_0C[0] & ~0x8; + this->mUnk_314.mUnk_0C[0] = tmp | 0x10; + return true; +} + ARM void ActorUnkKLTR::func_ov026_02113a5c(void) {} ARM void ActorUnkKLTR::func_ov026_02113b5c(void) {} ARM void ActorUnkKLTR::func_ov026_02113b98(void) {} -ARM ActorUnkKLTR::~ActorUnkKLTR() {} ARM ActorProfileUnkKLTR::~ActorProfileUnkKLTR() {} diff --git a/src/026_Train/Actor/Actor_Derived.cpp b/src/026_Train/Actor/Actor_Derived.cpp new file mode 100644 index 000000000..85a525bc6 --- /dev/null +++ b/src/026_Train/Actor/Actor_Derived.cpp @@ -0,0 +1 @@ +#include "Actor/Actor.hpp" diff --git a/src/031_Land/Actor/ActorRupee.cpp b/src/031_Land/Actor/ActorRupee.cpp index dcf259a35..4ee5f66ad 100644 --- a/src/031_Land/Actor/ActorRupee.cpp +++ b/src/031_Land/Actor/ActorRupee.cpp @@ -69,8 +69,8 @@ ARM ActorRupee::ActorRupee() : mUnk_E8(0), mUnk_F0(0), mUnk_F4(false) { - this->mUnk_A0 = 0x13100; - this->mUnk_40 = &this->mUnk_C4; + this->mUnk_9C.mUnk_04 = 0x13100; + this->mUnk_40 = &this->mUnk_C4; } // https://decomp.me/scratch/wunA4 @@ -348,7 +348,7 @@ ARM void ActorRupee::func_ov031_020e9450() { this->mVel.x = 0; this->mVel.y = 0; this->mVel.z = 0; - this->mUnk_A0 |= 0x1000; + this->mUnk_9C.mUnk_04 |= 0x1000; this->func_ov031_020e9904(0); } @@ -625,20 +625,20 @@ ARM void ActorRupee::vfunc_20() { this->func_ov000_020989e0(); uVar3 = uStack_18; - if ((this->mUnk_A4 & 0x3ffff) != 0) { - sVar1 = *(short *) &this->mUnk_B8; + if ((this->mUnk_9C.mUnk_08 & 0x3ffff) != 0) { + sVar1 = *(short *) &this->mUnk_9C.mUnk_1C; - switch (mUnk_B8) { + switch (this->mUnk_9C.mUnk_1C) { case 0x08: case 0x10: - if ((this->mUnk_A8 & 0x100) != 0) { + if ((this->mUnk_9C.mUnk_0C & 0x100) != 0) { this->func_ov031_020e9068(); uVar3 = uStack_18; } break; case 0x0C: - this->mUnk_BC = this->mUnk_A8; - this->mUnk_A0 &= 0xffffefff; + this->mUnk_BC = this->mUnk_9C.mUnk_0C; + this->mUnk_9C.mUnk_04 &= 0xffffefff; this->func_ov031_020e9904(6); uVar3 = uStack_18; break; diff --git a/tools/configure.py b/tools/configure.py index 921667e64..c49b453a7 100755 --- a/tools/configure.py +++ b/tools/configure.py @@ -170,7 +170,7 @@ def GameLib(lib_name: str, objects: List[Object]) -> Dict[str, Any]: Object("000_Second/Actor/ActorEventIcon.cpp"), Object("000_Second/Actor/ActorUnkEFIK.cpp"), Object("000_Second/MapObject/MapObjectProfile.cpp"), - Object("000_Second/MapObject/MapObjectProfile_Derived2_20.cpp"), + Object("000_Second/UnkActorFileSystem/UnkActorFileSystem1.cpp"), Object("000_Second/MapObject/MapObject.cpp"), Object("000_Second/MapObject/MapObjectSwitchStep.cpp"), Object("000_Second/MapObject/MapObjectMiniBlocks.cpp"), @@ -245,6 +245,7 @@ def GameLib(lib_name: str, objects: List[Object]) -> Dict[str, Any]: GameLib( "Overlay 26", [ + Object("026_Train/Actor/Actor_Derived.cpp"), Object("026_Train/Actor/ActorUnkBDEM.cpp"), Object("026_Train/Actor/ActorUnkCNBL.cpp"), Object("026_Train/Actor/ActorUnkDKCL.cpp"),