diff --git a/config/eur/arm9/itcm/symbols.txt b/config/eur/arm9/itcm/symbols.txt index 561545e4..4628684c 100644 --- a/config/eur/arm9/itcm/symbols.txt +++ b/config/eur/arm9/itcm/symbols.txt @@ -127,7 +127,7 @@ func_01ffc4cc kind:function(arm,size=0x54) addr:0x01ffc4cc func_01ffc520 kind:function(arm,size=0x5c) addr:0x01ffc520 _ZN11ModelRender8vfunc_0CEv kind:function(arm,size=0x24) addr:0x01ffc57c func_01ffc5a0 kind:function(arm,size=0x94) addr:0x01ffc5a0 -func_01ffc634 kind:function(arm,size=0xa0) addr:0x01ffc634 +_ZN15ModelRenderBase13func_01ffc634EP7VecFx3214UnkAngleStructS1_ kind:function(arm,size=0xa0) addr:0x01ffc634 _ZN15ModelRenderBase13func_01ffc6d4E14UnkAngleStructP7VecFx32 kind:function(arm,size=0x70) addr:0x01ffc6d4 func_01ffc744 kind:function(arm,size=0x24) addr:0x01ffc744 _ZN24UnkStruct_ov000_020b4ec413func_01ffc768Ei kind:function(arm,size=0x3c) addr:0x01ffc768 diff --git a/config/eur/arm9/overlays/ov000/symbols.txt b/config/eur/arm9/overlays/ov000/symbols.txt index 37e5c3db..d50d9dca 100644 --- a/config/eur/arm9/overlays/ov000/symbols.txt +++ b/config/eur/arm9/overlays/ov000/symbols.txt @@ -2281,10 +2281,10 @@ _ZN21ActorProfile_Derived18vfunc_04Ev kind:function(arm,size=0x8) addr:0x0209794 _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 -func_ov000_02097a18 kind:function(arm,size=0x70) addr:0x02097a18 +_ZN27ActorProfile_ov000_020b3018C2Ejj kind:function(arm,size=0x30) addr:0x020979b4 +_ZN27ActorProfile_ov000_020b30188vfunc_04Ev kind:function(arm,size=0x8) addr:0x020979e4 +_ZN27ActorProfile_ov000_020b30188vfunc_10Ev kind:function(arm,size=0x2c) addr:0x020979ec +_ZN27ActorProfile_ov000_020b30188vfunc_08Ev kind:function(arm,size=0x70) addr:0x02097a18 func_ov000_02097a88 kind:function(arm,size=0x70) addr:0x02097a88 func_ov000_02097af8 kind:function(arm,size=0x70) addr:0x02097af8 _ZN19func_ov000_02097b68D0Ev kind:function(arm,size=0x1c) addr:0x02097b68 diff --git a/config/eur/arm9/overlays/ov032/delinks.txt b/config/eur/arm9/overlays/ov032/delinks.txt index 724f9a18..75894495 100644 --- a/config/eur/arm9/overlays/ov032/delinks.txt +++ b/config/eur/arm9/overlays/ov032/delinks.txt @@ -12,10 +12,11 @@ src/032_MapA1/Actor/ActorSpinut.cpp: .data start:0x02122160 end:0x021223a8 .bss start:0x02122820 end:0x02122908 -src/032_MapA1/Actor/ActorUnkMKUR.cpp: +src/032_MapA1/Actor/ActorFleeingSpinut.cpp: .text start:0x0211b6cc end:0x0211db40 .init start:0x02121fa0 end:0x02122020 .ctor start:0x02122130 end:0x02122134 + .data start:0x021223a8 end:0x021224d8 .bss start:0x02122908 end:0x02122974 src/032_MapA1/Actor/ActorUnkKETH.cpp: @@ -28,6 +29,7 @@ src/032_MapA1/Actor/ActorUnkNSSW.cpp: .text start:0x0211fd80 end:0x02120e90 .init start:0x0212208c end:0x021220dc .ctor start:0x02122138 end:0x0212213c + .data start:0x021226c0 end:0x02122744 .bss start:0x02122a5c end:0x02122aa8 src/032_MapA1/MapObject/MapObjectUnkSWSW.cpp: diff --git a/config/eur/arm9/overlays/ov032/symbols.txt b/config/eur/arm9/overlays/ov032/symbols.txt index 227e8d13..9744499f 100644 --- a/config/eur/arm9/overlays/ov032/symbols.txt +++ b/config/eur/arm9/overlays/ov032/symbols.txt @@ -58,60 +58,60 @@ _ZN15ActorSpinut_1108vfunc_38Eii kind:function(arm,size=0x2c) addr:0x0211b654 _ZN15ActorSpinut_110D0Ev kind:function(arm,size=0x1c) addr:0x0211b680 _ZN15ActorSpinut_1BCD0Ev kind:function(arm,size=0x1c) addr:0x0211b69c _ZN18ActorProfileSpinutD1Ev kind:function(arm,size=0x14) addr:0x0211b6b8 -_ZN19ActorProfileUnkMKUR10GetProfileEv kind:function(arm,size=0xc) addr:0x0211b6cc -_ZN19ActorProfileUnkMKUR6CreateEv kind:function(arm,size=0x24) addr:0x0211b6d8 -_ZN19ActorProfileUnkMKURC1Ev kind:function(arm,size=0x4c) addr:0x0211b6fc -_ZN12ActorUnkMKURC1Ev kind:function(arm,size=0x1d8) addr:0x0211b748 -_ZN12ActorUnkMKURD1Ev kind:function(arm,size=0x30) addr:0x0211b920 -_ZN12ActorUnkMKURD0Ev kind:function(arm,size=0x38) addr:0x0211b950 -_ZN12ActorUnkMKUR19func_ov032_0211b988Ev kind:function(arm,size=0x1c) addr:0x0211b988 -_ZN12ActorUnkMKUR19func_ov032_0211b9a4Ev kind:function(arm,size=0x68) addr:0x0211b9a4 -_ZN12ActorUnkMKUR19func_ov032_0211ba0cEv kind:function(arm,size=0x268) addr:0x0211ba0c -_ZN12ActorUnkMKUR19func_ov032_0211bc74Ev kind:function(arm,size=0x104) addr:0x0211bc74 -_ZN12ActorUnkMKUR19func_ov032_0211bd78Ev kind:function(arm,size=0x8c) addr:0x0211bd78 -_ZN12ActorUnkMKUR19func_ov032_0211be04Ev kind:function(arm,size=0x2c) addr:0x0211be04 -_ZN12ActorUnkMKUR19func_ov032_0211be30Ev kind:function(arm,size=0x78) addr:0x0211be30 -_ZN12ActorUnkMKUR19func_ov032_0211bea8Ev kind:function(arm,size=0xdc) addr:0x0211bea8 -_ZN12ActorUnkMKUR19func_ov032_0211bf84Ev kind:function(arm,size=0x78) addr:0x0211bf84 -_ZN12ActorUnkMKUR19func_ov032_0211bffcEv kind:function(arm,size=0x80) addr:0x0211bffc -_ZN12ActorUnkMKUR19func_ov032_0211c07cEv kind:function(arm,size=0x8c) addr:0x0211c07c -_ZN12ActorUnkMKUR19func_ov032_0211c108Ev kind:function(arm,size=0x1bc) addr:0x0211c108 -_ZN12ActorUnkMKUR19func_ov032_0211c2c4Ev kind:function(arm,size=0x7c) addr:0x0211c2c4 -_ZN12ActorUnkMKUR19func_ov032_0211c340Ev kind:function(arm,size=0x104) addr:0x0211c340 -_ZN12ActorUnkMKUR19func_ov032_0211c444Ev kind:function(arm,size=0x90) addr:0x0211c444 -_ZN12ActorUnkMKUR19func_ov032_0211c4d4Ev kind:function(arm,size=0x68) addr:0x0211c4d4 -_ZN12ActorUnkMKUR19func_ov032_0211c53cEv kind:function(arm,size=0x90) addr:0x0211c53c -_ZN12ActorUnkMKUR19func_ov032_0211c5ccEv kind:function(arm,size=0x170) addr:0x0211c5cc -_ZN12ActorUnkMKUR19func_ov032_0211c73cEv kind:function(arm,size=0x80) addr:0x0211c73c -_ZN12ActorUnkMKUR19func_ov032_0211c7bcEv kind:function(arm,size=0x17c) addr:0x0211c7bc -_ZN12ActorUnkMKUR19func_ov032_0211c938Ev kind:function(arm,size=0xa0) addr:0x0211c938 -_ZN12ActorUnkMKUR19func_ov032_0211c9d8Ev kind:function(arm,size=0x48) addr:0x0211c9d8 -_ZN12ActorUnkMKUR19func_ov032_0211ca20Ev kind:function(arm,size=0x4c) addr:0x0211ca20 -_ZN12ActorUnkMKUR19func_ov032_0211ca6cEv kind:function(arm,size=0x4c) addr:0x0211ca6c -_ZN12ActorUnkMKUR19func_ov032_0211cab8Ev kind:function(arm,size=0x74) addr:0x0211cab8 -_ZN12ActorUnkMKUR19func_ov032_0211cb2cEv kind:function(arm,size=0xe4) addr:0x0211cb2c -_ZN12ActorUnkMKUR19func_ov032_0211cc10Ev kind:function(arm,size=0x38) addr:0x0211cc10 -_ZN12ActorUnkMKUR19func_ov032_0211cc48Ev kind:function(arm,size=0xd8) addr:0x0211cc48 -_ZN12ActorUnkMKUR19func_ov032_0211cd20Ev kind:function(arm,size=0x40) addr:0x0211cd20 -_ZN12ActorUnkMKUR19func_ov032_0211cd60Ev kind:function(arm,size=0x214) addr:0x0211cd60 -_ZN12ActorUnkMKUR19func_ov032_0211cf74Ev kind:function(arm,size=0x38) addr:0x0211cf74 -_ZN12ActorUnkMKUR19func_ov032_0211cfacEv kind:function(arm,size=0x7c) addr:0x0211cfac -_ZN12ActorUnkMKUR19func_ov032_0211d028Ev kind:function(arm,size=0x18) addr:0x0211d028 -_ZN12ActorUnkMKUR19func_ov032_0211d040Ev kind:function(arm,size=0x4c) addr:0x0211d040 -_ZN12ActorUnkMKUR19func_ov032_0211d08cEv kind:function(arm,size=0x258) addr:0x0211d08c -_ZN12ActorUnkMKUR19func_ov032_0211d2e4Ev kind:function(arm,size=0xa0) addr:0x0211d2e4 -_ZN12ActorUnkMKUR19func_ov032_0211d384Ev kind:function(arm,size=0x1e4) addr:0x0211d384 -_ZN12ActorUnkMKUR19func_ov032_0211d568Ev kind:function(arm,size=0x10c) addr:0x0211d568 -_ZN12ActorUnkMKUR19func_ov032_0211d674Ev kind:function(arm,size=0x64) addr:0x0211d674 -_ZN12ActorUnkMKUR19func_ov032_0211d6d8Ev kind:function(arm,size=0x110) addr:0x0211d6d8 -_ZN12ActorUnkMKUR19func_ov032_0211d7e8Ev kind:function(arm,size=0x24) addr:0x0211d7e8 -_ZN12ActorUnkMKUR19func_ov032_0211d80cEv kind:function(arm,size=0x24) addr:0x0211d80c -_ZN12ActorUnkMKUR19func_ov032_0211d830Ev kind:function(arm,size=0x34) addr:0x0211d830 -_ZN12ActorUnkMKUR19func_ov032_0211d864Ev kind:function(arm,size=0xac) addr:0x0211d864 -_ZN12ActorUnkMKUR19func_ov032_0211d910Ev kind:function(arm,size=0x10) addr:0x0211d910 -_ZN12ActorUnkMKUR19func_ov032_0211d920Ev kind:function(arm,size=0xec) addr:0x0211d920 -_ZN12ActorUnkMKUR19func_ov032_0211da0cEv kind:function(arm,size=0x120) addr:0x0211da0c -_ZN19ActorProfileUnkMKURD1Ev kind:function(arm,size=0x14) addr:0x0211db2c +_ZN25ActorProfileFleeingSpinut10GetProfileEv kind:function(arm,size=0xc) addr:0x0211b6cc +_ZN25ActorProfileFleeingSpinut6CreateEv kind:function(arm,size=0x24) addr:0x0211b6d8 +_ZN25ActorProfileFleeingSpinutC1Ev kind:function(arm,size=0x4c) addr:0x0211b6fc +_ZN18ActorFleeingSpinutC1Ev kind:function(arm,size=0x1d8) addr:0x0211b748 +_ZN18ActorFleeingSpinutD1Ev kind:function(arm,size=0x30) addr:0x0211b920 +_ZN18ActorFleeingSpinutD0Ev kind:function(arm,size=0x38) addr:0x0211b950 +_ZN18ActorFleeingSpinut8vfunc_18Ei kind:function(arm,size=0x1c) addr:0x0211b988 +_ZN18ActorFleeingSpinut8SetStateEs kind:function(arm,size=0x68) addr:0x0211b9a4 +_ZN18ActorFleeingSpinut8vfunc_20Ev kind:function(arm,size=0x268) addr:0x0211ba0c +_ZN18ActorFleeingSpinut8vfunc_30EP14Actor_vfunc_30 kind:function(arm,size=0x104) addr:0x0211bc74 +_ZN18ActorFleeingSpinut8vfunc_2CEi kind:function(arm,size=0x8c) addr:0x0211bd78 +_ZN18ActorFleeingSpinut19func_ov032_0211be04Ev kind:function(arm,size=0x2c) addr:0x0211be04 +_ZN18ActorFleeingSpinut19func_ov032_0211be30Ev kind:function(arm,size=0x78) addr:0x0211be30 +_ZN18ActorFleeingSpinut19func_ov032_0211bea8Ev kind:function(arm,size=0xdc) addr:0x0211bea8 +_ZN18ActorFleeingSpinut19func_ov032_0211bf84Ev kind:function(arm,size=0x78) addr:0x0211bf84 +_ZN18ActorFleeingSpinut19func_ov032_0211bffcEv kind:function(arm,size=0x80) addr:0x0211bffc +_ZN18ActorFleeingSpinut19func_ov032_0211c07cEv kind:function(arm,size=0x8c) addr:0x0211c07c +_ZN18ActorFleeingSpinut19func_ov032_0211c108Ev kind:function(arm,size=0x1bc) addr:0x0211c108 +_ZN18ActorFleeingSpinut19func_ov032_0211c2c4Ev kind:function(arm,size=0x7c) addr:0x0211c2c4 +_ZN18ActorFleeingSpinut19func_ov032_0211c340Ev kind:function(arm,size=0x104) addr:0x0211c340 +_ZN18ActorFleeingSpinut19func_ov032_0211c444Ev kind:function(arm,size=0x90) addr:0x0211c444 +_ZN18ActorFleeingSpinut19func_ov032_0211c4d4Ev kind:function(arm,size=0x68) addr:0x0211c4d4 +_ZN18ActorFleeingSpinut19func_ov032_0211c53cEv kind:function(arm,size=0x90) addr:0x0211c53c +_ZN18ActorFleeingSpinut19func_ov032_0211c5ccEv kind:function(arm,size=0x170) addr:0x0211c5cc +_ZN18ActorFleeingSpinut19func_ov032_0211c73cEv kind:function(arm,size=0x80) addr:0x0211c73c +_ZN18ActorFleeingSpinut19func_ov032_0211c7bcEv kind:function(arm,size=0x17c) addr:0x0211c7bc +_ZN18ActorFleeingSpinut19func_ov032_0211c938Ev kind:function(arm,size=0xa0) addr:0x0211c938 +_ZN18ActorFleeingSpinut19func_ov032_0211c9d8Ev kind:function(arm,size=0x48) addr:0x0211c9d8 +_ZN18ActorFleeingSpinut19func_ov032_0211ca20Ev kind:function(arm,size=0x4c) addr:0x0211ca20 +_ZN18ActorFleeingSpinut19func_ov032_0211ca6cEv kind:function(arm,size=0x4c) addr:0x0211ca6c +_ZN18ActorFleeingSpinut19func_ov032_0211cab8Eii kind:function(arm,size=0x74) addr:0x0211cab8 +_ZN18ActorFleeingSpinut19func_ov032_0211cb2cEv kind:function(arm,size=0xe4) addr:0x0211cb2c +_ZN22ActorFleeingSpinut_1ECC1Ev kind:function(arm,size=0x38) addr:0x0211cc10 +_ZN22ActorFleeingSpinut_1EC19func_ov032_0211cc48EP7VecFx32 kind:function(arm,size=0xd8) addr:0x0211cc48 +_ZN22ActorFleeingSpinut_1EC19func_ov032_0211cd20EP7VecFx32 kind:function(arm,size=0x40) addr:0x0211cd20 +_ZN22ActorFleeingSpinut_1EC19func_ov032_0211cd60EP7VecFx32PsS1_iii kind:function(arm,size=0x214) addr:0x0211cd60 +_ZN22ActorFleeingSpinut_1EC19func_ov032_0211cf74Ev kind:function(arm,size=0x38) addr:0x0211cf74 +_ZN22ActorFleeingSpinut_1EC19func_ov032_0211cfacEi kind:function(arm,size=0x7c) addr:0x0211cfac +_ZN22ActorFleeingSpinut_1EC19func_ov032_0211d028Ev kind:function(arm,size=0x18) addr:0x0211d028 +_ZN22ActorFleeingSpinut_1EC19func_ov032_0211d040EP7VecFx32 kind:function(arm,size=0x4c) addr:0x0211d040 +_ZN22ActorFleeingSpinut_1EC19func_ov032_0211d08cEP7VecFx32 kind:function(arm,size=0x258) addr:0x0211d08c +_ZN22ActorFleeingSpinut_1EC19func_ov032_0211d2e4EP37UnkStruct_027e0960_TableEntry_04_Base kind:function(arm,size=0xa0) addr:0x0211d2e4 +_ZN22ActorFleeingSpinut_1EC19func_ov032_0211d384EP7VecFx32 kind:function(arm,size=0x1e4) addr:0x0211d384 +_ZN22ActorFleeingSpinut_1EC19func_ov032_0211d568EP7VecFx32P37UnkStruct_027e0960_TableEntry_04_BaseS3_ kind:function(arm,size=0x10c) addr:0x0211d568 +_ZN22ActorFleeingSpinut_1EC19func_ov032_0211d674EP7VecFx32P37UnkStruct_027e0960_TableEntry_04_Base kind:function(arm,size=0x64) addr:0x0211d674 +_ZN22ActorFleeingSpinut_1EC19func_ov032_0211d6d8EP7VecFx32P37UnkStruct_027e0960_TableEntry_04_Basei kind:function(arm,size=0x110) addr:0x0211d6d8 +_ZN22ActorFleeingSpinut_1EC19func_ov032_0211d7e8EP7VecFx32 kind:function(arm,size=0x24) addr:0x0211d7e8 +_ZN22ActorFleeingSpinut_1EC19func_ov032_0211d80cEv kind:function(arm,size=0x24) addr:0x0211d80c +_ZN22ActorFleeingSpinut_1EC19func_ov032_0211d830EP32UnkStruct_027e0960_TableEntry_04 kind:function(arm,size=0x34) addr:0x0211d830 +_ZN22ActorFleeingSpinut_1EC19func_ov032_0211d864EP7VecFx32 kind:function(arm,size=0xac) addr:0x0211d864 +_ZN22ActorFleeingSpinut_1EC19func_ov032_0211d910Ev kind:function(arm,size=0x10) addr:0x0211d910 +_ZN22ActorFleeingSpinut_1EC19func_ov032_0211d920EP7VecFx32 kind:function(arm,size=0xec) addr:0x0211d920 +_ZN22ActorFleeingSpinut_1EC19func_ov032_0211da0cEiP7VecFx32 kind:function(arm,size=0x120) addr:0x0211da0c +_ZN25ActorProfileFleeingSpinutD1Ev kind:function(arm,size=0x14) addr:0x0211db2c _ZN19ActorProfileUnkKETH10GetProfileEv kind:function(arm,size=0xc) addr:0x0211db40 _ZN19ActorProfileUnkKETH6CreateEv kind:function(arm,size=0x24) addr:0x0211db4c _ZN19ActorProfileUnkKETHC1Ev kind:function(arm,size=0x5c) addr:0x0211db70 @@ -223,12 +223,12 @@ data_ov032_02121f04 kind:data(any) addr:0x02121f04 data_ov032_02121f14 kind:data(any) addr:0x02121f14 data_ov032_02121f24 kind:data(any) addr:0x02121f24 __sinit_ActorSpinut.cpp kind:function(arm,size=0x6c) addr:0x02121f34 -__sinit_ActorUnkMKUR.cpp kind:function(arm,size=0x80) addr:0x02121fa0 +__sinit_ActorFleeingSpinut.cpp kind:function(arm,size=0x80) addr:0x02121fa0 __sinit_ActorUnkKETH.cpp kind:function(arm,size=0x6c) addr:0x02122020 __sinit_ActorUnkNSSW.cpp kind:function(arm,size=0x50) addr:0x0212208c __sinit_MapObjectUnkSWSW.cpp kind:function(arm,size=0x50) addr:0x021220dc .p__sinit_ActorSpinut.cpp kind:data(word) addr:0x0212212c -.p__sinit_ActorUnkMKUR.cpp kind:data(word) addr:0x02122130 +.p__sinit_ActorFleeingSpinut.cpp kind:data(word) addr:0x02122130 .p__sinit_ActorUnkKETH.cpp kind:data(word) addr:0x02122134 .p__sinit_ActorUnkNSSW.cpp kind:data(word) addr:0x02122138 .p__sinit_MapObjectUnkSWSW.cpp kind:data(word) addr:0x0212213c @@ -247,10 +247,9 @@ data_ov032_021223a8 kind:data(any) addr:0x021223a8 data_ov032_021223b4 kind:data(any) addr:0x021223b4 data_ov032_021223cc kind:data(any) addr:0x021223cc data_ov032_021223e4 kind:data(any) addr:0x021223e4 -data_ov032_021223f1 kind:data(any) addr:0x021223f1 ambiguous data_ov032_0212241c kind:data(any) addr:0x0212241c -_ZTV19data_ov032_02122454 kind:data(any) addr:0x02122454 -_ZTV19data_ov032_02122478 kind:data(any) addr:0x02122478 +_ZTV25ActorProfileFleeingSpinut kind:data(any) addr:0x02122454 +_ZTV18ActorFleeingSpinut kind:data(any) addr:0x02122478 data_ov032_021224d8 kind:data(any) addr:0x021224d8 data_ov032_021224e4 kind:data(any) addr:0x021224e4 data_ov032_021224fc kind:data(any) addr:0x021224fc @@ -276,9 +275,9 @@ _ZGVN15ProfileInstanceI18ActorProfileSpinutE8sProfileE kind:bss addr:0x02122820 _ZN15ProfileInstanceI18ActorProfileSpinutE8sProfileE kind:bss addr:0x02122830 data_ov032_02122908 kind:bss addr:0x02122908 data_ov032_0212290c kind:bss addr:0x0212290c -_ZGVN15ProfileInstanceI19ActorProfileUnkMKURE8sProfileE kind:bss addr:0x02122918 +_ZGVN15ProfileInstanceI25ActorProfileFleeingSpinutE8sProfileE kind:bss addr:0x02122918 @11142 kind:bss addr:0x02122924 -_ZN15ProfileInstanceI19ActorProfileUnkMKURE8sProfileE kind:bss addr:0x02122930 +_ZN15ProfileInstanceI25ActorProfileFleeingSpinutE8sProfileE kind:bss addr:0x02122930 _ZGVN15ProfileInstanceI19ActorProfileUnkKETHE8sProfileE kind:bss addr:0x02122974 @11148 kind:bss addr:0x02122978 _ZN15ProfileInstanceI19ActorProfileUnkKETHE8sProfileE kind:bss addr:0x02122984 diff --git a/config/eur/arm9/overlays/ov070/symbols.txt b/config/eur/arm9/overlays/ov070/symbols.txt index ec8433f9..8d99d775 100644 --- a/config/eur/arm9/overlays/ov070/symbols.txt +++ b/config/eur/arm9/overlays/ov070/symbols.txt @@ -98,7 +98,7 @@ func_ov070_02141264 kind:function(arm,size=0x150) addr:0x02141264 _ZN19ActorProfileUnkKEYN10GetProfileEv kind:function(arm,size=0xc) addr:0x021413b4 _ZN19ActorProfileUnkKEYN6CreateEv kind:function(arm,size=0x24) addr:0x021413c0 _ZN19ActorProfileUnkKEYNC1Ev kind:function(arm,size=0x58) addr:0x021413e4 -_ZN12ActorUnkKEYN19func_ov070_0214143cEv kind:function(arm,size=0xac) addr:0x0214143c +_ZN12ActorUnkKEYN19func_ov070_0214143cEP8ActorRefP7VecFx32S0_sht kind:function(arm,size=0xac) addr:0x0214143c _ZN12ActorUnkKEYNC1Ev kind:function(arm,size=0x130) addr:0x021414e8 _ZN12ActorUnkKEYN19func_ov070_02141618Ev kind:function(arm,size=0x14) addr:0x02141618 _ZN12ActorUnkKEYN19func_ov070_0214162cEv kind:function(arm,size=0x124) addr:0x0214162c diff --git a/config/eur1/arm9/itcm/symbols.txt b/config/eur1/arm9/itcm/symbols.txt index 1ebb3fb0..b7b72329 100644 --- a/config/eur1/arm9/itcm/symbols.txt +++ b/config/eur1/arm9/itcm/symbols.txt @@ -127,7 +127,7 @@ func_01ffc4cc kind:function(arm,size=0x54) addr:0x01ffc4cc func_01ffc520 kind:function(arm,size=0x5c) addr:0x01ffc520 _ZN11ModelRender8vfunc_0CEv kind:function(arm,size=0x24) addr:0x01ffc57c func_01ffc5a0 kind:function(arm,size=0x94) addr:0x01ffc5a0 -func_01ffc634 kind:function(arm,size=0xa0) addr:0x01ffc634 +_ZN15ModelRenderBase13func_01ffc634EP7VecFx3214UnkAngleStructS1_ kind:function(arm,size=0xa0) addr:0x01ffc634 _ZN19UnkSystem6_Derived213func_01ffc6d4E14UnkAngleStructP7VecFx32 kind:function(arm,size=0x70) addr:0x01ffc6d4 func_01ffc744 kind:function(arm,size=0x24) addr:0x01ffc744 _ZN24UnkStruct_ov000_020b4ec413func_01ffc768Ei kind:function(arm,size=0x3c) addr:0x01ffc768 diff --git a/config/eur1/arm9/overlays/ov000/symbols.txt b/config/eur1/arm9/overlays/ov000/symbols.txt index 4bdeec6d..ee0017ba 100644 --- a/config/eur1/arm9/overlays/ov000/symbols.txt +++ b/config/eur1/arm9/overlays/ov000/symbols.txt @@ -2281,10 +2281,10 @@ _ZN21ActorProfile_Derived18vfunc_04Ev kind:function(arm,size=0x8) addr:0x0209799 _ZN21ActorProfile_Derived18vfunc_10Ev kind:function(arm,size=0x20) addr:0x020979a0 _ZN21ActorProfile_Derived18vfunc_14Ev kind:function(arm,size=0x2c) addr:0x020979c0 _ZN21ActorProfile_Derived18vfunc_18Ev kind:function(arm,size=0x1c) addr:0x020979ec -func_ov000_020979b4 kind:function(arm,size=0x30) addr:0x02097a08 -func_ov000_020979e4 kind:function(arm,size=0x8) addr:0x02097a38 -func_ov000_020979ec kind:function(arm,size=0x2c) addr:0x02097a40 -func_ov000_02097a18 kind:function(arm,size=0x70) addr:0x02097a6c +_ZN27ActorProfile_ov000_020b3018C2Ejj kind:function(arm,size=0x30) addr:0x02097a08 +_ZN27ActorProfile_ov000_020b30188vfunc_04Ev kind:function(arm,size=0x8) addr:0x02097a38 +_ZN27ActorProfile_ov000_020b30188vfunc_10Ev kind:function(arm,size=0x2c) addr:0x02097a40 +_ZN27ActorProfile_ov000_020b30188vfunc_08Ev kind:function(arm,size=0x70) addr:0x02097a6c func_ov000_02097a88 kind:function(arm,size=0x70) addr:0x02097adc func_ov000_02097af8 kind:function(arm,size=0x70) addr:0x02097b4c _ZN19func_ov000_02097b68D0Ev kind:function(arm,size=0x1c) addr:0x02097bbc diff --git a/config/eur1/arm9/overlays/ov032/delinks.txt b/config/eur1/arm9/overlays/ov032/delinks.txt index 14e007b1..fda069a1 100644 --- a/config/eur1/arm9/overlays/ov032/delinks.txt +++ b/config/eur1/arm9/overlays/ov032/delinks.txt @@ -12,10 +12,11 @@ src/032_MapA1/Actor/ActorSpinut.cpp: .data start:0x02122300 end:0x02122548 .bss start:0x021229c0 end:0x02122aa8 -src/032_MapA1/Actor/ActorUnkMKUR.cpp: +src/032_MapA1/Actor/ActorFleeingSpinut.cpp: .text start:0x0211b80c end:0x0211dc80 .init start:0x0212215c end:0x021221dc .ctor start:0x021222ec end:0x021222f0 + .data start:0x02122548 end:0x02122678 .bss start:0x02122aa8 end:0x02122b14 src/032_MapA1/Actor/ActorUnkKETH.cpp: diff --git a/config/eur1/arm9/overlays/ov032/relocs.txt b/config/eur1/arm9/overlays/ov032/relocs.txt index 658fa0d3..91424524 100644 --- a/config/eur1/arm9/overlays/ov032/relocs.txt +++ b/config/eur1/arm9/overlays/ov032/relocs.txt @@ -257,7 +257,7 @@ from:0x0211b814 kind:load to:0x02122ad0 module:overlay(32) from:0x0211b828 kind:arm_call to:0x02011f3c module:main from:0x0211b834 kind:arm_call to:0x0211b888 module:overlay(32) from:0x0211b84c kind:arm_call to:0x02097a08 module:overlay(0) -from:0x0211b884 kind:load to:0x021225fc module:overlay(32) +from:0x0211b884 kind:load to:0x021225f4 module:overlay(32) add:0x8 from:0x0211b894 kind:arm_call to:0x02098b7c module:overlay(0) from:0x0211b8f8 kind:arm_call_thumb to:0x02057a24 module:overlay(0) from:0x0211b924 kind:arm_call_thumb to:0x0209a1dc module:overlay(0) @@ -270,7 +270,7 @@ from:0x0211b9e8 kind:arm_call to:0x0205fc20 module:overlay(0) from:0x0211ba00 kind:arm_call to:0x0205fc20 module:overlay(0) from:0x0211ba0c kind:arm_call to:0x02098680 module:overlay(0) from:0x0211ba28 kind:arm_call to:0x0211bf44 module:overlay(32) -from:0x0211ba48 kind:load to:0x02122620 module:overlay(32) +from:0x0211ba48 kind:load to:0x02122618 module:overlay(32) add:0x8 from:0x0211ba4c kind:load to:0x02122ad0 module:overlay(32) from:0x0211ba50 kind:load to:0x021223e4 module:overlay(32) from:0x0211ba54 kind:load to:0x02122ac4 module:overlay(32) diff --git a/config/eur1/arm9/overlays/ov032/symbols.txt b/config/eur1/arm9/overlays/ov032/symbols.txt index 59991a6a..2401991b 100644 --- a/config/eur1/arm9/overlays/ov032/symbols.txt +++ b/config/eur1/arm9/overlays/ov032/symbols.txt @@ -58,60 +58,60 @@ _ZN15ActorSpinut_1108vfunc_38Eii kind:function(arm,size=0x2c) addr:0x0211b794 _ZN15ActorSpinut_110D0Ev kind:function(arm,size=0x1c) addr:0x0211b7c0 _ZN15ActorSpinut_1BCD0Ev kind:function(arm,size=0x1c) addr:0x0211b7dc _ZN18ActorProfileSpinutD1Ev kind:function(arm,size=0x14) addr:0x0211b7f8 -_ZN19ActorProfileUnkMKUR10GetProfileEv kind:function(arm,size=0xc) addr:0x0211b80c -_ZN19ActorProfileUnkMKUR6CreateEv kind:function(arm,size=0x24) addr:0x0211b818 -_ZN19ActorProfileUnkMKURC1Ev kind:function(arm,size=0x4c) addr:0x0211b83c -_ZN12ActorUnkMKURC1Ev kind:function(arm,size=0x1d8) addr:0x0211b888 -_ZN12ActorUnkMKURD1Ev kind:function(arm,size=0x30) addr:0x0211ba60 -_ZN12ActorUnkMKURD0Ev kind:function(arm,size=0x38) addr:0x0211ba90 -_ZN12ActorUnkMKUR19func_ov032_0211b988Ev kind:function(arm,size=0x1c) addr:0x0211bac8 -_ZN12ActorUnkMKUR19func_ov032_0211b9a4Ev kind:function(arm,size=0x68) addr:0x0211bae4 -_ZN12ActorUnkMKUR19func_ov032_0211ba0cEv kind:function(arm,size=0x268) addr:0x0211bb4c -_ZN12ActorUnkMKUR19func_ov032_0211bc74Ev kind:function(arm,size=0x104) addr:0x0211bdb4 -_ZN12ActorUnkMKUR19func_ov032_0211bd78Ev kind:function(arm,size=0x8c) addr:0x0211beb8 -_ZN12ActorUnkMKUR19func_ov032_0211be04Ev kind:function(arm,size=0x2c) addr:0x0211bf44 -_ZN12ActorUnkMKUR19func_ov032_0211be30Ev kind:function(arm,size=0x78) addr:0x0211bf70 -_ZN12ActorUnkMKUR19func_ov032_0211bea8Ev kind:function(arm,size=0xdc) addr:0x0211bfe8 -_ZN12ActorUnkMKUR19func_ov032_0211bf84Ev kind:function(arm,size=0x78) addr:0x0211c0c4 -_ZN12ActorUnkMKUR19func_ov032_0211bffcEv kind:function(arm,size=0x80) addr:0x0211c13c -_ZN12ActorUnkMKUR19func_ov032_0211c07cEv kind:function(arm,size=0x8c) addr:0x0211c1bc -_ZN12ActorUnkMKUR19func_ov032_0211c108Ev kind:function(arm,size=0x1bc) addr:0x0211c248 -_ZN12ActorUnkMKUR19func_ov032_0211c2c4Ev kind:function(arm,size=0x7c) addr:0x0211c404 -_ZN12ActorUnkMKUR19func_ov032_0211c340Ev kind:function(arm,size=0x104) addr:0x0211c480 -_ZN12ActorUnkMKUR19func_ov032_0211c444Ev kind:function(arm,size=0x90) addr:0x0211c584 -_ZN12ActorUnkMKUR19func_ov032_0211c4d4Ev kind:function(arm,size=0x68) addr:0x0211c614 -_ZN12ActorUnkMKUR19func_ov032_0211c53cEv kind:function(arm,size=0x90) addr:0x0211c67c -_ZN12ActorUnkMKUR19func_ov032_0211c5ccEv kind:function(arm,size=0x170) addr:0x0211c70c -_ZN12ActorUnkMKUR19func_ov032_0211c73cEv kind:function(arm,size=0x80) addr:0x0211c87c -_ZN12ActorUnkMKUR19func_ov032_0211c7bcEv kind:function(arm,size=0x17c) addr:0x0211c8fc -_ZN12ActorUnkMKUR19func_ov032_0211c938Ev kind:function(arm,size=0xa0) addr:0x0211ca78 -_ZN12ActorUnkMKUR19func_ov032_0211c9d8Ev kind:function(arm,size=0x48) addr:0x0211cb18 -_ZN12ActorUnkMKUR19func_ov032_0211ca20Ev kind:function(arm,size=0x4c) addr:0x0211cb60 -_ZN12ActorUnkMKUR19func_ov032_0211ca6cEv kind:function(arm,size=0x4c) addr:0x0211cbac -_ZN12ActorUnkMKUR19func_ov032_0211cab8Ev kind:function(arm,size=0x74) addr:0x0211cbf8 -_ZN12ActorUnkMKUR19func_ov032_0211cb2cEv kind:function(arm,size=0xe4) addr:0x0211cc6c -_ZN12ActorUnkMKUR19func_ov032_0211cc10Ev kind:function(arm,size=0x38) addr:0x0211cd50 -_ZN12ActorUnkMKUR19func_ov032_0211cc48Ev kind:function(arm,size=0xd8) addr:0x0211cd88 -_ZN12ActorUnkMKUR19func_ov032_0211cd20Ev kind:function(arm,size=0x40) addr:0x0211ce60 -_ZN12ActorUnkMKUR19func_ov032_0211cd60Ev kind:function(arm,size=0x214) addr:0x0211cea0 -_ZN12ActorUnkMKUR19func_ov032_0211cf74Ev kind:function(arm,size=0x38) addr:0x0211d0b4 -_ZN12ActorUnkMKUR19func_ov032_0211cfacEv kind:function(arm,size=0x7c) addr:0x0211d0ec -_ZN12ActorUnkMKUR19func_ov032_0211d028Ev kind:function(arm,size=0x18) addr:0x0211d168 -_ZN12ActorUnkMKUR19func_ov032_0211d040Ev kind:function(arm,size=0x4c) addr:0x0211d180 -_ZN12ActorUnkMKUR19func_ov032_0211d08cEv kind:function(arm,size=0x258) addr:0x0211d1cc -_ZN12ActorUnkMKUR19func_ov032_0211d2e4Ev kind:function(arm,size=0xa0) addr:0x0211d424 -_ZN12ActorUnkMKUR19func_ov032_0211d384Ev kind:function(arm,size=0x1e4) addr:0x0211d4c4 -_ZN12ActorUnkMKUR19func_ov032_0211d568Ev kind:function(arm,size=0x10c) addr:0x0211d6a8 -_ZN12ActorUnkMKUR19func_ov032_0211d674Ev kind:function(arm,size=0x64) addr:0x0211d7b4 -_ZN12ActorUnkMKUR19func_ov032_0211d6d8Ev kind:function(arm,size=0x110) addr:0x0211d818 -_ZN12ActorUnkMKUR19func_ov032_0211d7e8Ev kind:function(arm,size=0x24) addr:0x0211d928 -_ZN12ActorUnkMKUR19func_ov032_0211d80cEv kind:function(arm,size=0x24) addr:0x0211d94c -_ZN12ActorUnkMKUR19func_ov032_0211d830Ev kind:function(arm,size=0x34) addr:0x0211d970 -_ZN12ActorUnkMKUR19func_ov032_0211d864Ev kind:function(arm,size=0xac) addr:0x0211d9a4 -_ZN12ActorUnkMKUR19func_ov032_0211d910Ev kind:function(arm,size=0x10) addr:0x0211da50 -_ZN12ActorUnkMKUR19func_ov032_0211d920Ev kind:function(arm,size=0xec) addr:0x0211da60 -_ZN12ActorUnkMKUR19func_ov032_0211da0cEv kind:function(arm,size=0x120) addr:0x0211db4c -_ZN19ActorProfileUnkMKURD1Ev kind:function(arm,size=0x14) addr:0x0211dc6c +_ZN25ActorProfileFleeingSpinut10GetProfileEv kind:function(arm,size=0xc) addr:0x0211b80c +_ZN25ActorProfileFleeingSpinut6CreateEv kind:function(arm,size=0x24) addr:0x0211b818 +_ZN25ActorProfileFleeingSpinutC1Ev kind:function(arm,size=0x4c) addr:0x0211b83c +_ZN18ActorFleeingSpinutC1Ev kind:function(arm,size=0x1d8) addr:0x0211b888 +_ZN18ActorFleeingSpinutD1Ev kind:function(arm,size=0x30) addr:0x0211ba60 +_ZN18ActorFleeingSpinutD0Ev kind:function(arm,size=0x38) addr:0x0211ba90 +_ZN18ActorFleeingSpinut8vfunc_18Ei kind:function(arm,size=0x1c) addr:0x0211bac8 +_ZN18ActorFleeingSpinut8SetStateEs kind:function(arm,size=0x68) addr:0x0211bae4 +_ZN18ActorFleeingSpinut8vfunc_20Ev kind:function(arm,size=0x268) addr:0x0211bb4c +_ZN18ActorFleeingSpinut8vfunc_30EP14Actor_vfunc_30 kind:function(arm,size=0x104) addr:0x0211bdb4 +_ZN18ActorFleeingSpinut8vfunc_2CEi kind:function(arm,size=0x8c) addr:0x0211beb8 +_ZN18ActorFleeingSpinut19func_ov032_0211be04Ev kind:function(arm,size=0x2c) addr:0x0211bf44 +_ZN18ActorFleeingSpinut19func_ov032_0211be30Ev kind:function(arm,size=0x78) addr:0x0211bf70 +_ZN18ActorFleeingSpinut19func_ov032_0211bea8Ev kind:function(arm,size=0xdc) addr:0x0211bfe8 +_ZN18ActorFleeingSpinut19func_ov032_0211bf84Ev kind:function(arm,size=0x78) addr:0x0211c0c4 +_ZN18ActorFleeingSpinut19func_ov032_0211bffcEv kind:function(arm,size=0x80) addr:0x0211c13c +_ZN18ActorFleeingSpinut19func_ov032_0211c07cEv kind:function(arm,size=0x8c) addr:0x0211c1bc +_ZN18ActorFleeingSpinut19func_ov032_0211c108Ev kind:function(arm,size=0x1bc) addr:0x0211c248 +_ZN18ActorFleeingSpinut19func_ov032_0211c2c4Ev kind:function(arm,size=0x7c) addr:0x0211c404 +_ZN18ActorFleeingSpinut19func_ov032_0211c340Ev kind:function(arm,size=0x104) addr:0x0211c480 +_ZN18ActorFleeingSpinut19func_ov032_0211c444Ev kind:function(arm,size=0x90) addr:0x0211c584 +_ZN18ActorFleeingSpinut19func_ov032_0211c4d4Ev kind:function(arm,size=0x68) addr:0x0211c614 +_ZN18ActorFleeingSpinut19func_ov032_0211c53cEv kind:function(arm,size=0x90) addr:0x0211c67c +_ZN18ActorFleeingSpinut19func_ov032_0211c5ccEv kind:function(arm,size=0x170) addr:0x0211c70c +_ZN18ActorFleeingSpinut19func_ov032_0211c73cEv kind:function(arm,size=0x80) addr:0x0211c87c +_ZN18ActorFleeingSpinut19func_ov032_0211c7bcEv kind:function(arm,size=0x17c) addr:0x0211c8fc +_ZN18ActorFleeingSpinut19func_ov032_0211c938Ev kind:function(arm,size=0xa0) addr:0x0211ca78 +_ZN18ActorFleeingSpinut19func_ov032_0211c9d8Ev kind:function(arm,size=0x48) addr:0x0211cb18 +_ZN18ActorFleeingSpinut19func_ov032_0211ca20Ev kind:function(arm,size=0x4c) addr:0x0211cb60 +_ZN18ActorFleeingSpinut19func_ov032_0211ca6cEv kind:function(arm,size=0x4c) addr:0x0211cbac +_ZN18ActorFleeingSpinut19func_ov032_0211cab8Eii kind:function(arm,size=0x74) addr:0x0211cbf8 +_ZN18ActorFleeingSpinut19func_ov032_0211cb2cEv kind:function(arm,size=0xe4) addr:0x0211cc6c +_ZN22ActorFleeingSpinut_1ECC1Ev kind:function(arm,size=0x38) addr:0x0211cd50 +_ZN22ActorFleeingSpinut_1EC19func_ov032_0211cc48EP7VecFx32 kind:function(arm,size=0xd8) addr:0x0211cd88 +_ZN22ActorFleeingSpinut_1EC19func_ov032_0211cd20EP7VecFx32 kind:function(arm,size=0x40) addr:0x0211ce60 +_ZN22ActorFleeingSpinut_1EC19func_ov032_0211cd60EP7VecFx32PsS1_iii kind:function(arm,size=0x214) addr:0x0211cea0 +_ZN22ActorFleeingSpinut_1EC19func_ov032_0211cf74Ev kind:function(arm,size=0x38) addr:0x0211d0b4 +_ZN22ActorFleeingSpinut_1EC19func_ov032_0211cfacEi kind:function(arm,size=0x7c) addr:0x0211d0ec +_ZN22ActorFleeingSpinut_1EC19func_ov032_0211d028Ev kind:function(arm,size=0x18) addr:0x0211d168 +_ZN22ActorFleeingSpinut_1EC19func_ov032_0211d040EP7VecFx32 kind:function(arm,size=0x4c) addr:0x0211d180 +_ZN22ActorFleeingSpinut_1EC19func_ov032_0211d08cEP7VecFx32 kind:function(arm,size=0x258) addr:0x0211d1cc +_ZN22ActorFleeingSpinut_1EC19func_ov032_0211d2e4EP37UnkStruct_027e0960_TableEntry_04_Base kind:function(arm,size=0xa0) addr:0x0211d424 +_ZN22ActorFleeingSpinut_1EC19func_ov032_0211d384EP7VecFx32 kind:function(arm,size=0x1e4) addr:0x0211d4c4 +_ZN22ActorFleeingSpinut_1EC19func_ov032_0211d568EP7VecFx32P37UnkStruct_027e0960_TableEntry_04_BaseS3_ kind:function(arm,size=0x10c) addr:0x0211d6a8 +_ZN22ActorFleeingSpinut_1EC19func_ov032_0211d674EP7VecFx32P37UnkStruct_027e0960_TableEntry_04_Base kind:function(arm,size=0x64) addr:0x0211d7b4 +_ZN22ActorFleeingSpinut_1EC19func_ov032_0211d6d8EP7VecFx32P37UnkStruct_027e0960_TableEntry_04_Basei kind:function(arm,size=0x110) addr:0x0211d818 +_ZN22ActorFleeingSpinut_1EC19func_ov032_0211d7e8EP7VecFx32 kind:function(arm,size=0x24) addr:0x0211d928 +_ZN22ActorFleeingSpinut_1EC19func_ov032_0211d80cEv kind:function(arm,size=0x24) addr:0x0211d94c +_ZN22ActorFleeingSpinut_1EC19func_ov032_0211d830EP32UnkStruct_027e0960_TableEntry_04 kind:function(arm,size=0x34) addr:0x0211d970 +_ZN22ActorFleeingSpinut_1EC19func_ov032_0211d864EP7VecFx32 kind:function(arm,size=0xac) addr:0x0211d9a4 +_ZN22ActorFleeingSpinut_1EC19func_ov032_0211d910Ev kind:function(arm,size=0x10) addr:0x0211da50 +_ZN22ActorFleeingSpinut_1EC19func_ov032_0211d920EP7VecFx32 kind:function(arm,size=0xec) addr:0x0211da60 +_ZN22ActorFleeingSpinut_1EC19func_ov032_0211da0cEiP7VecFx32 kind:function(arm,size=0x120) addr:0x0211db4c +_ZN25ActorProfileFleeingSpinutD1Ev kind:function(arm,size=0x14) addr:0x0211dc6c _ZN19ActorProfileUnkKETH10GetProfileEv kind:function(arm,size=0xc) addr:0x0211dc80 _ZN19ActorProfileUnkKETH6CreateEv kind:function(arm,size=0x24) addr:0x0211dc8c _ZN19ActorProfileUnkKETHC1Ev kind:function(arm,size=0x5c) addr:0x0211dcb0 @@ -223,12 +223,12 @@ data_ov032_021220c0 kind:data(any) addr:0x021220c0 data_ov032_021220d0 kind:data(any) addr:0x021220d0 data_ov032_021220e0 kind:data(any) addr:0x021220e0 __sinit_ActorSpinut.cpp kind:function(arm,size=0x6c) addr:0x021220f0 local -__sinit_ActorUnkMKUR.cpp kind:function(arm,size=0x80) addr:0x0212215c local +__sinit_ActorFleeingSpinut.cpp kind:function(arm,size=0x80) addr:0x0212215c local __sinit_ActorUnkKETH.cpp kind:function(arm,size=0x6c) addr:0x021221dc local __sinit_ActorUnkNSSW.cpp kind:function(arm,size=0x50) addr:0x02122248 local __sinit_MapObjectUnkSWSW.cpp kind:function(arm,size=0x50) addr:0x02122298 local .p__sinit_ActorSpinut.cpp kind:data(word) addr:0x021222e8 local -.p__sinit_ActorUnkMKUR.cpp kind:data(word) addr:0x021222ec local +.p__sinit_ActorFleeingSpinut.cpp kind:data(word) addr:0x021222ec local .p__sinit_ActorUnkKETH.cpp kind:data(word) addr:0x021222f0 local .p__sinit_ActorUnkNSSW.cpp kind:data(word) addr:0x021222f4 local .p__sinit_MapObjectUnkSWSW.cpp kind:data(word) addr:0x021222f8 local @@ -239,18 +239,18 @@ data_ov032_0212233c kind:data(any) addr:0x0212233c data_ov032_0212235c kind:data(any) addr:0x0212235c data_ov032_02122378 kind:data(any) addr:0x02122378 data_ov032_0212239c kind:data(any) addr:0x0212239c -data_ov032_021223e4 kind:data(any) addr:0x021223e4 +_ZTV15ActorSpinut_110 kind:data(any) addr:0x021223e4 data_ov032_02122428 kind:data(any) addr:0x02122428 data_ov032_02122490 kind:data(any) addr:0x02122490 data_ov032_021224e8 kind:data(any) addr:0x021224e8 data_ov032_02122531 kind:data(any) addr:0x02122531 ambiguous -data_ov032_02122548 kind:data(any) addr:0x02122548 -data_ov032_02122554 kind:data(any) addr:0x02122554 -data_ov032_0212256c kind:data(any) addr:0x0212256c -data_ov032_02122584 kind:data(any) addr:0x02122584 -data_ov032_021225bc kind:data(any) addr:0x021225bc -data_ov032_021225fc kind:data(any) addr:0x021225fc -data_ov032_02122620 kind:data(any) addr:0x02122620 +data_ov032_021223a8 kind:data(any) addr:0x02122548 +data_ov032_021223b4 kind:data(any) addr:0x02122554 +data_ov032_021223cc kind:data(any) addr:0x0212256c +data_ov032_021223e4 kind:data(any) addr:0x02122584 +data_ov032_0212241c kind:data(any) addr:0x021225bc +_ZTV25ActorProfileFleeingSpinut kind:data(any) addr:0x021225f4 +_ZTV18ActorFleeingSpinut kind:data(any) addr:0x02122618 data_ov032_02122678 kind:data(any) addr:0x02122678 data_ov032_02122684 kind:data(any) addr:0x02122684 data_ov032_0212269c kind:data(any) addr:0x0212269c @@ -275,10 +275,10 @@ _ZGVN15ProfileInstanceI18ActorProfileSpinutE8sProfileE kind:bss addr:0x021229c0 @11136 kind:bss addr:0x021229c4 local _ZN15ProfileInstanceI18ActorProfileSpinutE8sProfileE kind:bss addr:0x021229d0 data_ov032_02122aa8 kind:bss addr:0x02122aa8 -data_ov032_02122aac kind:bss addr:0x02122aac -_ZGVN15ProfileInstanceI19ActorProfileUnkMKURE8sProfileE kind:bss addr:0x02122ab8 +data_ov032_0212290c kind:bss addr:0x02122aac +_ZGVN15ProfileInstanceI25ActorProfileFleeingSpinutE8sProfileE kind:bss addr:0x02122ab8 @11142 kind:bss addr:0x02122ac4 local -_ZN15ProfileInstanceI19ActorProfileUnkMKURE8sProfileE kind:bss addr:0x02122ad0 +_ZN15ProfileInstanceI25ActorProfileFleeingSpinutE8sProfileE kind:bss addr:0x02122ad0 _ZGVN15ProfileInstanceI19ActorProfileUnkKETHE8sProfileE kind:bss addr:0x02122b14 @11148 kind:bss addr:0x02122b18 local _ZN15ProfileInstanceI19ActorProfileUnkKETHE8sProfileE kind:bss addr:0x02122b24 diff --git a/config/jp/arm9/itcm/symbols.txt b/config/jp/arm9/itcm/symbols.txt index 561545e4..4628684c 100644 --- a/config/jp/arm9/itcm/symbols.txt +++ b/config/jp/arm9/itcm/symbols.txt @@ -127,7 +127,7 @@ func_01ffc4cc kind:function(arm,size=0x54) addr:0x01ffc4cc func_01ffc520 kind:function(arm,size=0x5c) addr:0x01ffc520 _ZN11ModelRender8vfunc_0CEv kind:function(arm,size=0x24) addr:0x01ffc57c func_01ffc5a0 kind:function(arm,size=0x94) addr:0x01ffc5a0 -func_01ffc634 kind:function(arm,size=0xa0) addr:0x01ffc634 +_ZN15ModelRenderBase13func_01ffc634EP7VecFx3214UnkAngleStructS1_ kind:function(arm,size=0xa0) addr:0x01ffc634 _ZN15ModelRenderBase13func_01ffc6d4E14UnkAngleStructP7VecFx32 kind:function(arm,size=0x70) addr:0x01ffc6d4 func_01ffc744 kind:function(arm,size=0x24) addr:0x01ffc744 _ZN24UnkStruct_ov000_020b4ec413func_01ffc768Ei kind:function(arm,size=0x3c) addr:0x01ffc768 diff --git a/config/jp/arm9/overlays/ov000/symbols.txt b/config/jp/arm9/overlays/ov000/symbols.txt index d9b676cc..a3356dad 100644 --- a/config/jp/arm9/overlays/ov000/symbols.txt +++ b/config/jp/arm9/overlays/ov000/symbols.txt @@ -269,7 +269,7 @@ func_ov000_0205c2a8 kind:function(arm,size=0x44) addr:0x0205c2a8 func_ov000_0205c2ec kind:function(arm,size=0x2c) addr:0x0205c2ec func_ov000_0205c318 kind:function(arm,size=0x34) addr:0x0205c318 func_ov000_0205c34c kind:function(arm,size=0x38) addr:0x0205c34c -func_ov000_0205c384 kind:function(arm,size=0x3c) addr:0x0205c384 +func_ov000_0205adfc kind:function(arm,size=0x3c) addr:0x0205c384 func_ov000_0205c3c0 kind:function(arm,size=0x48) addr:0x0205c3c0 func_ov000_0205c408 kind:function(arm,size=0x2c) addr:0x0205c408 func_ov000_0205c434 kind:function(arm,size=0x24) addr:0x0205c434 @@ -2281,10 +2281,10 @@ _ZN21ActorProfile_Derived18vfunc_04Ev kind:function(arm,size=0x8) addr:0x020990e _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 -func_ov000_020991c0 kind:function(arm,size=0x70) addr:0x020991c0 +_ZN27ActorProfile_ov000_020b3018C2Ejj kind:function(arm,size=0x30) addr:0x0209915c +_ZN27ActorProfile_ov000_020b30188vfunc_04Ev kind:function(arm,size=0x8) addr:0x0209918c +_ZN27ActorProfile_ov000_020b30188vfunc_10Ev kind:function(arm,size=0x2c) addr:0x02099194 +_ZN27ActorProfile_ov000_020b30188vfunc_08Ev kind:function(arm,size=0x70) addr:0x020991c0 func_ov000_02099230 kind:function(arm,size=0x70) addr:0x02099230 func_ov000_020992a0 kind:function(arm,size=0x70) addr:0x020992a0 _ZN19func_ov000_02099310D0Ev kind:function(arm,size=0x1c) addr:0x02099310 @@ -2356,7 +2356,7 @@ _ZN14Actor_Derived219func_ov000_02098f34EP7VecFx32 kind:function(arm,size=0xd0) _ZN14Actor_Derived28vfunc_30EP14Actor_vfunc_30 kind:function(arm,size=0xc) addr:0x0209a7d0 func_ov000_0209a7dc kind:function(arm,size=0xb0) addr:0x0209a7dc _ZN14Actor_Derived219func_ov000_020990c0EP8Actor_9Cii kind:function(arm,size=0x21c) addr:0x0209a88c -func_ov000_0209aaa8 kind:function(arm,size=0x90) addr:0x0209aaa8 +_ZN14Actor_Derived219func_ov000_020992dcEv kind:function(arm,size=0x90) addr:0x0209aaa8 func_ov000_0209ab38 kind:function(arm,size=0x64) addr:0x0209ab38 func_ov000_0209ab9c kind:function(arm,size=0x80) addr:0x0209ab9c _ZN14Actor_Derived219func_ov000_02099450EPvP7VecFx32it kind:function(arm,size=0x50) addr:0x0209ac1c diff --git a/config/jp/arm9/overlays/ov032/delinks.txt b/config/jp/arm9/overlays/ov032/delinks.txt index 0adddb0a..dabb7a09 100644 --- a/config/jp/arm9/overlays/ov032/delinks.txt +++ b/config/jp/arm9/overlays/ov032/delinks.txt @@ -12,10 +12,11 @@ src/032_MapA1/Actor/ActorSpinut.cpp: .data start:0x02124120 end:0x02124368 .bss start:0x02124800 end:0x021248e8 -src/032_MapA1/Actor/ActorUnkMKUR.cpp: +src/032_MapA1/Actor/ActorFleeingSpinut.cpp: .text start:0x0211d46c end:0x0211f8e0 .init start:0x02123f78 end:0x02123ff8 .ctor start:0x02124108 end:0x0212410c + .data start:0x02124368 end:0x02124498 .bss start:0x021248e8 end:0x02124954 src/032_MapA1/Actor/ActorUnkKETH.cpp: diff --git a/config/jp/arm9/overlays/ov032/symbols.txt b/config/jp/arm9/overlays/ov032/symbols.txt index 4a41182b..0258ed4c 100644 --- a/config/jp/arm9/overlays/ov032/symbols.txt +++ b/config/jp/arm9/overlays/ov032/symbols.txt @@ -58,60 +58,60 @@ _ZN15ActorSpinut_1108vfunc_38Eii kind:function(arm,size=0x2c) addr:0x0211d3f4 _ZN15ActorSpinut_110D0Ev kind:function(arm,size=0x1c) addr:0x0211d420 _ZN15ActorSpinut_1BCD0Ev kind:function(arm,size=0x1c) addr:0x0211d43c _ZN18ActorProfileSpinutD1Ev kind:function(arm,size=0x14) addr:0x0211d458 -_ZN19ActorProfileUnkMKUR10GetProfileEv kind:function(arm,size=0xc) addr:0x0211d46c -_ZN19ActorProfileUnkMKUR6CreateEv kind:function(arm,size=0x24) addr:0x0211d478 -_ZN19ActorProfileUnkMKURC1Ev kind:function(arm,size=0x4c) addr:0x0211d49c -_ZN12ActorUnkMKURC1Ev kind:function(arm,size=0x1d8) addr:0x0211d4e8 -_ZN12ActorUnkMKURD1Ev kind:function(arm,size=0x30) addr:0x0211d6c0 -_ZN12ActorUnkMKURD0Ev kind:function(arm,size=0x38) addr:0x0211d6f0 -_ZN12ActorUnkMKUR19func_ov032_0211b988Ev kind:function(arm,size=0x1c) addr:0x0211d728 -_ZN12ActorUnkMKUR19func_ov032_0211b9a4Ev kind:function(arm,size=0x68) addr:0x0211d744 -_ZN12ActorUnkMKUR19func_ov032_0211ba0cEv kind:function(arm,size=0x268) addr:0x0211d7ac -_ZN12ActorUnkMKUR19func_ov032_0211bc74Ev kind:function(arm,size=0x104) addr:0x0211da14 -_ZN12ActorUnkMKUR19func_ov032_0211bd78Ev kind:function(arm,size=0x8c) addr:0x0211db18 -_ZN12ActorUnkMKUR19func_ov032_0211be04Ev kind:function(arm,size=0x2c) addr:0x0211dba4 -_ZN12ActorUnkMKUR19func_ov032_0211be30Ev kind:function(arm,size=0x78) addr:0x0211dbd0 -_ZN12ActorUnkMKUR19func_ov032_0211bea8Ev kind:function(arm,size=0xdc) addr:0x0211dc48 -_ZN12ActorUnkMKUR19func_ov032_0211bf84Ev kind:function(arm,size=0x78) addr:0x0211dd24 -_ZN12ActorUnkMKUR19func_ov032_0211bffcEv kind:function(arm,size=0x80) addr:0x0211dd9c -_ZN12ActorUnkMKUR19func_ov032_0211c07cEv kind:function(arm,size=0x8c) addr:0x0211de1c -_ZN12ActorUnkMKUR19func_ov032_0211c108Ev kind:function(arm,size=0x1bc) addr:0x0211dea8 -_ZN12ActorUnkMKUR19func_ov032_0211c2c4Ev kind:function(arm,size=0x7c) addr:0x0211e064 -_ZN12ActorUnkMKUR19func_ov032_0211c340Ev kind:function(arm,size=0x104) addr:0x0211e0e0 -_ZN12ActorUnkMKUR19func_ov032_0211c444Ev kind:function(arm,size=0x90) addr:0x0211e1e4 -_ZN12ActorUnkMKUR19func_ov032_0211c4d4Ev kind:function(arm,size=0x68) addr:0x0211e274 -_ZN12ActorUnkMKUR19func_ov032_0211c53cEv kind:function(arm,size=0x90) addr:0x0211e2dc -_ZN12ActorUnkMKUR19func_ov032_0211c5ccEv kind:function(arm,size=0x170) addr:0x0211e36c -_ZN12ActorUnkMKUR19func_ov032_0211c73cEv kind:function(arm,size=0x80) addr:0x0211e4dc -_ZN12ActorUnkMKUR19func_ov032_0211c7bcEv kind:function(arm,size=0x17c) addr:0x0211e55c -_ZN12ActorUnkMKUR19func_ov032_0211c938Ev kind:function(arm,size=0xa0) addr:0x0211e6d8 -_ZN12ActorUnkMKUR19func_ov032_0211c9d8Ev kind:function(arm,size=0x48) addr:0x0211e778 -_ZN12ActorUnkMKUR19func_ov032_0211ca20Ev kind:function(arm,size=0x4c) addr:0x0211e7c0 -_ZN12ActorUnkMKUR19func_ov032_0211ca6cEv kind:function(arm,size=0x4c) addr:0x0211e80c -_ZN12ActorUnkMKUR19func_ov032_0211cab8Ev kind:function(arm,size=0x74) addr:0x0211e858 -_ZN12ActorUnkMKUR19func_ov032_0211cb2cEv kind:function(arm,size=0xe4) addr:0x0211e8cc -_ZN12ActorUnkMKUR19func_ov032_0211cc10Ev kind:function(arm,size=0x38) addr:0x0211e9b0 -_ZN12ActorUnkMKUR19func_ov032_0211cc48Ev kind:function(arm,size=0xd8) addr:0x0211e9e8 -_ZN12ActorUnkMKUR19func_ov032_0211cd20Ev kind:function(arm,size=0x40) addr:0x0211eac0 -_ZN12ActorUnkMKUR19func_ov032_0211cd60Ev kind:function(arm,size=0x214) addr:0x0211eb00 -_ZN12ActorUnkMKUR19func_ov032_0211cf74Ev kind:function(arm,size=0x38) addr:0x0211ed14 -_ZN12ActorUnkMKUR19func_ov032_0211cfacEv kind:function(arm,size=0x7c) addr:0x0211ed4c -_ZN12ActorUnkMKUR19func_ov032_0211d028Ev kind:function(arm,size=0x18) addr:0x0211edc8 -_ZN12ActorUnkMKUR19func_ov032_0211d040Ev kind:function(arm,size=0x4c) addr:0x0211ede0 -_ZN12ActorUnkMKUR19func_ov032_0211d08cEv kind:function(arm,size=0x258) addr:0x0211ee2c -_ZN12ActorUnkMKUR19func_ov032_0211d2e4Ev kind:function(arm,size=0xa0) addr:0x0211f084 -_ZN12ActorUnkMKUR19func_ov032_0211d384Ev kind:function(arm,size=0x1e4) addr:0x0211f124 -_ZN12ActorUnkMKUR19func_ov032_0211d568Ev kind:function(arm,size=0x10c) addr:0x0211f308 -_ZN12ActorUnkMKUR19func_ov032_0211d674Ev kind:function(arm,size=0x64) addr:0x0211f414 -_ZN12ActorUnkMKUR19func_ov032_0211d6d8Ev kind:function(arm,size=0x110) addr:0x0211f478 -_ZN12ActorUnkMKUR19func_ov032_0211d7e8Ev kind:function(arm,size=0x24) addr:0x0211f588 -_ZN12ActorUnkMKUR19func_ov032_0211d80cEv kind:function(arm,size=0x24) addr:0x0211f5ac -_ZN12ActorUnkMKUR19func_ov032_0211d830Ev kind:function(arm,size=0x34) addr:0x0211f5d0 -_ZN12ActorUnkMKUR19func_ov032_0211d864Ev kind:function(arm,size=0xac) addr:0x0211f604 -_ZN12ActorUnkMKUR19func_ov032_0211d910Ev kind:function(arm,size=0x10) addr:0x0211f6b0 -_ZN12ActorUnkMKUR19func_ov032_0211d920Ev kind:function(arm,size=0xec) addr:0x0211f6c0 -_ZN12ActorUnkMKUR19func_ov032_0211da0cEv kind:function(arm,size=0x120) addr:0x0211f7ac -_ZN19ActorProfileUnkMKURD1Ev kind:function(arm,size=0x14) addr:0x0211f8cc +_ZN25ActorProfileFleeingSpinut10GetProfileEv kind:function(arm,size=0xc) addr:0x0211d46c +_ZN25ActorProfileFleeingSpinut6CreateEv kind:function(arm,size=0x24) addr:0x0211d478 +_ZN25ActorProfileFleeingSpinutC1Ev kind:function(arm,size=0x4c) addr:0x0211d49c +_ZN18ActorFleeingSpinutC1Ev kind:function(arm,size=0x1d8) addr:0x0211d4e8 +_ZN18ActorFleeingSpinutD1Ev kind:function(arm,size=0x30) addr:0x0211d6c0 +_ZN18ActorFleeingSpinutD0Ev kind:function(arm,size=0x38) addr:0x0211d6f0 +_ZN18ActorFleeingSpinut8vfunc_18Ei kind:function(arm,size=0x1c) addr:0x0211d728 +_ZN18ActorFleeingSpinut8SetStateEs kind:function(arm,size=0x68) addr:0x0211d744 +_ZN18ActorFleeingSpinut8vfunc_20Ev kind:function(arm,size=0x268) addr:0x0211d7ac +_ZN18ActorFleeingSpinut8vfunc_30EP14Actor_vfunc_30 kind:function(arm,size=0x104) addr:0x0211da14 +_ZN18ActorFleeingSpinut8vfunc_2CEi kind:function(arm,size=0x8c) addr:0x0211db18 +_ZN18ActorFleeingSpinut19func_ov032_0211be04Ev kind:function(arm,size=0x2c) addr:0x0211dba4 +_ZN18ActorFleeingSpinut19func_ov032_0211be30Ev kind:function(arm,size=0x78) addr:0x0211dbd0 +_ZN18ActorFleeingSpinut19func_ov032_0211bea8Ev kind:function(arm,size=0xdc) addr:0x0211dc48 +_ZN18ActorFleeingSpinut19func_ov032_0211bf84Ev kind:function(arm,size=0x78) addr:0x0211dd24 +_ZN18ActorFleeingSpinut19func_ov032_0211bffcEv kind:function(arm,size=0x80) addr:0x0211dd9c +_ZN18ActorFleeingSpinut19func_ov032_0211c07cEv kind:function(arm,size=0x8c) addr:0x0211de1c +_ZN18ActorFleeingSpinut19func_ov032_0211c108Ev kind:function(arm,size=0x1bc) addr:0x0211dea8 +_ZN18ActorFleeingSpinut19func_ov032_0211c2c4Ev kind:function(arm,size=0x7c) addr:0x0211e064 +_ZN18ActorFleeingSpinut19func_ov032_0211c340Ev kind:function(arm,size=0x104) addr:0x0211e0e0 +_ZN18ActorFleeingSpinut19func_ov032_0211c444Ev kind:function(arm,size=0x90) addr:0x0211e1e4 +_ZN18ActorFleeingSpinut19func_ov032_0211c4d4Ev kind:function(arm,size=0x68) addr:0x0211e274 +_ZN18ActorFleeingSpinut19func_ov032_0211c53cEv kind:function(arm,size=0x90) addr:0x0211e2dc +_ZN18ActorFleeingSpinut19func_ov032_0211c5ccEv kind:function(arm,size=0x170) addr:0x0211e36c +_ZN18ActorFleeingSpinut19func_ov032_0211c73cEv kind:function(arm,size=0x80) addr:0x0211e4dc +_ZN18ActorFleeingSpinut19func_ov032_0211c7bcEv kind:function(arm,size=0x17c) addr:0x0211e55c +_ZN18ActorFleeingSpinut19func_ov032_0211c938Ev kind:function(arm,size=0xa0) addr:0x0211e6d8 +_ZN18ActorFleeingSpinut19func_ov032_0211c9d8Ev kind:function(arm,size=0x48) addr:0x0211e778 +_ZN18ActorFleeingSpinut19func_ov032_0211ca20Ev kind:function(arm,size=0x4c) addr:0x0211e7c0 +_ZN18ActorFleeingSpinut19func_ov032_0211ca6cEv kind:function(arm,size=0x4c) addr:0x0211e80c +_ZN18ActorFleeingSpinut19func_ov032_0211cab8Eii kind:function(arm,size=0x74) addr:0x0211e858 +_ZN18ActorFleeingSpinut19func_ov032_0211cb2cEv kind:function(arm,size=0xe4) addr:0x0211e8cc +_ZN22ActorFleeingSpinut_1ECC1Ev kind:function(arm,size=0x38) addr:0x0211e9b0 +_ZN22ActorFleeingSpinut_1EC19func_ov032_0211cc48EP7VecFx32 kind:function(arm,size=0xd8) addr:0x0211e9e8 +_ZN22ActorFleeingSpinut_1EC19func_ov032_0211cd20EP7VecFx32 kind:function(arm,size=0x40) addr:0x0211eac0 +_ZN22ActorFleeingSpinut_1EC19func_ov032_0211cd60EP7VecFx32PsS1_iii kind:function(arm,size=0x214) addr:0x0211eb00 +_ZN22ActorFleeingSpinut_1EC19func_ov032_0211cf74Ev kind:function(arm,size=0x38) addr:0x0211ed14 +_ZN22ActorFleeingSpinut_1EC19func_ov032_0211cfacEi kind:function(arm,size=0x7c) addr:0x0211ed4c +_ZN22ActorFleeingSpinut_1EC19func_ov032_0211d028Ev kind:function(arm,size=0x18) addr:0x0211edc8 +_ZN22ActorFleeingSpinut_1EC19func_ov032_0211d040EP7VecFx32 kind:function(arm,size=0x4c) addr:0x0211ede0 +_ZN22ActorFleeingSpinut_1EC19func_ov032_0211d08cEP7VecFx32 kind:function(arm,size=0x258) addr:0x0211ee2c +_ZN22ActorFleeingSpinut_1EC19func_ov032_0211d2e4EP37UnkStruct_027e0960_TableEntry_04_Base kind:function(arm,size=0xa0) addr:0x0211f084 +_ZN22ActorFleeingSpinut_1EC19func_ov032_0211d384EP7VecFx32 kind:function(arm,size=0x1e4) addr:0x0211f124 +_ZN22ActorFleeingSpinut_1EC19func_ov032_0211d568EP7VecFx32P37UnkStruct_027e0960_TableEntry_04_BaseS3_ kind:function(arm,size=0x10c) addr:0x0211f308 +_ZN22ActorFleeingSpinut_1EC19func_ov032_0211d674EP7VecFx32P37UnkStruct_027e0960_TableEntry_04_Base kind:function(arm,size=0x64) addr:0x0211f414 +_ZN22ActorFleeingSpinut_1EC19func_ov032_0211d6d8EP7VecFx32P37UnkStruct_027e0960_TableEntry_04_Basei kind:function(arm,size=0x110) addr:0x0211f478 +_ZN22ActorFleeingSpinut_1EC19func_ov032_0211d7e8EP7VecFx32 kind:function(arm,size=0x24) addr:0x0211f588 +_ZN22ActorFleeingSpinut_1EC19func_ov032_0211d80cEv kind:function(arm,size=0x24) addr:0x0211f5ac +_ZN22ActorFleeingSpinut_1EC19func_ov032_0211d830EP32UnkStruct_027e0960_TableEntry_04 kind:function(arm,size=0x34) addr:0x0211f5d0 +_ZN22ActorFleeingSpinut_1EC19func_ov032_0211d864EP7VecFx32 kind:function(arm,size=0xac) addr:0x0211f604 +_ZN22ActorFleeingSpinut_1EC19func_ov032_0211d910Ev kind:function(arm,size=0x10) addr:0x0211f6b0 +_ZN22ActorFleeingSpinut_1EC19func_ov032_0211d920EP7VecFx32 kind:function(arm,size=0xec) addr:0x0211f6c0 +_ZN22ActorFleeingSpinut_1EC19func_ov032_0211da0cEiP7VecFx32 kind:function(arm,size=0x120) addr:0x0211f7ac +_ZN25ActorProfileFleeingSpinutD1Ev kind:function(arm,size=0x14) addr:0x0211f8cc _ZN19ActorProfileUnkKETH10GetProfileEv kind:function(arm,size=0xc) addr:0x0211f8e0 _ZN19ActorProfileUnkKETH6CreateEv kind:function(arm,size=0x24) addr:0x0211f8ec _ZN19ActorProfileUnkKETHC1Ev kind:function(arm,size=0x5c) addr:0x0211f910 @@ -227,12 +227,12 @@ data_ov032_02121f04 kind:data(any) addr:0x02123edc data_ov032_02121f14 kind:data(any) addr:0x02123eec data_ov032_02121f24 kind:data(any) addr:0x02123efc __sinit_ActorSpinut.cpp kind:function(arm,size=0x6c) addr:0x02123f0c -__sinit_ActorUnkMKUR.cpp kind:function(arm,size=0x80) addr:0x02123f78 +__sinit_ActorFleeingSpinut.cpp kind:function(arm,size=0x80) addr:0x02123f78 __sinit_ActorUnkKETH.cpp kind:function(arm,size=0x6c) addr:0x02123ff8 __sinit_ActorUnkNSSW.cpp kind:function(arm,size=0x50) addr:0x02124064 __sinit_MapObjectUnkSWSW.cpp kind:function(arm,size=0x50) addr:0x021240b4 .p__sinit_ActorSpinut.cpp kind:data(word) addr:0x02124104 -.p__sinit_ActorUnkMKUR.cpp kind:data(word) addr:0x02124108 +.p__sinit_ActorFleeingSpinut.cpp kind:data(word) addr:0x02124108 .p__sinit_ActorUnkKETH.cpp kind:data(word) addr:0x0212410c .p__sinit_ActorUnkNSSW.cpp kind:data(word) addr:0x02124110 .p__sinit_MapObjectUnkSWSW.cpp kind:data(word) addr:0x02124114 @@ -247,13 +247,13 @@ _ZTV15ActorSpinut_110 kind:data(any) addr:0x021241fc data_ov032_02122288 kind:data(any) addr:0x02124248 _ZTV11ActorSpinut kind:data(any) addr:0x021242a8 data_ov032_02122348 kind:data(any) addr:0x02124308 -data_ov032_02124368 kind:data(any) addr:0x02124368 -data_ov032_02124374 kind:data(any) addr:0x02124374 -data_ov032_0212438c kind:data(any) addr:0x0212438c -data_ov032_021243a4 kind:data(any) addr:0x021243a4 -data_ov032_021243dc kind:data(any) addr:0x021243dc -_ZTV19data_ov032_02124414 kind:data(any) addr:0x02124414 -_ZTV19data_ov032_02124438 kind:data(any) addr:0x02124438 +data_ov032_021223a8 kind:data(any) addr:0x02124368 +data_ov032_021223b4 kind:data(any) addr:0x02124374 +data_ov032_021223cc kind:data(any) addr:0x0212438c +data_ov032_021223e4 kind:data(any) addr:0x021243a4 +data_ov032_0212241c kind:data(any) addr:0x021243dc +_ZTV25ActorProfileFleeingSpinut kind:data(any) addr:0x02124414 +_ZTV18ActorFleeingSpinut kind:data(any) addr:0x02124438 data_ov032_02124498 kind:data(any) addr:0x02124498 data_ov032_021244a4 kind:data(any) addr:0x021244a4 data_ov032_021244bc kind:data(any) addr:0x021244bc @@ -279,10 +279,10 @@ _ZGVN15ProfileInstanceI18ActorProfileSpinutE8sProfileE kind:bss addr:0x02124800 @31136 kind:bss addr:0x02124804 _ZN15ProfileInstanceI18ActorProfileSpinutE8sProfileE kind:bss addr:0x02124810 data_ov032_021248e8 kind:bss addr:0x021248e8 -data_ov032_021248ec kind:bss addr:0x021248ec -_ZGVN15ProfileInstanceI19ActorProfileUnkMKURE8sProfileE kind:bss addr:0x021248f8 +data_ov032_0212290c kind:bss addr:0x021248ec +_ZGVN15ProfileInstanceI25ActorProfileFleeingSpinutE8sProfileE kind:bss addr:0x021248f8 @31142 kind:bss addr:0x02124904 -_ZN15ProfileInstanceI19ActorProfileUnkMKURE8sProfileE kind:bss addr:0x02124910 +_ZN15ProfileInstanceI25ActorProfileFleeingSpinutE8sProfileE kind:bss addr:0x02124910 _ZGVN15ProfileInstanceI19ActorProfileUnkKETHE8sProfileE kind:bss addr:0x02124954 @31148 kind:bss addr:0x02124958 _ZN15ProfileInstanceI19ActorProfileUnkKETHE8sProfileE kind:bss addr:0x02124964 diff --git a/config/jp/arm9/overlays/ov070/symbols.txt b/config/jp/arm9/overlays/ov070/symbols.txt index 2410393c..dc4b16d5 100644 --- a/config/jp/arm9/overlays/ov070/symbols.txt +++ b/config/jp/arm9/overlays/ov070/symbols.txt @@ -98,7 +98,7 @@ func_ov070_02141264 kind:function(arm,size=0x150) addr:0x02142fec _ZN19ActorProfileUnkKEYN10GetProfileEv kind:function(arm,size=0xc) addr:0x0214313c _ZN19ActorProfileUnkKEYN6CreateEv kind:function(arm,size=0x24) addr:0x02143148 _ZN19ActorProfileUnkKEYNC1Ev kind:function(arm,size=0x58) addr:0x0214316c -_ZN12ActorUnkKEYN19func_ov070_0214143cEv kind:function(arm,size=0xac) addr:0x021431c4 +_ZN12ActorUnkKEYN19func_ov070_0214143cEP8ActorRefP7VecFx32S0_sht kind:function(arm,size=0xac) addr:0x021431c4 _ZN12ActorUnkKEYNC1Ev kind:function(arm,size=0x130) addr:0x02143270 _ZN12ActorUnkKEYN19func_ov070_02141618Ev kind:function(arm,size=0x14) addr:0x021433a0 _ZN12ActorUnkKEYN19func_ov070_0214162cEv kind:function(arm,size=0x124) addr:0x021433b4 diff --git a/config/usa/arm9/itcm/symbols.txt b/config/usa/arm9/itcm/symbols.txt index 1ebb3fb0..b7b72329 100644 --- a/config/usa/arm9/itcm/symbols.txt +++ b/config/usa/arm9/itcm/symbols.txt @@ -127,7 +127,7 @@ func_01ffc4cc kind:function(arm,size=0x54) addr:0x01ffc4cc func_01ffc520 kind:function(arm,size=0x5c) addr:0x01ffc520 _ZN11ModelRender8vfunc_0CEv kind:function(arm,size=0x24) addr:0x01ffc57c func_01ffc5a0 kind:function(arm,size=0x94) addr:0x01ffc5a0 -func_01ffc634 kind:function(arm,size=0xa0) addr:0x01ffc634 +_ZN15ModelRenderBase13func_01ffc634EP7VecFx3214UnkAngleStructS1_ kind:function(arm,size=0xa0) addr:0x01ffc634 _ZN19UnkSystem6_Derived213func_01ffc6d4E14UnkAngleStructP7VecFx32 kind:function(arm,size=0x70) addr:0x01ffc6d4 func_01ffc744 kind:function(arm,size=0x24) addr:0x01ffc744 _ZN24UnkStruct_ov000_020b4ec413func_01ffc768Ei kind:function(arm,size=0x3c) addr:0x01ffc768 diff --git a/config/usa/arm9/overlays/ov000/symbols.txt b/config/usa/arm9/overlays/ov000/symbols.txt index c06849cd..0f59e950 100644 --- a/config/usa/arm9/overlays/ov000/symbols.txt +++ b/config/usa/arm9/overlays/ov000/symbols.txt @@ -2281,10 +2281,10 @@ _ZN21ActorProfile_Derived18vfunc_04Ev kind:function(arm,size=0x8) addr:0x0209792 _ZN21ActorProfile_Derived18vfunc_10Ev kind:function(arm,size=0x20) addr:0x0209792c _ZN21ActorProfile_Derived18vfunc_14Ev kind:function(arm,size=0x2c) addr:0x0209794c _ZN21ActorProfile_Derived18vfunc_18Ev kind:function(arm,size=0x1c) addr:0x02097978 -func_ov000_020979b4 kind:function(arm,size=0x30) addr:0x02097994 -func_ov000_020979e4 kind:function(arm,size=0x8) addr:0x020979c4 -func_ov000_020979ec kind:function(arm,size=0x2c) addr:0x020979cc -func_ov000_02097a18 kind:function(arm,size=0x70) addr:0x020979f8 +_ZN27ActorProfile_ov000_020b3018C2Ejj kind:function(arm,size=0x30) addr:0x02097994 +_ZN27ActorProfile_ov000_020b30188vfunc_04Ev kind:function(arm,size=0x8) addr:0x020979c4 +_ZN27ActorProfile_ov000_020b30188vfunc_10Ev kind:function(arm,size=0x2c) addr:0x020979cc +_ZN27ActorProfile_ov000_020b30188vfunc_08Ev kind:function(arm,size=0x70) addr:0x020979f8 func_ov000_02097a88 kind:function(arm,size=0x70) addr:0x02097a68 func_ov000_02097af8 kind:function(arm,size=0x70) addr:0x02097ad8 _ZN19func_ov000_02097b68D0Ev kind:function(arm,size=0x1c) addr:0x02097b48 diff --git a/config/usa/arm9/overlays/ov031/relocs.txt b/config/usa/arm9/overlays/ov031/relocs.txt index ed1d93c0..82387213 100644 --- a/config/usa/arm9/overlays/ov031/relocs.txt +++ b/config/usa/arm9/overlays/ov031/relocs.txt @@ -177,7 +177,7 @@ from:0x020d9b30 kind:arm_call to:0x0208d46c module:overlay(0) from:0x020d9b4c kind:load to:0x0208d580 module:overlay(0) from:0x020d9b5c kind:load to:0x0208dcd0 module:overlay(0) from:0x020d9b84 kind:load to:0x020936cc module:overlay(0) -from:0x020d9b90 kind:load to:0x021223d1 module:overlays(32,33,34,36,37) +from:0x020d9b90 kind:load to:0x021223d1 module:overlays(33,34,36,37) from:0x020d9b9c kind:load to:0x02152a05 module:overlays(29,30,58,72,81) from:0x020d9bac kind:load to:0x027e0d34 module:dtcm from:0x020d9bba kind:thumb_call_arm to:0x02011f3c module:main diff --git a/config/usa/arm9/overlays/ov032/delinks.txt b/config/usa/arm9/overlays/ov032/delinks.txt index 991b6f5f..50ef07f8 100644 --- a/config/usa/arm9/overlays/ov032/delinks.txt +++ b/config/usa/arm9/overlays/ov032/delinks.txt @@ -12,10 +12,11 @@ src/032_MapA1/Actor/ActorSpinut.cpp: .data start:0x02122140 end:0x02122388 .bss start:0x02122800 end:0x021228e8 -src/032_MapA1/Actor/ActorUnkMKUR.cpp: +src/032_MapA1/Actor/ActorFleeingSpinut.cpp: .text start:0x0211b6ac end:0x0211db20 .init start:0x02121f80 end:0x02122000 .ctor start:0x02122110 end:0x02122114 + .data start:0x02122388 end:0x021224B8 .bss start:0x021228e8 end:0x02122954 src/032_MapA1/Actor/ActorUnkKETH.cpp: diff --git a/config/usa/arm9/overlays/ov032/relocs.txt b/config/usa/arm9/overlays/ov032/relocs.txt index 034c08cd..a78bcb19 100644 --- a/config/usa/arm9/overlays/ov032/relocs.txt +++ b/config/usa/arm9/overlays/ov032/relocs.txt @@ -257,7 +257,7 @@ from:0x0211b6b4 kind:load to:0x02122910 module:overlay(32) from:0x0211b6c8 kind:arm_call to:0x02011f3c module:main from:0x0211b6d4 kind:arm_call to:0x0211b728 module:overlay(32) from:0x0211b6ec kind:arm_call to:0x02097994 module:overlay(0) -from:0x0211b724 kind:load to:0x0212243c module:overlay(32) +from:0x0211b724 kind:load to:0x02122434 module:overlay(32) add:0x8 from:0x0211b734 kind:arm_call to:0x02098b08 module:overlay(0) from:0x0211b798 kind:arm_call_thumb to:0x02057a04 module:overlay(0) from:0x0211b7c4 kind:arm_call_thumb to:0x0209a168 module:overlay(0) @@ -270,7 +270,7 @@ from:0x0211b888 kind:arm_call to:0x0205fc00 module:overlay(0) from:0x0211b8a0 kind:arm_call to:0x0205fc00 module:overlay(0) from:0x0211b8ac kind:arm_call to:0x0209860c module:overlay(0) from:0x0211b8c8 kind:arm_call to:0x0211bde4 module:overlay(32) -from:0x0211b8e8 kind:load to:0x02122460 module:overlay(32) +from:0x0211b8e8 kind:load to:0x02122458 module:overlay(32) add:0x8 from:0x0211b8ec kind:load to:0x02122910 module:overlay(32) from:0x0211b8f0 kind:load to:0x02122224 module:overlay(32) from:0x0211b8f4 kind:load to:0x02122904 module:overlay(32) diff --git a/config/usa/arm9/overlays/ov032/symbols.txt b/config/usa/arm9/overlays/ov032/symbols.txt index c2f4b9bf..39118111 100644 --- a/config/usa/arm9/overlays/ov032/symbols.txt +++ b/config/usa/arm9/overlays/ov032/symbols.txt @@ -58,60 +58,60 @@ _ZN15ActorSpinut_1108vfunc_38Eii kind:function(arm,size=0x2c) addr:0x0211b634 _ZN15ActorSpinut_110D0Ev kind:function(arm,size=0x1c) addr:0x0211b660 _ZN15ActorSpinut_1BCD0Ev kind:function(arm,size=0x1c) addr:0x0211b67c _ZN18ActorProfileSpinutD1Ev kind:function(arm,size=0x14) addr:0x0211b698 -_ZN19ActorProfileUnkMKUR10GetProfileEv kind:function(arm,size=0xc) addr:0x0211b6ac -_ZN19ActorProfileUnkMKUR6CreateEv kind:function(arm,size=0x24) addr:0x0211b6b8 -_ZN19ActorProfileUnkMKURC1Ev kind:function(arm,size=0x4c) addr:0x0211b6dc -_ZN12ActorUnkMKURC1Ev kind:function(arm,size=0x1d8) addr:0x0211b728 -_ZN12ActorUnkMKURD1Ev kind:function(arm,size=0x30) addr:0x0211b900 -_ZN12ActorUnkMKURD0Ev kind:function(arm,size=0x38) addr:0x0211b930 -_ZN12ActorUnkMKUR19func_ov032_0211b988Ev kind:function(arm,size=0x1c) addr:0x0211b968 -_ZN12ActorUnkMKUR19func_ov032_0211b9a4Ev kind:function(arm,size=0x68) addr:0x0211b984 -_ZN12ActorUnkMKUR19func_ov032_0211ba0cEv kind:function(arm,size=0x268) addr:0x0211b9ec -_ZN12ActorUnkMKUR19func_ov032_0211bc74Ev kind:function(arm,size=0x104) addr:0x0211bc54 -_ZN12ActorUnkMKUR19func_ov032_0211bd78Ev kind:function(arm,size=0x8c) addr:0x0211bd58 -_ZN12ActorUnkMKUR19func_ov032_0211be04Ev kind:function(arm,size=0x2c) addr:0x0211bde4 -_ZN12ActorUnkMKUR19func_ov032_0211be30Ev kind:function(arm,size=0x78) addr:0x0211be10 -_ZN12ActorUnkMKUR19func_ov032_0211bea8Ev kind:function(arm,size=0xdc) addr:0x0211be88 -_ZN12ActorUnkMKUR19func_ov032_0211bf84Ev kind:function(arm,size=0x78) addr:0x0211bf64 -_ZN12ActorUnkMKUR19func_ov032_0211bffcEv kind:function(arm,size=0x80) addr:0x0211bfdc -_ZN12ActorUnkMKUR19func_ov032_0211c07cEv kind:function(arm,size=0x8c) addr:0x0211c05c -_ZN12ActorUnkMKUR19func_ov032_0211c108Ev kind:function(arm,size=0x1bc) addr:0x0211c0e8 -_ZN12ActorUnkMKUR19func_ov032_0211c2c4Ev kind:function(arm,size=0x7c) addr:0x0211c2a4 -_ZN12ActorUnkMKUR19func_ov032_0211c340Ev kind:function(arm,size=0x104) addr:0x0211c320 -_ZN12ActorUnkMKUR19func_ov032_0211c444Ev kind:function(arm,size=0x90) addr:0x0211c424 -_ZN12ActorUnkMKUR19func_ov032_0211c4d4Ev kind:function(arm,size=0x68) addr:0x0211c4b4 -_ZN12ActorUnkMKUR19func_ov032_0211c53cEv kind:function(arm,size=0x90) addr:0x0211c51c -_ZN12ActorUnkMKUR19func_ov032_0211c5ccEv kind:function(arm,size=0x170) addr:0x0211c5ac -_ZN12ActorUnkMKUR19func_ov032_0211c73cEv kind:function(arm,size=0x80) addr:0x0211c71c -_ZN12ActorUnkMKUR19func_ov032_0211c7bcEv kind:function(arm,size=0x17c) addr:0x0211c79c -_ZN12ActorUnkMKUR19func_ov032_0211c938Ev kind:function(arm,size=0xa0) addr:0x0211c918 -_ZN12ActorUnkMKUR19func_ov032_0211c9d8Ev kind:function(arm,size=0x48) addr:0x0211c9b8 -_ZN12ActorUnkMKUR19func_ov032_0211ca20Ev kind:function(arm,size=0x4c) addr:0x0211ca00 -_ZN12ActorUnkMKUR19func_ov032_0211ca6cEv kind:function(arm,size=0x4c) addr:0x0211ca4c -_ZN12ActorUnkMKUR19func_ov032_0211cab8Ev kind:function(arm,size=0x74) addr:0x0211ca98 -_ZN12ActorUnkMKUR19func_ov032_0211cb2cEv kind:function(arm,size=0xe4) addr:0x0211cb0c -_ZN12ActorUnkMKUR19func_ov032_0211cc10Ev kind:function(arm,size=0x38) addr:0x0211cbf0 -_ZN12ActorUnkMKUR19func_ov032_0211cc48Ev kind:function(arm,size=0xd8) addr:0x0211cc28 -_ZN12ActorUnkMKUR19func_ov032_0211cd20Ev kind:function(arm,size=0x40) addr:0x0211cd00 -_ZN12ActorUnkMKUR19func_ov032_0211cd60Ev kind:function(arm,size=0x214) addr:0x0211cd40 -_ZN12ActorUnkMKUR19func_ov032_0211cf74Ev kind:function(arm,size=0x38) addr:0x0211cf54 -_ZN12ActorUnkMKUR19func_ov032_0211cfacEv kind:function(arm,size=0x7c) addr:0x0211cf8c -_ZN12ActorUnkMKUR19func_ov032_0211d028Ev kind:function(arm,size=0x18) addr:0x0211d008 -_ZN12ActorUnkMKUR19func_ov032_0211d040Ev kind:function(arm,size=0x4c) addr:0x0211d020 -_ZN12ActorUnkMKUR19func_ov032_0211d08cEv kind:function(arm,size=0x258) addr:0x0211d06c -_ZN12ActorUnkMKUR19func_ov032_0211d2e4Ev kind:function(arm,size=0xa0) addr:0x0211d2c4 -_ZN12ActorUnkMKUR19func_ov032_0211d384Ev kind:function(arm,size=0x1e4) addr:0x0211d364 -_ZN12ActorUnkMKUR19func_ov032_0211d568Ev kind:function(arm,size=0x10c) addr:0x0211d548 -_ZN12ActorUnkMKUR19func_ov032_0211d674Ev kind:function(arm,size=0x64) addr:0x0211d654 -_ZN12ActorUnkMKUR19func_ov032_0211d6d8Ev kind:function(arm,size=0x110) addr:0x0211d6b8 -_ZN12ActorUnkMKUR19func_ov032_0211d7e8Ev kind:function(arm,size=0x24) addr:0x0211d7c8 -_ZN12ActorUnkMKUR19func_ov032_0211d80cEv kind:function(arm,size=0x24) addr:0x0211d7ec -_ZN12ActorUnkMKUR19func_ov032_0211d830Ev kind:function(arm,size=0x34) addr:0x0211d810 -_ZN12ActorUnkMKUR19func_ov032_0211d864Ev kind:function(arm,size=0xac) addr:0x0211d844 -_ZN12ActorUnkMKUR19func_ov032_0211d910Ev kind:function(arm,size=0x10) addr:0x0211d8f0 -_ZN12ActorUnkMKUR19func_ov032_0211d920Ev kind:function(arm,size=0xec) addr:0x0211d900 -_ZN12ActorUnkMKUR19func_ov032_0211da0cEv kind:function(arm,size=0x120) addr:0x0211d9ec -_ZN19ActorProfileUnkMKURD1Ev kind:function(arm,size=0x14) addr:0x0211db0c +_ZN25ActorProfileFleeingSpinut10GetProfileEv kind:function(arm,size=0xc) addr:0x0211b6ac +_ZN25ActorProfileFleeingSpinut6CreateEv kind:function(arm,size=0x24) addr:0x0211b6b8 +_ZN25ActorProfileFleeingSpinutC1Ev kind:function(arm,size=0x4c) addr:0x0211b6dc +_ZN18ActorFleeingSpinutC1Ev kind:function(arm,size=0x1d8) addr:0x0211b728 +_ZN18ActorFleeingSpinutD1Ev kind:function(arm,size=0x30) addr:0x0211b900 +_ZN18ActorFleeingSpinutD0Ev kind:function(arm,size=0x38) addr:0x0211b930 +_ZN18ActorFleeingSpinut8vfunc_18Ei kind:function(arm,size=0x1c) addr:0x0211b968 +_ZN18ActorFleeingSpinut8SetStateEs kind:function(arm,size=0x68) addr:0x0211b984 +_ZN18ActorFleeingSpinut8vfunc_20Ev kind:function(arm,size=0x268) addr:0x0211b9ec +_ZN18ActorFleeingSpinut8vfunc_30EP14Actor_vfunc_30 kind:function(arm,size=0x104) addr:0x0211bc54 +_ZN18ActorFleeingSpinut8vfunc_2CEi kind:function(arm,size=0x8c) addr:0x0211bd58 +_ZN18ActorFleeingSpinut19func_ov032_0211be04Ev kind:function(arm,size=0x2c) addr:0x0211bde4 +_ZN18ActorFleeingSpinut19func_ov032_0211be30Ev kind:function(arm,size=0x78) addr:0x0211be10 +_ZN18ActorFleeingSpinut19func_ov032_0211bea8Ev kind:function(arm,size=0xdc) addr:0x0211be88 +_ZN18ActorFleeingSpinut19func_ov032_0211bf84Ev kind:function(arm,size=0x78) addr:0x0211bf64 +_ZN18ActorFleeingSpinut19func_ov032_0211bffcEv kind:function(arm,size=0x80) addr:0x0211bfdc +_ZN18ActorFleeingSpinut19func_ov032_0211c07cEv kind:function(arm,size=0x8c) addr:0x0211c05c +_ZN18ActorFleeingSpinut19func_ov032_0211c108Ev kind:function(arm,size=0x1bc) addr:0x0211c0e8 +_ZN18ActorFleeingSpinut19func_ov032_0211c2c4Ev kind:function(arm,size=0x7c) addr:0x0211c2a4 +_ZN18ActorFleeingSpinut19func_ov032_0211c340Ev kind:function(arm,size=0x104) addr:0x0211c320 +_ZN18ActorFleeingSpinut19func_ov032_0211c444Ev kind:function(arm,size=0x90) addr:0x0211c424 +_ZN18ActorFleeingSpinut19func_ov032_0211c4d4Ev kind:function(arm,size=0x68) addr:0x0211c4b4 +_ZN18ActorFleeingSpinut19func_ov032_0211c53cEv kind:function(arm,size=0x90) addr:0x0211c51c +_ZN18ActorFleeingSpinut19func_ov032_0211c5ccEv kind:function(arm,size=0x170) addr:0x0211c5ac +_ZN18ActorFleeingSpinut19func_ov032_0211c73cEv kind:function(arm,size=0x80) addr:0x0211c71c +_ZN18ActorFleeingSpinut19func_ov032_0211c7bcEv kind:function(arm,size=0x17c) addr:0x0211c79c +_ZN18ActorFleeingSpinut19func_ov032_0211c938Ev kind:function(arm,size=0xa0) addr:0x0211c918 +_ZN18ActorFleeingSpinut19func_ov032_0211c9d8Ev kind:function(arm,size=0x48) addr:0x0211c9b8 +_ZN18ActorFleeingSpinut19func_ov032_0211ca20Ev kind:function(arm,size=0x4c) addr:0x0211ca00 +_ZN18ActorFleeingSpinut19func_ov032_0211ca6cEv kind:function(arm,size=0x4c) addr:0x0211ca4c +_ZN18ActorFleeingSpinut19func_ov032_0211cab8Eii kind:function(arm,size=0x74) addr:0x0211ca98 +_ZN18ActorFleeingSpinut19func_ov032_0211cb2cEv kind:function(arm,size=0xe4) addr:0x0211cb0c +_ZN22ActorFleeingSpinut_1ECC1Ev kind:function(arm,size=0x38) addr:0x0211cbf0 +_ZN22ActorFleeingSpinut_1EC19func_ov032_0211cc48EP7VecFx32 kind:function(arm,size=0xd8) addr:0x0211cc28 +_ZN22ActorFleeingSpinut_1EC19func_ov032_0211cd20EP7VecFx32 kind:function(arm,size=0x40) addr:0x0211cd00 +_ZN22ActorFleeingSpinut_1EC19func_ov032_0211cd60EP7VecFx32PsS1_iii kind:function(arm,size=0x214) addr:0x0211cd40 +_ZN22ActorFleeingSpinut_1EC19func_ov032_0211cf74Ev kind:function(arm,size=0x38) addr:0x0211cf54 +_ZN22ActorFleeingSpinut_1EC19func_ov032_0211cfacEi kind:function(arm,size=0x7c) addr:0x0211cf8c +_ZN22ActorFleeingSpinut_1EC19func_ov032_0211d028Ev kind:function(arm,size=0x18) addr:0x0211d008 +_ZN22ActorFleeingSpinut_1EC19func_ov032_0211d040EP7VecFx32 kind:function(arm,size=0x4c) addr:0x0211d020 +_ZN22ActorFleeingSpinut_1EC19func_ov032_0211d08cEP7VecFx32 kind:function(arm,size=0x258) addr:0x0211d06c +_ZN22ActorFleeingSpinut_1EC19func_ov032_0211d2e4EP37UnkStruct_027e0960_TableEntry_04_Base kind:function(arm,size=0xa0) addr:0x0211d2c4 +_ZN22ActorFleeingSpinut_1EC19func_ov032_0211d384EP7VecFx32 kind:function(arm,size=0x1e4) addr:0x0211d364 +_ZN22ActorFleeingSpinut_1EC19func_ov032_0211d568EP7VecFx32P37UnkStruct_027e0960_TableEntry_04_BaseS3_ kind:function(arm,size=0x10c) addr:0x0211d548 +_ZN22ActorFleeingSpinut_1EC19func_ov032_0211d674EP7VecFx32P37UnkStruct_027e0960_TableEntry_04_Base kind:function(arm,size=0x64) addr:0x0211d654 +_ZN22ActorFleeingSpinut_1EC19func_ov032_0211d6d8EP7VecFx32P37UnkStruct_027e0960_TableEntry_04_Basei kind:function(arm,size=0x110) addr:0x0211d6b8 +_ZN22ActorFleeingSpinut_1EC19func_ov032_0211d7e8EP7VecFx32 kind:function(arm,size=0x24) addr:0x0211d7c8 +_ZN22ActorFleeingSpinut_1EC19func_ov032_0211d80cEv kind:function(arm,size=0x24) addr:0x0211d7ec +_ZN22ActorFleeingSpinut_1EC19func_ov032_0211d830EP32UnkStruct_027e0960_TableEntry_04 kind:function(arm,size=0x34) addr:0x0211d810 +_ZN22ActorFleeingSpinut_1EC19func_ov032_0211d864EP7VecFx32 kind:function(arm,size=0xac) addr:0x0211d844 +_ZN22ActorFleeingSpinut_1EC19func_ov032_0211d910Ev kind:function(arm,size=0x10) addr:0x0211d8f0 +_ZN22ActorFleeingSpinut_1EC19func_ov032_0211d920EP7VecFx32 kind:function(arm,size=0xec) addr:0x0211d900 +_ZN22ActorFleeingSpinut_1EC19func_ov032_0211da0cEiP7VecFx32 kind:function(arm,size=0x120) addr:0x0211d9ec +_ZN25ActorProfileFleeingSpinutD1Ev kind:function(arm,size=0x14) addr:0x0211db0c _ZN19ActorProfileUnkKETH10GetProfileEv kind:function(arm,size=0xc) addr:0x0211db20 _ZN19ActorProfileUnkKETH6CreateEv kind:function(arm,size=0x24) addr:0x0211db2c _ZN19ActorProfileUnkKETHC1Ev kind:function(arm,size=0x5c) addr:0x0211db50 @@ -223,12 +223,12 @@ data_ov032_02121ee4 kind:data(any) addr:0x02121ee4 data_ov032_02121ef4 kind:data(any) addr:0x02121ef4 data_ov032_02121f04 kind:data(any) addr:0x02121f04 __sinit_ActorSpinut.cpp kind:function(arm,size=0x6c) addr:0x02121f14 local -__sinit_ActorUnkMKUR.cpp kind:function(arm,size=0x80) addr:0x02121f80 local +__sinit_ActorFleeingSpinut.cpp kind:function(arm,size=0x80) addr:0x02121f80 local __sinit_ActorUnkKETH.cpp kind:function(arm,size=0x6c) addr:0x02122000 local __sinit_ActorUnkNSSW.cpp kind:function(arm,size=0x50) addr:0x0212206c local __sinit_MapObjectUnkSWSW.cpp kind:function(arm,size=0x50) addr:0x021220bc local .p__sinit_ActorSpinut.cpp kind:data(word) addr:0x0212210c local -.p__sinit_ActorUnkMKUR.cpp kind:data(word) addr:0x02122110 local +.p__sinit_ActorFleeingSpinut.cpp kind:data(word) addr:0x02122110 local .p__sinit_ActorUnkKETH.cpp kind:data(word) addr:0x02122114 local .p__sinit_ActorUnkNSSW.cpp kind:data(word) addr:0x02122118 local .p__sinit_MapObjectUnkSWSW.cpp kind:data(word) addr:0x0212211c local @@ -243,14 +243,13 @@ data_ov032_02122224 kind:data(any) addr:0x02122224 data_ov032_02122268 kind:data(any) addr:0x02122268 data_ov032_021222d0 kind:data(any) addr:0x021222d0 data_ov032_02122328 kind:data(any) addr:0x02122328 -data_ov032_02122388 kind:data(any) addr:0x02122388 -data_ov032_02122394 kind:data(any) addr:0x02122394 -data_ov032_021223ac kind:data(any) addr:0x021223ac -data_ov032_021223c4 kind:data(any) addr:0x021223c4 -data_ov032_021223d1 kind:data(any) addr:0x021223d1 ambiguous -data_ov032_021223fc kind:data(any) addr:0x021223fc -data_ov032_0212243c kind:data(any) addr:0x0212243c -data_ov032_02122460 kind:data(any) addr:0x02122460 +data_ov032_021223a8 kind:data(any) addr:0x02122388 +data_ov032_021223b4 kind:data(any) addr:0x02122394 +data_ov032_021223cc kind:data(any) addr:0x021223ac +data_ov032_021223e4 kind:data(any) addr:0x021223c4 +data_ov032_0212241c kind:data(any) addr:0x021223fc +_ZTV25ActorProfileFleeingSpinut kind:data(any) addr:0x02122434 +_ZTV18ActorFleeingSpinut kind:data(any) addr:0x02122458 data_ov032_021224b8 kind:data(any) addr:0x021224b8 data_ov032_021224c4 kind:data(any) addr:0x021224c4 data_ov032_021224dc kind:data(any) addr:0x021224dc @@ -275,10 +274,10 @@ _ZGVN15ProfileInstanceI18ActorProfileSpinutE8sProfileE kind:bss addr:0x02122800 @11136 kind:bss addr:0x02122804 local _ZN15ProfileInstanceI18ActorProfileSpinutE8sProfileE kind:bss addr:0x02122810 data_ov032_021228e8 kind:bss addr:0x021228e8 -data_ov032_021228ec kind:bss addr:0x021228ec -_ZGVN15ProfileInstanceI19ActorProfileUnkMKURE8sProfileE kind:bss addr:0x021228f8 +data_ov032_0212290c kind:bss addr:0x021228ec +_ZGVN15ProfileInstanceI25ActorProfileFleeingSpinutE8sProfileE kind:bss addr:0x021228f8 @11142 kind:bss addr:0x02122904 local -_ZN15ProfileInstanceI19ActorProfileUnkMKURE8sProfileE kind:bss addr:0x02122910 +_ZN15ProfileInstanceI25ActorProfileFleeingSpinutE8sProfileE kind:bss addr:0x02122910 _ZGVN15ProfileInstanceI19ActorProfileUnkKETHE8sProfileE kind:bss addr:0x02122954 @11148 kind:bss addr:0x02122958 local _ZN15ProfileInstanceI19ActorProfileUnkKETHE8sProfileE kind:bss addr:0x02122964 diff --git a/include/Actor/ActorFleeingSpinut.hpp b/include/Actor/ActorFleeingSpinut.hpp new file mode 100644 index 00000000..e6e86f38 --- /dev/null +++ b/include/Actor/ActorFleeingSpinut.hpp @@ -0,0 +1,119 @@ +#pragma once + +#include "Actor/Actor.hpp" +#include "Actor/ActorProfile.hpp" +#include "ActorProfile_ov000_020b3018.hpp" +#include "ActorSpinut.hpp" +#include "global.h" +#include "types.h" + +enum ActorFleeingSpinutState_ { + ActorFleeingSpinutState_0 = 0, + ActorFleeingSpinutState_1 = 1, + ActorFleeingSpinutState_2 = 2, + ActorFleeingSpinutState_3 = 3, + ActorFleeingSpinutState_4 = 4, + ActorFleeingSpinutState_5 = 5, + ActorFleeingSpinutState_6 = 6, + ActorFleeingSpinutState_Max +}; + +class ActorFleeingSpinut_1EC { +public: + /* 00 */ u8 mUnk_00; + /* 04 */ UnkStruct_027e0960_TableEntry_04 *mUnk_04; + /* 08 */ UnkStruct_027e0960_TableEntry_04 *mUnk_08; + /* 0C */ unk32 mUnk_0C; + /* 10 */ unk32 mUnk_10; + /* 14 */ unk32 mUnk_14; + /* 18 */ unk32 mUnk_18; + /* 1C */ VecFx32 mUnk_1C; + /* 28 */ u16 mUnk_28; + /* 2C */ unk32 mUnk_2C; + /* 30 */ + + ActorFleeingSpinut_1EC(); + + void func_ov032_0211cc48(VecFx32 *param1); + UnkStruct_027e0960_TableEntry_04 *func_ov032_0211cd20(VecFx32 *param1); + u16 *func_ov032_0211cd60(VecFx32 *param1, s16 *param2, VecFx32 *param3, unk32 param4, unk32 param5, unk32 param6); + void func_ov032_0211cf74(); + void func_ov032_0211cfac(unk32 param1); + void func_ov032_0211d028(); + bool func_ov032_0211d040(VecFx32 *param1); + void func_ov032_0211d08c(VecFx32 *param1); + bool func_ov032_0211d2e4(UnkStruct_027e0960_TableEntry_04_Base *param1); + UnkStruct_027e0960_TableEntry_04 *func_ov032_0211d384(VecFx32 *param1); + unk32 func_ov032_0211d568(VecFx32 *param1, UnkStruct_027e0960_TableEntry_04_Base *param2, + UnkStruct_027e0960_TableEntry_04_Base *param3); + bool func_ov032_0211d674(VecFx32 *param1, UnkStruct_027e0960_TableEntry_04_Base *param2); + bool func_ov032_0211d6d8(VecFx32 *param1, UnkStruct_027e0960_TableEntry_04_Base *param2, unk32 param3); + void func_ov032_0211d7e8(VecFx32 *param1); + void func_ov032_0211d80c(); + void func_ov032_0211d830(UnkStruct_027e0960_TableEntry_04 *param1); + void func_ov032_0211d910(); + bool func_ov032_0211d920(VecFx32 *param1); + bool func_ov032_0211d864(VecFx32 *param1); + bool func_ov032_0211da0c(unk32 param1, VecFx32 *param2); +}; + +class ActorFleeingSpinut : public Actor_Derived2 { +public: + /* 000 (base) */ + /* 0AE */ STRUCT_PAD(0x0AE, 0x0B0); + /* 0B0 */ ModelRender_ov000_020b1a1c mUnk_0B0; + /* 110 */ ActorSpinut_110 mUnk_110; + /* 1A0 */ STRUCT_PAD(0x1A0, 0x1BC); + /* 1BC */ ActorState mPrevState; + /* 1BE */ unk16 mUnk_1BE; + /* 1C0 */ Actor_9C mUnk_1C0; + /* 1E0 */ Actor_Derived1_94 mUnk_1E0; + /* 1EC */ ActorFleeingSpinut_1EC mUnk_1EC; + /* 21C */ fx32 mUnk_21C; + /* 220 */ unk32 mUnk_220; + /* 224 */ bool mUnk_224; + + ActorFleeingSpinut(); + + /* 18 */ virtual bool vfunc_18(unk32 param1) override; + /* 20 */ virtual void vfunc_20() override; + /* 2C */ virtual void vfunc_2C(unk32 param1) override; + /* 30 */ virtual void vfunc_30(Actor_vfunc_30 *param1) override; + /* 4C */ virtual ~ActorFleeingSpinut() override; + + void SetState(ActorState state); + bool func_ov032_0211be04(); + void func_ov032_0211be30(); + void func_ov032_0211bea8(); + void func_ov032_0211bf84(); + void func_ov032_0211bffc(); + void func_ov032_0211c07c(); + void func_ov032_0211c108(); + void func_ov032_0211c2c4(); + void func_ov032_0211c340(); + void func_ov032_0211c444(); + void func_ov032_0211c4d4(); + void func_ov032_0211c53c(); + void func_ov032_0211c5cc(); + void func_ov032_0211c73c(); + void func_ov032_0211c7bc(); + bool func_ov032_0211c938(); + bool func_ov032_0211c9d8(); + bool func_ov032_0211ca20(); + bool func_ov032_0211ca6c(); + bool func_ov032_0211cab8(unk32 param1, unk32 param2); + void func_ov032_0211cb2c(); +}; + +class ActorProfileFleeingSpinut : public ActorProfile_ov000_020b3018 { +public: + /* 00 (base) */ + /* 3C */ STRUCT_PAD(0x3C, 0x44); + /* 44 */ + + ActorProfileFleeingSpinut(); + + /* 0C */ virtual Actor *Create(); + + static ActorProfileFleeingSpinut *GetProfile(); +}; diff --git a/include/Actor/ActorProfile_ov000_020b3018.hpp b/include/Actor/ActorProfile_ov000_020b3018.hpp new file mode 100644 index 00000000..c55e3b7d --- /dev/null +++ b/include/Actor/ActorProfile_ov000_020b3018.hpp @@ -0,0 +1,16 @@ +#pragma once + +#include "Actor/ActorProfile.hpp" + +class ActorProfile_ov000_020b3018 : public ActorProfile { +public: + /* 00 (base) */ + /* 3C */ + + ActorProfile_ov000_020b3018(ActorId param1, ActorId param2); // func_ov000_020979b4 + + // data_ov000_020b3018 + /* 04 */ virtual UnkActorFileSystem2 *vfunc_04() override; // func_ov000_020979e4 + /* 08 */ virtual void vfunc_08() override; // func_ov000_02097a18 + /* 10 */ virtual void vfunc_10() override; // func_ov000_020979ec +}; diff --git a/include/Actor/ActorSpinut.hpp b/include/Actor/ActorSpinut.hpp index 74b3f6e5..44675935 100644 --- a/include/Actor/ActorSpinut.hpp +++ b/include/Actor/ActorSpinut.hpp @@ -16,16 +16,16 @@ public: }; enum ActorSpinutState_ { - ActorSpinutState_0 = 0, - ActorSpinutState_1 = 1, + ActorSpinutState_0 = 0, // Idle + ActorSpinutState_1 = 1, // Triggered by Link ActorSpinutState_2 = 2, - ActorSpinutState_3 = 3, + ActorSpinutState_3 = 3, // Walking to target aka Link ActorSpinutState_4 = 4, ActorSpinutState_5 = 5, - ActorSpinutState_6 = 6, + ActorSpinutState_6 = 6, // Damaged or killed ? ActorSpinutState_7 = 7, ActorSpinutState_8 = 8, - ActorSpinutState_9 = 9, + ActorSpinutState_9 = 9, // Target lost ActorSpinutState_10 = 10, ActorSpinutState_11 = 11, ActorSpinutState_Max diff --git a/include/Actor/ActorTable.inl b/include/Actor/ActorTable.inl index ab273ded..f4cf5c59 100644 --- a/include/Actor/ActorTable.inl +++ b/include/Actor/ActorTable.inl @@ -204,7 +204,7 @@ DEFINE_ACTOR_TYPE('KOAT', KOAT) DEFINE_ACTOR_TYPE('KOCH', KOCH) DEFINE_ACTOR_TYPE('KOKO', Cucco) DEFINE_ACTOR_TYPE('KOTA', KOTA) -DEFINE_ACTOR_TYPE('KURI', KURI) +DEFINE_ACTOR_TYPE('KURI', Spinut) DEFINE_ACTOR_TYPE('L2MT', L2MT) DEFINE_ACTOR_TYPE('L2V1', L2V1) DEFINE_ACTOR_TYPE('L2V2', L2V2) @@ -227,7 +227,7 @@ DEFINE_ACTOR_TYPE('MBCC', MBCC) DEFINE_ACTOR_TYPE('MDYG', MDYG) DEFINE_ACTOR_TYPE('MGAJ', MGAJ) DEFINE_ACTOR_TYPE('MIFR', MIFR) -DEFINE_ACTOR_TYPE('MKUR', MKUR) +DEFINE_ACTOR_TYPE('MKUR', FleeingSpinut) DEFINE_ACTOR_TYPE('MLCK', MLCK) DEFINE_ACTOR_TYPE('MNCB', MNCB) DEFINE_ACTOR_TYPE('MOCT', MOCT) diff --git a/include/Actor/ActorUnkKEYN.hpp b/include/Actor/ActorUnkKEYN.hpp index 6112fd1d..f171a173 100644 --- a/include/Actor/ActorUnkKEYN.hpp +++ b/include/Actor/ActorUnkKEYN.hpp @@ -28,7 +28,7 @@ public: /* 4C */ virtual ~ActorUnkKEYN() override; - void func_ov070_0214143c(void); + static void func_ov070_0214143c(ActorRef *param1, VecFx32 *param2, ActorRef param3, s16 param4, u8 param5, u16 param6); void func_ov070_02141618(void); void func_ov070_0214162c(void); void func_ov070_02141750(void); diff --git a/include/Actor/ActorUnkMKUR.hpp b/include/Actor/ActorUnkMKUR.hpp deleted file mode 100644 index 305d668f..00000000 --- a/include/Actor/ActorUnkMKUR.hpp +++ /dev/null @@ -1,88 +0,0 @@ -//! TODO: This file was generated automatically and might contain errors - -#pragma once - -#include "Actor/Actor.hpp" -#include "Actor/ActorProfile.hpp" -#include "global.h" -#include "types.h" - -class ActorUnkMKUR_C4 : public Actor_C4 { -public: - ActorUnkMKUR_C4(Actor *param1); - - /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override; - /* 04 */ virtual bool vfunc_04() override; - /* 08 */ virtual void vfunc_08() override; - /* 0C */ virtual void vfunc_0C(unk32 param1) override; -}; - -class ActorUnkMKUR : public Actor { -public: - /* 00 (base) */ - /* 94 */ - - ActorUnkMKUR(); - - /* 4C */ virtual ~ActorUnkMKUR() override; - - void func_ov032_0211b988(void); - void func_ov032_0211b9a4(void); - void func_ov032_0211ba0c(void); - void func_ov032_0211bc74(void); - void func_ov032_0211bd78(void); - void func_ov032_0211be04(void); - void func_ov032_0211be30(void); - void func_ov032_0211bea8(void); - void func_ov032_0211bf84(void); - void func_ov032_0211bffc(void); - void func_ov032_0211c07c(void); - void func_ov032_0211c108(void); - void func_ov032_0211c2c4(void); - void func_ov032_0211c340(void); - void func_ov032_0211c444(void); - void func_ov032_0211c4d4(void); - void func_ov032_0211c53c(void); - void func_ov032_0211c5cc(void); - void func_ov032_0211c73c(void); - void func_ov032_0211c7bc(void); - void func_ov032_0211c938(void); - void func_ov032_0211c9d8(void); - void func_ov032_0211ca20(void); - void func_ov032_0211ca6c(void); - void func_ov032_0211cab8(void); - void func_ov032_0211cb2c(void); - void func_ov032_0211cc10(void); - void func_ov032_0211cc48(void); - void func_ov032_0211cd20(void); - void func_ov032_0211cd60(void); - void func_ov032_0211cf74(void); - void func_ov032_0211cfac(void); - void func_ov032_0211d028(void); - void func_ov032_0211d040(void); - void func_ov032_0211d08c(void); - void func_ov032_0211d2e4(void); - void func_ov032_0211d384(void); - void func_ov032_0211d568(void); - void func_ov032_0211d674(void); - void func_ov032_0211d6d8(void); - void func_ov032_0211d7e8(void); - void func_ov032_0211d80c(void); - void func_ov032_0211d830(void); - void func_ov032_0211d864(void); - void func_ov032_0211d910(void); - void func_ov032_0211d920(void); - void func_ov032_0211da0c(void); -}; - -class ActorProfileUnkMKUR : public ActorProfile { -public: - /* 00 (base) */ - - ActorProfileUnkMKUR(); - ~ActorProfileUnkMKUR(); - - /* 0C */ virtual Actor *Create(); - - static ActorProfileUnkMKUR *GetProfile(); -}; diff --git a/include/Render/ModelRender.hpp b/include/Render/ModelRender.hpp index e5fbdb3e..2a8d21e2 100644 --- a/include/Render/ModelRender.hpp +++ b/include/Render/ModelRender.hpp @@ -57,6 +57,7 @@ public: /* 18 */ virtual void vfunc_18(VecFx32 *param1) = 0; /* 1C */ + void func_01ffc634(VecFx32 *param1, UnkAngleStruct param2, VecFx32 *param3); void func_01ffc6d4(UnkAngleStruct angleStruct, VecFx32 *pos); void func_ov000_02057cb0(); diff --git a/include/Unknown/UnkStruct_027e0960.hpp b/include/Unknown/UnkStruct_027e0960.hpp index 5e1131e7..2b27d838 100644 --- a/include/Unknown/UnkStruct_027e0960.hpp +++ b/include/Unknown/UnkStruct_027e0960.hpp @@ -10,7 +10,7 @@ public: /* 00 (vtable) */ /* 04 */ unk8 mUnk_04; /* 08 */ unk32 mUnk_08; - /* 0C */ unk32 mUnk_0C; + /* 0C */ UnkStruct_027e0960_TableEntry_04_Base *mUnk_0C; /* 10 */ unk32 mUnk_10; /* 14 */ @@ -19,18 +19,18 @@ public: // data_02043ff0 /* 00 */ virtual ~UnkStruct_027e0960_TableEntry_04_Base(); /* 08 */ virtual void vfunc_08(); - /* 0C */ virtual void vfunc_0C(VecFx32 *param1) = 0; - /* 10 */ virtual void vfunc_10() = 0; - /* 14 */ virtual void vfunc_14() = 0; - /* 18 */ virtual void vfunc_18() = 0; - /* 1C */ virtual void vfunc_1C() = 0; + /* 0C */ virtual void vfunc_0C(VecFx32 *param1) = 0; + /* 10 */ virtual void vfunc_10() = 0; + /* 14 */ virtual void vfunc_14() = 0; + /* 18 */ virtual UnkStruct_027e0960_TableEntry_04_Base *vfunc_18(unk32 param1) = 0; + /* 1C */ virtual u32 vfunc_1C() = 0; /* 20 */ }; class UnkStruct_027e0960_TableEntry_04 : public UnkStruct_027e0960_TableEntry_04_Base { public: /* 00 (base) */ - /* 14 */ unk32 mUnk_14; + /* 14 */ UnkStruct_027e0960_TableEntry_04_Base *mUnk_14; /* 18 */ unk32 mUnk_18; /* 1C */ unk32 mUnk_1C; /* 20 */ unk16 mUnk_20; @@ -43,8 +43,8 @@ public: /* 0C */ virtual void vfunc_0C(VecFx32 *param1) override; /* 10 */ virtual void vfunc_10() override; /* 14 */ virtual void vfunc_14() override; - /* 18 */ virtual void vfunc_18() override; - /* 1C */ virtual void vfunc_1C() override; + /* 18 */ virtual UnkStruct_027e0960_TableEntry_04 *vfunc_18(unk32 param1) override; + /* 1C */ virtual u32 vfunc_1C() override; }; class UnkStruct_027e0960_TableEntry { @@ -57,6 +57,7 @@ public: ~UnkStruct_027e0960_TableEntry(); bool func_ov000_02059ccc(u8 param1, u8 param2); + void func_ov000_02059da4(VecFx32 *param1); }; class UnkStruct_027e0960 : public AutoInstance { diff --git a/src/031_Land/Actor/ActorUnkEFSB.cpp b/src/031_Land/Actor/ActorUnkEFSB.cpp index 55c10974..4a595d1e 100644 --- a/src/031_Land/Actor/ActorUnkEFSB.cpp +++ b/src/031_Land/Actor/ActorUnkEFSB.cpp @@ -2,7 +2,6 @@ #include "System/SysNew.hpp" extern "C" unk32 func_01ffb428(unk32, unk32); -extern "C" void func_01ffc634(ModelRender *, VecFx32 *, UnkAngleStruct, VecFx32 *); static ActorUnkZLSL_AnimationTag data_ov031_02114ed0[0x2] = { {.index = 0x0, .name = "statue_beam"}, @@ -61,5 +60,5 @@ void ActorUnkEFSB::vfunc_2C(unk32 param1) { VecFx32 sp0 = this->mPos; sp0.y += FLOAT_TO_FX32(0.85f); - func_01ffc634(&this->mUnk_098, &vec, this->mAngleStruct, &sp0); + this->mUnk_098.func_01ffc634(&vec, this->mAngleStruct, &sp0); } diff --git a/src/032_MapA1/Actor/ActorFleeingSpinut.cpp b/src/032_MapA1/Actor/ActorFleeingSpinut.cpp new file mode 100644 index 00000000..ca09d33d --- /dev/null +++ b/src/032_MapA1/Actor/ActorFleeingSpinut.cpp @@ -0,0 +1,840 @@ +#define VECFX32_CTORS + +#include "Actor/ActorFleeingSpinut.hpp" + +#include "Actor/ActorUnkKEYN.hpp" +#include "System/SysNew.hpp" +#include "Unknown/UnkStruct_0204af1c.hpp" +#include "Unknown/UnkStruct_027e0998.hpp" +#include "Unknown/UnkStruct_027e09a8.hpp" +#include "Unknown/UnkStruct_027e09c0.hpp" +#include "Unknown/UnkStruct_027e0cd8.hpp" +#include "Unknown/UnkStruct_027e0cec.hpp" + +extern "C" unk32 data_ov000_020aecf8; + +extern "C" bool func_01ff916c(void *, int, int); +extern "C" void func_01ff9318(void *, unk32, unk32); +extern "C" fx32 func_01ffb428(unk32, unk32); +extern "C" fx32 func_01ffb464(fx32); + +extern "C" bool func_ov000_0205adfc(VecFx32 *, VecFx32 *); +extern "C" void func_ov000_020986b4(s16 *param1, Actor_Derived2 *param2, unk32 param3); + +struct UnkStruct_ov032_02122908 { + /* 00 */ unk32 mUnk_00; + /* 04 */ unk32 mUnk_04; + /* 08 */ unk32 mUnk_08; +}; + +UnkStruct_ov032_02122908 *data_ov032_02122908; +UnkStruct_ov019_020d24c8_28_258_00_Derived1 data_ov032_0212290c; +UnkStruct_ov019_020d24c8_28_258_00_Derived1 data_ov032_02122924; // @11142 Eur +static const VecFx32 data_ov032_021223a8(FLOAT_TO_FX32(0.0f), FLOAT_TO_FX32(0.0f), FLOAT_TO_FX32(0.0f)); + +static ActorUnkZLSL_AnimationTag data_ov032_021223b4 = {.index = 0, .name = "walk", .unknown = 0x0}; +static ActorUnkZLSL_AnimationTag data_ov032_021223cc = {.index = 1, .name = "discover", .unknown = 0x1}; + +static PTMF data_ov032_021223e4[ActorFleeingSpinutState_Max] = { + ActorFleeingSpinut::func_ov032_0211c2c4, // ActorFleeingSpinutState_0 + ActorFleeingSpinut::func_ov032_0211c444, // ActorFleeingSpinutState_1 + ActorFleeingSpinut::func_ov032_0211be30, // ActorFleeingSpinutState_2 + ActorFleeingSpinut::func_ov032_0211bf84, // ActorFleeingSpinutState_3 + ActorFleeingSpinut::func_ov032_0211c53c, // ActorFleeingSpinutState_4 + ActorFleeingSpinut::func_ov032_0211c73c, // ActorFleeingSpinutState_5 + ActorFleeingSpinut::func_ov032_0211c07c // ActorFleeingSpinutState_6 +}; +static PTMF data_ov032_0212241c[ActorFleeingSpinutState_Max] = { + ActorFleeingSpinut::func_ov032_0211c340, // ActorFleeingSpinutState_0 + ActorFleeingSpinut::func_ov032_0211c4d4, // ActorFleeingSpinutState_1 + ActorFleeingSpinut::func_ov032_0211bea8, // ActorFleeingSpinutState_2 + ActorFleeingSpinut::func_ov032_0211bffc, // ActorFleeingSpinutState_3 + ActorFleeingSpinut::func_ov032_0211c5cc, // ActorFleeingSpinutState_4 + ActorFleeingSpinut::func_ov032_0211c7bc, // ActorFleeingSpinutState_5 + ActorFleeingSpinut::func_ov032_0211c108 // ActorFleeingSpinutState_6 +}; + +DECL_PROFILE(ActorProfileFleeingSpinut); + +Actor *ActorProfileFleeingSpinut::Create() { + return new(HeapIndex_2) ActorFleeingSpinut(); +} + +ActorProfileFleeingSpinut::ActorProfileFleeingSpinut() : + ActorProfile_ov000_020b3018(ActorId_FleeingSpinut, ActorId_Spinut) { + this->mUnk_04.Init(FLOAT_TO_FX32(0.4f)); +} + +ActorFleeingSpinut::ActorFleeingSpinut() : + mUnk_0B0(G3d_GetModelPtr(GET_PROFILE(ActorProfileFleeingSpinut)->vfunc_04()->mUnk_50)), + mUnk_110(&this->mUnk_0B0, GET_PROFILE(ActorProfileFleeingSpinut)->vfunc_04()), + mPrevState(ActorState_None), + mUnk_1BE(0x0) { + *(s16 *) &this->mUnk_44 |= 0x40; + SET_FLAG(this->mFlags, ActorFlag_6); + + this->mUnk_1E0.mUnk_00.mUnk_08 = 0x1; + this->mUnk_38 = &this->mUnk_1E0.mUnk_00; + this->mUnk_224 = true; + + this->mUnk_21C = 0x0; + this->mUnk_220 = 0x0; + this->mUnk_1C0.mUnk_04 |= 0x8000; + + data_ov032_02122924.func_ov000_0205fc20(0x5D, 0x22, NULL, NULL); + data_ov032_0212290c.func_ov000_0205fc20(0x5D, 0x7, NULL, NULL); + + this->Actor::func_ov000_0209862c(0x4); + + SET_FLAG(this->mFlags, ActorFlag_9); + this->mUnk_A4 = &data_ov032_021223a8; + + if (this->func_ov032_0211be04()) { + UNSET_FLAG(this->mFlags, ActorFlag_16); + } +} + +ActorFleeingSpinut::~ActorFleeingSpinut() {} + +bool ActorFleeingSpinut::vfunc_18(unk32 param1) { + this->mUnk_1EC.mUnk_00 = this->mUnk_5C.mParams[1]; + + this->SetState(0x0); + + return true; +} + +// non-matching (assignation order) +void ActorFleeingSpinut::SetState(ActorState state) { + ActorState oldState = this->mState; + this->mState = state; + + this->mPrevState = oldState; + this->mUnk_1BE = 0x0; + this->mUnk_2C = data_ov000_020aecf8; + this->mUnk_224 = true; + + CALL_PTMF(PTMF, data_ov032_021223e4[oldState]); +} + +void ActorFleeingSpinut::vfunc_20() { + this->mUnk_3C = &this->mUnk_1C0; + if (!this->func_ov032_0211c938()) { + this->mUnk_1EC.func_ov032_0211d028(); + } else { + this->mUnk_1EC.func_ov032_0211cf74(); + } + + CALL_PTMF(PTMF, data_ov032_0212241c[this->mState]); + + this->Actor::func_ov000_02098838(); + this->func_ov032_0211cb2c(); + + VecFx32_Copy(&this->mPos, &this->mPrevPos); + VecFx32_Add(&this->mPos, &this->mVel, &this->mPos); + + this->Actor::func_ov000_02098b8c(0x0, NULL); + + if (this->mUnk_46 & 0x1) { + this->mVel.y = FLOAT_TO_FX32(0.0f); + } + + if (this->mUnk_224) { + this->Actor::func_ov000_020989e0(); + bool var = true; + + if (this->mUnk_1C0.mUnk_08 & 0x3FFFF) { + var = false; + + switch (this->mUnk_1C0.mUnk_1C) { + case 0xC: + case 0x4: + break; + + case 0xE: + if (!this->Actor::func_ov000_020986fc(0x0) && !this->Actor::func_ov000_020986fc(0x1)) { + var = true; + break; + } + + case 0xF: + this->Actor_Derived2::func_ov000_020990c0(&this->mUnk_1C0, 0x0, 0x0); + this->SetState(ActorFleeingSpinutState_2); + break; + + default: + this->mUnk_48 -= this->mUnk_1C0.mUnk_1E; + this->Actor_Derived2::func_ov000_020990c0(&this->mUnk_1C0, 0x0, 0x0); + data_027e09a8->func_ov000_02071b30(0x983C, &this->mPos, 0x0); + this->SetState(ActorFleeingSpinutState_2); + break; + } + } + + if (var) { + this->Actor::func_ov000_02098ab4(0x2, 0x0, 0x1, NULL); + } + } + if (GET_FLAG(this->mFlags, ActorFlag_14)) { + this->mUnk_110.vfunc_34(); + } + + if (!GET_FLAG(this->mFlags, ActorFlag_Alive)) { + return; + } + + VecFx32 vec = this->mPos; + + UnkStruct_ov000_0207de98 sp04; + VecFx32_Copy(&vec, &sp04.vec); + sp04.param1 = 0x548; + sp04.param2 = 0x1000; + + data_027e09c0->func_ov000_0207de98(this->mRef, &sp04, this->mUnk_38); +} + +// non-matching (@1142) +void ActorFleeingSpinut::vfunc_30(Actor_vfunc_30 *param1) { + if (!this->func_ov032_0211be04()) { + return; + } + + bool var = true; + this->Actor::func_ov017_020bef88(param1, &data_ov032_02122924, 0x1); + + if (this->mState != ActorFleeingSpinutState_6) { + return; + } + + if (!(data_ov032_02122908->mUnk_08 & 0x1)) { + var = false; + } + + if (param1->mUnk_00 != var && param1->mUnk_01 != var) { + return; + } + + VecFx32 sp08 = this->mPos; + + sp08.x += FLOAT_TO_FX32(2.5f); + sp08.z -= FLOAT_TO_FX32(2.5f); + + Vec2s sp04; + + if (!data_027e0998->vfunc_00(&sp08, &sp04, (u16 *) &this->mRef)) { + return; + } + + data_0204af1c.func_0201aa44(&data_ov032_0212290c, &sp04, 0x1, NULL); +} + +void ActorFleeingSpinut::vfunc_2C(unk32 param1) { + if (!this->Actor::func_01fff5d0(param1, 0x0)) { + return; + } + + this->Actor::func_ov017_020bf5c4(&this->mPos, 0x548, 0x548, 0x1F, 0x0); + + VecFx32 vec = this->mPos; + + vec.y += this->mUnk_21C; + + this->mUnk_0B0.func_01ffc634(&this->mUnk_98, this->mAngleStruct, &vec); +} + +bool ActorFleeingSpinut::func_ov032_0211be04() { + return this->mUnk_5C.mParams[2] == 0x1 && !this->Actor::func_ov000_02098a60(0x0); +} + +void ActorFleeingSpinut::func_ov032_0211be30() { + this->mUnk_110.vfunc_1C(data_ov032_021223b4, 0x1000, 0x19A, 0x0); + + this->mUnk_1C0.func_ov000_02097bec(); + this->mUnk_38->mUnk_08 = 0x3; +} + +void ActorFleeingSpinut::func_ov032_0211bea8() { + this->Actor_Derived2::func_ov000_020992dc(); + + if (!GET_FLAG(this->mFlags, ActorFlag_5)) { + return; + } + + this->mUnk_38->mUnk_08 = 0x1; + + if (this->mUnk_48 <= 0x0) { + data_027e09a8->func_ov000_02071b30(0x983D, &this->mPos, 0x0); + + this->Actor::func_ov000_020984d0(); + this->Actor::func_ov017_020bf3e0(0x1, 0x0); + + if (this->func_ov032_0211be04()) { + ActorRef ref; + ActorUnkKEYN::func_ov070_0214143c(&ref, &this->mPos, this->mRef, this->mUnk_5C.mUnk_24, this->mUnk_5C.mUnk_18[0], + this->mUnk_5C.mUnk_1A[0]); + return; + } + + this->Actor_Derived2::func_ov000_020997c4(0x0); + return; + } + + this->SetState(this->mPrevState); +} + +void ActorFleeingSpinut::func_ov032_0211bf84() { + this->mUnk_110.vfunc_1C(data_ov032_021223b4, 0x1000, 0x19A, 0x0); + + this->mUnk_52 = 0xF; + this->mUnk_50 = 0x0; + + this->mVel.x = FLOAT_TO_FX32(0.0f); + this->mVel.z = FLOAT_TO_FX32(0.0f); +} + +void ActorFleeingSpinut::func_ov032_0211bffc() { + if (this->func_ov032_0211ca20()) { + if (this->mUnk_50 >= this->mUnk_52) { + this->SetState(ActorFleeingSpinutState_1); + } else { + this->SetState(ActorFleeingSpinutState_4); + } + } else { + if (!this->func_ov032_0211c938() || this->func_ov032_0211c9d8()) { + this->SetState(ActorFleeingSpinutState_0); + } + } + + this->IsTimerOut(); +} + +void ActorFleeingSpinut::func_ov032_0211c07c() { + this->mUnk_110.vfunc_1C(data_ov032_021223cc, 0x1000, 0x19A, 0x0); + + this->mVel.x = FLOAT_TO_FX32(0.0f); + this->mVel.z = FLOAT_TO_FX32(0.0f); + + data_027e09a8->func_ov000_02071b30(0x9837, &this->mPos, 0x0); +} + +// non-matching (func_01ffb428 & sp8) +void ActorFleeingSpinut::func_ov032_0211c108() { + UnkStruct_PlayerGet_50 *pGet50 = this->mUnk_110.vfunc_28(); + unk32 pGet50Unk8 = pGet50->mUnk_08; + unk32 pGet50Unk10 = pGet50->mUnk_10; + + bool var; + if (this->mUnk_1BE % 2 == 0 || !data_027e0ce0->func_01fff1a4()) { + var = false; + } else { + var = true; + } + + unk32 temp_r5_2 = func_01ffb428(pGet50Unk10 - pGet50Unk8, 0x1000) >> 0xC; + unk16 sp8; + func_ov000_020986b4(&sp8, this, var); + + if (temp_r5_2 > 0) { + func_01ff9318(&this->mAngle, sp8, func_01ffb464(temp_r5_2 << 0xC)); + } + + if (!this->mUnk_110.vfunc_28()->func_01ff8fa8()) { + return; + } + + data_027e0cec->func_ov000_0209feac(0x880, &this->mPos, 0x2, 0x0, 0x0); + + if (!this->func_ov032_0211c938()) { + this->SetState(ActorFleeingSpinutState_0); + return; + } + + if (this->func_ov032_0211c9d8()) { + this->SetState(ActorFleeingSpinutState_5); + return; + } + + if (this->mUnk_1EC.func_ov032_0211d040(&this->mPos)) { + this->SetState(ActorFleeingSpinutState_4); + return; + } + + ++this->mUnk_1BE; + + this->mUnk_110.vfunc_28()->mUnk_02 = 0x0; + this->mUnk_110.vfunc_28()->mUnk_08 = 0x0; + + data_027e09a8->func_ov000_02071b30(0x9837, &this->mPos, 0x0); +} + +void ActorFleeingSpinut::func_ov032_0211c2c4() { + this->mUnk_1EC.mUnk_2C = 0x0; + this->mUnk_1EC.func_ov032_0211cc48(&this->mPos); + + this->mUnk_110.vfunc_1C(data_ov032_021223b4, 0x1000, 0x19A, 0x0); + + this->mVel.x = FLOAT_TO_FX32(0.0f); + this->mVel.z = FLOAT_TO_FX32(0.0f); +} + +void ActorFleeingSpinut::func_ov032_0211c340() { + this->mUnk_1EC.func_ov032_0211cd60(&this->mPos, &this->mAngle, &this->mVel, 0xF6, 0xE39, 0xF6); + + if (this->func_ov032_0211c938() && this->func_ov032_0211ca20()) { + this->SetState(ActorFleeingSpinutState_1); + return; + } + + if (this->mUnk_110.vfunc_10()->mUnk_04.func_02015080(0x1000)) { + data_027e09a8->func_ov000_02071b30(0x9838, &this->mPos, 0x0); + return; + } + + if (this->mUnk_110.vfunc_10()->mUnk_04.func_02015080(0xF000)) { + data_027e09a8->func_ov000_02071b30(0x9839, &this->mPos, 0x0); + } +} + +void ActorFleeingSpinut::func_ov032_0211c444() { + this->mUnk_110.vfunc_1C(data_ov032_021223cc, 0x2000, 0x19A, 0x0); + + data_027e09a8->func_ov000_02071b30(0x9837, &this->mPos, 0x0); + + this->mVel.x = FLOAT_TO_FX32(0.0f); + this->mVel.z = FLOAT_TO_FX32(0.0f); + this->mUnk_224 = false; +} + +void ActorFleeingSpinut::func_ov032_0211c4d4() { + if (!this->mUnk_110.vfunc_28()->func_01ff8fa8()) { + return; + } + + data_027e0cec->func_ov000_0209feac(0x880, &this->mPos, 0x2, 0x0, 0x0); + + this->SetState(ActorFleeingSpinutState_4); +} + +void ActorFleeingSpinut::func_ov032_0211c53c() { + this->mUnk_1EC.mUnk_2C = 0x1; + + this->mUnk_110.vfunc_1C(data_ov032_021223b4, 0x3000, 0x19A, 0x0); + + this->mUnk_224 = false; + this->mUnk_1EC.func_ov032_0211d08c(&this->mPos); + + this->mUnk_52 = 0xA; + this->mUnk_50 = 0x0; + + this->mVel.x = FLOAT_TO_FX32(0.0f); + this->mVel.z = FLOAT_TO_FX32(0.0f); +} + +void ActorFleeingSpinut::func_ov032_0211c5cc() { + if (this->IsTimerOut()) { + this->mUnk_224 = true; + } + + this->mUnk_1EC.func_ov032_0211cd60(&this->mPos, &this->mAngle, &this->mVel, 0x429, 0x429 + 0xA10, 0x429); + + if (this->mUnk_1EC.mUnk_28 & 0x1) { + this->SetState(ActorFleeingSpinutState_6); + return; + } + + if (!this->func_ov032_0211c938()) { + this->SetState(ActorFleeingSpinutState_0); + return; + } + + if (this->func_ov032_0211c9d8() && (this->mUnk_1EC.mUnk_28 & 0x2)) { + this->SetState(ActorFleeingSpinutState_5); + return; + } + + if (this->mUnk_110.vfunc_10()->mUnk_04.func_02015080(0x1000)) { + data_027e09a8->func_ov000_02071b30(0x983A, &this->mPos, 0x0); + return; + } + + if (!this->mUnk_110.vfunc_10()->mUnk_04.func_02015080(0xF000)) { + return; + } + + data_027e09a8->func_ov000_02071b30(0x983B, &this->mPos, 0x0); +} + +void ActorFleeingSpinut::func_ov032_0211c73c() { + this->mUnk_1EC.func_ov032_0211cc48(&this->mPos); + + this->mUnk_1EC.mUnk_2C = 0x1; + + this->mUnk_110.vfunc_1C(data_ov032_021223b4, 0x1000, 0x19A, 0x0); + + this->mVel.x = FLOAT_TO_FX32(0.0f); + this->mVel.z = FLOAT_TO_FX32(0.0f); +} + +void ActorFleeingSpinut::func_ov032_0211c7bc() { + this->mUnk_1EC.func_ov032_0211cd60(&this->mPos, &this->mAngle, &this->mVel, 0xF6, 0xE39, 0xF6); + + if (this->func_ov032_0211ca6c() && this->mUnk_1EC.mUnk_28 & 0x2) { + this->SetState(ActorFleeingSpinutState_3); + return; + } + + if (this->mUnk_1EC.mUnk_28 & 0x1) { + this->SetState(ActorFleeingSpinutState_6); + return; + } + + if (this->func_ov032_0211c938() && this->func_ov032_0211ca20()) { + this->SetState(ActorFleeingSpinutState_1); + return; + } + + if (!this->func_ov032_0211c938()) { + this->SetState(ActorFleeingSpinutState_0); + return; + } + + if (this->mUnk_110.vfunc_10()->mUnk_04.func_02015080(0x1000)) { + data_027e09a8->func_ov000_02071b30(0x9838, &this->mPos, 0x0); + return; + } + + if (!this->mUnk_110.vfunc_10()->mUnk_04.func_02015080(0xF000)) { + return; + } + + data_027e09a8->func_ov000_02071b30(0x9839, &this->mPos, 0x0); +} + +// non-matching (ldr of mUnk_0C) +bool ActorFleeingSpinut::func_ov032_0211c938() { + if (this->mUnk_5C.mParams[0] == 0x0) { + return true; + } + + UnkStruct_027e0cd8 *data_2 = data_027e0cd8; + UnkStruct_027e0ce0 *data_1 = data_027e0ce0; + + UnkStruct_027e0cd8_0C_Base *data_2_0C = data_2->mUnk_0C; + bool ret = data_2_0C->func_ov000_020802ec(this->mUnk_5C.mParams[0], data_1->func_01fff148(0x0)); + + if (data_027e0ce0->func_01fff1a4()) { + bool var = true; + data_2_0C = data_2->mUnk_0C; + if (ret || !data_2_0C->func_ov000_020802ec(this->mUnk_5C.mParams[0], data_1->func_01fff148(0x1))) { + var = false; + } + ret = var; + } + return ret; +} + +bool ActorFleeingSpinut::func_ov032_0211c9d8() { + return !this->func_ov032_0211cab8(0x0, 0x5000) && !this->func_ov032_0211cab8(0x1, 0x5000); +} + +bool ActorFleeingSpinut::func_ov032_0211ca20() { + return this->func_ov032_0211cab8(0x0, 0x3CCD) || this->func_ov032_0211cab8(0x1, 0x3CCD); +} + +bool ActorFleeingSpinut::func_ov032_0211ca6c() { + return !this->func_ov032_0211cab8(0x0, 0x3CCD) && !this->func_ov032_0211cab8(0x1, 0x3CCD); +} + +bool ActorFleeingSpinut::func_ov032_0211cab8(unk32 param1, unk32 param2) { + if (param1 == 0x1 && !data_027e0ce0->func_01fff1a4()) { + return false; + } + + if (func_ov000_0205adfc(data_027e0ce0->func_01fff148(param1), &this->mPos) && + this->Actor::func_ov000_0209867c(param1) < param2) { + return true; + } + + return false; +} + +// non-matching (MUL_FX32 etc.) +void ActorFleeingSpinut::func_ov032_0211cb2c() { + if (this->mUnk_110.vfunc_30() != 0x1) { + if (this->mUnk_21C <= FLOAT_TO_FX32(0.0f)) { + this->mUnk_220 = 0x0; + return; + } + + this->mUnk_220 -= this->mUnk_2C; + func_01ff916c(&this->mUnk_21C, 0x0, this->mUnk_220); + return; + } + + fx32 value = this->mUnk_110.vfunc_28()->mUnk_08; + if (FLOAT_TO_FX32(1.0f) < value && value < FLOAT_TO_FX32(16.0f)) { + value -= FLOAT_TO_FX32(1.0f); + this->mUnk_21C = MUL_FX32(value + ROUND_FX32(-MUL_FX32(value, value) * 0x92492493), 0x3B4); + return; + } + + this->mUnk_21C = FLOAT_TO_FX32(0.0f); +} + +ActorFleeingSpinut_1EC::ActorFleeingSpinut_1EC() : + mUnk_00(0x0), + mUnk_04(NULL), + mUnk_08(NULL), + mUnk_1C(FLOAT_TO_FX32(0.0f), FLOAT_TO_FX32(0.0f), FLOAT_TO_FX32(0.0f)), + mUnk_2C(0x0) { + this->mUnk_0C = 0x0; + this->mUnk_10 = 0x0; + this->mUnk_14 = 0x0; + this->mUnk_18 = 0x0; + this->mUnk_28 = 0x0; +} + +// non-matching +void ActorFleeingSpinut_1EC::func_ov032_0211cc48(VecFx32 *param1) { + this->mUnk_04 = this->func_ov032_0211cd20(param1); +} + +// non-matching +UnkStruct_027e0960_TableEntry_04 *ActorFleeingSpinut_1EC::func_ov032_0211cd20(VecFx32 *param1) { + UnkStruct_027e0960_TableEntry *tEntry = data_027e0960->func_ov000_0205a3fc(*param1, this->mUnk_00); + tEntry->func_ov000_02059da4(param1); + return tEntry->mTable.GetPtr(0x1); +} + +extern "C" void func_01ffb714(VecFx32 *, VecFx32 *, void *); +extern "C" fx16 func_01ffbbe0(fx32, fx32); +extern "C" unk32 func_01ff930c(s16 *, s16, unk32, s16); +extern "C" unk32 func_01ff9258(fx32, fx32); +extern "C" fx32 func_02017f54(s16 *, UnkAngleStruct); + +// non-matching +u16 *ActorFleeingSpinut_1EC::func_ov032_0211cd60(VecFx32 *param1, s16 *param2, VecFx32 *param3, unk32 param4, unk32 param5, + unk32 param6) { + if (param6 == 0x0 || this->mUnk_04 == NULL) { + param3->z = FLOAT_TO_FX32(0.0f); + param3->x = FLOAT_TO_FX32(0.0f); + return &this->mUnk_28; + } + + this->mUnk_28 = 0x0; + + if (this->func_ov032_0211d920(param1)) { + param3->z = FLOAT_TO_FX32(0.0f); + param3->x = FLOAT_TO_FX32(0.0f); + this->mUnk_28 |= 0x1; + return &this->mUnk_28; + } + + if (this->func_ov032_0211d864(param1)) { + this->func_ov032_0211d910(); + } + + VecFx32 sp1C; + this->mUnk_04->vfunc_0C(&sp1C); + + VecFx32 sp10; + func_01ffb714(&sp10, &sp10, &sp1C); + + VecFx32 sp04; + func_01ffb714(&sp10, &this->mUnk_1C, &sp04); + + fx16 sp00 = (fx32) func_01ffbbe0(sp10.x, sp10.z); + + func_01ff930c(param2, sp00, param5, sp00); + + func_01ff9258(sp1C.x - param1->x, sp1C.z - param1->z); + + UnkAngleStruct spm04 = {.angle = (u16) sp00}; + func_02017f54(param2, spm04); +} + +void ActorFleeingSpinut_1EC::func_ov032_0211cf74() { + this->func_ov032_0211cfac(0x0); + + if (!data_027e0ce0->func_01fff1a4()) { + return; + } + + this->func_ov032_0211cfac(0x1); +} + +extern "C" bool func_02017930(UnkStruct_027e0960_TableEntry_04_Base *, UnkStruct_027e0960_TableEntry_04_Base *); + +// non-matching +void ActorFleeingSpinut_1EC::func_ov032_0211cfac(unk32 param1) { + VecFx32 sp00; + UnkStruct_027e0960_TableEntry_04 *entry04 = this->func_ov032_0211cd20(data_027e0ce0->func_01fff148(param1)); + entry04->vfunc_0C(&sp00); + + if (entry04->mUnk_0C != NULL && func_02017930(entry04->mUnk_0C, entry04)) { + return; + } + + entry04->mUnk_14 = entry04->mUnk_0C; + entry04->mUnk_0C = NULL; +} + +void ActorFleeingSpinut_1EC::func_ov032_0211d028() { + this->mUnk_14 = 0x0; + this->mUnk_18 = 0x0; + this->mUnk_0C = 0x0; + this->mUnk_10 = 0x0; +} + +bool ActorFleeingSpinut_1EC::func_ov032_0211d040(VecFx32 *param1) { + return (this->func_ov032_0211d568(param1, this->mUnk_04, NULL) > 0) || + (this->func_ov032_0211d568(param1, this->mUnk_08, NULL) > 0); +} + +// non-matching +void ActorFleeingSpinut_1EC::func_ov032_0211d08c(VecFx32 *param1) { + if (this->func_ov032_0211d568(param1, this->mUnk_08, this->mUnk_04) > 0x0) { + VecFx32 *vec = data_027e0ce0->func_01fff148(0x0); + if ((func_01ff9258(vec->x - param1->x, vec->z - param1->z) > 0x3CCD)) { + return; + } + } +} + +// non-matching +bool ActorFleeingSpinut_1EC::func_ov032_0211d2e4(UnkStruct_027e0960_TableEntry_04_Base *param1) { + if (param1 == NULL) { + } +} + +// non-matching +UnkStruct_027e0960_TableEntry_04 *ActorFleeingSpinut_1EC::func_ov032_0211d384(VecFx32 *param1) { + VecFx32 *sp00 = param1; + if (this->func_ov032_0211d920(param1)) { + return NULL; + } + + u32 sp08 = this->mUnk_04->vfunc_1C(); + u32 sp04 = 0x0; + + // loop +} + +// non-matching (regalloc) +unk32 ActorFleeingSpinut_1EC::func_ov032_0211d568(VecFx32 *param1, UnkStruct_027e0960_TableEntry_04_Base *param2, + UnkStruct_027e0960_TableEntry_04_Base *param3) { + if (this->func_ov032_0211d674(param1, param2) == 0) { + return 0x0; + } + + unk32 ret = 0; + u32 val = param2->vfunc_1C(); + if (val < 0x2) { + return ret; + } + + VecFx32 sp00; + param2->vfunc_0C(&sp00); + + for (u32 i = 0; i < val; ++i) { + UnkStruct_027e0960_TableEntry_04_Base *temp = param2->vfunc_18(i); + if (!func_02017930(temp, param2) && (param3 == NULL || !func_02017930(temp, param3)) && + this->func_ov032_0211d674(&sp00, temp)) { + if (val != 0x2) { + ++ret; + } else { + ret += this->func_ov032_0211d568(&sp00, temp, param2); + } + } + } + + return ret; +} + +bool ActorFleeingSpinut_1EC::func_ov032_0211d674(VecFx32 *param1, UnkStruct_027e0960_TableEntry_04_Base *param2) { + if (this->func_ov032_0211d6d8(param1, param2, 0x0) && + (!data_027e0ce0->func_01fff1a4() || this->func_ov032_0211d6d8(param1, param2, 0x1))) { + return true; + } + return false; +} + +// non-matching +bool ActorFleeingSpinut_1EC::func_ov032_0211d6d8(VecFx32 *param1, UnkStruct_027e0960_TableEntry_04_Base *param2, + unk32 param3) {} + +void ActorFleeingSpinut_1EC::func_ov032_0211d7e8(VecFx32 *param1) { + this->func_ov032_0211d830(this->func_ov032_0211d384(param1)); + this->func_ov032_0211d80c(); +} + +void ActorFleeingSpinut_1EC::func_ov032_0211d80c() { + this->mUnk_28 |= 0x2; + if (this->mUnk_04 == NULL) { + this->mUnk_28 |= 0x1; + } +} + +void ActorFleeingSpinut_1EC::func_ov032_0211d830(UnkStruct_027e0960_TableEntry_04 *param1) { + this->mUnk_08 = this->mUnk_04; + if (this->mUnk_04 != NULL) { + this->mUnk_04->vfunc_0C(&this->mUnk_1C); + } + this->mUnk_04 = param1; +} + +bool ActorFleeingSpinut_1EC::func_ov032_0211d864(VecFx32 *param1) { + if (this->mUnk_2C == 0x0) { + return false; + } + + if (!this->func_ov032_0211d568(param1, this->mUnk_04, NULL)) { + + if (this->func_ov032_0211d568(param1, this->mUnk_08, NULL) > 0x0) { + return true; + } + } + + return this->func_ov032_0211da0c(0x0, param1) || + (data_027e0ce0->func_01fff1a4() && this->func_ov032_0211da0c(0x1, param1)); +} + +void ActorFleeingSpinut_1EC::func_ov032_0211d910() { + UnkStruct_027e0960_TableEntry_04 *oldUnk04 = this->mUnk_04; + this->mUnk_04 = this->mUnk_08; + this->mUnk_08 = oldUnk04; +} + +// non-matching (regalloc :sob:) +bool ActorFleeingSpinut_1EC::func_ov032_0211d920(VecFx32 *param1) { + UnkStruct_027e0ce0 *data = data_027e0ce0; + if (!data->func_01fff1a4()) { + return false; + } + + bool ret = false; + bool var_r7 = false; + bool var_r8 = false; + + VecFx32 *vec = data->func_01fff148(0x0); + if (func_01ff9258(param1->x - vec->x, param1->z - vec->z) < 0x3000) { + vec = data->func_01fff148(0x1); + + if (func_01ff9258(param1->x - vec->x, param1->z - vec->z) < 0x3000) { + var_r8 = true; + } + } + + if (var_r8 && this->func_ov032_0211d568(param1, this->mUnk_04, NULL) == 0) { + var_r7 = true; + } + + if (var_r7 && this->func_ov032_0211d568(param1, this->mUnk_08, NULL) == 0) { + ret = true; + } + + return ret; +} + +// non-matching +bool ActorFleeingSpinut_1EC::func_ov032_0211da0c(unk32 param1, VecFx32 *param2) {} diff --git a/src/032_MapA1/Actor/ActorSpinut.cpp b/src/032_MapA1/Actor/ActorSpinut.cpp index f60c3449..223ef37b 100644 --- a/src/032_MapA1/Actor/ActorSpinut.cpp +++ b/src/032_MapA1/Actor/ActorSpinut.cpp @@ -24,7 +24,6 @@ extern "C" fx32 func_01ffb428(unk32, unk32); extern "C" unk32 func_01ffb464(unk32 param1); extern "C" fx32 func_01ffb66c(unk32, unk32); extern "C" fx16 func_01ffbbe0(fx32, fx32); -extern "C" void func_01ffc634(ModelRender *, VecFx32 *, UnkAngleStruct, VecFx32 *); extern "C" bool func_02016ae0(VecFx32 *, VecFx32 *, UnkAngleStruct, unk32, unk32); extern "C" Actor *func_02016fbc(ActorId, VecFx32 *, unk32); @@ -74,7 +73,7 @@ Actor *ActorProfileSpinut::Create() { } ActorProfileSpinut::ActorProfileSpinut() : - ActorProfile_Derived1(ActorId_KURI) { + ActorProfile_Derived1(ActorId_Spinut) { this->mUnk_04.Init(FLOAT_TO_FX32(0.4f)); this->vfunc_04()->mUnk_15 = true; } @@ -284,7 +283,7 @@ void ActorSpinut::vfunc_2C(unk32 param1) { VecFx32 sp08 = this->mPos; sp08.y += this->mUnk_288.y; - func_01ffc634(&this->mUnk_0B0, &sp14, this->mAngleStruct, &sp08); + this->mUnk_0B0.func_01ffc634(&sp14, this->mAngleStruct, &sp08); } void ActorSpinut::func_ov032_02119990() { @@ -849,7 +848,7 @@ void ActorSpinut::func_ov032_0211b298() { } void ActorSpinut::func_ov032_0211b37c(ActorSpinut *thisx, u16 param1) { - if (thisx->GetActorId() == ActorId_KURI) { + if (thisx->GetActorId() == ActorId_Spinut) { thisx->mUnk_294 = true; thisx->mUnk_52 = param1; thisx->mUnk_50 = 0x0; diff --git a/src/032_MapA1/Actor/ActorUnkMKUR.cpp b/src/032_MapA1/Actor/ActorUnkMKUR.cpp deleted file mode 100644 index 339c46db..00000000 --- a/src/032_MapA1/Actor/ActorUnkMKUR.cpp +++ /dev/null @@ -1,66 +0,0 @@ -//! TODO: This file was generated automatically and might contain errors - -#include "Actor/ActorUnkMKUR.hpp" -#include "System/SysNew.hpp" - -DECL_PROFILE(ActorProfileUnkMKUR); - -Actor *ActorProfileUnkMKUR::Create() { - return new(HeapIndex_2) ActorUnkMKUR(); -} - -ActorProfileUnkMKUR::ActorProfileUnkMKUR() : - ActorProfile(ActorId_MKUR) {} - -ActorUnkMKUR::ActorUnkMKUR() {} - -void ActorUnkMKUR::func_ov032_0211b988(void) {} -void ActorUnkMKUR::func_ov032_0211b9a4(void) {} -void ActorUnkMKUR::func_ov032_0211ba0c(void) {} -void ActorUnkMKUR::func_ov032_0211bc74(void) {} -void ActorUnkMKUR::func_ov032_0211bd78(void) {} -void ActorUnkMKUR::func_ov032_0211be04(void) {} -void ActorUnkMKUR::func_ov032_0211be30(void) {} -void ActorUnkMKUR::func_ov032_0211bea8(void) {} -void ActorUnkMKUR::func_ov032_0211bf84(void) {} -void ActorUnkMKUR::func_ov032_0211bffc(void) {} -void ActorUnkMKUR::func_ov032_0211c07c(void) {} -void ActorUnkMKUR::func_ov032_0211c108(void) {} -void ActorUnkMKUR::func_ov032_0211c2c4(void) {} -void ActorUnkMKUR::func_ov032_0211c340(void) {} -void ActorUnkMKUR::func_ov032_0211c444(void) {} -void ActorUnkMKUR::func_ov032_0211c4d4(void) {} -void ActorUnkMKUR::func_ov032_0211c53c(void) {} -void ActorUnkMKUR::func_ov032_0211c5cc(void) {} -void ActorUnkMKUR::func_ov032_0211c73c(void) {} -void ActorUnkMKUR::func_ov032_0211c7bc(void) {} -void ActorUnkMKUR::func_ov032_0211c938(void) {} -void ActorUnkMKUR::func_ov032_0211c9d8(void) {} -void ActorUnkMKUR::func_ov032_0211ca20(void) {} -void ActorUnkMKUR::func_ov032_0211ca6c(void) {} -void ActorUnkMKUR::func_ov032_0211cab8(void) {} -void ActorUnkMKUR::func_ov032_0211cb2c(void) {} -void ActorUnkMKUR::func_ov032_0211cc10(void) {} -void ActorUnkMKUR::func_ov032_0211cc48(void) {} -void ActorUnkMKUR::func_ov032_0211cd20(void) {} -void ActorUnkMKUR::func_ov032_0211cd60(void) {} -void ActorUnkMKUR::func_ov032_0211cf74(void) {} -void ActorUnkMKUR::func_ov032_0211cfac(void) {} -void ActorUnkMKUR::func_ov032_0211d028(void) {} -void ActorUnkMKUR::func_ov032_0211d040(void) {} -void ActorUnkMKUR::func_ov032_0211d08c(void) {} -void ActorUnkMKUR::func_ov032_0211d2e4(void) {} -void ActorUnkMKUR::func_ov032_0211d384(void) {} -void ActorUnkMKUR::func_ov032_0211d568(void) {} -void ActorUnkMKUR::func_ov032_0211d674(void) {} -void ActorUnkMKUR::func_ov032_0211d6d8(void) {} -void ActorUnkMKUR::func_ov032_0211d7e8(void) {} -void ActorUnkMKUR::func_ov032_0211d80c(void) {} -void ActorUnkMKUR::func_ov032_0211d830(void) {} -void ActorUnkMKUR::func_ov032_0211d864(void) {} -void ActorUnkMKUR::func_ov032_0211d910(void) {} -void ActorUnkMKUR::func_ov032_0211d920(void) {} -void ActorUnkMKUR::func_ov032_0211da0c(void) {} - -ActorUnkMKUR::~ActorUnkMKUR() {} -ActorProfileUnkMKUR::~ActorProfileUnkMKUR() {} diff --git a/src/070_Dungeon/Actor/ActorUnkKEYN.cpp b/src/070_Dungeon/Actor/ActorUnkKEYN.cpp index 715eb1ae..1feb6b7e 100644 --- a/src/070_Dungeon/Actor/ActorUnkKEYN.cpp +++ b/src/070_Dungeon/Actor/ActorUnkKEYN.cpp @@ -16,7 +16,8 @@ ActorProfileUnkKEYN::ActorProfileUnkKEYN() : ActorUnkKEYN::ActorUnkKEYN() {} -void ActorUnkKEYN::func_ov070_0214143c(void) {} +void ActorUnkKEYN::func_ov070_0214143c(ActorRef *param1, VecFx32 *param2, ActorRef param3, s16 param4, u8 param5, u16 param6) { +} void ActorUnkKEYN::func_ov070_02141618(void) {} void ActorUnkKEYN::func_ov070_0214162c(void) {} void ActorUnkKEYN::func_ov070_02141750(void) {} diff --git a/tools/configure.py b/tools/configure.py index 6c089ba5..5709a9b6 100755 --- a/tools/configure.py +++ b/tools/configure.py @@ -599,7 +599,7 @@ config.libs = [ [ Object("032_MapA1/Actor/ActorUnkKETH.cpp"), Object("032_MapA1/Actor/ActorSpinut.cpp"), - Object("032_MapA1/Actor/ActorUnkMKUR.cpp"), + Object("032_MapA1/Actor/ActorFleeingSpinut.cpp"), Object("032_MapA1/Actor/ActorUnkNSSW.cpp"), Object("032_MapA1/MapObject/MapObjectUnkSWSW.cpp"), ]