diff --git a/config/eur/arm9/overlays/ov000/symbols.txt b/config/eur/arm9/overlays/ov000/symbols.txt index 19717e74..fea35f0e 100644 --- a/config/eur/arm9/overlays/ov000/symbols.txt +++ b/config/eur/arm9/overlays/ov000/symbols.txt @@ -2370,10 +2370,10 @@ func_ov000_020997a4 kind:function(arm,size=0x20) addr:0x020997a4 _ZN14Actor_Derived219func_ov000_020997c4Ei kind:function(arm,size=0x2c) addr:0x020997c4 _ZN14Actor_Derived2D1Ev kind:function(arm,size=0x14) addr:0x020997f0 _ZN14Actor_Derived2D0Ev kind:function(arm,size=0x1c) addr:0x02099804 -_ZN26UnkStruct_ActorUnkCANS_224C1Ev kind:function(arm,size=0x50) addr:0x02099820 +_ZN28UnkStruct_ActorLobarrier_224C1Ev kind:function(arm,size=0x50) addr:0x02099820 func_ov000_02099870 kind:function(arm,size=0x80) addr:0x02099870 -_ZN26UnkStruct_ActorUnkCANS_22419func_ov000_020998f0E9RefStructP7VecFx32 kind:function(arm,size=0x11c) addr:0x020998f0 -_ZN26UnkStruct_ActorUnkCANS_22419func_ov000_02099a0cEv kind:function(arm,size=0x10) addr:0x02099a0c +_ZN28UnkStruct_ActorLobarrier_22419func_ov000_020998f0E9RefStructP7VecFx32 kind:function(arm,size=0x11c) addr:0x020998f0 +_ZN28UnkStruct_ActorLobarrier_22419func_ov000_02099a0cEv kind:function(arm,size=0x10) addr:0x02099a0c func_ov000_02099a1c kind:function(arm,size=0xc) addr:0x02099a1c _ZN24UnkStruct_ov000_020b31a8C2EP10UnkSystem5P11ModelRenderP33MapObjectProfile_Derived2_20_Base kind:function(thumb,size=0x54) addr:0x02099a28 func_ov000_02099a7c kind:function(thumb,size=0x48) addr:0x02099a7c diff --git a/config/eur/arm9/overlays/ov017/symbols.txt b/config/eur/arm9/overlays/ov017/symbols.txt index 5b413b41..d0635ce3 100644 --- a/config/eur/arm9/overlays/ov017/symbols.txt +++ b/config/eur/arm9/overlays/ov017/symbols.txt @@ -69,9 +69,9 @@ _ZN5Actor19func_ov017_020bf574Eii kind:function(arm,size=0x50) addr:0x020bf574 _ZN5Actor19func_ov017_020bf5c4EP7VecFx32iiis kind:function(arm,size=0x70) addr:0x020bf5c4 _ZN5Actor19func_ov017_020bf634EPK7VecFx32ti kind:function(arm,size=0x54) addr:0x020bf634 _ZN5Actor19func_ov017_020bf688Ev kind:function(arm,size=0x88) addr:0x020bf688 -_ZN5Actor19func_ov017_020bf710EP26UnkStruct_ActorUnkCANS_224PK7VecFx32t kind:function(arm,size=0x98) addr:0x020bf710 +_ZN5Actor19func_ov017_020bf710EP28UnkStruct_ActorLobarrier_224PK7VecFx32t kind:function(arm,size=0x98) addr:0x020bf710 _ZN5Actor19func_ov017_020bf7a8Ev kind:function(arm,size=0xec) addr:0x020bf7a8 -_ZN5Actor19func_ov017_020bf894EP26UnkStruct_ActorUnkCANS_224 kind:function(arm,size=0x60) addr:0x020bf894 +_ZN5Actor19func_ov017_020bf894EP28UnkStruct_ActorLobarrier_224 kind:function(arm,size=0x60) addr:0x020bf894 _ZN5Actor8vfunc_40Ev kind:function(arm,size=0x44) addr:0x020bf8f4 _ZN5Actor8vfunc_44Ev kind:function(arm,size=0x64) addr:0x020bf938 _ZN5Actor19func_ov017_020bf99cEv kind:function(arm,size=0x2c) addr:0x020bf99c diff --git a/config/eur/arm9/overlays/ov063/delinks.txt b/config/eur/arm9/overlays/ov063/delinks.txt index 757a2895..572a95e2 100644 --- a/config/eur/arm9/overlays/ov063/delinks.txt +++ b/config/eur/arm9/overlays/ov063/delinks.txt @@ -5,14 +5,14 @@ .data start:0x02162e80 end:0x02163b60 kind:data align:32 .bss start:0x02163b60 end:0x02164a20 kind:bss align:32 -src/063_Shrine/Actor/ActorUnkCANS.cpp: +src/063_Shrine/Actor/ActorLobarrier.cpp: .text start:0x02157ea0 end:0x0215aaf8 .init start:0x02162730 end:0x021627a0 .ctor start:0x02162e40 end:0x02162e44 .data start:0x02162e80 end:0x02163068 .bss start:0x02163b60 end:0x02163c48 -src/063_Shrine/Actor/ActorUnkCASE.cpp: +src/063_Shrine/Actor/ActorLobarrierShield.cpp: .text start:0x0215aaf8 end:0x0215bafc .init start:0x021627a0 end:0x02162834 .ctor start:0x02162e44 end:0x02162e48 diff --git a/config/eur/arm9/overlays/ov063/symbols.txt b/config/eur/arm9/overlays/ov063/symbols.txt index 39363fa3..5b61e72e 100644 --- a/config/eur/arm9/overlays/ov063/symbols.txt +++ b/config/eur/arm9/overlays/ov063/symbols.txt @@ -1,55 +1,55 @@ -_ZN19ActorProfileUnkCANS10GetProfileEv kind:function(arm,size=0xc) addr:0x02157ea0 -_ZN19ActorProfileUnkCANS6CreateEv kind:function(arm,size=0x24) addr:0x02157eac -_ZN19ActorProfileUnkCANSC1Ev kind:function(arm,size=0x50) addr:0x02157ed0 +_ZN21ActorProfileLobarrier10GetProfileEv kind:function(arm,size=0xc) addr:0x02157ea0 +_ZN21ActorProfileLobarrier6CreateEv kind:function(arm,size=0x24) addr:0x02157eac +_ZN21ActorProfileLobarrierC1Ev kind:function(arm,size=0x50) addr:0x02157ed0 _ZN24UnkStruct_ov063_02162ee8C1EP10G3d_Model_ kind:function(arm,size=0x5c) addr:0x02157f20 -_ZN24UnkStruct_ov063_02162e88C1EPv kind:function(arm,size=0x28) addr:0x02157f7c +_ZN24UnkStruct_ov063_02162e88C1EP14ActorLobarrier kind:function(arm,size=0x28) addr:0x02157f7c _ZN24UnkStruct_ov063_02162e888vfunc_04E9RefStructiiPi kind:function(arm,size=0x178) addr:0x02157fa4 -_ZN12ActorUnkCANSC1Ev kind:function(arm,size=0x1dc) addr:0x0215811c +_ZN14ActorLobarrierC1Ev kind:function(arm,size=0x1dc) addr:0x0215811c _ZN24UnkStruct_ov063_02162ee8D1Ev kind:function(arm,size=0x14) addr:0x021582f8 _ZN24UnkStruct_ov063_02162f14D1Ev kind:function(arm,size=0x14) addr:0x0215830c -_ZN12ActorUnkCANS4InitEi kind:function(arm,size=0x68) addr:0x02158320 -_ZN12ActorUnkCANS5SetupEv kind:function(arm,size=0x9c) addr:0x02158388 -_ZN12ActorUnkCANS19func_ov063_02158424Ev kind:function(arm,size=0x24) addr:0x02158424 -_ZN12ActorUnkCANS19func_ov063_02158448Ei kind:function(arm,size=0x48) addr:0x02158448 -_ZN12ActorUnkCANS19func_ov063_02158490Ev kind:function(arm,size=0x34) addr:0x02158490 -_ZN12ActorUnkCANS8vfunc_24Ev kind:function(arm,size=0x2c) addr:0x021584c4 -_ZN12ActorUnkCANS6UpdateEv kind:function(arm,size=0x53c) addr:0x021584f0 -_ZN12ActorUnkCANS8vfunc_2CEi kind:function(arm,size=0xe0) addr:0x02158a2c -_ZN12ActorUnkCANS19func_ov063_02158b0cEv kind:function(arm,size=0x28) addr:0x02158b0c -_ZN12ActorUnkCANS19func_ov063_02158b34Ev kind:function(arm,size=0x64) addr:0x02158b34 -_ZN12ActorUnkCANS19func_ov063_02158b98Ev kind:function(arm,size=0x1a8) addr:0x02158b98 -_ZN12ActorUnkCANS19func_ov063_02158d40Ev kind:function(arm,size=0x70) addr:0x02158d40 -_ZN12ActorUnkCANS19func_ov063_02158db0Ev kind:function(arm,size=0x318) addr:0x02158db0 -_ZN12ActorUnkCANS19func_ov063_021590c8Ev kind:function(arm,size=0x38) addr:0x021590c8 -_ZN12ActorUnkCANS19func_ov063_02159100Ev kind:function(arm,size=0xf4) addr:0x02159100 -_ZN12ActorUnkCANS19func_ov063_021591f4Ev kind:function(arm,size=0x64) addr:0x021591f4 -_ZN12ActorUnkCANS19func_ov063_02159258Ev kind:function(arm,size=0x1b0) addr:0x02159258 -_ZN12ActorUnkCANS19func_ov063_02159408Ev kind:function(arm,size=0x8c) addr:0x02159408 -_ZN12ActorUnkCANS19func_ov063_02159494Ev kind:function(arm,size=0x110) addr:0x02159494 -_ZN12ActorUnkCANS19func_ov063_021595a4Ev kind:function(arm,size=0x74) addr:0x021595a4 -_ZN12ActorUnkCANS19func_ov063_02159618Ev kind:function(arm,size=0xfc) addr:0x02159618 -_ZN12ActorUnkCANS19func_ov063_02159714Ev kind:function(arm,size=0x70) addr:0x02159714 -_ZN12ActorUnkCANS19func_ov063_02159784Ev kind:function(arm,size=0x178) addr:0x02159784 -_ZN12ActorUnkCANS19func_ov063_021598fcEv kind:function(arm,size=0xe8) addr:0x021598fc -_ZN12ActorUnkCANS19func_ov063_021599e4Ev kind:function(arm,size=0x2c4) addr:0x021599e4 -_ZN12ActorUnkCANS19func_ov063_02159ca8Ev kind:function(arm,size=0xc0) addr:0x02159ca8 -_ZN12ActorUnkCANS19func_ov063_02159d68Ev kind:function(arm,size=0x94) addr:0x02159d68 -_ZN12ActorUnkCANS19func_ov063_02159dfcEv kind:function(arm,size=0x20) addr:0x02159dfc -_ZN12ActorUnkCANS19func_ov063_02159e1cEv kind:function(arm,size=0x4) addr:0x02159e1c -_ZN12ActorUnkCANS19func_ov063_02159e20Ev kind:function(arm,size=0xa0) addr:0x02159e20 -_ZN12ActorUnkCANS19func_ov063_02159ec0Ev kind:function(arm,size=0x7c) addr:0x02159ec0 -_ZN12ActorUnkCANS19func_ov063_02159f3cEi kind:function(arm,size=0x1b4) addr:0x02159f3c -_ZN12ActorUnkCANS19func_ov063_0215a0f0Ev kind:function(arm,size=0x1d0) addr:0x0215a0f0 -_ZN12ActorUnkCANS19func_ov063_0215a2c0Ev kind:function(arm,size=0x168) addr:0x0215a2c0 -_ZN12ActorUnkCANS19func_ov063_0215a428Ev kind:function(arm,size=0x4c) addr:0x0215a428 -_ZN12ActorUnkCANS19func_ov063_0215a474Ev kind:function(arm,size=0xa0) addr:0x0215a474 -_ZN12ActorUnkCANS19func_ov063_0215a514Ev kind:function(arm,size=0x58) addr:0x0215a514 -_ZN12ActorUnkCANS19func_ov063_0215a56cEi kind:function(arm,size=0x34) addr:0x0215a56c -_ZN12ActorUnkCANS19func_ov063_0215a5a0EP7VecFx32 kind:function(arm,size=0x1c) addr:0x0215a5a0 -_ZN12ActorUnkCANS19func_ov063_0215a5bcEv kind:function(arm,size=0x1c) addr:0x0215a5bc -_ZN12ActorUnkCANS19func_ov063_0215a5d8Ev kind:function(arm,size=0x20) addr:0x0215a5d8 -_ZN12ActorUnkCANS8vfunc_10EP8Cylinder kind:function(arm,size=0x80) addr:0x0215a5f8 -_ZN12ActorUnkCANS19func_ov063_0215a678EPS_P29UnkStruct_func_ov063_0215a678 kind:function(arm,size=0x15c) addr:0x0215a678 +_ZN14ActorLobarrier4InitEi kind:function(arm,size=0x68) addr:0x02158320 +_ZN14ActorLobarrier5SetupEv kind:function(arm,size=0x9c) addr:0x02158388 +_ZN14ActorLobarrier19func_ov063_02158424Ev kind:function(arm,size=0x24) addr:0x02158424 +_ZN14ActorLobarrier8SetStateEs kind:function(arm,size=0x48) addr:0x02158448 +_ZN14ActorLobarrier19func_ov063_02158490Ev kind:function(arm,size=0x34) addr:0x02158490 +_ZN14ActorLobarrier8vfunc_24Ev kind:function(arm,size=0x2c) addr:0x021584c4 +_ZN14ActorLobarrier6UpdateEv kind:function(arm,size=0x53c) addr:0x021584f0 +_ZN14ActorLobarrier8vfunc_2CEi kind:function(arm,size=0xe0) addr:0x02158a2c +_ZN14ActorLobarrier19func_ov063_02158b0cEv kind:function(arm,size=0x28) addr:0x02158b0c +_ZN14ActorLobarrier19func_ov063_02158b34Ev kind:function(arm,size=0x64) addr:0x02158b34 +_ZN14ActorLobarrier19func_ov063_02158b98Ev kind:function(arm,size=0x1a8) addr:0x02158b98 +_ZN14ActorLobarrier19func_ov063_02158d40Ev kind:function(arm,size=0x70) addr:0x02158d40 +_ZN14ActorLobarrier19func_ov063_02158db0Ev kind:function(arm,size=0x318) addr:0x02158db0 +_ZN14ActorLobarrier19func_ov063_021590c8Ev kind:function(arm,size=0x38) addr:0x021590c8 +_ZN14ActorLobarrier19func_ov063_02159100Ev kind:function(arm,size=0xf4) addr:0x02159100 +_ZN14ActorLobarrier19func_ov063_021591f4Ev kind:function(arm,size=0x64) addr:0x021591f4 +_ZN14ActorLobarrier19func_ov063_02159258Ev kind:function(arm,size=0x1b0) addr:0x02159258 +_ZN14ActorLobarrier19func_ov063_02159408Ev kind:function(arm,size=0x8c) addr:0x02159408 +_ZN14ActorLobarrier19func_ov063_02159494Ev kind:function(arm,size=0x110) addr:0x02159494 +_ZN14ActorLobarrier19func_ov063_021595a4Ev kind:function(arm,size=0x74) addr:0x021595a4 +_ZN14ActorLobarrier19func_ov063_02159618Ev kind:function(arm,size=0xfc) addr:0x02159618 +_ZN14ActorLobarrier19func_ov063_02159714Ev kind:function(arm,size=0x70) addr:0x02159714 +_ZN14ActorLobarrier19func_ov063_02159784Ev kind:function(arm,size=0x178) addr:0x02159784 +_ZN14ActorLobarrier19func_ov063_021598fcEv kind:function(arm,size=0xe8) addr:0x021598fc +_ZN14ActorLobarrier19func_ov063_021599e4Ev kind:function(arm,size=0x2c4) addr:0x021599e4 +_ZN14ActorLobarrier19func_ov063_02159ca8Ev kind:function(arm,size=0xc0) addr:0x02159ca8 +_ZN14ActorLobarrier19func_ov063_02159d68Ev kind:function(arm,size=0x94) addr:0x02159d68 +_ZN14ActorLobarrier19func_ov063_02159dfcEv kind:function(arm,size=0x20) addr:0x02159dfc +_ZN14ActorLobarrier19func_ov063_02159e1cEv kind:function(arm,size=0x4) addr:0x02159e1c +_ZN14ActorLobarrier19func_ov063_02159e20Ev kind:function(arm,size=0xa0) addr:0x02159e20 +_ZN14ActorLobarrier19func_ov063_02159ec0Ev kind:function(arm,size=0x7c) addr:0x02159ec0 +_ZN14ActorLobarrier19func_ov063_02159f3cEi kind:function(arm,size=0x1b4) addr:0x02159f3c +_ZN14ActorLobarrier19func_ov063_0215a0f0Ev kind:function(arm,size=0x1d0) addr:0x0215a0f0 +_ZN14ActorLobarrier19func_ov063_0215a2c0Ev kind:function(arm,size=0x168) addr:0x0215a2c0 +_ZN14ActorLobarrier19func_ov063_0215a428Ev kind:function(arm,size=0x4c) addr:0x0215a428 +_ZN14ActorLobarrier19func_ov063_0215a474Ev kind:function(arm,size=0xa0) addr:0x0215a474 +_ZN14ActorLobarrier19func_ov063_0215a514Ev kind:function(arm,size=0x58) addr:0x0215a514 +_ZN14ActorLobarrier19func_ov063_0215a56cEi kind:function(arm,size=0x34) addr:0x0215a56c +_ZN14ActorLobarrier19func_ov063_0215a5a0EP7VecFx32 kind:function(arm,size=0x1c) addr:0x0215a5a0 +_ZN14ActorLobarrier19func_ov063_0215a5bcEv kind:function(arm,size=0x1c) addr:0x0215a5bc +_ZN14ActorLobarrier19func_ov063_0215a5d8Ev kind:function(arm,size=0x20) addr:0x0215a5d8 +_ZN14ActorLobarrier8vfunc_10EP8Cylinder kind:function(arm,size=0x80) addr:0x0215a5f8 +_ZN14ActorLobarrier19func_ov063_0215a678EPS_P29UnkStruct_func_ov063_0215a678 kind:function(arm,size=0x15c) addr:0x0215a678 _ZN24UnkStruct_ov063_02162ea8C1Ev kind:function(arm,size=0x30) addr:0x0215a7d4 _ZN24UnkStruct_ov063_02162ea8D1Ev kind:function(arm,size=0x14) addr:0x0215a804 _ZN24UnkStruct_ov063_02162ea8D0Ev kind:function(arm,size=0x1c) addr:0x0215a818 @@ -59,52 +59,52 @@ _ZN24UnkStruct_ov063_02162f148vfunc_3CEv kind:function(arm,size=0x24) addr:0x021 _ZN24UnkStruct_ov063_02162f148vfunc_38Eii kind:function(arm,size=0x2c) addr:0x0215a970 _ZN24UnkStruct_ov063_02162ee8D0Ev kind:function(arm,size=0x1c) addr:0x0215a99c _ZN24UnkStruct_ov063_02162f14D0Ev kind:function(arm,size=0x1c) addr:0x0215a9b8 -_ZN12ActorUnkCANSD1Ev kind:function(arm,size=0x84) addr:0x0215a9d4 -_ZN12ActorUnkCANSD0Ev kind:function(arm,size=0x8c) addr:0x0215aa58 -_ZN19ActorProfileUnkCANSD1Ev kind:function(arm,size=0x14) addr:0x0215aae4 -_ZN19ActorProfileUnkCASE10GetProfileEv kind:function(arm,size=0xc) addr:0x0215aaf8 -_ZN19ActorProfileUnkCASE6CreateEv kind:function(arm,size=0x24) addr:0x0215ab04 -_ZN19ActorProfileUnkCASEC1Ev kind:function(arm,size=0x48) addr:0x0215ab28 +_ZN14ActorLobarrierD1Ev kind:function(arm,size=0x84) addr:0x0215a9d4 +_ZN14ActorLobarrierD0Ev kind:function(arm,size=0x8c) addr:0x0215aa58 +_ZN21ActorProfileLobarrierD1Ev kind:function(arm,size=0x14) addr:0x0215aae4 +_ZN27ActorProfileLobarrierShield10GetProfileEv kind:function(arm,size=0xc) addr:0x0215aaf8 +_ZN27ActorProfileLobarrierShield6CreateEv kind:function(arm,size=0x24) addr:0x0215ab04 +_ZN27ActorProfileLobarrierShieldC1Ev kind:function(arm,size=0x48) addr:0x0215ab28 _ZN24UnkStruct_ov063_021631a0C1EP10G3d_Model_ kind:function(arm,size=0x34) addr:0x0215ab70 -_ZN16ActorUnkCASE_150C1EP5Actor kind:function(arm,size=0x34) addr:0x0215aba4 -_ZN16ActorUnkCASE_1508vfunc_00E9RefStructi kind:function(arm,size=0x74) addr:0x0215abd8 -_ZN16ActorUnkCASE_1508vfunc_04Ev kind:function(arm,size=0x1c) addr:0x0215ac4c -_ZN16ActorUnkCASE_1508vfunc_0CEP7VecFx32 kind:function(arm,size=0x24) addr:0x0215ac68 -_ZN16ActorUnkCASE_174C1EP5Actor kind:function(arm,size=0x3c) addr:0x0215ac8c -_ZN16ActorUnkCASE_1748vfunc_10EPK5Actor kind:function(arm,size=0x24) addr:0x0215acc8 -_ZN12ActorUnkCASE19func_ov063_0215acecEP9RefStructS0_ kind:function(arm,size=0x5c) addr:0x0215acec -_ZN12ActorUnkCASEC1Ev kind:function(arm,size=0x124) addr:0x0215ad48 +_ZN24ActorLobarrierShield_150C1EP5Actor kind:function(arm,size=0x34) addr:0x0215aba4 +_ZN24ActorLobarrierShield_1508vfunc_00E9RefStructi kind:function(arm,size=0x74) addr:0x0215abd8 +_ZN24ActorLobarrierShield_1508vfunc_04Ev kind:function(arm,size=0x1c) addr:0x0215ac4c +_ZN24ActorLobarrierShield_1508vfunc_0CEP7VecFx32 kind:function(arm,size=0x24) addr:0x0215ac68 +_ZN24ActorLobarrierShield_174C1EP5Actor kind:function(arm,size=0x3c) addr:0x0215ac8c +_ZN24ActorLobarrierShield_1748vfunc_10EPK5Actor kind:function(arm,size=0x24) addr:0x0215acc8 +_ZN20ActorLobarrierShield19func_ov063_0215acecEP9RefStructS0_ kind:function(arm,size=0x5c) addr:0x0215acec +_ZN20ActorLobarrierShieldC1Ev kind:function(arm,size=0x124) addr:0x0215ad48 _ZN24UnkStruct_ov063_021631a0D1Ev kind:function(arm,size=0x14) addr:0x0215ae6c -_ZN16ActorUnkCASE_174D1Ev kind:function(arm,size=0x14) addr:0x0215ae80 -_ZN12ActorUnkCASE4InitEi kind:function(arm,size=0x68) addr:0x0215ae94 -_ZN12ActorUnkCASE19func_ov063_0215aefcEs kind:function(arm,size=0x58) addr:0x0215aefc -_ZN12ActorUnkCASE19func_ov063_0215af54Ev kind:function(arm,size=0x4) addr:0x0215af54 -_ZN12ActorUnkCASE19func_ov063_0215af58Ev kind:function(arm,size=0x4) addr:0x0215af58 -_ZN12ActorUnkCASE19func_ov063_0215af5cEv kind:function(arm,size=0x4) addr:0x0215af5c -_ZN12ActorUnkCASE19func_ov063_0215af60Ev kind:function(arm,size=0x44) addr:0x0215af60 -_ZN12ActorUnkCASE19func_ov063_0215afa4Ev kind:function(arm,size=0x14) addr:0x0215afa4 -_ZN12ActorUnkCASE19func_ov063_0215afb8Ev kind:function(arm,size=0x9c) addr:0x0215afb8 -_ZN12ActorUnkCASE19func_ov063_0215b054Ev kind:function(arm,size=0x3c) addr:0x0215b054 -_ZN12ActorUnkCASE19func_ov063_0215b090Ev kind:function(arm,size=0x12c) addr:0x0215b090 -_ZN12ActorUnkCASE19func_ov063_0215b1bcEv kind:function(arm,size=0x88) addr:0x0215b1bc -_ZN12ActorUnkCASE19func_ov063_0215b244Ev kind:function(arm,size=0x6c) addr:0x0215b244 -_ZN12ActorUnkCASE19func_ov063_0215b2b0Ev kind:function(arm,size=0x14) addr:0x0215b2b0 -_ZN12ActorUnkCASE19func_ov063_0215b2c4Ev kind:function(arm,size=0x4) addr:0x0215b2c4 -_ZN12ActorUnkCASE8vfunc_24Ev kind:function(arm,size=0x24) addr:0x0215b2c8 -_ZN12ActorUnkCASE6UpdateEv kind:function(arm,size=0x338) addr:0x0215b2ec -_ZN12ActorUnkCASE8vfunc_2CEi kind:function(arm,size=0xa4) addr:0x0215b624 -_ZN12ActorUnkCASE19func_ov063_0215b6c8EP7VecFx3214UnkAngleStruct kind:function(arm,size=0x5c) addr:0x0215b6c8 -_ZN12ActorUnkCASE19func_ov063_0215b724Ev kind:function(arm,size=0xa8) addr:0x0215b724 -_ZN12ActorUnkCASE8vfunc_10EP8Cylinder kind:function(arm,size=0x48) addr:0x0215b7cc -_ZN12ActorUnkCASE19func_ov063_0215b814E9RefStruct kind:function(arm,size=0x40) addr:0x0215b814 -_ZN12ActorUnkCASE19func_ov063_0215b854Ev kind:function(arm,size=0x94) addr:0x0215b854 -_ZN12ActorUnkCASE19func_ov063_0215b8e8EP7VecFx32 kind:function(arm,size=0xb4) addr:0x0215b8e8 -_ZN12ActorUnkCASE19func_ov063_0215b99cEPS_P29UnkStruct_func_ov063_0215a678 kind:function(arm,size=0xac) addr:0x0215b99c -_ZN16ActorUnkCASE_174D0Ev kind:function(arm,size=0x1c) addr:0x0215ba48 +_ZN24ActorLobarrierShield_174D1Ev kind:function(arm,size=0x14) addr:0x0215ae80 +_ZN20ActorLobarrierShield4InitEi kind:function(arm,size=0x68) addr:0x0215ae94 +_ZN20ActorLobarrierShield8SetStateEs kind:function(arm,size=0x58) addr:0x0215aefc +_ZN20ActorLobarrierShield19func_ov063_0215af54Ev kind:function(arm,size=0x4) addr:0x0215af54 +_ZN20ActorLobarrierShield19func_ov063_0215af58Ev kind:function(arm,size=0x4) addr:0x0215af58 +_ZN20ActorLobarrierShield19func_ov063_0215af5cEv kind:function(arm,size=0x4) addr:0x0215af5c +_ZN20ActorLobarrierShield19func_ov063_0215af60Ev kind:function(arm,size=0x44) addr:0x0215af60 +_ZN20ActorLobarrierShield19func_ov063_0215afa4Ev kind:function(arm,size=0x14) addr:0x0215afa4 +_ZN20ActorLobarrierShield19func_ov063_0215afb8Ev kind:function(arm,size=0x9c) addr:0x0215afb8 +_ZN20ActorLobarrierShield19func_ov063_0215b054Ev kind:function(arm,size=0x3c) addr:0x0215b054 +_ZN20ActorLobarrierShield19func_ov063_0215b090Ev kind:function(arm,size=0x12c) addr:0x0215b090 +_ZN20ActorLobarrierShield19func_ov063_0215b1bcEv kind:function(arm,size=0x88) addr:0x0215b1bc +_ZN20ActorLobarrierShield19func_ov063_0215b244Ev kind:function(arm,size=0x6c) addr:0x0215b244 +_ZN20ActorLobarrierShield19func_ov063_0215b2b0Ev kind:function(arm,size=0x14) addr:0x0215b2b0 +_ZN20ActorLobarrierShield19func_ov063_0215b2c4Ev kind:function(arm,size=0x4) addr:0x0215b2c4 +_ZN20ActorLobarrierShield8vfunc_24Ev kind:function(arm,size=0x24) addr:0x0215b2c8 +_ZN20ActorLobarrierShield6UpdateEv kind:function(arm,size=0x338) addr:0x0215b2ec +_ZN20ActorLobarrierShield8vfunc_2CEi kind:function(arm,size=0xa4) addr:0x0215b624 +_ZN20ActorLobarrierShield19func_ov063_0215b6c8EP7VecFx3214UnkAngleStruct kind:function(arm,size=0x5c) addr:0x0215b6c8 +_ZN20ActorLobarrierShield19func_ov063_0215b724Ev kind:function(arm,size=0xa8) addr:0x0215b724 +_ZN20ActorLobarrierShield8vfunc_10EP8Cylinder kind:function(arm,size=0x48) addr:0x0215b7cc +_ZN20ActorLobarrierShield19func_ov063_0215b814E9RefStruct kind:function(arm,size=0x40) addr:0x0215b814 +_ZN20ActorLobarrierShield19func_ov063_0215b854Ev kind:function(arm,size=0x94) addr:0x0215b854 +_ZN20ActorLobarrierShield19func_ov063_0215b8e8EP7VecFx32 kind:function(arm,size=0xb4) addr:0x0215b8e8 +_ZN20ActorLobarrierShield19func_ov063_0215b99cEPS_P29UnkStruct_func_ov063_0215a678 kind:function(arm,size=0xac) addr:0x0215b99c +_ZN24ActorLobarrierShield_174D0Ev kind:function(arm,size=0x1c) addr:0x0215ba48 _ZN24UnkStruct_ov063_021631a0D0Ev kind:function(arm,size=0x1c) addr:0x0215ba64 -_ZN12ActorUnkCASED1Ev kind:function(arm,size=0x30) addr:0x0215ba80 -_ZN12ActorUnkCASED0Ev kind:function(arm,size=0x38) addr:0x0215bab0 -_ZN19ActorProfileUnkCASED1Ev kind:function(arm,size=0x14) addr:0x0215bae8 +_ZN20ActorLobarrierShieldD1Ev kind:function(arm,size=0x30) addr:0x0215ba80 +_ZN20ActorLobarrierShieldD0Ev kind:function(arm,size=0x38) addr:0x0215bab0 +_ZN27ActorProfileLobarrierShieldD1Ev kind:function(arm,size=0x14) addr:0x0215bae8 _ZN15ActorUnkRMSBaseC2Ev kind:function(arm,size=0x38) addr:0x0215bafc _ZN15ActorUnkRMSBase4InitEi kind:function(arm,size=0x54) addr:0x0215bb34 _ZN15ActorUnkRMSBase5SetupEv kind:function(arm,size=0x4) addr:0x0215bb88 @@ -384,8 +384,8 @@ data_ov063_02162700 kind:data(any) addr:0x02162700 data_ov063_02162710 kind:data(any) addr:0x02162710 data_ov063_02162718 kind:data(any) addr:0x02162718 ambiguous data_ov063_02162720 kind:data(any) addr:0x02162720 -__sinit_ActorUnkCANS.cpp kind:function(arm,size=0x70) addr:0x02162730 -__sinit_ActorUnkCASE.cpp kind:function(arm,size=0x94) addr:0x021627a0 +__sinit_ActorLobarrier.cpp kind:function(arm,size=0x70) addr:0x02162730 +__sinit_ActorLobarrierShield.cpp kind:function(arm,size=0x94) addr:0x021627a0 __sinit_ActorUnkRMSV.cpp kind:function(arm,size=0x50) addr:0x02162834 local __sinit_ActorUnkRMSW.cpp kind:function(arm,size=0x50) addr:0x02162884 __sinit_ActorUnkRMSF.cpp kind:function(arm,size=0x50) addr:0x021628d4 local @@ -398,8 +398,8 @@ __sinit_MapObjectUnkWLMS.cpp kind:function(arm,size=0x154) addr:0x02162bcc __sinit_MapObjectUnkLTRW.cpp kind:function(arm,size=0x80) addr:0x02162d20 local __sinit_MapObjectUnkMTJR.cpp kind:function(arm,size=0x50) addr:0x02162da0 __sinit_MapObjectUnkSWCR.cpp kind:function(arm,size=0x50) addr:0x02162df0 -.p__sinit_ActorUnkCANS.cpp kind:data(word) addr:0x02162e40 -.p__sinit_ActorUnkCASE.cpp kind:data(word) addr:0x02162e44 +.p__sinit_ActorLobarrier.cpp kind:data(word) addr:0x02162e40 +.p__sinit_ActorLobarrierShield.cpp kind:data(word) addr:0x02162e44 .p__sinit_ActorUnkRMSV.cpp kind:data(word) addr:0x02162e48 local .p__sinit_ActorUnkRMSW.cpp kind:data(word) addr:0x02162e4c .p__sinit_ActorUnkRMSF.cpp kind:data(word) addr:0x02162e50 local @@ -415,12 +415,12 @@ __sinit_MapObjectUnkSWCR.cpp kind:function(arm,size=0x50) addr:0x02162df0 _ZTV24UnkStruct_ov063_02162e88 kind:data(any) addr:0x02162e80 data_ov063_02162e90 kind:data(any) addr:0x02162e90 _ZTV24UnkStruct_ov063_02162ea8 kind:data(any) addr:0x02162ea0 -_ZTV19ActorProfileUnkCANS kind:data(any) addr:0x02162ebc +_ZTV21ActorProfileLobarrier kind:data(any) addr:0x02162ebc _ZTV24UnkStruct_ov063_02162ee8 kind:data(any) addr:0x02162ee0 _ZTV24UnkStruct_ov063_02162f14 kind:data(any) addr:0x02162f0c data_ov063_02162f58 kind:data(any) addr:0x02162f58 data_ov063_02162fb0 kind:data(any) addr:0x02162fb0 -_ZTV12ActorUnkCANS kind:data(any) addr:0x02163008 +_ZTV14ActorLobarrier kind:data(any) addr:0x02163008 data_ov063_02163068 kind:data(any) addr:0x02163068 data_ov063_02163080 kind:data(any) addr:0x02163080 data_ov063_02163098 kind:data(any) addr:0x02163098 @@ -428,11 +428,11 @@ data_ov063_021630b0 kind:data(any) addr:0x021630b0 data_ov063_021630c8 kind:data(any) addr:0x021630c8 data_ov063_021630e0 kind:data(any) addr:0x021630e0 data_ov063_02163110 kind:data(any) addr:0x02163110 -_ZTV16ActorUnkCASE_150 kind:data(any) addr:0x02163140 -_ZTV16ActorUnkCASE_174 kind:data(any) addr:0x02163158 -_ZTV19ActorProfileUnkCASE kind:data(any) addr:0x02163174 +_ZTV24ActorLobarrierShield_150 kind:data(any) addr:0x02163140 +_ZTV24ActorLobarrierShield_174 kind:data(any) addr:0x02163158 +_ZTV27ActorProfileLobarrierShield kind:data(any) addr:0x02163174 _ZTV24UnkStruct_ov063_021631a0 kind:data(any) addr:0x02163198 -_ZTV12ActorUnkCASE kind:data(any) addr:0x021631c4 +_ZTV20ActorLobarrierShield kind:data(any) addr:0x021631c4 _ZTV15ActorUnkRMSBase kind:data(any) addr:0x02163224 _ZTV19ActorProfileUnkRMSV kind:data(any) addr:0x02163288 data_ov063_021632ac kind:data(any) addr:0x021632ac @@ -495,12 +495,12 @@ _ZTV16MapObjectUnkMTJR kind:data(any) addr:0x02163ab0 data_ov063_02163af8 kind:data(any) addr:0x02163af0 data_ov063_02163b0c kind:data(any) addr:0x02163b0c data_ov063_02163b28 kind:data(any) addr:0x02163b28 -_ZGVN15ProfileInstanceI19ActorProfileUnkCANSE8sProfileE kind:bss addr:0x02163b60 +_ZGVN15ProfileInstanceI21ActorProfileLobarrierE8sProfileE kind:bss addr:0x02163b60 @12600 kind:bss addr:0x02163b64 -_ZN15ProfileInstanceI19ActorProfileUnkCANSE8sProfileE kind:bss addr:0x02163b70 -_ZGVN15ProfileInstanceI19ActorProfileUnkCASEE8sProfileE kind:bss addr:0x02163c48 +_ZN15ProfileInstanceI21ActorProfileLobarrierE8sProfileE kind:bss addr:0x02163b70 +_ZGVN15ProfileInstanceI27ActorProfileLobarrierShieldE8sProfileE kind:bss addr:0x02163c48 @12606 kind:bss addr:0x02163c4c -_ZN15ProfileInstanceI19ActorProfileUnkCASEE8sProfileE kind:bss addr:0x02163c58 +_ZN15ProfileInstanceI27ActorProfileLobarrierShieldE8sProfileE kind:bss addr:0x02163c58 _ZGVN15ProfileInstanceI19ActorProfileUnkRMSVE8sProfileE kind:bss addr:0x02163d30 @12612 kind:bss addr:0x02163d34 local _ZN15ProfileInstanceI19ActorProfileUnkRMSVE8sProfileE kind:bss addr:0x02163d40 diff --git a/config/eur1/arm9/overlays/ov000/symbols.txt b/config/eur1/arm9/overlays/ov000/symbols.txt index 7b5044fd..01058ea7 100644 --- a/config/eur1/arm9/overlays/ov000/symbols.txt +++ b/config/eur1/arm9/overlays/ov000/symbols.txt @@ -2370,10 +2370,10 @@ func_ov000_020997a4 kind:function(arm,size=0x20) addr:0x020997f8 _ZN14Actor_Derived219func_ov000_020997c4Ei kind:function(arm,size=0x2c) addr:0x02099818 _ZN14Actor_Derived2D1Ev kind:function(arm,size=0x14) addr:0x02099844 _ZN14Actor_Derived2D0Ev kind:function(arm,size=0x1c) addr:0x02099858 -_ZN26UnkStruct_ActorUnkCANS_224C1Ev kind:function(arm,size=0x50) addr:0x02099874 +_ZN28UnkStruct_ActorLobarrier_224C1Ev kind:function(arm,size=0x50) addr:0x02099874 func_ov000_02099870 kind:function(arm,size=0x80) addr:0x020998c4 -_ZN26UnkStruct_ActorUnkCANS_22419func_ov000_020998f0E9RefStructP7VecFx32 kind:function(arm,size=0x11c) addr:0x02099944 -_ZN26UnkStruct_ActorUnkCANS_22419func_ov000_02099a0cEv kind:function(arm,size=0x10) addr:0x02099a60 +_ZN28UnkStruct_ActorLobarrier_22419func_ov000_020998f0E9RefStructP7VecFx32 kind:function(arm,size=0x11c) addr:0x02099944 +_ZN28UnkStruct_ActorLobarrier_22419func_ov000_02099a0cEv kind:function(arm,size=0x10) addr:0x02099a60 func_ov000_02099a1c kind:function(arm,size=0xc) addr:0x02099a70 _ZN24UnkStruct_ov000_020b31a8C2EP10UnkSystem5P11ModelRenderP33MapObjectProfile_Derived2_20_Base kind:function(thumb,size=0x54) addr:0x02099a7c func_ov000_02099a7c kind:function(thumb,size=0x48) addr:0x02099ad0 diff --git a/config/eur1/arm9/overlays/ov017/symbols.txt b/config/eur1/arm9/overlays/ov017/symbols.txt index b0117729..6fbf11b3 100644 --- a/config/eur1/arm9/overlays/ov017/symbols.txt +++ b/config/eur1/arm9/overlays/ov017/symbols.txt @@ -69,9 +69,9 @@ _ZN5Actor19func_ov017_020bf574Eii kind:function(arm,size=0x50) addr:0x020bf5b4 _ZN5Actor19func_ov017_020bf5c4EP7VecFx32iiis kind:function(arm,size=0x70) addr:0x020bf604 _ZN5Actor19func_ov017_020bf634EPK7VecFx32ti kind:function(arm,size=0x54) addr:0x020bf674 _ZN5Actor19func_ov017_020bf688Ev kind:function(arm,size=0x88) addr:0x020bf6c8 -_ZN5Actor19func_ov017_020bf710EP26UnkStruct_ActorUnkCANS_224PK7VecFx32t kind:function(arm,size=0x98) addr:0x020bf750 +_ZN5Actor19func_ov017_020bf710EP28UnkStruct_ActorLobarrier_224PK7VecFx32t kind:function(arm,size=0x98) addr:0x020bf750 _ZN5Actor19func_ov017_020bf7a8Ev kind:function(arm,size=0xec) addr:0x020bf7e8 -_ZN5Actor19func_ov017_020bf894EP26UnkStruct_ActorUnkCANS_224 kind:function(arm,size=0x60) addr:0x020bf8d4 +_ZN5Actor19func_ov017_020bf894EP28UnkStruct_ActorLobarrier_224 kind:function(arm,size=0x60) addr:0x020bf8d4 _ZN5Actor8vfunc_40Ev kind:function(arm,size=0x44) addr:0x020bf934 _ZN5Actor8vfunc_44Ev kind:function(arm,size=0x64) addr:0x020bf978 _ZN5Actor19func_ov017_020bf99cEv kind:function(arm,size=0x2c) addr:0x020bf9dc diff --git a/config/eur1/arm9/overlays/ov063/delinks.txt b/config/eur1/arm9/overlays/ov063/delinks.txt index ab4c5820..84801783 100644 --- a/config/eur1/arm9/overlays/ov063/delinks.txt +++ b/config/eur1/arm9/overlays/ov063/delinks.txt @@ -5,14 +5,14 @@ .data start:0x02162fe0 end:0x02163cc0 kind:data align:32 .bss start:0x02163cc0 end:0x02164b80 kind:bss align:32 -src/063_Shrine/Actor/ActorUnkCANS.cpp: +src/063_Shrine/Actor/ActorLobarrier.cpp: .text start:0x02157fc0 end:0x0215ac18 .init start:0x02162894 end:0x02162904 .ctor start:0x02162fa4 end:0x02162fa8 .data start:0x02162fe0 end:0x021631c8 .bss start:0x02163cc0 end:0x02163da8 -src/063_Shrine/Actor/ActorUnkCASE.cpp: +src/063_Shrine/Actor/ActorLobarrierShield.cpp: .text start:0x0215ac18 end:0x0215bc1c .init start:0x02162904 end:0x02162998 .ctor start:0x02162fa8 end:0x02162fac diff --git a/config/eur1/arm9/overlays/ov063/symbols.txt b/config/eur1/arm9/overlays/ov063/symbols.txt index d55dad92..1e503fca 100644 --- a/config/eur1/arm9/overlays/ov063/symbols.txt +++ b/config/eur1/arm9/overlays/ov063/symbols.txt @@ -1,55 +1,55 @@ -_ZN19ActorProfileUnkCANS10GetProfileEv kind:function(arm,size=0xc) addr:0x02157fc0 -_ZN19ActorProfileUnkCANS6CreateEv kind:function(arm,size=0x24) addr:0x02157fcc -_ZN19ActorProfileUnkCANSC1Ev kind:function(arm,size=0x50) addr:0x02157ff0 +_ZN21ActorProfileLobarrier10GetProfileEv kind:function(arm,size=0xc) addr:0x02157fc0 +_ZN21ActorProfileLobarrier6CreateEv kind:function(arm,size=0x24) addr:0x02157fcc +_ZN21ActorProfileLobarrierC1Ev kind:function(arm,size=0x50) addr:0x02157ff0 _ZN24UnkStruct_ov063_02162ee8C1EP10G3d_Model_ kind:function(arm,size=0x5c) addr:0x02158040 -_ZN24UnkStruct_ov063_02162e88C1EPv kind:function(arm,size=0x28) addr:0x0215809c +_ZN24UnkStruct_ov063_02162e88C1EP14ActorLobarrier kind:function(arm,size=0x28) addr:0x0215809c _ZN24UnkStruct_ov063_02162e888vfunc_04E9RefStructiiPi kind:function(arm,size=0x178) addr:0x021580c4 -_ZN12ActorUnkCANSC1Ev kind:function(arm,size=0x1dc) addr:0x0215823c +_ZN14ActorLobarrierC1Ev kind:function(arm,size=0x1dc) addr:0x0215823c _ZN24UnkStruct_ov063_02162ee8D1Ev kind:function(arm,size=0x14) addr:0x02158418 _ZN24UnkStruct_ov063_02162f14D1Ev kind:function(arm,size=0x14) addr:0x0215842c -_ZN12ActorUnkCANS4InitEi kind:function(arm,size=0x68) addr:0x02158440 -_ZN12ActorUnkCANS5SetupEv kind:function(arm,size=0x9c) addr:0x021584a8 -_ZN12ActorUnkCANS19func_ov063_02158424Ev kind:function(arm,size=0x24) addr:0x02158544 -_ZN12ActorUnkCANS19func_ov063_02158448Ei kind:function(arm,size=0x48) addr:0x02158568 -_ZN12ActorUnkCANS19func_ov063_02158490Ev kind:function(arm,size=0x34) addr:0x021585b0 -_ZN12ActorUnkCANS8vfunc_24Ev kind:function(arm,size=0x2c) addr:0x021585e4 -_ZN12ActorUnkCANS6UpdateEv kind:function(arm,size=0x53c) addr:0x02158610 -_ZN12ActorUnkCANS8vfunc_2CEi kind:function(arm,size=0xe0) addr:0x02158b4c -_ZN12ActorUnkCANS19func_ov063_02158b0cEv kind:function(arm,size=0x28) addr:0x02158c2c -_ZN12ActorUnkCANS19func_ov063_02158b34Ev kind:function(arm,size=0x64) addr:0x02158c54 -_ZN12ActorUnkCANS19func_ov063_02158b98Ev kind:function(arm,size=0x1a8) addr:0x02158cb8 -_ZN12ActorUnkCANS19func_ov063_02158d40Ev kind:function(arm,size=0x70) addr:0x02158e60 -_ZN12ActorUnkCANS19func_ov063_02158db0Ev kind:function(arm,size=0x318) addr:0x02158ed0 -_ZN12ActorUnkCANS19func_ov063_021590c8Ev kind:function(arm,size=0x38) addr:0x021591e8 -_ZN12ActorUnkCANS19func_ov063_02159100Ev kind:function(arm,size=0xf4) addr:0x02159220 -_ZN12ActorUnkCANS19func_ov063_021591f4Ev kind:function(arm,size=0x64) addr:0x02159314 -_ZN12ActorUnkCANS19func_ov063_02159258Ev kind:function(arm,size=0x1b0) addr:0x02159378 -_ZN12ActorUnkCANS19func_ov063_02159408Ev kind:function(arm,size=0x8c) addr:0x02159528 -_ZN12ActorUnkCANS19func_ov063_02159494Ev kind:function(arm,size=0x110) addr:0x021595b4 -_ZN12ActorUnkCANS19func_ov063_021595a4Ev kind:function(arm,size=0x74) addr:0x021596c4 -_ZN12ActorUnkCANS19func_ov063_02159618Ev kind:function(arm,size=0xfc) addr:0x02159738 -_ZN12ActorUnkCANS19func_ov063_02159714Ev kind:function(arm,size=0x70) addr:0x02159834 -_ZN12ActorUnkCANS19func_ov063_02159784Ev kind:function(arm,size=0x178) addr:0x021598a4 -_ZN12ActorUnkCANS19func_ov063_021598fcEv kind:function(arm,size=0xe8) addr:0x02159a1c -_ZN12ActorUnkCANS19func_ov063_021599e4Ev kind:function(arm,size=0x2c4) addr:0x02159b04 -_ZN12ActorUnkCANS19func_ov063_02159ca8Ev kind:function(arm,size=0xc0) addr:0x02159dc8 -_ZN12ActorUnkCANS19func_ov063_02159d68Ev kind:function(arm,size=0x94) addr:0x02159e88 -_ZN12ActorUnkCANS19func_ov063_02159dfcEv kind:function(arm,size=0x20) addr:0x02159f1c -_ZN12ActorUnkCANS19func_ov063_02159e1cEv kind:function(arm,size=0x4) addr:0x02159f3c -_ZN12ActorUnkCANS19func_ov063_02159e20Ev kind:function(arm,size=0xa0) addr:0x02159f40 -_ZN12ActorUnkCANS19func_ov063_02159ec0Ev kind:function(arm,size=0x7c) addr:0x02159fe0 -_ZN12ActorUnkCANS19func_ov063_02159f3cEi kind:function(arm,size=0x1b4) addr:0x0215a05c -_ZN12ActorUnkCANS19func_ov063_0215a0f0Ev kind:function(arm,size=0x1d0) addr:0x0215a210 -_ZN12ActorUnkCANS19func_ov063_0215a2c0Ev kind:function(arm,size=0x168) addr:0x0215a3e0 -_ZN12ActorUnkCANS19func_ov063_0215a428Ev kind:function(arm,size=0x4c) addr:0x0215a548 -_ZN12ActorUnkCANS19func_ov063_0215a474Ev kind:function(arm,size=0xa0) addr:0x0215a594 -_ZN12ActorUnkCANS19func_ov063_0215a514Ev kind:function(arm,size=0x58) addr:0x0215a634 -_ZN12ActorUnkCANS19func_ov063_0215a56cEi kind:function(arm,size=0x34) addr:0x0215a68c -_ZN12ActorUnkCANS19func_ov063_0215a5a0EP7VecFx32 kind:function(arm,size=0x1c) addr:0x0215a6c0 -_ZN12ActorUnkCANS19func_ov063_0215a5bcEv kind:function(arm,size=0x1c) addr:0x0215a6dc -_ZN12ActorUnkCANS19func_ov063_0215a5d8Ev kind:function(arm,size=0x20) addr:0x0215a6f8 -_ZN12ActorUnkCANS8vfunc_10EP8Cylinder kind:function(arm,size=0x80) addr:0x0215a718 -_ZN12ActorUnkCANS19func_ov063_0215a678EPS_P29UnkStruct_func_ov063_0215a678 kind:function(arm,size=0x15c) addr:0x0215a798 +_ZN14ActorLobarrier4InitEi kind:function(arm,size=0x68) addr:0x02158440 +_ZN14ActorLobarrier5SetupEv kind:function(arm,size=0x9c) addr:0x021584a8 +_ZN14ActorLobarrier19func_ov063_02158424Ev kind:function(arm,size=0x24) addr:0x02158544 +_ZN14ActorLobarrier8SetStateEs kind:function(arm,size=0x48) addr:0x02158568 +_ZN14ActorLobarrier19func_ov063_02158490Ev kind:function(arm,size=0x34) addr:0x021585b0 +_ZN14ActorLobarrier8vfunc_24Ev kind:function(arm,size=0x2c) addr:0x021585e4 +_ZN14ActorLobarrier6UpdateEv kind:function(arm,size=0x53c) addr:0x02158610 +_ZN14ActorLobarrier8vfunc_2CEi kind:function(arm,size=0xe0) addr:0x02158b4c +_ZN14ActorLobarrier19func_ov063_02158b0cEv kind:function(arm,size=0x28) addr:0x02158c2c +_ZN14ActorLobarrier19func_ov063_02158b34Ev kind:function(arm,size=0x64) addr:0x02158c54 +_ZN14ActorLobarrier19func_ov063_02158b98Ev kind:function(arm,size=0x1a8) addr:0x02158cb8 +_ZN14ActorLobarrier19func_ov063_02158d40Ev kind:function(arm,size=0x70) addr:0x02158e60 +_ZN14ActorLobarrier19func_ov063_02158db0Ev kind:function(arm,size=0x318) addr:0x02158ed0 +_ZN14ActorLobarrier19func_ov063_021590c8Ev kind:function(arm,size=0x38) addr:0x021591e8 +_ZN14ActorLobarrier19func_ov063_02159100Ev kind:function(arm,size=0xf4) addr:0x02159220 +_ZN14ActorLobarrier19func_ov063_021591f4Ev kind:function(arm,size=0x64) addr:0x02159314 +_ZN14ActorLobarrier19func_ov063_02159258Ev kind:function(arm,size=0x1b0) addr:0x02159378 +_ZN14ActorLobarrier19func_ov063_02159408Ev kind:function(arm,size=0x8c) addr:0x02159528 +_ZN14ActorLobarrier19func_ov063_02159494Ev kind:function(arm,size=0x110) addr:0x021595b4 +_ZN14ActorLobarrier19func_ov063_021595a4Ev kind:function(arm,size=0x74) addr:0x021596c4 +_ZN14ActorLobarrier19func_ov063_02159618Ev kind:function(arm,size=0xfc) addr:0x02159738 +_ZN14ActorLobarrier19func_ov063_02159714Ev kind:function(arm,size=0x70) addr:0x02159834 +_ZN14ActorLobarrier19func_ov063_02159784Ev kind:function(arm,size=0x178) addr:0x021598a4 +_ZN14ActorLobarrier19func_ov063_021598fcEv kind:function(arm,size=0xe8) addr:0x02159a1c +_ZN14ActorLobarrier19func_ov063_021599e4Ev kind:function(arm,size=0x2c4) addr:0x02159b04 +_ZN14ActorLobarrier19func_ov063_02159ca8Ev kind:function(arm,size=0xc0) addr:0x02159dc8 +_ZN14ActorLobarrier19func_ov063_02159d68Ev kind:function(arm,size=0x94) addr:0x02159e88 +_ZN14ActorLobarrier19func_ov063_02159dfcEv kind:function(arm,size=0x20) addr:0x02159f1c +_ZN14ActorLobarrier19func_ov063_02159e1cEv kind:function(arm,size=0x4) addr:0x02159f3c +_ZN14ActorLobarrier19func_ov063_02159e20Ev kind:function(arm,size=0xa0) addr:0x02159f40 +_ZN14ActorLobarrier19func_ov063_02159ec0Ev kind:function(arm,size=0x7c) addr:0x02159fe0 +_ZN14ActorLobarrier19func_ov063_02159f3cEi kind:function(arm,size=0x1b4) addr:0x0215a05c +_ZN14ActorLobarrier19func_ov063_0215a0f0Ev kind:function(arm,size=0x1d0) addr:0x0215a210 +_ZN14ActorLobarrier19func_ov063_0215a2c0Ev kind:function(arm,size=0x168) addr:0x0215a3e0 +_ZN14ActorLobarrier19func_ov063_0215a428Ev kind:function(arm,size=0x4c) addr:0x0215a548 +_ZN14ActorLobarrier19func_ov063_0215a474Ev kind:function(arm,size=0xa0) addr:0x0215a594 +_ZN14ActorLobarrier19func_ov063_0215a514Ev kind:function(arm,size=0x58) addr:0x0215a634 +_ZN14ActorLobarrier19func_ov063_0215a56cEi kind:function(arm,size=0x34) addr:0x0215a68c +_ZN14ActorLobarrier19func_ov063_0215a5a0EP7VecFx32 kind:function(arm,size=0x1c) addr:0x0215a6c0 +_ZN14ActorLobarrier19func_ov063_0215a5bcEv kind:function(arm,size=0x1c) addr:0x0215a6dc +_ZN14ActorLobarrier19func_ov063_0215a5d8Ev kind:function(arm,size=0x20) addr:0x0215a6f8 +_ZN14ActorLobarrier8vfunc_10EP8Cylinder kind:function(arm,size=0x80) addr:0x0215a718 +_ZN14ActorLobarrier19func_ov063_0215a678EPS_P29UnkStruct_func_ov063_0215a678 kind:function(arm,size=0x15c) addr:0x0215a798 _ZN24UnkStruct_ov063_02162ea8C1Ev kind:function(arm,size=0x30) addr:0x0215a8f4 _ZN24UnkStruct_ov063_02162ea8D1Ev kind:function(arm,size=0x14) addr:0x0215a924 _ZN24UnkStruct_ov063_02162ea8D0Ev kind:function(arm,size=0x1c) addr:0x0215a938 @@ -59,52 +59,52 @@ _ZN24UnkStruct_ov063_02162f148vfunc_3CEv kind:function(arm,size=0x24) addr:0x021 _ZN24UnkStruct_ov063_02162f148vfunc_38Eii kind:function(arm,size=0x2c) addr:0x0215aa90 _ZN24UnkStruct_ov063_02162ee8D0Ev kind:function(arm,size=0x1c) addr:0x0215aabc _ZN24UnkStruct_ov063_02162f14D0Ev kind:function(arm,size=0x1c) addr:0x0215aad8 -_ZN12ActorUnkCANSD1Ev kind:function(arm,size=0x84) addr:0x0215aaf4 -_ZN12ActorUnkCANSD0Ev kind:function(arm,size=0x8c) addr:0x0215ab78 -_ZN19ActorProfileUnkCANSD1Ev kind:function(arm,size=0x14) addr:0x0215ac04 -_ZN19ActorProfileUnkCASE10GetProfileEv kind:function(arm,size=0xc) addr:0x0215ac18 -_ZN19ActorProfileUnkCASE6CreateEv kind:function(arm,size=0x24) addr:0x0215ac24 -_ZN19ActorProfileUnkCASEC1Ev kind:function(arm,size=0x48) addr:0x0215ac48 +_ZN14ActorLobarrierD1Ev kind:function(arm,size=0x84) addr:0x0215aaf4 +_ZN14ActorLobarrierD0Ev kind:function(arm,size=0x8c) addr:0x0215ab78 +_ZN21ActorProfileLobarrierD1Ev kind:function(arm,size=0x14) addr:0x0215ac04 +_ZN27ActorProfileLobarrierShield10GetProfileEv kind:function(arm,size=0xc) addr:0x0215ac18 +_ZN27ActorProfileLobarrierShield6CreateEv kind:function(arm,size=0x24) addr:0x0215ac24 +_ZN27ActorProfileLobarrierShieldC1Ev kind:function(arm,size=0x48) addr:0x0215ac48 _ZN24UnkStruct_ov063_021631a0C1EP10G3d_Model_ kind:function(arm,size=0x34) addr:0x0215ac90 -_ZN16ActorUnkCASE_150C1EP5Actor kind:function(arm,size=0x34) addr:0x0215acc4 -_ZN16ActorUnkCASE_1508vfunc_00E9RefStructi kind:function(arm,size=0x74) addr:0x0215acf8 -_ZN16ActorUnkCASE_1508vfunc_04Ev kind:function(arm,size=0x1c) addr:0x0215ad6c -_ZN16ActorUnkCASE_1508vfunc_0CEP7VecFx32 kind:function(arm,size=0x24) addr:0x0215ad88 -_ZN16ActorUnkCASE_174C1EP5Actor kind:function(arm,size=0x3c) addr:0x0215adac -_ZN16ActorUnkCASE_1748vfunc_10EPK5Actor kind:function(arm,size=0x24) addr:0x0215ade8 -_ZN12ActorUnkCASE19func_ov063_0215acecEP9RefStructS0_ kind:function(arm,size=0x5c) addr:0x0215ae0c -_ZN12ActorUnkCASEC1Ev kind:function(arm,size=0x124) addr:0x0215ae68 +_ZN24ActorLobarrierShield_150C1EP5Actor kind:function(arm,size=0x34) addr:0x0215acc4 +_ZN24ActorLobarrierShield_1508vfunc_00E9RefStructi kind:function(arm,size=0x74) addr:0x0215acf8 +_ZN24ActorLobarrierShield_1508vfunc_04Ev kind:function(arm,size=0x1c) addr:0x0215ad6c +_ZN24ActorLobarrierShield_1508vfunc_0CEP7VecFx32 kind:function(arm,size=0x24) addr:0x0215ad88 +_ZN24ActorLobarrierShield_174C1EP5Actor kind:function(arm,size=0x3c) addr:0x0215adac +_ZN24ActorLobarrierShield_1748vfunc_10EPK5Actor kind:function(arm,size=0x24) addr:0x0215ade8 +_ZN20ActorLobarrierShield19func_ov063_0215acecEP9RefStructS0_ kind:function(arm,size=0x5c) addr:0x0215ae0c +_ZN20ActorLobarrierShieldC1Ev kind:function(arm,size=0x124) addr:0x0215ae68 _ZN24UnkStruct_ov063_021631a0D1Ev kind:function(arm,size=0x14) addr:0x0215af8c -_ZN16ActorUnkCASE_174D1Ev kind:function(arm,size=0x14) addr:0x0215afa0 -_ZN12ActorUnkCASE4InitEi kind:function(arm,size=0x68) addr:0x0215afb4 -_ZN12ActorUnkCASE19func_ov063_0215aefcEs kind:function(arm,size=0x58) addr:0x0215b01c -_ZN12ActorUnkCASE19func_ov063_0215af54Ev kind:function(arm,size=0x4) addr:0x0215b074 -_ZN12ActorUnkCASE19func_ov063_0215af58Ev kind:function(arm,size=0x4) addr:0x0215b078 -_ZN12ActorUnkCASE19func_ov063_0215af5cEv kind:function(arm,size=0x4) addr:0x0215b07c -_ZN12ActorUnkCASE19func_ov063_0215af60Ev kind:function(arm,size=0x44) addr:0x0215b080 -_ZN12ActorUnkCASE19func_ov063_0215afa4Ev kind:function(arm,size=0x14) addr:0x0215b0c4 -_ZN12ActorUnkCASE19func_ov063_0215afb8Ev kind:function(arm,size=0x9c) addr:0x0215b0d8 -_ZN12ActorUnkCASE19func_ov063_0215b054Ev kind:function(arm,size=0x3c) addr:0x0215b174 -_ZN12ActorUnkCASE19func_ov063_0215b090Ev kind:function(arm,size=0x12c) addr:0x0215b1b0 -_ZN12ActorUnkCASE19func_ov063_0215b1bcEv kind:function(arm,size=0x88) addr:0x0215b2dc -_ZN12ActorUnkCASE19func_ov063_0215b244Ev kind:function(arm,size=0x6c) addr:0x0215b364 -_ZN12ActorUnkCASE19func_ov063_0215b2b0Ev kind:function(arm,size=0x14) addr:0x0215b3d0 -_ZN12ActorUnkCASE19func_ov063_0215b2c4Ev kind:function(arm,size=0x4) addr:0x0215b3e4 -_ZN12ActorUnkCASE8vfunc_24Ev kind:function(arm,size=0x24) addr:0x0215b3e8 -_ZN12ActorUnkCASE6UpdateEv kind:function(arm,size=0x338) addr:0x0215b40c -_ZN12ActorUnkCASE8vfunc_2CEi kind:function(arm,size=0xa4) addr:0x0215b744 -_ZN12ActorUnkCASE19func_ov063_0215b6c8EP7VecFx3214UnkAngleStruct kind:function(arm,size=0x5c) addr:0x0215b7e8 -_ZN12ActorUnkCASE19func_ov063_0215b724Ev kind:function(arm,size=0xa8) addr:0x0215b844 -_ZN12ActorUnkCASE8vfunc_10EP8Cylinder kind:function(arm,size=0x48) addr:0x0215b8ec -_ZN12ActorUnkCASE19func_ov063_0215b814E9RefStruct kind:function(arm,size=0x40) addr:0x0215b934 -_ZN12ActorUnkCASE19func_ov063_0215b854Ev kind:function(arm,size=0x94) addr:0x0215b974 -_ZN12ActorUnkCASE19func_ov063_0215b8e8EP7VecFx32 kind:function(arm,size=0xb4) addr:0x0215ba08 -_ZN12ActorUnkCASE19func_ov063_0215b99cEPS_P29UnkStruct_func_ov063_0215a678 kind:function(arm,size=0xac) addr:0x0215babc -_ZN16ActorUnkCASE_174D0Ev kind:function(arm,size=0x1c) addr:0x0215bb68 +_ZN24ActorLobarrierShield_174D1Ev kind:function(arm,size=0x14) addr:0x0215afa0 +_ZN20ActorLobarrierShield4InitEi kind:function(arm,size=0x68) addr:0x0215afb4 +_ZN20ActorLobarrierShield8SetStateEs kind:function(arm,size=0x58) addr:0x0215b01c +_ZN20ActorLobarrierShield19func_ov063_0215af54Ev kind:function(arm,size=0x4) addr:0x0215b074 +_ZN20ActorLobarrierShield19func_ov063_0215af58Ev kind:function(arm,size=0x4) addr:0x0215b078 +_ZN20ActorLobarrierShield19func_ov063_0215af5cEv kind:function(arm,size=0x4) addr:0x0215b07c +_ZN20ActorLobarrierShield19func_ov063_0215af60Ev kind:function(arm,size=0x44) addr:0x0215b080 +_ZN20ActorLobarrierShield19func_ov063_0215afa4Ev kind:function(arm,size=0x14) addr:0x0215b0c4 +_ZN20ActorLobarrierShield19func_ov063_0215afb8Ev kind:function(arm,size=0x9c) addr:0x0215b0d8 +_ZN20ActorLobarrierShield19func_ov063_0215b054Ev kind:function(arm,size=0x3c) addr:0x0215b174 +_ZN20ActorLobarrierShield19func_ov063_0215b090Ev kind:function(arm,size=0x12c) addr:0x0215b1b0 +_ZN20ActorLobarrierShield19func_ov063_0215b1bcEv kind:function(arm,size=0x88) addr:0x0215b2dc +_ZN20ActorLobarrierShield19func_ov063_0215b244Ev kind:function(arm,size=0x6c) addr:0x0215b364 +_ZN20ActorLobarrierShield19func_ov063_0215b2b0Ev kind:function(arm,size=0x14) addr:0x0215b3d0 +_ZN20ActorLobarrierShield19func_ov063_0215b2c4Ev kind:function(arm,size=0x4) addr:0x0215b3e4 +_ZN20ActorLobarrierShield8vfunc_24Ev kind:function(arm,size=0x24) addr:0x0215b3e8 +_ZN20ActorLobarrierShield6UpdateEv kind:function(arm,size=0x338) addr:0x0215b40c +_ZN20ActorLobarrierShield8vfunc_2CEi kind:function(arm,size=0xa4) addr:0x0215b744 +_ZN20ActorLobarrierShield19func_ov063_0215b6c8EP7VecFx3214UnkAngleStruct kind:function(arm,size=0x5c) addr:0x0215b7e8 +_ZN20ActorLobarrierShield19func_ov063_0215b724Ev kind:function(arm,size=0xa8) addr:0x0215b844 +_ZN20ActorLobarrierShield8vfunc_10EP8Cylinder kind:function(arm,size=0x48) addr:0x0215b8ec +_ZN20ActorLobarrierShield19func_ov063_0215b814E9RefStruct kind:function(arm,size=0x40) addr:0x0215b934 +_ZN20ActorLobarrierShield19func_ov063_0215b854Ev kind:function(arm,size=0x94) addr:0x0215b974 +_ZN20ActorLobarrierShield19func_ov063_0215b8e8EP7VecFx32 kind:function(arm,size=0xb4) addr:0x0215ba08 +_ZN20ActorLobarrierShield19func_ov063_0215b99cEPS_P29UnkStruct_func_ov063_0215a678 kind:function(arm,size=0xac) addr:0x0215babc +_ZN24ActorLobarrierShield_174D0Ev kind:function(arm,size=0x1c) addr:0x0215bb68 _ZN24UnkStruct_ov063_021631a0D0Ev kind:function(arm,size=0x1c) addr:0x0215bb84 -_ZN12ActorUnkCASED1Ev kind:function(arm,size=0x30) addr:0x0215bba0 -_ZN12ActorUnkCASED0Ev kind:function(arm,size=0x38) addr:0x0215bbd0 -_ZN19ActorProfileUnkCASED1Ev kind:function(arm,size=0x14) addr:0x0215bc08 +_ZN20ActorLobarrierShieldD1Ev kind:function(arm,size=0x30) addr:0x0215bba0 +_ZN20ActorLobarrierShieldD0Ev kind:function(arm,size=0x38) addr:0x0215bbd0 +_ZN27ActorProfileLobarrierShieldD1Ev kind:function(arm,size=0x14) addr:0x0215bc08 _ZN15ActorUnkRMSBaseC2Ev kind:function(arm,size=0x38) addr:0x0215bc1c _ZN15ActorUnkRMSBase4InitEi kind:function(arm,size=0x54) addr:0x0215bc54 _ZN15ActorUnkRMSBase5SetupEv kind:function(arm,size=0x4) addr:0x0215bca8 @@ -385,8 +385,8 @@ data_ov063_02162838 kind:data(any) addr:0x02162838 ambiguous data_ov063_02162864 kind:data(any) addr:0x02162864 data_ov063_02162874 kind:data(any) addr:0x02162874 data_ov063_02162884 kind:data(any) addr:0x02162884 -__sinit_ActorUnkCANS.cpp kind:function(arm,size=0x70) addr:0x02162894 local -__sinit_ActorUnkCASE.cpp kind:function(arm,size=0x94) addr:0x02162904 local +__sinit_ActorLobarrier.cpp kind:function(arm,size=0x70) addr:0x02162894 local +__sinit_ActorLobarrierShield.cpp kind:function(arm,size=0x94) addr:0x02162904 local __sinit_ActorUnkRMSV.cpp kind:function(arm,size=0x50) addr:0x02162998 local __sinit_ActorUnkRMSW.cpp kind:function(arm,size=0x50) addr:0x021629e8 local __sinit_ActorUnkRMSF.cpp kind:function(arm,size=0x50) addr:0x02162a38 local @@ -399,8 +399,8 @@ __sinit_MapObjectUnkWLMS.cpp kind:function(arm,size=0x154) addr:0x02162d30 local __sinit_MapObjectUnkLTRW.cpp kind:function(arm,size=0x80) addr:0x02162e84 local __sinit_MapObjectUnkMTJR.cpp kind:function(arm,size=0x50) addr:0x02162f04 local __sinit_MapObjectUnkSWCR.cpp kind:function(arm,size=0x50) addr:0x02162f54 local -.p__sinit_ActorUnkCANS.cpp kind:data(word) addr:0x02162fa4 local -.p__sinit_ActorUnkCASE.cpp kind:data(word) addr:0x02162fa8 local +.p__sinit_ActorLobarrier.cpp kind:data(word) addr:0x02162fa4 local +.p__sinit_ActorLobarrierShield.cpp kind:data(word) addr:0x02162fa8 local .p__sinit_ActorUnkRMSV.cpp kind:data(word) addr:0x02162fac local .p__sinit_ActorUnkRMSW.cpp kind:data(word) addr:0x02162fb0 local .p__sinit_ActorUnkRMSF.cpp kind:data(word) addr:0x02162fb4 local diff --git a/config/jp/arm9/overlays/ov000/symbols.txt b/config/jp/arm9/overlays/ov000/symbols.txt index c35d1be9..5d110e11 100644 --- a/config/jp/arm9/overlays/ov000/symbols.txt +++ b/config/jp/arm9/overlays/ov000/symbols.txt @@ -2370,10 +2370,10 @@ func_ov000_020997a4 kind:function(arm,size=0x20) addr:0x0209af70 _ZN14Actor_Derived219func_ov000_020997c4Ei kind:function(arm,size=0x2c) addr:0x0209af90 _ZN14Actor_Derived2D1Ev kind:function(arm,size=0x14) addr:0x0209afbc _ZN14Actor_Derived2D0Ev kind:function(arm,size=0x1c) addr:0x0209afd0 -_ZN26UnkStruct_ActorUnkCANS_224C1Ev kind:function(arm,size=0x50) addr:0x0209afec +_ZN28UnkStruct_ActorLobarrier_224C1Ev kind:function(arm,size=0x50) addr:0x0209afec func_ov000_02099870 kind:function(arm,size=0x80) addr:0x0209b03c -_ZN26UnkStruct_ActorUnkCANS_22419func_ov000_020998f0E9RefStructP7VecFx32 kind:function(arm,size=0x11c) addr:0x0209b0bc -_ZN26UnkStruct_ActorUnkCANS_22419func_ov000_02099a0cEv kind:function(arm,size=0x10) addr:0x0209b1d8 +_ZN28UnkStruct_ActorLobarrier_22419func_ov000_020998f0E9RefStructP7VecFx32 kind:function(arm,size=0x11c) addr:0x0209b0bc +_ZN28UnkStruct_ActorLobarrier_22419func_ov000_02099a0cEv kind:function(arm,size=0x10) addr:0x0209b1d8 func_ov000_02099a1c kind:function(arm,size=0xc) addr:0x0209b1e8 _ZN24UnkStruct_ov000_020b31a8C2EP10UnkSystem5P11ModelRenderP33MapObjectProfile_Derived2_20_Base kind:function(thumb,size=0x54) addr:0x0209b1f4 func_ov000_02099a7c kind:function(thumb,size=0x48) addr:0x0209b248 diff --git a/config/jp/arm9/overlays/ov017/symbols.txt b/config/jp/arm9/overlays/ov017/symbols.txt index eb8e308d..3fb65b5a 100644 --- a/config/jp/arm9/overlays/ov017/symbols.txt +++ b/config/jp/arm9/overlays/ov017/symbols.txt @@ -69,9 +69,9 @@ _ZN5Actor19func_ov017_020bf574Eii kind:function(arm,size=0x50) addr:0x020c0da0 _ZN5Actor19func_ov017_020bf5c4EP7VecFx32iiis kind:function(arm,size=0x70) addr:0x020c0df0 _ZN5Actor19func_ov017_020bf634EPK7VecFx32ti kind:function(arm,size=0x54) addr:0x020c0e60 _ZN5Actor19func_ov017_020bf688Ev kind:function(arm,size=0x88) addr:0x020c0eb4 -_ZN5Actor19func_ov017_020bf710EP26UnkStruct_ActorUnkCANS_224PK7VecFx32t kind:function(arm,size=0x98) addr:0x020c0f3c +_ZN5Actor19func_ov017_020bf710EP28UnkStruct_ActorLobarrier_224PK7VecFx32t kind:function(arm,size=0x98) addr:0x020c0f3c _ZN5Actor19func_ov017_020bf7a8Ev kind:function(arm,size=0xec) addr:0x020c0fd4 -_ZN5Actor19func_ov017_020bf894EP26UnkStruct_ActorUnkCANS_224 kind:function(arm,size=0x60) addr:0x020c10c0 +_ZN5Actor19func_ov017_020bf894EP28UnkStruct_ActorLobarrier_224 kind:function(arm,size=0x60) addr:0x020c10c0 _ZN5Actor8vfunc_40Ev kind:function(arm,size=0x44) addr:0x020c1120 _ZN5Actor8vfunc_44Ev kind:function(arm,size=0x64) addr:0x020c1164 _ZN5Actor19func_ov017_020bf99cEv kind:function(arm,size=0x2c) addr:0x020c11c8 diff --git a/config/jp/arm9/overlays/ov063/delinks.txt b/config/jp/arm9/overlays/ov063/delinks.txt index 5c8b312b..fb8dbd21 100644 --- a/config/jp/arm9/overlays/ov063/delinks.txt +++ b/config/jp/arm9/overlays/ov063/delinks.txt @@ -5,14 +5,14 @@ .data start:0x02164ca0 end:0x02165980 kind:data align:32 .bss start:0x02165980 end:0x02166840 kind:bss align:32 -src/063_Shrine/Actor/ActorUnkCANS.cpp: +src/063_Shrine/Actor/ActorLobarrier.cpp: .text start:0x02159be0 end:0x0215c894 .init start:0x02164548 end:0x021645b8 .ctor start:0x02164c58 end:0x02164c5c .data start:0x02164ca0 end:0x02164e88 .bss start:0x02165980 end:0x02165a68 -src/063_Shrine/Actor/ActorUnkCASE.cpp: +src/063_Shrine/Actor/ActorLobarrierShield.cpp: .text start:0x0215c894 end:0x0215d890 .init start:0x021645b8 end:0x0216464c .ctor start:0x02164c5c end:0x02164c60 diff --git a/config/jp/arm9/overlays/ov063/symbols.txt b/config/jp/arm9/overlays/ov063/symbols.txt index 9fe5625f..b8383af6 100644 --- a/config/jp/arm9/overlays/ov063/symbols.txt +++ b/config/jp/arm9/overlays/ov063/symbols.txt @@ -1,55 +1,55 @@ -_ZN19ActorProfileUnkCANS10GetProfileEv kind:function(arm,size=0xc) addr:0x02159be0 -_ZN19ActorProfileUnkCANS6CreateEv kind:function(arm,size=0x24) addr:0x02159bec -_ZN19ActorProfileUnkCANSC1Ev kind:function(arm,size=0x50) addr:0x02159c10 +_ZN21ActorProfileLobarrier10GetProfileEv kind:function(arm,size=0xc) addr:0x02159be0 +_ZN21ActorProfileLobarrier6CreateEv kind:function(arm,size=0x24) addr:0x02159bec +_ZN21ActorProfileLobarrierC1Ev kind:function(arm,size=0x50) addr:0x02159c10 _ZN24UnkStruct_ov063_02162ee8C1EP10G3d_Model_ kind:function(arm,size=0x5c) addr:0x02159c60 -_ZN24UnkStruct_ov063_02162e88C1EPv kind:function(arm,size=0x28) addr:0x02159cbc +_ZN24UnkStruct_ov063_02162e88C1EP14ActorLobarrier kind:function(arm,size=0x28) addr:0x02159cbc _ZN24UnkStruct_ov063_02162e888vfunc_04E9RefStructiiPi kind:function(arm,size=0x178) addr:0x02159ce4 -_ZN12ActorUnkCANSC1Ev kind:function(arm,size=0x1dc) addr:0x02159e5c +_ZN14ActorLobarrierC1Ev kind:function(arm,size=0x1dc) addr:0x02159e5c _ZN24UnkStruct_ov063_02162ee8D1Ev kind:function(arm,size=0x14) addr:0x0215a038 _ZN24UnkStruct_ov063_02162f14D1Ev kind:function(arm,size=0x14) addr:0x0215a04c -_ZN12ActorUnkCANS4InitEi kind:function(arm,size=0x68) addr:0x0215a060 -_ZN12ActorUnkCANS5SetupEv kind:function(arm,size=0x9c) addr:0x0215a0c8 -_ZN12ActorUnkCANS19func_ov063_02158424Ev kind:function(arm,size=0x24) addr:0x0215a164 -_ZN12ActorUnkCANS19func_ov063_02158448Ei kind:function(arm,size=0x48) addr:0x0215a188 -_ZN12ActorUnkCANS19func_ov063_02158490Ev kind:function(arm,size=0x34) addr:0x0215a1d0 -_ZN12ActorUnkCANS8vfunc_24Ev kind:function(arm,size=0x2c) addr:0x0215a204 -_ZN12ActorUnkCANS6UpdateEv kind:function(arm,size=0x53c) addr:0x0215a230 -_ZN12ActorUnkCANS8vfunc_2CEi kind:function(arm,size=0xe0) addr:0x0215a76c -_ZN12ActorUnkCANS19func_ov063_02158b0cEv kind:function(arm,size=0x28) addr:0x0215a84c -_ZN12ActorUnkCANS19func_ov063_02158b34Ev kind:function(arm,size=0x64) addr:0x0215a874 -_ZN12ActorUnkCANS19func_ov063_02158b98Ev kind:function(arm,size=0x1a8) addr:0x0215a8d8 -_ZN12ActorUnkCANS19func_ov063_02158d40Ev kind:function(arm,size=0x70) addr:0x0215aa80 -_ZN12ActorUnkCANS19func_ov063_02158db0Ev kind:function(arm,size=0x318) addr:0x0215aaf0 -_ZN12ActorUnkCANS19func_ov063_021590c8Ev kind:function(arm,size=0x38) addr:0x0215ae08 -_ZN12ActorUnkCANS19func_ov063_02159100Ev kind:function(arm,size=0xf4) addr:0x0215ae40 -_ZN12ActorUnkCANS19func_ov063_021591f4Ev kind:function(arm,size=0x64) addr:0x0215af34 -_ZN12ActorUnkCANS19func_ov063_02159258Ev kind:function(arm,size=0x1b0) addr:0x0215af98 -_ZN12ActorUnkCANS19func_ov063_02159408Ev kind:function(arm,size=0x8c) addr:0x0215b148 -_ZN12ActorUnkCANS19func_ov063_02159494Ev kind:function(arm,size=0x110) addr:0x0215b1d4 -_ZN12ActorUnkCANS19func_ov063_021595a4Ev kind:function(arm,size=0x74) addr:0x0215b2e4 -_ZN12ActorUnkCANS19func_ov063_02159618Ev kind:function(arm,size=0xfc) addr:0x0215b358 -_ZN12ActorUnkCANS19func_ov063_02159714Ev kind:function(arm,size=0x70) addr:0x0215b454 -_ZN12ActorUnkCANS19func_ov063_02159784Ev kind:function(arm,size=0x1a0) addr:0x0215b4c4 -_ZN12ActorUnkCANS19func_ov063_021598fcEv kind:function(arm,size=0xe8) addr:0x0215b664 -_ZN12ActorUnkCANS19func_ov063_021599e4Ev kind:function(arm,size=0x2c4) addr:0x0215b74c -_ZN12ActorUnkCANS19func_ov063_02159ca8Ev kind:function(arm,size=0xc0) addr:0x0215ba10 -_ZN12ActorUnkCANS19func_ov063_02159d68Ev kind:function(arm,size=0x94) addr:0x0215bad0 -_ZN12ActorUnkCANS19func_ov063_02159dfcEv kind:function(arm,size=0x20) addr:0x0215bb64 -_ZN12ActorUnkCANS19func_ov063_02159e1cEv kind:function(arm,size=0x4) addr:0x0215bb84 -_ZN12ActorUnkCANS19func_ov063_02159e20Ev kind:function(arm,size=0xa0) addr:0x0215bb88 -_ZN12ActorUnkCANS19func_ov063_02159ec0Ev kind:function(arm,size=0x7c) addr:0x0215bc28 -_ZN12ActorUnkCANS19func_ov063_02159f3cEi kind:function(arm,size=0x1b4) addr:0x0215bca4 -_ZN12ActorUnkCANS19func_ov063_0215a0f0Ev kind:function(arm,size=0x1d0) addr:0x0215be58 -_ZN12ActorUnkCANS19func_ov063_0215a2c0Ev kind:function(arm,size=0x180) addr:0x0215c028 -_ZN12ActorUnkCANS19func_ov063_0215a428Ev kind:function(arm,size=0x4c) addr:0x0215c1a8 -_ZN12ActorUnkCANS19func_ov063_0215a474Ev kind:function(arm,size=0xbc) addr:0x0215c1f4 -_ZN12ActorUnkCANS19func_ov063_0215a514Ev kind:function(arm,size=0x58) addr:0x0215c2b0 -_ZN12ActorUnkCANS19func_ov063_0215a56cEi kind:function(arm,size=0x34) addr:0x0215c308 -_ZN12ActorUnkCANS19func_ov063_0215a5a0EP7VecFx32 kind:function(arm,size=0x1c) addr:0x0215c33c -_ZN12ActorUnkCANS19func_ov063_0215a5bcEv kind:function(arm,size=0x1c) addr:0x0215c358 -_ZN12ActorUnkCANS19func_ov063_0215a5d8Ev kind:function(arm,size=0x20) addr:0x0215c374 -_ZN12ActorUnkCANS8vfunc_10EP8Cylinder kind:function(arm,size=0x80) addr:0x0215c394 -_ZN12ActorUnkCANS19func_ov063_0215a678EPS_P29UnkStruct_func_ov063_0215a678 kind:function(arm,size=0x15c) addr:0x0215c414 +_ZN14ActorLobarrier4InitEi kind:function(arm,size=0x68) addr:0x0215a060 +_ZN14ActorLobarrier5SetupEv kind:function(arm,size=0x9c) addr:0x0215a0c8 +_ZN14ActorLobarrier19func_ov063_02158424Ev kind:function(arm,size=0x24) addr:0x0215a164 +_ZN14ActorLobarrier8SetStateEs kind:function(arm,size=0x48) addr:0x0215a188 +_ZN14ActorLobarrier19func_ov063_02158490Ev kind:function(arm,size=0x34) addr:0x0215a1d0 +_ZN14ActorLobarrier8vfunc_24Ev kind:function(arm,size=0x2c) addr:0x0215a204 +_ZN14ActorLobarrier6UpdateEv kind:function(arm,size=0x53c) addr:0x0215a230 +_ZN14ActorLobarrier8vfunc_2CEi kind:function(arm,size=0xe0) addr:0x0215a76c +_ZN14ActorLobarrier19func_ov063_02158b0cEv kind:function(arm,size=0x28) addr:0x0215a84c +_ZN14ActorLobarrier19func_ov063_02158b34Ev kind:function(arm,size=0x64) addr:0x0215a874 +_ZN14ActorLobarrier19func_ov063_02158b98Ev kind:function(arm,size=0x1a8) addr:0x0215a8d8 +_ZN14ActorLobarrier19func_ov063_02158d40Ev kind:function(arm,size=0x70) addr:0x0215aa80 +_ZN14ActorLobarrier19func_ov063_02158db0Ev kind:function(arm,size=0x318) addr:0x0215aaf0 +_ZN14ActorLobarrier19func_ov063_021590c8Ev kind:function(arm,size=0x38) addr:0x0215ae08 +_ZN14ActorLobarrier19func_ov063_02159100Ev kind:function(arm,size=0xf4) addr:0x0215ae40 +_ZN14ActorLobarrier19func_ov063_021591f4Ev kind:function(arm,size=0x64) addr:0x0215af34 +_ZN14ActorLobarrier19func_ov063_02159258Ev kind:function(arm,size=0x1b0) addr:0x0215af98 +_ZN14ActorLobarrier19func_ov063_02159408Ev kind:function(arm,size=0x8c) addr:0x0215b148 +_ZN14ActorLobarrier19func_ov063_02159494Ev kind:function(arm,size=0x110) addr:0x0215b1d4 +_ZN14ActorLobarrier19func_ov063_021595a4Ev kind:function(arm,size=0x74) addr:0x0215b2e4 +_ZN14ActorLobarrier19func_ov063_02159618Ev kind:function(arm,size=0xfc) addr:0x0215b358 +_ZN14ActorLobarrier19func_ov063_02159714Ev kind:function(arm,size=0x70) addr:0x0215b454 +_ZN14ActorLobarrier19func_ov063_02159784Ev kind:function(arm,size=0x1a0) addr:0x0215b4c4 +_ZN14ActorLobarrier19func_ov063_021598fcEv kind:function(arm,size=0xe8) addr:0x0215b664 +_ZN14ActorLobarrier19func_ov063_021599e4Ev kind:function(arm,size=0x2c4) addr:0x0215b74c +_ZN14ActorLobarrier19func_ov063_02159ca8Ev kind:function(arm,size=0xc0) addr:0x0215ba10 +_ZN14ActorLobarrier19func_ov063_02159d68Ev kind:function(arm,size=0x94) addr:0x0215bad0 +_ZN14ActorLobarrier19func_ov063_02159dfcEv kind:function(arm,size=0x20) addr:0x0215bb64 +_ZN14ActorLobarrier19func_ov063_02159e1cEv kind:function(arm,size=0x4) addr:0x0215bb84 +_ZN14ActorLobarrier19func_ov063_02159e20Ev kind:function(arm,size=0xa0) addr:0x0215bb88 +_ZN14ActorLobarrier19func_ov063_02159ec0Ev kind:function(arm,size=0x7c) addr:0x0215bc28 +_ZN14ActorLobarrier19func_ov063_02159f3cEi kind:function(arm,size=0x1b4) addr:0x0215bca4 +_ZN14ActorLobarrier19func_ov063_0215a0f0Ev kind:function(arm,size=0x1d0) addr:0x0215be58 +_ZN14ActorLobarrier19func_ov063_0215a2c0Ev kind:function(arm,size=0x180) addr:0x0215c028 +_ZN14ActorLobarrier19func_ov063_0215a428Ev kind:function(arm,size=0x4c) addr:0x0215c1a8 +_ZN14ActorLobarrier19func_ov063_0215a474Ev kind:function(arm,size=0xbc) addr:0x0215c1f4 +_ZN14ActorLobarrier19func_ov063_0215a514Ev kind:function(arm,size=0x58) addr:0x0215c2b0 +_ZN14ActorLobarrier19func_ov063_0215a56cEi kind:function(arm,size=0x34) addr:0x0215c308 +_ZN14ActorLobarrier19func_ov063_0215a5a0EP7VecFx32 kind:function(arm,size=0x1c) addr:0x0215c33c +_ZN14ActorLobarrier19func_ov063_0215a5bcEv kind:function(arm,size=0x1c) addr:0x0215c358 +_ZN14ActorLobarrier19func_ov063_0215a5d8Ev kind:function(arm,size=0x20) addr:0x0215c374 +_ZN14ActorLobarrier8vfunc_10EP8Cylinder kind:function(arm,size=0x80) addr:0x0215c394 +_ZN14ActorLobarrier19func_ov063_0215a678EPS_P29UnkStruct_func_ov063_0215a678 kind:function(arm,size=0x15c) addr:0x0215c414 _ZN24UnkStruct_ov063_02162ea8C1Ev kind:function(arm,size=0x30) addr:0x0215c570 _ZN24UnkStruct_ov063_02162ea8D1Ev kind:function(arm,size=0x14) addr:0x0215c5a0 _ZN24UnkStruct_ov063_02162ea8D0Ev kind:function(arm,size=0x1c) addr:0x0215c5b4 @@ -59,52 +59,52 @@ _ZN24UnkStruct_ov063_02162f148vfunc_3CEv kind:function(arm,size=0x24) addr:0x021 _ZN24UnkStruct_ov063_02162f148vfunc_38Eii kind:function(arm,size=0x2c) addr:0x0215c70c _ZN24UnkStruct_ov063_02162ee8D0Ev kind:function(arm,size=0x1c) addr:0x0215c738 _ZN24UnkStruct_ov063_02162f14D0Ev kind:function(arm,size=0x1c) addr:0x0215c754 -_ZN12ActorUnkCANSD1Ev kind:function(arm,size=0x84) addr:0x0215c770 -_ZN12ActorUnkCANSD0Ev kind:function(arm,size=0x8c) addr:0x0215c7f4 -_ZN19ActorProfileUnkCANSD1Ev kind:function(arm,size=0x14) addr:0x0215c880 -_ZN19ActorProfileUnkCASE10GetProfileEv kind:function(arm,size=0xc) addr:0x0215c894 -_ZN19ActorProfileUnkCASE6CreateEv kind:function(arm,size=0x24) addr:0x0215c8a0 -_ZN19ActorProfileUnkCASEC1Ev kind:function(arm,size=0x48) addr:0x0215c8c4 +_ZN14ActorLobarrierD1Ev kind:function(arm,size=0x84) addr:0x0215c770 +_ZN14ActorLobarrierD0Ev kind:function(arm,size=0x8c) addr:0x0215c7f4 +_ZN21ActorProfileLobarrierD1Ev kind:function(arm,size=0x14) addr:0x0215c880 +_ZN27ActorProfileLobarrierShield10GetProfileEv kind:function(arm,size=0xc) addr:0x0215c894 +_ZN27ActorProfileLobarrierShield6CreateEv kind:function(arm,size=0x24) addr:0x0215c8a0 +_ZN27ActorProfileLobarrierShieldC1Ev kind:function(arm,size=0x48) addr:0x0215c8c4 _ZN24UnkStruct_ov063_021631a0C1EP10G3d_Model_ kind:function(arm,size=0x34) addr:0x0215c90c -_ZN16ActorUnkCASE_150C1EP5Actor kind:function(arm,size=0x34) addr:0x0215c940 -_ZN16ActorUnkCASE_1508vfunc_00E9RefStructi kind:function(arm,size=0x74) addr:0x0215c974 -_ZN16ActorUnkCASE_1508vfunc_04Ev kind:function(arm,size=0x1c) addr:0x0215c9e8 -_ZN16ActorUnkCASE_1508vfunc_0CEP7VecFx32 kind:function(arm,size=0x24) addr:0x0215ca04 -_ZN16ActorUnkCASE_174C1EP5Actor kind:function(arm,size=0x3c) addr:0x0215ca28 -_ZN16ActorUnkCASE_1748vfunc_10EPK5Actor kind:function(arm,size=0x24) addr:0x0215ca64 -_ZN12ActorUnkCASE19func_ov063_0215acecEP9RefStructS0_ kind:function(arm,size=0x5c) addr:0x0215ca88 -_ZN12ActorUnkCASEC1Ev kind:function(arm,size=0x124) addr:0x0215cae4 +_ZN24ActorLobarrierShield_150C1EP5Actor kind:function(arm,size=0x34) addr:0x0215c940 +_ZN24ActorLobarrierShield_1508vfunc_00E9RefStructi kind:function(arm,size=0x74) addr:0x0215c974 +_ZN24ActorLobarrierShield_1508vfunc_04Ev kind:function(arm,size=0x1c) addr:0x0215c9e8 +_ZN24ActorLobarrierShield_1508vfunc_0CEP7VecFx32 kind:function(arm,size=0x24) addr:0x0215ca04 +_ZN24ActorLobarrierShield_174C1EP5Actor kind:function(arm,size=0x3c) addr:0x0215ca28 +_ZN24ActorLobarrierShield_1748vfunc_10EPK5Actor kind:function(arm,size=0x24) addr:0x0215ca64 +_ZN20ActorLobarrierShield19func_ov063_0215acecEP9RefStructS0_ kind:function(arm,size=0x5c) addr:0x0215ca88 +_ZN20ActorLobarrierShieldC1Ev kind:function(arm,size=0x124) addr:0x0215cae4 _ZN24UnkStruct_ov063_021631a0D1Ev kind:function(arm,size=0x14) addr:0x0215cc08 -_ZN16ActorUnkCASE_174D1Ev kind:function(arm,size=0x14) addr:0x0215cc1c -_ZN12ActorUnkCASE4InitEi kind:function(arm,size=0x68) addr:0x0215cc30 -_ZN12ActorUnkCASE19func_ov063_0215aefcEs kind:function(arm,size=0x58) addr:0x0215cc98 -_ZN12ActorUnkCASE19func_ov063_0215af54Ev kind:function(arm,size=0x4) addr:0x0215ccf0 -_ZN12ActorUnkCASE19func_ov063_0215af58Ev kind:function(arm,size=0x4) addr:0x0215ccf4 -_ZN12ActorUnkCASE19func_ov063_0215af5cEv kind:function(arm,size=0x4) addr:0x0215ccf8 -_ZN12ActorUnkCASE19func_ov063_0215af60Ev kind:function(arm,size=0x44) addr:0x0215ccfc -_ZN12ActorUnkCASE19func_ov063_0215afa4Ev kind:function(arm,size=0x14) addr:0x0215cd40 -_ZN12ActorUnkCASE19func_ov063_0215afb8Ev kind:function(arm,size=0x9c) addr:0x0215cd54 -_ZN12ActorUnkCASE19func_ov063_0215b054Ev kind:function(arm,size=0x3c) addr:0x0215cdf0 -_ZN12ActorUnkCASE19func_ov063_0215b090Ev kind:function(arm,size=0x12c) addr:0x0215ce2c -_ZN12ActorUnkCASE19func_ov063_0215b1bcEv kind:function(arm,size=0x88) addr:0x0215cf58 -_ZN12ActorUnkCASE19func_ov063_0215b244Ev kind:function(arm,size=0x6c) addr:0x0215cfe0 -_ZN12ActorUnkCASE19func_ov063_0215b2b0Ev kind:function(arm,size=0x14) addr:0x0215d04c -_ZN12ActorUnkCASE19func_ov063_0215b2c4Ev kind:function(arm,size=0x4) addr:0x0215d060 -_ZN12ActorUnkCASE8vfunc_24Ev kind:function(arm,size=0x24) addr:0x0215d064 -_ZN12ActorUnkCASE6UpdateEv kind:function(arm,size=0x338) addr:0x0215d088 -_ZN12ActorUnkCASE8vfunc_2CEi kind:function(arm,size=0xa4) addr:0x0215d3c0 -_ZN12ActorUnkCASE19func_ov063_0215b6c8EP7VecFx3214UnkAngleStruct kind:function(arm,size=0x5c) addr:0x0215d464 -_ZN12ActorUnkCASE19func_ov063_0215b724Ev kind:function(arm,size=0xa8) addr:0x0215d4c0 -_ZN12ActorUnkCASE8vfunc_10EP8Cylinder kind:function(arm,size=0x48) addr:0x0215d568 -_ZN12ActorUnkCASE19func_ov063_0215b814E9RefStruct kind:function(arm,size=0x40) addr:0x0215d5b0 -_ZN12ActorUnkCASE19func_ov063_0215b854Ev kind:function(arm,size=0x94) addr:0x0215d5f0 -_ZN12ActorUnkCASE19func_ov063_0215b8e8EP7VecFx32 kind:function(arm,size=0xac) addr:0x0215d684 -_ZN12ActorUnkCASE19func_ov063_0215b99cEPS_P29UnkStruct_func_ov063_0215a678 kind:function(arm,size=0xac) addr:0x0215d730 -_ZN16ActorUnkCASE_174D0Ev kind:function(arm,size=0x1c) addr:0x0215d7dc +_ZN24ActorLobarrierShield_174D1Ev kind:function(arm,size=0x14) addr:0x0215cc1c +_ZN20ActorLobarrierShield4InitEi kind:function(arm,size=0x68) addr:0x0215cc30 +_ZN20ActorLobarrierShield8SetStateEs kind:function(arm,size=0x58) addr:0x0215cc98 +_ZN20ActorLobarrierShield19func_ov063_0215af54Ev kind:function(arm,size=0x4) addr:0x0215ccf0 +_ZN20ActorLobarrierShield19func_ov063_0215af58Ev kind:function(arm,size=0x4) addr:0x0215ccf4 +_ZN20ActorLobarrierShield19func_ov063_0215af5cEv kind:function(arm,size=0x4) addr:0x0215ccf8 +_ZN20ActorLobarrierShield19func_ov063_0215af60Ev kind:function(arm,size=0x44) addr:0x0215ccfc +_ZN20ActorLobarrierShield19func_ov063_0215afa4Ev kind:function(arm,size=0x14) addr:0x0215cd40 +_ZN20ActorLobarrierShield19func_ov063_0215afb8Ev kind:function(arm,size=0x9c) addr:0x0215cd54 +_ZN20ActorLobarrierShield19func_ov063_0215b054Ev kind:function(arm,size=0x3c) addr:0x0215cdf0 +_ZN20ActorLobarrierShield19func_ov063_0215b090Ev kind:function(arm,size=0x12c) addr:0x0215ce2c +_ZN20ActorLobarrierShield19func_ov063_0215b1bcEv kind:function(arm,size=0x88) addr:0x0215cf58 +_ZN20ActorLobarrierShield19func_ov063_0215b244Ev kind:function(arm,size=0x6c) addr:0x0215cfe0 +_ZN20ActorLobarrierShield19func_ov063_0215b2b0Ev kind:function(arm,size=0x14) addr:0x0215d04c +_ZN20ActorLobarrierShield19func_ov063_0215b2c4Ev kind:function(arm,size=0x4) addr:0x0215d060 +_ZN20ActorLobarrierShield8vfunc_24Ev kind:function(arm,size=0x24) addr:0x0215d064 +_ZN20ActorLobarrierShield6UpdateEv kind:function(arm,size=0x338) addr:0x0215d088 +_ZN20ActorLobarrierShield8vfunc_2CEi kind:function(arm,size=0xa4) addr:0x0215d3c0 +_ZN20ActorLobarrierShield19func_ov063_0215b6c8EP7VecFx3214UnkAngleStruct kind:function(arm,size=0x5c) addr:0x0215d464 +_ZN20ActorLobarrierShield19func_ov063_0215b724Ev kind:function(arm,size=0xa8) addr:0x0215d4c0 +_ZN20ActorLobarrierShield8vfunc_10EP8Cylinder kind:function(arm,size=0x48) addr:0x0215d568 +_ZN20ActorLobarrierShield19func_ov063_0215b814E9RefStruct kind:function(arm,size=0x40) addr:0x0215d5b0 +_ZN20ActorLobarrierShield19func_ov063_0215b854Ev kind:function(arm,size=0x94) addr:0x0215d5f0 +_ZN20ActorLobarrierShield19func_ov063_0215b8e8EP7VecFx32 kind:function(arm,size=0xac) addr:0x0215d684 +_ZN20ActorLobarrierShield19func_ov063_0215b99cEPS_P29UnkStruct_func_ov063_0215a678 kind:function(arm,size=0xac) addr:0x0215d730 +_ZN24ActorLobarrierShield_174D0Ev kind:function(arm,size=0x1c) addr:0x0215d7dc _ZN24UnkStruct_ov063_021631a0D0Ev kind:function(arm,size=0x1c) addr:0x0215d7f8 -_ZN12ActorUnkCASED1Ev kind:function(arm,size=0x30) addr:0x0215d814 -_ZN12ActorUnkCASED0Ev kind:function(arm,size=0x38) addr:0x0215d844 -_ZN19ActorProfileUnkCASED1Ev kind:function(arm,size=0x14) addr:0x0215d87c +_ZN20ActorLobarrierShieldD1Ev kind:function(arm,size=0x30) addr:0x0215d814 +_ZN20ActorLobarrierShieldD0Ev kind:function(arm,size=0x38) addr:0x0215d844 +_ZN27ActorProfileLobarrierShieldD1Ev kind:function(arm,size=0x14) addr:0x0215d87c _ZN15ActorUnkRMSBaseC2Ev kind:function(arm,size=0x38) addr:0x0215d890 _ZN15ActorUnkRMSBase4InitEi kind:function(arm,size=0x54) addr:0x0215d8c8 _ZN15ActorUnkRMSBase5SetupEv kind:function(arm,size=0x4) addr:0x0215d91c @@ -386,8 +386,8 @@ data_ov063_02164484 kind:data(any) addr:0x02164484 ambiguous data_ov063_02164518 kind:data(any) addr:0x02164518 data_ov063_02164528 kind:data(any) addr:0x02164528 data_ov063_02164538 kind:data(any) addr:0x02164538 -__sinit_ActorUnkCANS.cpp kind:function(arm,size=0x70) addr:0x02164548 -__sinit_ActorUnkCASE.cpp kind:function(arm,size=0x94) addr:0x021645b8 +__sinit_ActorLobarrier.cpp kind:function(arm,size=0x70) addr:0x02164548 +__sinit_ActorLobarrierShield.cpp kind:function(arm,size=0x94) addr:0x021645b8 __sinit_ActorUnkRMSV.cpp kind:function(arm,size=0x50) addr:0x0216464c local __sinit_ActorUnkRMSW.cpp kind:function(arm,size=0x50) addr:0x0216469c __sinit_ActorUnkRMSF.cpp kind:function(arm,size=0x50) addr:0x021646ec local @@ -400,8 +400,8 @@ __sinit_MapObjectUnkWLMS.cpp kind:function(arm,size=0x154) addr:0x021649e4 __sinit_MapObjectUnkLTRW.cpp kind:function(arm,size=0x80) addr:0x02164b38 local __sinit_MapObjectUnkMTJR.cpp kind:function(arm,size=0x50) addr:0x02164bb8 __sinit_MapObjectUnkSWCR.cpp kind:function(arm,size=0x50) addr:0x02164c08 -.p__sinit_ActorUnkCANS.cpp kind:data(word) addr:0x02164c58 -.p__sinit_ActorUnkCASE.cpp kind:data(word) addr:0x02164c5c +.p__sinit_ActorLobarrier.cpp kind:data(word) addr:0x02164c58 +.p__sinit_ActorLobarrierShield.cpp kind:data(word) addr:0x02164c5c .p__sinit_ActorUnkRMSV.cpp kind:data(word) addr:0x02164c60 local .p__sinit_ActorUnkRMSW.cpp kind:data(word) addr:0x02164c64 .p__sinit_ActorUnkRMSF.cpp kind:data(word) addr:0x02164c68 local @@ -417,12 +417,12 @@ __sinit_MapObjectUnkSWCR.cpp kind:function(arm,size=0x50) addr:0x02164c08 _ZTV24UnkStruct_ov063_02162e88 kind:data(any) addr:0x02164ca0 data_ov063_02162e90 kind:data(any) addr:0x02164cb0 _ZTV24UnkStruct_ov063_02162ea8 kind:data(any) addr:0x02164cc0 -_ZTV19ActorProfileUnkCANS kind:data(any) addr:0x02164cdc +_ZTV21ActorProfileLobarrier kind:data(any) addr:0x02164cdc _ZTV24UnkStruct_ov063_02162ee8 kind:data(any) addr:0x02164d00 _ZTV24UnkStruct_ov063_02162f14 kind:data(any) addr:0x02164d2c data_ov063_02162f58 kind:data(any) addr:0x02164d78 data_ov063_02162fb0 kind:data(any) addr:0x02164dd0 -_ZTV12ActorUnkCANS kind:data(any) addr:0x02164e28 +_ZTV14ActorLobarrier kind:data(any) addr:0x02164e28 data_ov063_02163068 kind:data(any) addr:0x02164e88 data_ov063_02163080 kind:data(any) addr:0x02164ea0 data_ov063_02163098 kind:data(any) addr:0x02164eb8 @@ -430,11 +430,11 @@ data_ov063_021630b0 kind:data(any) addr:0x02164ed0 data_ov063_021630c8 kind:data(any) addr:0x02164ee8 data_ov063_021630e0 kind:data(any) addr:0x02164f00 data_ov063_02163110 kind:data(any) addr:0x02164f30 -_ZTV16ActorUnkCASE_150 kind:data(any) addr:0x02164f60 -_ZTV16ActorUnkCASE_174 kind:data(any) addr:0x02164f78 -_ZTV19ActorProfileUnkCASE kind:data(any) addr:0x02164f94 +_ZTV24ActorLobarrierShield_150 kind:data(any) addr:0x02164f60 +_ZTV24ActorLobarrierShield_174 kind:data(any) addr:0x02164f78 +_ZTV27ActorProfileLobarrierShield kind:data(any) addr:0x02164f94 _ZTV24UnkStruct_ov063_021631a0 kind:data(any) addr:0x02164fb8 -_ZTV12ActorUnkCASE kind:data(any) addr:0x02164fe4 +_ZTV20ActorLobarrierShield kind:data(any) addr:0x02164fe4 _ZTV15ActorUnkRMSBase kind:data(any) addr:0x02165044 _ZTV19ActorProfileUnkRMSV kind:data(any) addr:0x021650a8 data_ov063_021632ac kind:data(any) addr:0x021650cc @@ -498,12 +498,12 @@ _ZTV16MapObjectUnkMTJR kind:data(any) addr:0x021658d0 data_ov063_02165918 kind:data(any) addr:0x02165910 data_ov063_0216592c kind:data(any) addr:0x0216592c data_ov063_02165948 kind:data(any) addr:0x02165948 -_ZGVN15ProfileInstanceI19ActorProfileUnkCANSE8sProfileE kind:bss addr:0x02165980 +_ZGVN15ProfileInstanceI21ActorProfileLobarrierE8sProfileE kind:bss addr:0x02165980 @32611 kind:bss addr:0x02165984 -_ZN15ProfileInstanceI19ActorProfileUnkCANSE8sProfileE kind:bss addr:0x02165990 -_ZGVN15ProfileInstanceI19ActorProfileUnkCASEE8sProfileE kind:bss addr:0x02165a68 +_ZN15ProfileInstanceI21ActorProfileLobarrierE8sProfileE kind:bss addr:0x02165990 +_ZGVN15ProfileInstanceI27ActorProfileLobarrierShieldE8sProfileE kind:bss addr:0x02165a68 @32617 kind:bss addr:0x02165a6c -_ZN15ProfileInstanceI19ActorProfileUnkCASEE8sProfileE kind:bss addr:0x02165a78 +_ZN15ProfileInstanceI27ActorProfileLobarrierShieldE8sProfileE kind:bss addr:0x02165a78 _ZGVN15ProfileInstanceI19ActorProfileUnkRMSVE8sProfileE kind:bss addr:0x02165b50 @32623 kind:bss addr:0x02165b54 _ZN15ProfileInstanceI19ActorProfileUnkRMSVE8sProfileE kind:bss addr:0x02165b60 diff --git a/config/usa/arm9/overlays/ov000/symbols.txt b/config/usa/arm9/overlays/ov000/symbols.txt index 104ab767..6adf45db 100644 --- a/config/usa/arm9/overlays/ov000/symbols.txt +++ b/config/usa/arm9/overlays/ov000/symbols.txt @@ -2370,10 +2370,10 @@ func_ov000_020997a4 kind:function(arm,size=0x20) addr:0x02099784 _ZN14Actor_Derived219func_ov000_020997c4Ei kind:function(arm,size=0x2c) addr:0x020997a4 _ZN14Actor_Derived2D1Ev kind:function(arm,size=0x14) addr:0x020997d0 _ZN14Actor_Derived2D0Ev kind:function(arm,size=0x1c) addr:0x020997e4 -_ZN26UnkStruct_ActorUnkCANS_224C1Ev kind:function(arm,size=0x50) addr:0x02099800 +_ZN28UnkStruct_ActorLobarrier_224C1Ev kind:function(arm,size=0x50) addr:0x02099800 func_ov000_02099870 kind:function(arm,size=0x80) addr:0x02099850 -_ZN26UnkStruct_ActorUnkCANS_22419func_ov000_020998f0E9RefStructP7VecFx32 kind:function(arm,size=0x11c) addr:0x020998d0 -_ZN26UnkStruct_ActorUnkCANS_22419func_ov000_02099a0cEv kind:function(arm,size=0x10) addr:0x020999ec +_ZN28UnkStruct_ActorLobarrier_22419func_ov000_020998f0E9RefStructP7VecFx32 kind:function(arm,size=0x11c) addr:0x020998d0 +_ZN28UnkStruct_ActorLobarrier_22419func_ov000_02099a0cEv kind:function(arm,size=0x10) addr:0x020999ec func_ov000_02099a1c kind:function(arm,size=0xc) addr:0x020999fc _ZN24UnkStruct_ov000_020b31a8C2EP10UnkSystem5P11ModelRenderP33MapObjectProfile_Derived2_20_Base kind:function(thumb,size=0x54) addr:0x02099a08 func_ov000_02099a7c kind:function(thumb,size=0x48) addr:0x02099a5c diff --git a/config/usa/arm9/overlays/ov017/symbols.txt b/config/usa/arm9/overlays/ov017/symbols.txt index d7692214..4904ff59 100644 --- a/config/usa/arm9/overlays/ov017/symbols.txt +++ b/config/usa/arm9/overlays/ov017/symbols.txt @@ -69,9 +69,9 @@ _ZN5Actor19func_ov017_020bf574Eii kind:function(arm,size=0x50) addr:0x020bf554 _ZN5Actor19func_ov017_020bf5c4EP7VecFx32iiis kind:function(arm,size=0x70) addr:0x020bf5a4 _ZN5Actor19func_ov017_020bf634EPK7VecFx32ti kind:function(arm,size=0x54) addr:0x020bf614 _ZN5Actor19func_ov017_020bf688Ev kind:function(arm,size=0x88) addr:0x020bf668 -_ZN5Actor19func_ov017_020bf710EP26UnkStruct_ActorUnkCANS_224PK7VecFx32t kind:function(arm,size=0x98) addr:0x020bf6f0 +_ZN5Actor19func_ov017_020bf710EP28UnkStruct_ActorLobarrier_224PK7VecFx32t kind:function(arm,size=0x98) addr:0x020bf6f0 _ZN5Actor19func_ov017_020bf7a8Ev kind:function(arm,size=0xec) addr:0x020bf788 -_ZN5Actor19func_ov017_020bf894EP26UnkStruct_ActorUnkCANS_224 kind:function(arm,size=0x60) addr:0x020bf874 +_ZN5Actor19func_ov017_020bf894EP28UnkStruct_ActorLobarrier_224 kind:function(arm,size=0x60) addr:0x020bf874 _ZN5Actor8vfunc_40Ev kind:function(arm,size=0x44) addr:0x020bf8d4 _ZN5Actor8vfunc_44Ev kind:function(arm,size=0x64) addr:0x020bf918 _ZN5Actor19func_ov017_020bf99cEv kind:function(arm,size=0x2c) addr:0x020bf97c diff --git a/config/usa/arm9/overlays/ov063/delinks.txt b/config/usa/arm9/overlays/ov063/delinks.txt index c0218980..d115b81c 100644 --- a/config/usa/arm9/overlays/ov063/delinks.txt +++ b/config/usa/arm9/overlays/ov063/delinks.txt @@ -5,14 +5,14 @@ .data start:0x02162e60 end:0x02163b40 kind:data align:32 .bss start:0x02163b40 end:0x02164a00 kind:bss align:32 -src/063_Shrine/Actor/ActorUnkCANS.cpp: +src/063_Shrine/Actor/ActorLobarrier.cpp: .text start:0x02157e80 end:0x0215aad8 .init start:0x02162710 end:0x02162780 .ctor start:0x02162e20 end:0x02162e24 .data start:0x02162e60 end:0x02163048 .bss start:0x02163b40 end:0x02163c28 -src/063_Shrine/Actor/ActorUnkCASE.cpp: +src/063_Shrine/Actor/ActorLobarrierShield.cpp: .text start:0x0215aad8 end:0x0215badc .init start:0x02162780 end:0x02162814 .ctor start:0x02162e24 end:0x02162e28 diff --git a/config/usa/arm9/overlays/ov063/symbols.txt b/config/usa/arm9/overlays/ov063/symbols.txt index 86027424..e3e241f8 100644 --- a/config/usa/arm9/overlays/ov063/symbols.txt +++ b/config/usa/arm9/overlays/ov063/symbols.txt @@ -1,55 +1,55 @@ -_ZN19ActorProfileUnkCANS10GetProfileEv kind:function(arm,size=0xc) addr:0x02157e80 -_ZN19ActorProfileUnkCANS6CreateEv kind:function(arm,size=0x24) addr:0x02157e8c -_ZN19ActorProfileUnkCANSC1Ev kind:function(arm,size=0x50) addr:0x02157eb0 +_ZN21ActorProfileLobarrier10GetProfileEv kind:function(arm,size=0xc) addr:0x02157e80 +_ZN21ActorProfileLobarrier6CreateEv kind:function(arm,size=0x24) addr:0x02157e8c +_ZN21ActorProfileLobarrierC1Ev kind:function(arm,size=0x50) addr:0x02157eb0 _ZN24UnkStruct_ov063_02162ee8C1EP10G3d_Model_ kind:function(arm,size=0x5c) addr:0x02157f00 -_ZN24UnkStruct_ov063_02162e88C1EPv kind:function(arm,size=0x28) addr:0x02157f5c +_ZN24UnkStruct_ov063_02162e88C1EP14ActorLobarrier kind:function(arm,size=0x28) addr:0x02157f5c _ZN24UnkStruct_ov063_02162e888vfunc_04E9RefStructiiPi kind:function(arm,size=0x178) addr:0x02157f84 -_ZN12ActorUnkCANSC1Ev kind:function(arm,size=0x1dc) addr:0x021580fc +_ZN14ActorLobarrierC1Ev kind:function(arm,size=0x1dc) addr:0x021580fc _ZN24UnkStruct_ov063_02162ee8D1Ev kind:function(arm,size=0x14) addr:0x021582d8 _ZN24UnkStruct_ov063_02162f14D1Ev kind:function(arm,size=0x14) addr:0x021582ec -_ZN12ActorUnkCANS4InitEi kind:function(arm,size=0x68) addr:0x02158300 -_ZN12ActorUnkCANS5SetupEv kind:function(arm,size=0x9c) addr:0x02158368 -_ZN12ActorUnkCANS19func_ov063_02158424Ev kind:function(arm,size=0x24) addr:0x02158404 -_ZN12ActorUnkCANS19func_ov063_02158448Ei kind:function(arm,size=0x48) addr:0x02158428 -_ZN12ActorUnkCANS19func_ov063_02158490Ev kind:function(arm,size=0x34) addr:0x02158470 -_ZN12ActorUnkCANS8vfunc_24Ev kind:function(arm,size=0x2c) addr:0x021584a4 -_ZN12ActorUnkCANS6UpdateEv kind:function(arm,size=0x53c) addr:0x021584d0 -_ZN12ActorUnkCANS8vfunc_2CEi kind:function(arm,size=0xe0) addr:0x02158a0c -_ZN12ActorUnkCANS19func_ov063_02158b0cEv kind:function(arm,size=0x28) addr:0x02158aec -_ZN12ActorUnkCANS19func_ov063_02158b34Ev kind:function(arm,size=0x64) addr:0x02158b14 -_ZN12ActorUnkCANS19func_ov063_02158b98Ev kind:function(arm,size=0x1a8) addr:0x02158b78 -_ZN12ActorUnkCANS19func_ov063_02158d40Ev kind:function(arm,size=0x70) addr:0x02158d20 -_ZN12ActorUnkCANS19func_ov063_02158db0Ev kind:function(arm,size=0x318) addr:0x02158d90 -_ZN12ActorUnkCANS19func_ov063_021590c8Ev kind:function(arm,size=0x38) addr:0x021590a8 -_ZN12ActorUnkCANS19func_ov063_02159100Ev kind:function(arm,size=0xf4) addr:0x021590e0 -_ZN12ActorUnkCANS19func_ov063_021591f4Ev kind:function(arm,size=0x64) addr:0x021591d4 -_ZN12ActorUnkCANS19func_ov063_02159258Ev kind:function(arm,size=0x1b0) addr:0x02159238 -_ZN12ActorUnkCANS19func_ov063_02159408Ev kind:function(arm,size=0x8c) addr:0x021593e8 -_ZN12ActorUnkCANS19func_ov063_02159494Ev kind:function(arm,size=0x110) addr:0x02159474 -_ZN12ActorUnkCANS19func_ov063_021595a4Ev kind:function(arm,size=0x74) addr:0x02159584 -_ZN12ActorUnkCANS19func_ov063_02159618Ev kind:function(arm,size=0xfc) addr:0x021595f8 -_ZN12ActorUnkCANS19func_ov063_02159714Ev kind:function(arm,size=0x70) addr:0x021596f4 -_ZN12ActorUnkCANS19func_ov063_02159784Ev kind:function(arm,size=0x178) addr:0x02159764 -_ZN12ActorUnkCANS19func_ov063_021598fcEv kind:function(arm,size=0xe8) addr:0x021598dc -_ZN12ActorUnkCANS19func_ov063_021599e4Ev kind:function(arm,size=0x2c4) addr:0x021599c4 -_ZN12ActorUnkCANS19func_ov063_02159ca8Ev kind:function(arm,size=0xc0) addr:0x02159c88 -_ZN12ActorUnkCANS19func_ov063_02159d68Ev kind:function(arm,size=0x94) addr:0x02159d48 -_ZN12ActorUnkCANS19func_ov063_02159dfcEv kind:function(arm,size=0x20) addr:0x02159ddc -_ZN12ActorUnkCANS19func_ov063_02159e1cEv kind:function(arm,size=0x4) addr:0x02159dfc -_ZN12ActorUnkCANS19func_ov063_02159e20Ev kind:function(arm,size=0xa0) addr:0x02159e00 -_ZN12ActorUnkCANS19func_ov063_02159ec0Ev kind:function(arm,size=0x7c) addr:0x02159ea0 -_ZN12ActorUnkCANS19func_ov063_02159f3cEi kind:function(arm,size=0x1b4) addr:0x02159f1c -_ZN12ActorUnkCANS19func_ov063_0215a0f0Ev kind:function(arm,size=0x1d0) addr:0x0215a0d0 -_ZN12ActorUnkCANS19func_ov063_0215a2c0Ev kind:function(arm,size=0x168) addr:0x0215a2a0 -_ZN12ActorUnkCANS19func_ov063_0215a428Ev kind:function(arm,size=0x4c) addr:0x0215a408 -_ZN12ActorUnkCANS19func_ov063_0215a474Ev kind:function(arm,size=0xa0) addr:0x0215a454 -_ZN12ActorUnkCANS19func_ov063_0215a514Ev kind:function(arm,size=0x58) addr:0x0215a4f4 -_ZN12ActorUnkCANS19func_ov063_0215a56cEi kind:function(arm,size=0x34) addr:0x0215a54c -_ZN12ActorUnkCANS19func_ov063_0215a5a0EP7VecFx32 kind:function(arm,size=0x1c) addr:0x0215a580 -_ZN12ActorUnkCANS19func_ov063_0215a5bcEv kind:function(arm,size=0x1c) addr:0x0215a59c -_ZN12ActorUnkCANS19func_ov063_0215a5d8Ev kind:function(arm,size=0x20) addr:0x0215a5b8 -_ZN12ActorUnkCANS8vfunc_10EP8Cylinder kind:function(arm,size=0x80) addr:0x0215a5d8 -_ZN12ActorUnkCANS19func_ov063_0215a678EPS_P29UnkStruct_func_ov063_0215a678 kind:function(arm,size=0x15c) addr:0x0215a658 +_ZN14ActorLobarrier4InitEi kind:function(arm,size=0x68) addr:0x02158300 +_ZN14ActorLobarrier5SetupEv kind:function(arm,size=0x9c) addr:0x02158368 +_ZN14ActorLobarrier19func_ov063_02158424Ev kind:function(arm,size=0x24) addr:0x02158404 +_ZN14ActorLobarrier8SetStateEs kind:function(arm,size=0x48) addr:0x02158428 +_ZN14ActorLobarrier19func_ov063_02158490Ev kind:function(arm,size=0x34) addr:0x02158470 +_ZN14ActorLobarrier8vfunc_24Ev kind:function(arm,size=0x2c) addr:0x021584a4 +_ZN14ActorLobarrier6UpdateEv kind:function(arm,size=0x53c) addr:0x021584d0 +_ZN14ActorLobarrier8vfunc_2CEi kind:function(arm,size=0xe0) addr:0x02158a0c +_ZN14ActorLobarrier19func_ov063_02158b0cEv kind:function(arm,size=0x28) addr:0x02158aec +_ZN14ActorLobarrier19func_ov063_02158b34Ev kind:function(arm,size=0x64) addr:0x02158b14 +_ZN14ActorLobarrier19func_ov063_02158b98Ev kind:function(arm,size=0x1a8) addr:0x02158b78 +_ZN14ActorLobarrier19func_ov063_02158d40Ev kind:function(arm,size=0x70) addr:0x02158d20 +_ZN14ActorLobarrier19func_ov063_02158db0Ev kind:function(arm,size=0x318) addr:0x02158d90 +_ZN14ActorLobarrier19func_ov063_021590c8Ev kind:function(arm,size=0x38) addr:0x021590a8 +_ZN14ActorLobarrier19func_ov063_02159100Ev kind:function(arm,size=0xf4) addr:0x021590e0 +_ZN14ActorLobarrier19func_ov063_021591f4Ev kind:function(arm,size=0x64) addr:0x021591d4 +_ZN14ActorLobarrier19func_ov063_02159258Ev kind:function(arm,size=0x1b0) addr:0x02159238 +_ZN14ActorLobarrier19func_ov063_02159408Ev kind:function(arm,size=0x8c) addr:0x021593e8 +_ZN14ActorLobarrier19func_ov063_02159494Ev kind:function(arm,size=0x110) addr:0x02159474 +_ZN14ActorLobarrier19func_ov063_021595a4Ev kind:function(arm,size=0x74) addr:0x02159584 +_ZN14ActorLobarrier19func_ov063_02159618Ev kind:function(arm,size=0xfc) addr:0x021595f8 +_ZN14ActorLobarrier19func_ov063_02159714Ev kind:function(arm,size=0x70) addr:0x021596f4 +_ZN14ActorLobarrier19func_ov063_02159784Ev kind:function(arm,size=0x178) addr:0x02159764 +_ZN14ActorLobarrier19func_ov063_021598fcEv kind:function(arm,size=0xe8) addr:0x021598dc +_ZN14ActorLobarrier19func_ov063_021599e4Ev kind:function(arm,size=0x2c4) addr:0x021599c4 +_ZN14ActorLobarrier19func_ov063_02159ca8Ev kind:function(arm,size=0xc0) addr:0x02159c88 +_ZN14ActorLobarrier19func_ov063_02159d68Ev kind:function(arm,size=0x94) addr:0x02159d48 +_ZN14ActorLobarrier19func_ov063_02159dfcEv kind:function(arm,size=0x20) addr:0x02159ddc +_ZN14ActorLobarrier19func_ov063_02159e1cEv kind:function(arm,size=0x4) addr:0x02159dfc +_ZN14ActorLobarrier19func_ov063_02159e20Ev kind:function(arm,size=0xa0) addr:0x02159e00 +_ZN14ActorLobarrier19func_ov063_02159ec0Ev kind:function(arm,size=0x7c) addr:0x02159ea0 +_ZN14ActorLobarrier19func_ov063_02159f3cEi kind:function(arm,size=0x1b4) addr:0x02159f1c +_ZN14ActorLobarrier19func_ov063_0215a0f0Ev kind:function(arm,size=0x1d0) addr:0x0215a0d0 +_ZN14ActorLobarrier19func_ov063_0215a2c0Ev kind:function(arm,size=0x168) addr:0x0215a2a0 +_ZN14ActorLobarrier19func_ov063_0215a428Ev kind:function(arm,size=0x4c) addr:0x0215a408 +_ZN14ActorLobarrier19func_ov063_0215a474Ev kind:function(arm,size=0xa0) addr:0x0215a454 +_ZN14ActorLobarrier19func_ov063_0215a514Ev kind:function(arm,size=0x58) addr:0x0215a4f4 +_ZN14ActorLobarrier19func_ov063_0215a56cEi kind:function(arm,size=0x34) addr:0x0215a54c +_ZN14ActorLobarrier19func_ov063_0215a5a0EP7VecFx32 kind:function(arm,size=0x1c) addr:0x0215a580 +_ZN14ActorLobarrier19func_ov063_0215a5bcEv kind:function(arm,size=0x1c) addr:0x0215a59c +_ZN14ActorLobarrier19func_ov063_0215a5d8Ev kind:function(arm,size=0x20) addr:0x0215a5b8 +_ZN14ActorLobarrier8vfunc_10EP8Cylinder kind:function(arm,size=0x80) addr:0x0215a5d8 +_ZN14ActorLobarrier19func_ov063_0215a678EPS_P29UnkStruct_func_ov063_0215a678 kind:function(arm,size=0x15c) addr:0x0215a658 _ZN24UnkStruct_ov063_02162ea8C1Ev kind:function(arm,size=0x30) addr:0x0215a7b4 _ZN24UnkStruct_ov063_02162ea8D1Ev kind:function(arm,size=0x14) addr:0x0215a7e4 _ZN24UnkStruct_ov063_02162ea8D0Ev kind:function(arm,size=0x1c) addr:0x0215a7f8 @@ -59,52 +59,52 @@ _ZN24UnkStruct_ov063_02162f148vfunc_3CEv kind:function(arm,size=0x24) addr:0x021 _ZN24UnkStruct_ov063_02162f148vfunc_38Eii kind:function(arm,size=0x2c) addr:0x0215a950 _ZN24UnkStruct_ov063_02162ee8D0Ev kind:function(arm,size=0x1c) addr:0x0215a97c _ZN24UnkStruct_ov063_02162f14D0Ev kind:function(arm,size=0x1c) addr:0x0215a998 -_ZN12ActorUnkCANSD1Ev kind:function(arm,size=0x84) addr:0x0215a9b4 -_ZN12ActorUnkCANSD0Ev kind:function(arm,size=0x8c) addr:0x0215aa38 -_ZN19ActorProfileUnkCANSD1Ev kind:function(arm,size=0x14) addr:0x0215aac4 -_ZN19ActorProfileUnkCASE10GetProfileEv kind:function(arm,size=0xc) addr:0x0215aad8 -_ZN19ActorProfileUnkCASE6CreateEv kind:function(arm,size=0x24) addr:0x0215aae4 -_ZN19ActorProfileUnkCASEC1Ev kind:function(arm,size=0x48) addr:0x0215ab08 +_ZN14ActorLobarrierD1Ev kind:function(arm,size=0x84) addr:0x0215a9b4 +_ZN14ActorLobarrierD0Ev kind:function(arm,size=0x8c) addr:0x0215aa38 +_ZN21ActorProfileLobarrierD1Ev kind:function(arm,size=0x14) addr:0x0215aac4 +_ZN27ActorProfileLobarrierShield10GetProfileEv kind:function(arm,size=0xc) addr:0x0215aad8 +_ZN27ActorProfileLobarrierShield6CreateEv kind:function(arm,size=0x24) addr:0x0215aae4 +_ZN27ActorProfileLobarrierShieldC1Ev kind:function(arm,size=0x48) addr:0x0215ab08 _ZN24UnkStruct_ov063_021631a0C1EP10G3d_Model_ kind:function(arm,size=0x34) addr:0x0215ab50 -_ZN16ActorUnkCASE_150C1EP5Actor kind:function(arm,size=0x34) addr:0x0215ab84 -_ZN16ActorUnkCASE_1508vfunc_00E9RefStructi kind:function(arm,size=0x74) addr:0x0215abb8 -_ZN16ActorUnkCASE_1508vfunc_04Ev kind:function(arm,size=0x1c) addr:0x0215ac2c -_ZN16ActorUnkCASE_1508vfunc_0CEP7VecFx32 kind:function(arm,size=0x24) addr:0x0215ac48 -_ZN16ActorUnkCASE_174C1EP5Actor kind:function(arm,size=0x3c) addr:0x0215ac6c -_ZN16ActorUnkCASE_1748vfunc_10EPK5Actor kind:function(arm,size=0x24) addr:0x0215aca8 -_ZN12ActorUnkCASE19func_ov063_0215acecEP9RefStructS0_ kind:function(arm,size=0x5c) addr:0x0215accc -_ZN12ActorUnkCASEC1Ev kind:function(arm,size=0x124) addr:0x0215ad28 +_ZN24ActorLobarrierShield_150C1EP5Actor kind:function(arm,size=0x34) addr:0x0215ab84 +_ZN24ActorLobarrierShield_1508vfunc_00E9RefStructi kind:function(arm,size=0x74) addr:0x0215abb8 +_ZN24ActorLobarrierShield_1508vfunc_04Ev kind:function(arm,size=0x1c) addr:0x0215ac2c +_ZN24ActorLobarrierShield_1508vfunc_0CEP7VecFx32 kind:function(arm,size=0x24) addr:0x0215ac48 +_ZN24ActorLobarrierShield_174C1EP5Actor kind:function(arm,size=0x3c) addr:0x0215ac6c +_ZN24ActorLobarrierShield_1748vfunc_10EPK5Actor kind:function(arm,size=0x24) addr:0x0215aca8 +_ZN20ActorLobarrierShield19func_ov063_0215acecEP9RefStructS0_ kind:function(arm,size=0x5c) addr:0x0215accc +_ZN20ActorLobarrierShieldC1Ev kind:function(arm,size=0x124) addr:0x0215ad28 _ZN24UnkStruct_ov063_021631a0D1Ev kind:function(arm,size=0x14) addr:0x0215ae4c -_ZN16ActorUnkCASE_174D1Ev kind:function(arm,size=0x14) addr:0x0215ae60 -_ZN12ActorUnkCASE4InitEi kind:function(arm,size=0x68) addr:0x0215ae74 -_ZN12ActorUnkCASE19func_ov063_0215aefcEs kind:function(arm,size=0x58) addr:0x0215aedc -_ZN12ActorUnkCASE19func_ov063_0215af54Ev kind:function(arm,size=0x4) addr:0x0215af34 -_ZN12ActorUnkCASE19func_ov063_0215af58Ev kind:function(arm,size=0x4) addr:0x0215af38 -_ZN12ActorUnkCASE19func_ov063_0215af5cEv kind:function(arm,size=0x4) addr:0x0215af3c -_ZN12ActorUnkCASE19func_ov063_0215af60Ev kind:function(arm,size=0x44) addr:0x0215af40 -_ZN12ActorUnkCASE19func_ov063_0215afa4Ev kind:function(arm,size=0x14) addr:0x0215af84 -_ZN12ActorUnkCASE19func_ov063_0215afb8Ev kind:function(arm,size=0x9c) addr:0x0215af98 -_ZN12ActorUnkCASE19func_ov063_0215b054Ev kind:function(arm,size=0x3c) addr:0x0215b034 -_ZN12ActorUnkCASE19func_ov063_0215b090Ev kind:function(arm,size=0x12c) addr:0x0215b070 -_ZN12ActorUnkCASE19func_ov063_0215b1bcEv kind:function(arm,size=0x88) addr:0x0215b19c -_ZN12ActorUnkCASE19func_ov063_0215b244Ev kind:function(arm,size=0x6c) addr:0x0215b224 -_ZN12ActorUnkCASE19func_ov063_0215b2b0Ev kind:function(arm,size=0x14) addr:0x0215b290 -_ZN12ActorUnkCASE19func_ov063_0215b2c4Ev kind:function(arm,size=0x4) addr:0x0215b2a4 -_ZN12ActorUnkCASE8vfunc_24Ev kind:function(arm,size=0x24) addr:0x0215b2a8 -_ZN12ActorUnkCASE6UpdateEv kind:function(arm,size=0x338) addr:0x0215b2cc -_ZN12ActorUnkCASE8vfunc_2CEi kind:function(arm,size=0xa4) addr:0x0215b604 -_ZN12ActorUnkCASE19func_ov063_0215b6c8EP7VecFx3214UnkAngleStruct kind:function(arm,size=0x5c) addr:0x0215b6a8 -_ZN12ActorUnkCASE19func_ov063_0215b724Ev kind:function(arm,size=0xa8) addr:0x0215b704 -_ZN12ActorUnkCASE8vfunc_10EP8Cylinder kind:function(arm,size=0x48) addr:0x0215b7ac -_ZN12ActorUnkCASE19func_ov063_0215b814E9RefStruct kind:function(arm,size=0x40) addr:0x0215b7f4 -_ZN12ActorUnkCASE19func_ov063_0215b854Ev kind:function(arm,size=0x94) addr:0x0215b834 -_ZN12ActorUnkCASE19func_ov063_0215b8e8EP7VecFx32 kind:function(arm,size=0xb4) addr:0x0215b8c8 -_ZN12ActorUnkCASE19func_ov063_0215b99cEPS_P29UnkStruct_func_ov063_0215a678 kind:function(arm,size=0xac) addr:0x0215b97c -_ZN16ActorUnkCASE_174D0Ev kind:function(arm,size=0x1c) addr:0x0215ba28 +_ZN24ActorLobarrierShield_174D1Ev kind:function(arm,size=0x14) addr:0x0215ae60 +_ZN20ActorLobarrierShield4InitEi kind:function(arm,size=0x68) addr:0x0215ae74 +_ZN20ActorLobarrierShield8SetStateEs kind:function(arm,size=0x58) addr:0x0215aedc +_ZN20ActorLobarrierShield19func_ov063_0215af54Ev kind:function(arm,size=0x4) addr:0x0215af34 +_ZN20ActorLobarrierShield19func_ov063_0215af58Ev kind:function(arm,size=0x4) addr:0x0215af38 +_ZN20ActorLobarrierShield19func_ov063_0215af5cEv kind:function(arm,size=0x4) addr:0x0215af3c +_ZN20ActorLobarrierShield19func_ov063_0215af60Ev kind:function(arm,size=0x44) addr:0x0215af40 +_ZN20ActorLobarrierShield19func_ov063_0215afa4Ev kind:function(arm,size=0x14) addr:0x0215af84 +_ZN20ActorLobarrierShield19func_ov063_0215afb8Ev kind:function(arm,size=0x9c) addr:0x0215af98 +_ZN20ActorLobarrierShield19func_ov063_0215b054Ev kind:function(arm,size=0x3c) addr:0x0215b034 +_ZN20ActorLobarrierShield19func_ov063_0215b090Ev kind:function(arm,size=0x12c) addr:0x0215b070 +_ZN20ActorLobarrierShield19func_ov063_0215b1bcEv kind:function(arm,size=0x88) addr:0x0215b19c +_ZN20ActorLobarrierShield19func_ov063_0215b244Ev kind:function(arm,size=0x6c) addr:0x0215b224 +_ZN20ActorLobarrierShield19func_ov063_0215b2b0Ev kind:function(arm,size=0x14) addr:0x0215b290 +_ZN20ActorLobarrierShield19func_ov063_0215b2c4Ev kind:function(arm,size=0x4) addr:0x0215b2a4 +_ZN20ActorLobarrierShield8vfunc_24Ev kind:function(arm,size=0x24) addr:0x0215b2a8 +_ZN20ActorLobarrierShield6UpdateEv kind:function(arm,size=0x338) addr:0x0215b2cc +_ZN20ActorLobarrierShield8vfunc_2CEi kind:function(arm,size=0xa4) addr:0x0215b604 +_ZN20ActorLobarrierShield19func_ov063_0215b6c8EP7VecFx3214UnkAngleStruct kind:function(arm,size=0x5c) addr:0x0215b6a8 +_ZN20ActorLobarrierShield19func_ov063_0215b724Ev kind:function(arm,size=0xa8) addr:0x0215b704 +_ZN20ActorLobarrierShield8vfunc_10EP8Cylinder kind:function(arm,size=0x48) addr:0x0215b7ac +_ZN20ActorLobarrierShield19func_ov063_0215b814E9RefStruct kind:function(arm,size=0x40) addr:0x0215b7f4 +_ZN20ActorLobarrierShield19func_ov063_0215b854Ev kind:function(arm,size=0x94) addr:0x0215b834 +_ZN20ActorLobarrierShield19func_ov063_0215b8e8EP7VecFx32 kind:function(arm,size=0xb4) addr:0x0215b8c8 +_ZN20ActorLobarrierShield19func_ov063_0215b99cEPS_P29UnkStruct_func_ov063_0215a678 kind:function(arm,size=0xac) addr:0x0215b97c +_ZN24ActorLobarrierShield_174D0Ev kind:function(arm,size=0x1c) addr:0x0215ba28 _ZN24UnkStruct_ov063_021631a0D0Ev kind:function(arm,size=0x1c) addr:0x0215ba44 -_ZN12ActorUnkCASED1Ev kind:function(arm,size=0x30) addr:0x0215ba60 -_ZN12ActorUnkCASED0Ev kind:function(arm,size=0x38) addr:0x0215ba90 -_ZN19ActorProfileUnkCASED1Ev kind:function(arm,size=0x14) addr:0x0215bac8 +_ZN20ActorLobarrierShieldD1Ev kind:function(arm,size=0x30) addr:0x0215ba60 +_ZN20ActorLobarrierShieldD0Ev kind:function(arm,size=0x38) addr:0x0215ba90 +_ZN27ActorProfileLobarrierShieldD1Ev kind:function(arm,size=0x14) addr:0x0215bac8 _ZN15ActorUnkRMSBaseC2Ev kind:function(arm,size=0x38) addr:0x0215badc _ZN15ActorUnkRMSBase4InitEi kind:function(arm,size=0x54) addr:0x0215bb14 _ZN15ActorUnkRMSBase5SetupEv kind:function(arm,size=0x4) addr:0x0215bb68 @@ -384,8 +384,8 @@ data_ov063_021626e0 kind:data(any) addr:0x021626e0 data_ov063_021626f0 kind:data(any) addr:0x021626f0 data_ov063_021626f8 kind:data(any) addr:0x021626f8 ambiguous data_ov063_02162700 kind:data(any) addr:0x02162700 -__sinit_ActorUnkCANS.cpp kind:function(arm,size=0x70) addr:0x02162710 local -__sinit_ActorUnkCASE.cpp kind:function(arm,size=0x94) addr:0x02162780 local +__sinit_ActorLobarrier.cpp kind:function(arm,size=0x70) addr:0x02162710 local +__sinit_ActorLobarrierShield.cpp kind:function(arm,size=0x94) addr:0x02162780 local __sinit_ActorUnkRMSV.cpp kind:function(arm,size=0x50) addr:0x02162814 local __sinit_ActorUnkRMSW.cpp kind:function(arm,size=0x50) addr:0x02162864 local __sinit_ActorUnkRMSF.cpp kind:function(arm,size=0x50) addr:0x021628b4 local @@ -398,8 +398,8 @@ __sinit_MapObjectUnkWLMS.cpp kind:function(arm,size=0x154) addr:0x02162bac local __sinit_MapObjectUnkLTRW.cpp kind:function(arm,size=0x80) addr:0x02162d00 local __sinit_MapObjectUnkMTJR.cpp kind:function(arm,size=0x50) addr:0x02162d80 local __sinit_MapObjectUnkSWCR.cpp kind:function(arm,size=0x50) addr:0x02162dd0 local -.p__sinit_ActorUnkCANS.cpp kind:data(word) addr:0x02162e20 local -.p__sinit_ActorUnkCASE.cpp kind:data(word) addr:0x02162e24 local +.p__sinit_ActorLobarrier.cpp kind:data(word) addr:0x02162e20 local +.p__sinit_ActorLobarrierShield.cpp kind:data(word) addr:0x02162e24 local .p__sinit_ActorUnkRMSV.cpp kind:data(word) addr:0x02162e28 local .p__sinit_ActorUnkRMSW.cpp kind:data(word) addr:0x02162e2c local .p__sinit_ActorUnkRMSF.cpp kind:data(word) addr:0x02162e30 local diff --git a/include/Actor/Actor.hpp b/include/Actor/Actor.hpp index 516204fc..f60375b4 100644 --- a/include/Actor/Actor.hpp +++ b/include/Actor/Actor.hpp @@ -139,7 +139,7 @@ public: }; // ActorStateStunned? seems to related to that -class UnkStruct_ActorUnkCANS_224 { +class UnkStruct_ActorLobarrier_224 { public: /* 00 (base) */ UnkStruct_PlayerGet_ec mUnk_00[0x2]; /* 08 */ Timer mUnk_08; @@ -147,9 +147,9 @@ public: /* 0E */ u16 mUnk_0E; /* 10 */ - UnkStruct_ActorUnkCANS_224(); // func_ov000_02099820 + UnkStruct_ActorLobarrier_224(); // func_ov000_02099820 - ~UnkStruct_ActorUnkCANS_224() { + ~UnkStruct_ActorLobarrier_224() { this->Destroy(); } @@ -189,7 +189,7 @@ public: /* 4C */ ActorState mState; /* 4E */ fx16 mYOffset; /* 50 */ Timer mTimer; // generic timer, used for stunned time, drop expiration, ... - /* 54 */ UnkStruct_ActorUnkCANS_224 *mUnk_54; + /* 54 */ UnkStruct_ActorLobarrier_224 *mUnk_54; /* 58 */ ActorFlags mFlags[1]; /* 5C */ ActorParams mUnk_5C; /* 8C */ RefStruct mRef; @@ -327,9 +327,9 @@ public: void func_ov017_020bf5c4(VecFx32 *param1, unk32 param2, unk32 param3, unk32 param4, s16 param5); void func_ov017_020bf634(const VecFx32 *param1, u16 param2, unk32 param3); void func_ov017_020bf688(); - void func_ov017_020bf710(UnkStruct_ActorUnkCANS_224 *param1, const VecFx32 *param2, u16 param3); + void func_ov017_020bf710(UnkStruct_ActorLobarrier_224 *param1, const VecFx32 *param2, u16 param3); void func_ov017_020bf7a8(); - void func_ov017_020bf894(UnkStruct_ActorUnkCANS_224 *param1); + void func_ov017_020bf894(UnkStruct_ActorLobarrier_224 *param1); void func_ov017_020bf99c(); void func_ov017_020bf9c8(Actor *param1); void func_ov017_020bfa50(VecFx32 *param1, unk32 param2); @@ -413,7 +413,7 @@ public: void func_ov000_020990c0(Actor_9C *param1, unk32 param2, unk32 param3); void func_ov000_020992dc(); - unk32 func_ov000_02099450(UnkStruct_ActorUnkCANS_224 *param1, VecFx32 *param2, unk32 param3, u16 param4); + unk32 func_ov000_02099450(UnkStruct_ActorLobarrier_224 *param1, VecFx32 *param2, unk32 param3, u16 param4); void func_ov000_020994a0(); void func_ov000_020997c4(unk32 param1); void func_ov000_02098f34(VecFx32 *); diff --git a/include/Actor/ActorKeese.hpp b/include/Actor/ActorKeese.hpp index b10e142c..96db1ca3 100644 --- a/include/Actor/ActorKeese.hpp +++ b/include/Actor/ActorKeese.hpp @@ -3,7 +3,7 @@ #include "Actor/Actor.hpp" #include "Actor/ActorProfile.hpp" #include "ActorSpinut.hpp" -#include "Map/MapObjectId.hpp" +#include "Unknown/UnkStruct_ov000_020b3268.hpp" #include "Unknown/UnkStruct_ov000_020b34c4.hpp" #include "global.h" #include "types.h" @@ -90,7 +90,7 @@ public: /* 244 */ unk16 mUnk_244; /* 246 */ unk16 mUnk_246; /* 248 */ Actor_9C mUnk_248; - /* 268 */ UnkStruct_ActorUnkCANS_224 mUnk_268; + /* 268 */ UnkStruct_ActorLobarrier_224 mUnk_268; /* 278 */ UnkSystem7 mUnk_278; /* 27C */ unk32 mUnk_27C; /* 280 */ unk32 mUnk_280; diff --git a/include/Actor/ActorUnkCANS.hpp b/include/Actor/ActorLobarrier.hpp similarity index 58% rename from include/Actor/ActorUnkCANS.hpp rename to include/Actor/ActorLobarrier.hpp index bc94e10e..da3023e3 100644 --- a/include/Actor/ActorUnkCANS.hpp +++ b/include/Actor/ActorLobarrier.hpp @@ -1,8 +1,8 @@ #pragma once #include "Actor/Actor.hpp" +#include "Actor/ActorLobarrierShield.hpp" #include "Actor/ActorProfile.hpp" -#include "Actor/ActorUnkCASE.hpp" #include "Actor/ActorUnkZLSL_ZSRS.hpp" #include "Actor/Actor_Derived1.hpp" #include "Physics/Cylinder.hpp" @@ -81,17 +81,34 @@ public: /* 3C */ virtual void vfunc_3C(void) override; }; +class ActorLobarrier; + class UnkStruct_ov063_02162e88 : public Actor_9C { public: - /* 20 */ void *mUnk_20; // ActorUnkCANS* + /* 20 */ ActorLobarrier *mUnk_20; /* 24 */ - UnkStruct_ov063_02162e88(void *param1); + UnkStruct_ov063_02162e88(ActorLobarrier *param1); /* 04 */ virtual unk32 vfunc_04(RefStruct param1, unk32 param2, unk32 param3, unk32 *param4) override; }; -class ActorUnkCANS : public Actor_Derived2 { +enum ActorLobarrierState_ { + ActorLobarrierState_Idle = 0, // left/right moves + ActorLobarrierState_Chasing = 1, // fast moves to be in front of Link + ActorLobarrierState_Dying = 2, + ActorLobarrierState_LinkInRange = 3, + ActorLobarrierState_Stunned = 4, // hit by the boomerang for instance + ActorLobarrierState_RisingShield = 5, // Counter boomerang + ActorLobarrierState_Hitting = 6, // try to hit Link + ActorLobarrierState_Fleeing = 7, + ActorLobarrierState_Rotating = 8, + ActorLobarrierState_LosingShield = 9, + ActorLobarrierState_10 = 10, + ActorLobarrierState_Max +}; + +class ActorLobarrier : public Actor_Derived2 { public: /* 000 (base) */ /* 0AE */ PAD(0xAE, 0xB0); @@ -100,15 +117,13 @@ public: /* 1C8 */ PAD(0x1C8, 0x1F4); /* 1F4 */ Actor_Derived1_94 mUnk_1F4; /* 200 */ UnkStruct_ov063_02162e88 mUnk_200; - /* 224 */ UnkStruct_ActorUnkCANS_224 mUnk_224; + /* 224 */ UnkStruct_ActorLobarrier_224 mUnk_224; /* 234 */ Timer mUnk_234; /* 238 */ Timer mUnk_238; /* 23C */ UnkStruct_ov063_02162ea8 mUnk_23C; /* 250 */ VecFx32 mUnk_250; - /* 25C */ unk32 mUnk_25C; - /* 260 */ unk32 mUnk_260; - /* 264 */ unk32 mUnk_264; - /* 268 */ ActorUnkCASE *mUnk_268; + /* 25C */ VecFx32 mUnk_25C; + /* 268 */ ActorLobarrierShield *shield; /* 26C */ fx16 mUnk_26C; // Some kind of angle, probably /* 26E */ PAD(0x26E, 0x270); /* 270 */ unk32 mUnk_270; @@ -117,61 +132,61 @@ public: /* 277 */ s8 mUnk_277; /* 278 */ - ActorUnkCANS(); + ActorLobarrier(); /* 10 */ virtual void vfunc_10(Cylinder *param1) override; /* 18 */ virtual bool Init(unk32 param1) override; - /* 1C */ virtual void Setup(void) override; - /* 20 */ virtual void Update(void) override; - /* 24 */ virtual void vfunc_24(void) override; + /* 1C */ virtual void Setup() override; + /* 20 */ virtual void Update() override; + /* 24 */ virtual void vfunc_24() override; /* 2C */ virtual void vfunc_2C(unk32 param1) override; - void func_ov063_02158424(void); - void func_ov063_02158448(unk32 param1); - void func_ov063_02158490(void); - void func_ov063_02158b0c(void); - void func_ov063_02158b34(void); - void func_ov063_02158b98(void); - void func_ov063_02158d40(void); - void func_ov063_02158db0(void); - void func_ov063_021590c8(void); - void func_ov063_02159100(void); - void func_ov063_021591f4(void); - void func_ov063_02159258(void); - void func_ov063_02159408(void); - void func_ov063_02159494(void); - void func_ov063_021595a4(void); - void func_ov063_02159618(void); - void func_ov063_02159714(void); - void func_ov063_02159784(void); - void func_ov063_021598fc(void); - void func_ov063_021599e4(void); - void func_ov063_02159ca8(void); - void func_ov063_02159d68(void); - void func_ov063_02159dfc(void); - void func_ov063_02159e1c(void); - void func_ov063_02159e20(void); - void func_ov063_02159ec0(void); + void func_ov063_02158424(); + void SetState(ActorState state); + void func_ov063_02158490(); + void func_ov063_02158b0c(); + void func_ov063_02158b34(); + void func_ov063_02158b98(); + void func_ov063_02158d40(); + void func_ov063_02158db0(); + void func_ov063_021590c8(); + void func_ov063_02159100(); + void func_ov063_021591f4(); + void func_ov063_02159258(); + void func_ov063_02159408(); + void func_ov063_02159494(); + void func_ov063_021595a4(); + void func_ov063_02159618(); + void func_ov063_02159714(); + void func_ov063_02159784(); + void func_ov063_021598fc(); + void func_ov063_021599e4(); + void func_ov063_02159ca8(); + void func_ov063_02159d68(); + void func_ov063_02159dfc(); + void func_ov063_02159e1c(); + void func_ov063_02159e20(); + void func_ov063_02159ec0(); unk32 func_ov063_02159f3c(unk32 param1); - unk32 func_ov063_0215a0f0(void); - unk32 func_ov063_0215a2c0(void); - void func_ov063_0215a428(void); - unk32 func_ov063_0215a474(void); - unk32 func_ov063_0215a514(void); + unk32 func_ov063_0215a0f0(); + unk32 func_ov063_0215a2c0(); + void func_ov063_0215a428(); + unk32 func_ov063_0215a474(); + unk32 func_ov063_0215a514(); unk32 func_ov063_0215a56c(unk32 param1); void func_ov063_0215a5a0(VecFx32 *param1); - unk32 func_ov063_0215a5bc(void); - unk32 func_ov063_0215a5d8(void); - static void func_ov063_0215a678(ActorUnkCANS *param1, UnkStruct_func_ov063_0215a678 *param2); + unk32 func_ov063_0215a5bc(); + unk32 func_ov063_0215a5d8(); + static void func_ov063_0215a678(ActorLobarrier *param1, UnkStruct_func_ov063_0215a678 *param2); }; -class ActorProfileUnkCANS : public ActorProfile_Derived1 { +class ActorProfileLobarrier : public ActorProfile_Derived1 { public: /* 00 (base) */ - ActorProfileUnkCANS(); + ActorProfileLobarrier(); /* 0C */ virtual Actor *Create(); - static ActorProfileUnkCANS *GetProfile(); + static ActorProfileLobarrier *GetProfile(); }; diff --git a/include/Actor/ActorUnkCASE.hpp b/include/Actor/ActorLobarrierShield.hpp similarity index 55% rename from include/Actor/ActorUnkCASE.hpp rename to include/Actor/ActorLobarrierShield.hpp index 88210a04..db48591a 100644 --- a/include/Actor/ActorUnkCASE.hpp +++ b/include/Actor/ActorLobarrierShield.hpp @@ -1,5 +1,3 @@ -//! TODO: This file was generated automatically and might contain errors - #pragma once #include "Actor/Actor.hpp" @@ -37,30 +35,42 @@ public: /* AE */ u8 mUnk_AE; }; -class ActorUnkCASE_150 : public Actor_C4 { +class ActorLobarrierShield_150 : public Actor_C4 { public: /* 00 (base) */ /* 24 */ - ActorUnkCASE_150(Actor *param1); + ActorLobarrierShield_150(Actor *param1); /* 00 */ virtual bool vfunc_00(RefStruct ref, unk32 param2) override; /* 04 */ virtual bool vfunc_04() override; /* 0C */ virtual void vfunc_0C(VecFx32 *param1) override; }; -class ActorUnkCASE_174 : public UnkStruct_ov031_Items_01 { +class ActorLobarrierShield_174 : public UnkStruct_ov031_Items_01 { public: /* 00 (base) */ /* 2C */ Actor *mUnk_2C; /* 30 */ - ActorUnkCASE_174(Actor *param1); + ActorLobarrierShield_174(Actor *param1); /* 10 */ virtual void vfunc_10(const Actor *actor) override; }; -class ActorUnkCASE : public Actor_Derived2 { +enum ActorLobarrierShieldState_ { + ActorLobarrierShieldState_Held = 0, // by a Lobarrier + ActorLobarrierShieldState_Grabbing = 1, // with whip + ActorLobarrierShieldState_Grabbed = 2, // with whip + ActorLobarrierShieldState_Thrown = 3, + ActorLobarrierShieldState_Releasing = 4, + ActorLobarrierShieldState_LyingOnGround = 5, + ActorLobarrierShieldState_Max +}; + +class ActorLobarrier; + +class ActorLobarrierShield : public Actor_Derived2 { public: /* 000 (base) */ /* 0AE */ unk16 mUnk_0AE; @@ -68,9 +78,9 @@ public: /* 120 */ unk16 mUnk_120; /* 122 */ PAD(0x122, 0x124); /* 124 */ ActorShotArrow_140 mUnk_124; - /* 14C */ Actor *mUnk_14C; - /* 150 */ ActorUnkCASE_150 mUnk_150; - /* 174 */ ActorUnkCASE_174 mUnk_174; + /* 14C */ ActorLobarrier *lobarrier; + /* 150 */ ActorLobarrierShield_150 mUnk_150; + /* 174 */ ActorLobarrierShield_174 mUnk_174; /* 1A4 */ MtxFx33 mUnk_1A4; /* 1C8 */ unk16 mUnk_1C8; // Angle related /* 1CA */ PAD(0x1CA, 0x1CC); @@ -83,7 +93,7 @@ public: /* 1F4 */ u8 mUnk_1F4; /* 1F5 */ - ActorUnkCASE(); + ActorLobarrierShield(); /* 10 */ virtual void vfunc_10(Cylinder *param1) override; /* 18 */ virtual bool Init(unk32 param1) override; @@ -91,45 +101,45 @@ public: /* 24 */ virtual void vfunc_24() override; /* 2C */ virtual void vfunc_2C(unk32 param1) override; - void func_ov063_0215ab70(void); - void func_ov063_0215aba4(void); - void func_ov063_0215abd8(void); - void func_ov063_0215ac4c(void); - void func_ov063_0215ac68(void); - void func_ov063_0215ac8c(void); - void func_ov063_0215acc8(void); + void func_ov063_0215ab70(); + void func_ov063_0215aba4(); + void func_ov063_0215abd8(); + void func_ov063_0215ac4c(); + void func_ov063_0215ac68(); + void func_ov063_0215ac8c(); + void func_ov063_0215acc8(); static void func_ov063_0215acec(RefStruct *ref1, RefStruct ref2); // copy ? - void func_ov063_0215ae6c(void); - void func_ov063_0215ae80(void); - void func_ov063_0215aefc(ActorState param2); - void func_ov063_0215af54(void); - void func_ov063_0215af58(void); - void func_ov063_0215af5c(void); - void func_ov063_0215af60(void); - void func_ov063_0215afa4(void); - void func_ov063_0215afb8(void); - void func_ov063_0215b054(void); - void func_ov063_0215b090(void); - void func_ov063_0215b1bc(void); - void func_ov063_0215b244(void); - void func_ov063_0215b2b0(void); - void func_ov063_0215b2c4(void); + void func_ov063_0215ae6c(); + void func_ov063_0215ae80(); + void SetState(ActorState state); + void func_ov063_0215af54(); + void func_ov063_0215af58(); + void func_ov063_0215af5c(); + void func_ov063_0215af60(); + void func_ov063_0215afa4(); + void func_ov063_0215afb8(); + void func_ov063_0215b054(); + void func_ov063_0215b090(); + void func_ov063_0215b1bc(); + void func_ov063_0215b244(); + void func_ov063_0215b2b0(); + void func_ov063_0215b2c4(); void func_ov063_0215b6c8(VecFx32 *param1, UnkAngleStruct angle); - void func_ov063_0215b724(void); + void func_ov063_0215b724(); void func_ov063_0215b814(RefStruct ref); - void func_ov063_0215b854(void); + void func_ov063_0215b854(); void func_ov063_0215b8e8(VecFx32 *param1); - static void func_ov063_0215b99c(ActorUnkCASE *param1, UnkStruct_func_ov063_0215a678 *param2); - void func_ov063_0215ba64(void); + static void func_ov063_0215b99c(ActorLobarrierShield *param1, UnkStruct_func_ov063_0215a678 *param2); + void func_ov063_0215ba64(); }; -class ActorProfileUnkCASE : public ActorProfile_Derived1 { +class ActorProfileLobarrierShield : public ActorProfile_Derived1 { public: /* 00 (base) */ - ActorProfileUnkCASE(); + ActorProfileLobarrierShield(); /* 0C */ virtual Actor *Create(); - static ActorProfileUnkCASE *GetProfile(); + static ActorProfileLobarrierShield *GetProfile(); }; diff --git a/include/Actor/ActorSpinut.hpp b/include/Actor/ActorSpinut.hpp index e58cc657..48e90762 100644 --- a/include/Actor/ActorSpinut.hpp +++ b/include/Actor/ActorSpinut.hpp @@ -2,7 +2,6 @@ #include "Actor/Actor.hpp" #include "Actor/ActorProfile.hpp" -#include "ActorUnkCANS.hpp" #include "ActorUnkZLSL_ZSRS.hpp" #include "global.h" @@ -105,7 +104,7 @@ public: /* 220 */ unk32 mUnk_220; /* 224 */ unk16 mUnk_224; /* 228 */ Actor_9C mUnk_228; - /* 248 */ UnkStruct_ActorUnkCANS_224 mUnk_248; + /* 248 */ UnkStruct_ActorLobarrier_224 mUnk_248; /* 258 */ Actor_Derived1_94 mUnk_258; /* 264 */ unk32 mUnk_264; /* 268 */ ActorSpinut_268 mUnk_268; diff --git a/include/CommonFuncs.hpp b/include/CommonFuncs.hpp index 8e88ce4b..a84b5d83 100644 --- a/include/CommonFuncs.hpp +++ b/include/CommonFuncs.hpp @@ -1,6 +1,8 @@ #pragma once #include "Actor/ActorId.hpp" +#include "Actor/ActorLobarrier.hpp" +#include "Actor/ActorLobarrierShield.hpp" #include "Course/Course.hpp" #include "Map/MapObjectId.hpp" #include "Player/PlayerActorBase.hpp" @@ -39,7 +41,7 @@ struct UnkStruct_027e0ce0_30_00; struct Actor_Derived2; struct ActorUnkCANS; struct UnkStruct_ov063_02162e88; -struct UnkStruct_ActorUnkCANS_224; +struct UnkStruct_ActorLobarrier_224; struct ActorUnkZLSL_AnimationTag; struct UnkStruct_ov063_02163784; struct UnkStruct_ov063_021632e4; @@ -297,7 +299,7 @@ unk32 func_ov000_02077480(); fx32 func_ov000_020775d8(fx32); unk32 func_ov000_02078aec(); void func_ov000_0207b6c0(); -void func_ov000_0207b70c(ActorUnkCASE_174 *param1, Actor *param2); +void func_ov000_0207b70c(ActorLobarrierShield_174 *param1, Actor *param2); unk32 func_ov000_0207df88(unk32 *, Cylinder *, unk32); void Unknown_func_ov000_0207fd7c(void *, void *, unk32); fx32 func_ov000_02080068(fx32 x); @@ -334,8 +336,8 @@ void func_ov000_0209807c(void *); void func_ov000_020980e0(void *); void func_ov000_02098244(VecFx32 *); void func_ov000_020986b4(s16 *param1, Actor *param2, unk32 param3); -unk32 func_ov000_02098d7c(ActorUnkCANS *param1, UnkStruct_ov063_02162e88 *param2); -void func_ov000_02099870(UnkStruct_ActorUnkCANS_224 *, VecFx32 *, u16); +unk32 func_ov000_02098d7c(ActorLobarrier *param1, UnkStruct_ov063_02162e88 *param2); +void func_ov000_02099870(UnkStruct_ActorLobarrier_224 *, VecFx32 *, u16); void func_ov000_02099e58(UnkStruct_ov063_021632e4 *param1, ActorUnkZLSL_AnimationTag param2, unk32 param8); void func_ov000_02099f64(UnkStruct_ov063_02163784 *param1, ActorUnkZLSL_AnimationTag param2, unk32 param3); bool func_ov000_020a0a90(size_t, unk32, size_t); @@ -366,8 +368,8 @@ unk32 func_ov004_020b697c(void *, unk32 param1); AdventureModeManager_160_18 *func_ov006_020b6ab0(void *, void *); // overlay 7 -void func_ov007_02102850(uint **); -void func_ov007_021028a0(uint **); +void func_ov007_02102850(UnkStruct_027e0ce0 **); +void func_ov007_021028a0(UnkStruct_027e0ce0 **); // overlay 8 GameModeManagerBase_104 *func_ov008_020b6520(void *); diff --git a/src/017_CourseExec/Actor/Actor_017.cpp b/src/017_CourseExec/Actor/Actor_017.cpp index 97640f5c..68f5f5fc 100644 --- a/src/017_CourseExec/Actor/Actor_017.cpp +++ b/src/017_CourseExec/Actor/Actor_017.cpp @@ -331,7 +331,7 @@ void Actor::func_ov017_020bf688() { } } -void Actor::func_ov017_020bf710(UnkStruct_ActorUnkCANS_224 *param1, const VecFx32 *param2, u16 param3) { +void Actor::func_ov017_020bf710(UnkStruct_ActorLobarrier_224 *param1, const VecFx32 *param2, u16 param3) { UNSET_FLAG(this->mFlags, ActorFlag_5); this->mUnk_54 = param1; @@ -355,7 +355,7 @@ void Actor::func_ov017_020bf7a8() { SET_FLAG(this->mFlags, ActorFlag_15); this->func_ov000_02098838(); - UnkStruct_ActorUnkCANS_224 *temp_r4 = this->mUnk_54; + UnkStruct_ActorLobarrier_224 *temp_r4 = this->mUnk_54; temp_r4->mUnk_08.Update(); func_01ff93c0(&this->mVel, 0xC7B); @@ -375,7 +375,7 @@ void Actor::func_ov017_020bf7a8() { } } -void Actor::func_ov017_020bf894(UnkStruct_ActorUnkCANS_224 *param1) { +void Actor::func_ov017_020bf894(UnkStruct_ActorLobarrier_224 *param1) { if (this->mUnk_48 <= 0) { param1->Destroy(); return; diff --git a/src/032_MapA1/Actor/ActorSpinut.cpp b/src/032_MapA1/Actor/ActorSpinut.cpp index 0a177ac8..380b950c 100644 --- a/src/032_MapA1/Actor/ActorSpinut.cpp +++ b/src/032_MapA1/Actor/ActorSpinut.cpp @@ -2,7 +2,6 @@ #include "CommonFuncs.hpp" #include "Actor/ActorManager.hpp" -#include "Actor/Actor_Derived1.hpp" #include "System/Random.hpp" #include "System/SysNew.hpp" #include "Unknown/UnkStruct_027e09a8.hpp" diff --git a/src/063_Shrine/Actor/ActorUnkCANS.cpp b/src/063_Shrine/Actor/ActorLobarrier.cpp similarity index 77% rename from src/063_Shrine/Actor/ActorUnkCANS.cpp rename to src/063_Shrine/Actor/ActorLobarrier.cpp index 3bd6be10..569103cc 100644 --- a/src/063_Shrine/Actor/ActorUnkCANS.cpp +++ b/src/063_Shrine/Actor/ActorLobarrier.cpp @@ -1,10 +1,9 @@ -#include "Actor/ActorUnkCANS.hpp" +#include "Actor/ActorLobarrier.hpp" #include "Actor/Actor.hpp" #include "Actor/ActorId.hpp" #include "Actor/ActorItemBoomerang.hpp" #include "Actor/ActorManager.hpp" #include "Actor/ActorShotArrow.hpp" -#include "Actor/ActorUnkCASE.hpp" #include "CommonFuncs.hpp" #include "Map/MapObjectId.hpp" #include "MapObject/MapObject.hpp" @@ -60,27 +59,41 @@ extern unk32 data_ov000_020aecfc[0x2]; //! INFO: Unsure about the size const Cylinder data_ov063_02162e90(0, 0x99A, 0, 0x99A); -DECL_PROFILE(ActorProfileUnkCANS); +DECL_PROFILE(ActorProfileLobarrier); -static PTMF data_ov063_02162f58[0xB] = { - &ActorUnkCANS::func_ov063_02158b34, &ActorUnkCANS::func_ov063_02158d40, &ActorUnkCANS::func_ov063_021590c8, - &ActorUnkCANS::func_ov063_021591f4, &ActorUnkCANS::func_ov063_02159408, &ActorUnkCANS::func_ov063_021595a4, - &ActorUnkCANS::func_ov063_02159714, &ActorUnkCANS::func_ov063_021598fc, &ActorUnkCANS::func_ov063_02159ca8, - &ActorUnkCANS::func_ov063_02159dfc, &ActorUnkCANS::func_ov063_02159e20, +static PTMF data_ov063_02162f58[ActorLobarrierState_Max] = { + &ActorLobarrier::func_ov063_02158b34, // ActorLobarrierState_Idle + &ActorLobarrier::func_ov063_02158d40, // ActorLobarrierState_Chasing + &ActorLobarrier::func_ov063_021590c8, // ActorLobarrierState_Dying + &ActorLobarrier::func_ov063_021591f4, // ActorLobarrierState_LinkInRange + &ActorLobarrier::func_ov063_02159408, // ActorLobarrierState_Stunned + &ActorLobarrier::func_ov063_021595a4, // ActorLobarrierState_RisingShield + &ActorLobarrier::func_ov063_02159714, // ActorLobarrierState_Hitting + &ActorLobarrier::func_ov063_021598fc, // ActorLobarrierState_Fleeing + &ActorLobarrier::func_ov063_02159ca8, // ActorLobarrierState_Rotating + &ActorLobarrier::func_ov063_02159dfc, // ActorLobarrierState_LosingShield + &ActorLobarrier::func_ov063_02159e20, // ActorLobarrierState_10 }; -static PTMF data_ov063_02162fb0[0xB] = { - &ActorUnkCANS::func_ov063_02158b98, &ActorUnkCANS::func_ov063_02158db0, &ActorUnkCANS::func_ov063_02159100, - &ActorUnkCANS::func_ov063_02159258, &ActorUnkCANS::func_ov063_02159494, &ActorUnkCANS::func_ov063_02159618, - &ActorUnkCANS::func_ov063_02159784, &ActorUnkCANS::func_ov063_021599e4, &ActorUnkCANS::func_ov063_02159d68, - &ActorUnkCANS::func_ov063_02159e1c, &ActorUnkCANS::func_ov063_02159ec0, +static PTMF data_ov063_02162fb0[ActorLobarrierState_Max] = { + &ActorLobarrier::func_ov063_02158b98, // ActorLobarrierState_Idle + &ActorLobarrier::func_ov063_02158db0, // ActorLobarrierState_Chasing + &ActorLobarrier::func_ov063_02159100, // ActorLobarrierState_Dying + &ActorLobarrier::func_ov063_02159258, // ActorLobarrierState_LinkInRange + &ActorLobarrier::func_ov063_02159494, // ActorLobarrierState_Stunned + &ActorLobarrier::func_ov063_02159618, // ActorLobarrierState_RisingShield + &ActorLobarrier::func_ov063_02159784, // ActorLobarrierState_Hitting + &ActorLobarrier::func_ov063_021599e4, // ActorLobarrierState_Fleeing + &ActorLobarrier::func_ov063_02159d68, // ActorLobarrierState_Rotating + &ActorLobarrier::func_ov063_02159e1c, // ActorLobarrierState_LosingShield + &ActorLobarrier::func_ov063_02159ec0, // ActorLobarrierState_10 }; -Actor *ActorProfileUnkCANS::Create() { - return new(HeapIndex_2) ActorUnkCANS(); +Actor *ActorProfileLobarrier::Create() { + return new(HeapIndex_2) ActorLobarrier(); } -ActorProfileUnkCANS::ActorProfileUnkCANS() : +ActorProfileLobarrier::ActorProfileLobarrier() : ActorProfile_Derived1(ActorId_CANS) { mUnk_24 = 0x43415345; VecFx32_Init(0, 0xCCD, 0, &mUnk_04.pos); @@ -93,7 +106,7 @@ UnkStruct_ov063_02162ee8::UnkStruct_ov063_02162ee8(G3d_Model *pModel) : mUnk_70(ModelRenderBase::func_ov000_02057f18(data_ov063_02162538)), mUnk_74(ModelRenderBase::func_ov000_02057f18(data_ov063_02162548)) {} -UnkStruct_ov063_02162e88::UnkStruct_ov063_02162e88(void *param1) : +UnkStruct_ov063_02162e88::UnkStruct_ov063_02162e88(ActorLobarrier *param1) : mUnk_20(param1) {} unk32 UnkStruct_ov063_02162e88::vfunc_04(RefStruct param1, unk32 param2, unk32 param3, unk32 *param4) { @@ -108,12 +121,12 @@ unk32 UnkStruct_ov063_02162e88::vfunc_04(RefStruct param1, unk32 param2, unk32 p return ret1; } - if (((ActorUnkCANS *) mUnk_20)->func_ov063_0215a56c((unk16) func_01ffbbe0(param4[0], param4[2])) != 0 && + if (((ActorLobarrier *) mUnk_20)->func_ov063_0215a56c((unk16) func_01ffbbe0(param4[0], param4[2])) != 0 && param1.common.type != 0) { ActorShotArrow *ret4 = (ActorShotArrow *) gpActorManager->func_01fff3b4(param1); if (ret4 != NULL && ret4->GetActorId() == ActorId_ShotArrow) { - u16 angle = ((ActorUnkCANS *) mUnk_20)->mAngle.angle_s; + u16 angle = ((ActorLobarrier *) mUnk_20)->mAngle.angle_s; fx32 sin_val = FX_MUL(SIN(angle), FX_F32_TO_FX32(1.f)); fx32 cos_val = FX_MUL(COS(angle), FX_F32_TO_FX32(1.f)); VecFx32 vec; @@ -135,9 +148,9 @@ unk32 UnkStruct_ov063_02162e88::vfunc_04(RefStruct param1, unk32 param2, unk32 p } // non-matching -ActorUnkCANS::ActorUnkCANS() : - mUnk_0B0(G3d_GetModelPtr(GET_PROFILE(ActorProfileUnkCANS)->vfunc_04()->mUnk_50)), - mUnk_128(&mUnk_0B0, GET_PROFILE(ActorProfileUnkCANS)->vfunc_04()), +ActorLobarrier::ActorLobarrier() : + mUnk_0B0(G3d_GetModelPtr(GET_PROFILE(ActorProfileLobarrier)->vfunc_04()->mUnk_50)), + mUnk_128(&mUnk_0B0, GET_PROFILE(ActorProfileLobarrier)->vfunc_04()), mUnk_1F4(), mUnk_200(this), mUnk_224(), @@ -157,20 +170,20 @@ ActorUnkCANS::ActorUnkCANS() : mUnk_270 *= mUnk_276; } -bool ActorUnkCANS::Init(unk32 param1) { +bool ActorLobarrier::Init(unk32 param1) { this->mUnk_0B0.func_ov000_02057c38(6, 2); - this->mUnk_0B0.func_ov000_0209a7b8(this, (UnkSystem4_UnkCallback) ActorUnkCANS::func_ov063_0215a678); + this->mUnk_0B0.func_ov000_0209a7b8(this, (UnkSystem4_UnkCallback) ActorLobarrier::func_ov063_0215a678); RefStruct var; ActorManager *actorManager = gpActorManager; - ActorUnkCASE::func_ov063_0215acec(&var, this->mRef); - this->mUnk_268 = (ActorUnkCASE *) actorManager->func_01fff3b4(var); + ActorLobarrierShield::func_ov063_0215acec(&var, this->mRef); + this->shield = (ActorLobarrierShield *) actorManager->func_01fff3b4(var); return true; } -void ActorUnkCANS::Setup(void) { +void ActorLobarrier::Setup(void) { mUnk_26C = mUnk_5C.mInitialAngle; s16 var; @@ -192,36 +205,36 @@ void ActorUnkCANS::Setup(void) { mAngle += DEG_TO_ANG(180); } - this->func_ov063_02158448(0); + this->SetState(ActorLobarrierState_Idle); } -void ActorUnkCANS::func_ov063_02158424(void) { +void ActorLobarrier::func_ov063_02158424(void) { mUnk_274 = 0; if (mState == 6) { this->mUnk_238.Set(0, 20); } } -void ActorUnkCANS::func_ov063_02158448(unk32 param1) { +void ActorLobarrier::SetState(ActorState state) { this->func_ov063_02158424(); - mState = param1; - CALL_PTMF(PTMF, data_ov063_02162f58[mState]); + mState = state; + CALL_PTMF(PTMF, data_ov063_02162f58[mState]); } -void ActorUnkCANS::func_ov063_02158490(void) { +void ActorLobarrier::func_ov063_02158490(void) { mUnk_48 -= mUnk_200.mUnk_1E; this->func_ov017_020bf050(&mUnk_200, 1); - this->func_ov063_02158448(2); + this->SetState(ActorLobarrierState_Dying); } -void ActorUnkCANS::vfunc_24(void) { +void ActorLobarrier::vfunc_24(void) { if (data_027e09b8->HasAdventureFlag(AdventureFlag_VisitedIslandSanctuaryFirstTime)) { this->Update(); } } // non-matching -void ActorUnkCANS::Update(void) { +void ActorLobarrier::Update(void) { this->mUnk_238.Update(); if (!this->func_ov017_020bef4c(0x4000) && mUnk_48 != 0 && mState != 4) { @@ -229,7 +242,7 @@ void ActorUnkCANS::Update(void) { } mUnk_3C = &mUnk_200; - CALL_PTMF(PTMF, data_ov063_02162fb0[mState]); + CALL_PTMF(PTMF, data_ov063_02162fb0[mState]); this->func_ov017_020bf894(&mUnk_224); this->func_ov000_02098838(); @@ -237,8 +250,8 @@ void ActorUnkCANS::Update(void) { VecFx32_Copy(&mPos, &mPrevPos); VecFx32_Add(&mPos, &mVel, &mPos); - if (mUnk_268 != NULL) { - mUnk_268->func_ov063_0215b6c8(&mUnk_250, mAngle); + if (this->shield != NULL) { + this->shield->func_ov063_0215b6c8(&this->mUnk_250, this->mAngle); } this->func_ov000_02098b8c(1, &mUnk_23C); @@ -261,8 +274,8 @@ void ActorUnkCANS::Update(void) { if (mUnk_48 > 0) { if (!this->mUnk_234.HasExpired()) { - if (mUnk_268 != NULL) { - mUnk_268->mUnk_1F4 = 0; + if (this->shield != NULL) { + this->shield->mUnk_1F4 = 0; } } else { @@ -281,23 +294,23 @@ void ActorUnkCANS::Update(void) { ((ActorItemBoomerang *) iVar6)->func_ov031_020e49b0(0x8D70); } if (mState != 4) { - this->func_ov063_02158448(5); + this->SetState(ActorLobarrierState_RisingShield); } } else { this->Actor_Derived2::func_ov017_020bf178(&mUnk_200, 1); mUnk_224.func_ov000_02099a0c(); - this->func_ov063_02158448(4); + this->SetState(ActorLobarrierState_Stunned); } break; case 4: { - if (mUnk_268 == NULL) { + if (this->shield == NULL) { if (data_027e0d38->func_ov031_020d9c04(1, 0, 0) != 0) { - this->func_ov063_02158448(10); + this->SetState(ActorLobarrierState_10); } } else { data_027e0d38->func_ov031_020d9c44(data_ov000_020aed00); if (mState != 4) { - this->func_ov063_02158448(5); + this->SetState(ActorLobarrierState_RisingShield); } } break; @@ -321,7 +334,7 @@ void ActorUnkCANS::Update(void) { data_027e09a8->func_ov000_02071b30(0x8C98, &mPos, 0); } if (mState != 4) { - this->func_ov063_02158448(5); + this->SetState(ActorLobarrierState_RisingShield); } } else { this->func_ov063_02158490(); @@ -330,7 +343,7 @@ void ActorUnkCANS::Update(void) { case 3: if (iVar5 != 0) { if (mState != 4) { - this->func_ov063_02158448(5); + this->SetState(ActorLobarrierState_RisingShield); } break; } @@ -349,7 +362,7 @@ void ActorUnkCANS::Update(void) { if (iVar5 != 0) { this->func_ov017_020bfb18(&mUnk_200); if (mState != 4) { - this->func_ov063_02158448(5); + this->SetState(ActorLobarrierState_RisingShield); } } else { this->func_ov063_02158490(); @@ -357,8 +370,8 @@ void ActorUnkCANS::Update(void) { break; } } - if (mUnk_268 != NULL) { - mUnk_268->mUnk_1F4 = iVar5; + if (this->shield != NULL) { + this->shield->mUnk_1F4 = iVar5; } } } @@ -371,7 +384,7 @@ void ActorUnkCANS::Update(void) { // unk32 puVar11[0xF]; - if (mUnk_268 != NULL) { + if (this->shield != NULL) { VecFx32 a; UnkStruct_ov000_0207de98 b; VecFx32 *aPtr = &a; @@ -408,14 +421,14 @@ void ActorUnkCANS::Update(void) { } } -void ActorUnkCANS::vfunc_2C(unk32 param1) { +void ActorLobarrier::vfunc_2C(unk32 param1) { if (!this->func_01fff5d0(param1, 0)) { return; } mUnk_0B0.func_01ffc6d4(mAngle, &mPos); - if (mUnk_268 != NULL) { + if (this->shield != NULL) { VecFx32 vec; VecFx32_Init(0x4CD, 0, 0, &vec); @@ -428,19 +441,19 @@ void ActorUnkCANS::vfunc_2C(unk32 param1) { } } -void ActorUnkCANS::func_ov063_02158b0c(void) { - mUnk_268 = NULL; +void ActorLobarrier::func_ov063_02158b0c(void) { + this->shield = NULL; mUnk_38->mUnk_08 = 1; mUnk_34 = (Cylinder *) &data_ov063_02162e90; mUnk_30 = (Cylinder *) &data_ov063_02162e90; } -void ActorUnkCANS::func_ov063_02158b34(void) { +void ActorLobarrier::func_ov063_02158b34(void) { mUnk_128.vfunc_1C(data_ov063_02163068, 0x1000, 0x19A, 0); } // non-matching -void ActorUnkCANS::func_ov063_02158b98(void) { +void ActorLobarrier::func_ov063_02158b98(void) { if (mUnk_128.vfunc_28()->func_02015080(0x1000) || mUnk_128.vfunc_28()->func_02015080(0x11000) || mUnk_128.vfunc_28()->func_02015080(0x21000)) { data_027e09a8->func_ov000_02071b30(0x985F, &mPos, 0); @@ -461,22 +474,22 @@ void ActorUnkCANS::func_ov063_02158b98(void) { mVel.z = FX_MUL(COS(angle), mUnk_270); if (this->func_ov063_0215a514() != 0) { - this->func_ov063_02158448(8); + this->SetState(ActorLobarrierState_Rotating); return; } if (this->func_ov063_02159f3c(0x3000) != 0) { - this->func_ov063_02158448(1); + this->SetState(ActorLobarrierState_Chasing); } } -void ActorUnkCANS::func_ov063_02158d40(void) { +void ActorLobarrier::func_ov063_02158d40(void) { this->mUnk_128.vfunc_1C(data_ov063_02163068, 0x1800, 0x19A, 0); this->mUnk_238.Init(); } // non-matching -void ActorUnkCANS::func_ov063_02158db0(void) { +void ActorLobarrier::func_ov063_02158db0(void) { if (mUnk_128.vfunc_28()->func_02015080(0x1000) || mUnk_128.vfunc_28()->func_02015080(0xD000) || mUnk_128.vfunc_28()->func_02015080(0x19000) || mUnk_128.vfunc_28()->func_02015080(0x25000)) { data_027e09a8->func_ov000_02071b30(0x985F, &mPos, 0); @@ -511,12 +524,12 @@ void ActorUnkCANS::func_ov063_02158db0(void) { mVel.z = FX_MUL(cos_val, mUnk_270); if (this->func_ov063_0215a514()) { - this->func_ov063_02158448(8); + this->SetState(ActorLobarrierState_Rotating); return; } if (!this->func_ov063_02159f3c(0x4000)) { - this->func_ov063_02158448(0); + this->SetState(ActorLobarrierState_Idle); return; } @@ -525,19 +538,19 @@ void ActorUnkCANS::func_ov063_02158db0(void) { } if (this->func_ov063_0215a474()) { - this->func_ov063_02158448(6); + this->SetState(ActorLobarrierState_Hitting); return; } - this->func_ov063_02158448(3); + this->SetState(ActorLobarrierState_LinkInRange); } -void ActorUnkCANS::func_ov063_021590c8(void) { +void ActorLobarrier::func_ov063_021590c8(void) { this->Actor::func_ov017_020bf634(&mUnk_200.mUnk_10, this->func_ov063_0215a5bc(), this->func_ov063_0215a5d8()); mUnk_200.func_ov000_02097bec(); } -void ActorUnkCANS::func_ov063_02159100(void) { +void ActorLobarrier::func_ov063_02159100(void) { this->Actor::func_ov017_020bf688(); if (!GET_FLAG(this->mFlags, ActorFlag_5)) { @@ -545,8 +558,8 @@ void ActorUnkCANS::func_ov063_02159100(void) { } if (mUnk_48 <= 0) { - if (mUnk_268 != NULL) { - mUnk_268->func_ov000_020984d0(); + if (this->shield != NULL) { + this->shield->func_ov000_020984d0(); } this->vfunc_54(0); return; @@ -554,12 +567,12 @@ void ActorUnkCANS::func_ov063_02159100(void) { u16 *tmpArr = (u16 *) &mUnk_224.mUnk_08; if (tmpArr[0] < tmpArr[1]) { - this->func_ov063_02158448(4); + this->SetState(ActorLobarrierState_Stunned); return; } if (this->func_ov063_0215a514() != 0) { - this->func_ov063_02158448(8); + this->SetState(ActorLobarrierState_Rotating); return; } @@ -568,24 +581,24 @@ void ActorUnkCANS::func_ov063_02159100(void) { return; } - if (mUnk_268 == NULL) { - this->func_ov063_02158448(7); + if (this->shield == NULL) { + this->SetState(ActorLobarrierState_Fleeing); return; } if (this->func_ov063_02159f3c(0x3000)) { - this->func_ov063_02158448(1); + this->SetState(ActorLobarrierState_Chasing); return; } - this->func_ov063_02158448(0); + this->SetState(ActorLobarrierState_Idle); } -void ActorUnkCANS::func_ov063_021591f4(void) { +void ActorLobarrier::func_ov063_021591f4(void) { mUnk_128.vfunc_1C(data_ov063_02163068, 0x1000, 0x19A, 0); } -void ActorUnkCANS::func_ov063_02159258(void) { +void ActorLobarrier::func_ov063_02159258(void) { if (mUnk_128.vfunc_28()->func_02015080(0x6000) || mUnk_128.vfunc_28()->func_02015080(0xF000)) { data_027e09a8->func_ov000_02071b30(0x9860, &mPos, 0); } @@ -604,21 +617,21 @@ void ActorUnkCANS::func_ov063_02159258(void) { mVel.z = FX_MUL(cos_val, val); if (!mUnk_270 && this->func_ov063_0215a514()) { - this->func_ov063_02158448(8); + this->SetState(ActorLobarrierState_Rotating); } else if (!mUnk_270 && this->mUnk_238.HasReachedMaxU() && this->func_ov063_0215a474()) { - this->func_ov063_02158448(6); + this->SetState(ActorLobarrierState_Hitting); } else if (!this->func_ov063_0215a2c0()) { - this->func_ov063_02158448(1); + this->SetState(ActorLobarrierState_Chasing); } } -void ActorUnkCANS::func_ov063_02159408(void) { +void ActorLobarrier::func_ov063_02159408(void) { this->func_ov000_02099450(&mUnk_224, &data_027e07d4, 0, data_ov000_020aecf0[0]); mUnk_128.vfunc_1C(data_ov063_02163068, 0, 0x19A, 0); mUnk_200.func_ov000_02097bec(); } -void ActorUnkCANS::func_ov063_02159494(void) { +void ActorLobarrier::func_ov063_02159494(void) { this->func_ov000_020994a0(); if (GET_FLAG(mFlags, ActorFlag_5) == 0) { @@ -626,7 +639,7 @@ void ActorUnkCANS::func_ov063_02159494(void) { } if (this->func_ov063_0215a514()) { - this->func_ov063_02158448(8); + this->SetState(ActorLobarrierState_Rotating); return; } @@ -636,19 +649,19 @@ void ActorUnkCANS::func_ov063_02159494(void) { return; } - if (mUnk_268 == NULL) { - this->func_ov063_02158448(7); + if (this->shield == NULL) { + this->SetState(ActorLobarrierState_Fleeing); } else { if (this->func_ov063_02159f3c(0x3000)) { - this->func_ov063_02158448(1); + this->SetState(ActorLobarrierState_Chasing); } else { - this->func_ov063_02158448(0); + this->SetState(ActorLobarrierState_Idle); } } } -void ActorUnkCANS::func_ov063_021595a4(void) { +void ActorLobarrier::func_ov063_021595a4(void) { mVel.x = 0; mVel.z = 0; mUnk_270 = 0; @@ -656,7 +669,7 @@ void ActorUnkCANS::func_ov063_021595a4(void) { mUnk_200.func_ov000_02097bec(); } -void ActorUnkCANS::func_ov063_02159618(void) { +void ActorLobarrier::func_ov063_02159618(void) { if (!mUnk_128.vfunc_28()->func_01ff8fa8()) { return; } @@ -668,22 +681,22 @@ void ActorUnkCANS::func_ov063_02159618(void) { } if (this->func_ov063_0215a474()) { - this->func_ov063_02158448(6); + this->SetState(ActorLobarrierState_Hitting); } else if (this->func_ov063_02159f3c(0x3000)) { - this->func_ov063_02158448(1); + this->SetState(ActorLobarrierState_Chasing); } else { - this->func_ov063_02158448(0); + this->SetState(ActorLobarrierState_Idle); } } -void ActorUnkCANS::func_ov063_02159714(void) { +void ActorLobarrier::func_ov063_02159714(void) { mVel.x = 0; mVel.z = 0; mUnk_270 = 0; mUnk_128.vfunc_1C(data_ov063_02163098, 0x1000, 0x19A, 0); } -void ActorUnkCANS::func_ov063_02159784(void) { +void ActorLobarrier::func_ov063_02159784(void) { if (mUnk_128.vfunc_28()->func_02015080(0x7000)) { data_027e09a8->func_ov000_02071b30(0x9862, &mPos, 0); } @@ -714,22 +727,22 @@ void ActorUnkCANS::func_ov063_02159784(void) { } if (this->func_ov063_0215a514()) { - this->func_ov063_02158448(8); + this->SetState(ActorLobarrierState_Rotating); } else if (this->func_ov063_0215a2c0()) { - this->func_ov063_02158448(3); + this->SetState(ActorLobarrierState_LinkInRange); } else { - this->func_ov063_02158448(1); + this->SetState(ActorLobarrierState_Chasing); } } -void ActorUnkCANS::func_ov063_021598fc(void) { +void ActorLobarrier::func_ov063_021598fc(void) { mUnk_128.vfunc_1C(data_ov063_02163080, 0x1333, 0x19A, 0); this->mTimer.Set(0, gRandom.Next32(21) + 10); mUnk_276 = gRandom.Next32(0) & 0x80000000 ? 1 : -1; } // non-matching -void ActorUnkCANS::func_ov063_021599e4(void) { +void ActorLobarrier::func_ov063_021599e4(void) { if (mUnk_128.vfunc_28()->func_02015080(0x1000) || mUnk_128.vfunc_28()->func_02015080(0xA000) || mUnk_128.vfunc_28()->func_02015080(0x13000) || mUnk_128.vfunc_28()->func_02015080(0x1C000)) { data_027e09a8->func_ov000_02071b30(0x9864, &mPos, 0); @@ -761,11 +774,11 @@ void ActorUnkCANS::func_ov063_021599e4(void) { mVel.z = FX_MUL(cos_val1, FX_F32_TO_FX32(0.02f)) + FX_MUL(cos_val2, mUnk_270); if (this->func_ov063_0215a514()) { - this->func_ov063_02158448(8); + this->SetState(ActorLobarrierState_Rotating); } } -void ActorUnkCANS::func_ov063_02159ca8(void) { +void ActorLobarrier::func_ov063_02159ca8(void) { mUnk_128.vfunc_1C(data_ov063_02163068, 0x1333, 0x19A, 0); mVel.x = 0; mVel.z = 0; @@ -783,7 +796,7 @@ void ActorUnkCANS::func_ov063_02159ca8(void) { mUnk_26C += -FX_F32_TO_FX32(8.f); } -void ActorUnkCANS::func_ov063_02159d68(void) { +void ActorLobarrier::func_ov063_02159d68(void) { if (this->func_ov063_0215a514()) { mUnk_26C += -FX_F32_TO_FX32(8.f); } @@ -794,18 +807,18 @@ void ActorUnkCANS::func_ov063_02159d68(void) { VecFx32_Init(0, 0, 0, &mUnk_23C.mUnk_08); - if (mUnk_268 != NULL) { + if (this->shield != NULL) { if (this->func_ov063_0215a474()) { - this->func_ov063_02158448(3); + this->SetState(ActorLobarrierState_LinkInRange); return; } - this->func_ov063_02158448(1); + this->SetState(ActorLobarrierState_Chasing); } else { - this->func_ov063_02158448(7); + this->SetState(ActorLobarrierState_Fleeing); } } -void ActorUnkCANS::func_ov063_02159dfc(void) { +void ActorLobarrier::func_ov063_02159dfc(void) { mVel.x = 0; mVel.z = 0; mUnk_270 = 0; @@ -813,9 +826,9 @@ void ActorUnkCANS::func_ov063_02159dfc(void) { } // Empty (matched) -void ActorUnkCANS::func_ov063_02159e1c(void) {} +void ActorLobarrier::func_ov063_02159e1c(void) {} -void ActorUnkCANS::func_ov063_02159e20(void) { +void ActorLobarrier::func_ov063_02159e20(void) { this->func_ov000_02098f34(&mUnk_200.mUnk_10); vfunc_40(); @@ -831,7 +844,7 @@ void ActorUnkCANS::func_ov063_02159e20(void) { } // non-matching -void ActorUnkCANS::func_ov063_02159ec0(void) { +void ActorLobarrier::func_ov063_02159ec0(void) { this->vfunc_44(); if (!GET_FLAG(mFlags, ActorFlag_5)) { @@ -846,14 +859,14 @@ void ActorUnkCANS::func_ov063_02159ec0(void) { VecFx32_Init(FX_F32_TO_FX32(0.0f), FX_F32_TO_FX32(0.0f), FX_F32_TO_FX32(0.0f), &mUnk_200.mUnk_10); - this->func_ov063_02158448(4); + this->SetState(ActorLobarrierState_Stunned); *(s16 *) &mUnk_44 |= 0x20; } // non-matching // return bool ? -unk32 ActorUnkCANS::func_ov063_02159f3c(unk32 param1) { +unk32 ActorLobarrier::func_ov063_02159f3c(unk32 param1) { s16 var; func_ov000_020986b4((s16 *) &var, this, 0); @@ -896,7 +909,7 @@ unk32 ActorUnkCANS::func_ov063_02159f3c(unk32 param1) { // non-matching // return bool ? -unk32 ActorUnkCANS::func_ov063_0215a0f0(void) { +unk32 ActorLobarrier::func_ov063_0215a0f0(void) { s16 var1; func_ov000_020986b4((s16 *) &var1, this, 0); @@ -943,7 +956,7 @@ unk32 ActorUnkCANS::func_ov063_0215a0f0(void) { } // non-matching -unk32 ActorUnkCANS::func_ov063_0215a2c0(void) { +unk32 ActorLobarrier::func_ov063_0215a2c0(void) { s16 var1; func_ov000_020986b4((s16 *) &var1, this, 0); unk32 val1 = ABS((s16) (var1 - mUnk_26C)); @@ -989,20 +1002,20 @@ unk32 ActorUnkCANS::func_ov063_0215a2c0(void) { return func_01ff9a5c(otherVecPtr, &mPos, &stackVec) < 0xB33; } -void ActorUnkCANS::func_ov063_0215a428(void) { +void ActorLobarrier::func_ov063_0215a428(void) { // A not very clean code to access 22C and 22E matching the asm u16 *values = (u16 *) &mUnk_224.mUnk_08; if (values[0] < values[1]) { - this->func_ov063_02158448(4); - } else if (mUnk_268 == NULL) { - this->func_ov063_02158448(7); + this->SetState(ActorLobarrierState_Stunned); + } else if (this->shield == NULL) { + this->SetState(ActorLobarrierState_Fleeing); } else { - this->func_ov063_02158448(0); + this->SetState(ActorLobarrierState_Idle); } } // return bool ? -unk32 ActorUnkCANS::func_ov063_0215a474(void) { +unk32 ActorLobarrier::func_ov063_0215a474(void) { s16 var; VecFx32 stackVec; @@ -1031,7 +1044,7 @@ unk32 ActorUnkCANS::func_ov063_0215a474(void) { #endif } -unk32 ActorUnkCANS::func_ov063_0215a514(void) { +unk32 ActorLobarrier::func_ov063_0215a514(void) { s16 var; func_ov000_020986b4((s16 *) &var, this, 0); @@ -1041,8 +1054,8 @@ unk32 ActorUnkCANS::func_ov063_0215a514(void) { } // return bool ? -unk32 ActorUnkCANS::func_ov063_0215a56c(unk32 param1) { - if (mUnk_268 == NULL) { +unk32 ActorLobarrier::func_ov063_0215a56c(unk32 param1) { + if (this->shield == NULL) { return false; } @@ -1050,7 +1063,7 @@ unk32 ActorUnkCANS::func_ov063_0215a56c(unk32 param1) { } // non-matching -void ActorUnkCANS::func_ov063_0215a5a0(VecFx32 *param1) { +void ActorLobarrier::func_ov063_0215a5a0(VecFx32 *param1) { // Does not match instruction order VecFx32 vec; vec.x = mUnk_250.x; @@ -1061,27 +1074,27 @@ void ActorUnkCANS::func_ov063_0215a5a0(VecFx32 *param1) { param1->y = vec.y; } -unk32 ActorUnkCANS::func_ov063_0215a5bc(void) { - if (mUnk_268 != NULL) { +unk32 ActorLobarrier::func_ov063_0215a5bc(void) { + if (this->shield != NULL) { return 10; } return data_ov000_020aecf4[0]; } -unk32 ActorUnkCANS::func_ov063_0215a5d8(void) { - if (mUnk_268 != NULL) { +unk32 ActorLobarrier::func_ov063_0215a5d8(void) { + if (this->shield != NULL) { return 0x385; } return data_ov000_020aecfc[0]; } // non-matching -void ActorUnkCANS::vfunc_10(Cylinder *param1) { +void ActorLobarrier::vfunc_10(Cylinder *param1) { Cylinder *cylinder = this->mUnk_34; *param1 = *cylinder; VecFx32_Add(¶m1->pos, &this->mPos, ¶m1->pos); - if (this->mUnk_268 != NULL) { + if (this->shield != NULL) { fx16 angle = this->mAngle.angle_s; VecFx32 pos; VecFx32_Init(FX_F32_TO_FX32(0.25f), 0, 0, &pos); @@ -1090,10 +1103,10 @@ void ActorUnkCANS::vfunc_10(Cylinder *param1) { } } -void ActorUnkCANS::func_ov063_0215a678(ActorUnkCANS *actor, UnkStruct_func_ov063_0215a678 *param2) { +void ActorLobarrier::func_ov063_0215a678(ActorLobarrier *actor, UnkStruct_func_ov063_0215a678 *param2) { ModelRender *modelRender = param2->mUnk_04; - if (actor->mUnk_268 == NULL) { + if (actor->shield == NULL) { func_0200eab0(modelRender->mpModel, actor->mUnk_0B0.mUnk_6C, 0x00); } else { func_0200eab0(modelRender->mpModel, actor->mUnk_0B0.mUnk_6C, 0x1F); @@ -1147,12 +1160,12 @@ void ActorUnkCANS::func_ov063_0215a678(ActorUnkCANS *actor, UnkStruct_func_ov063 func_01ffad5c(&matx3, &data_027e0964, &matx4); VecFx32 vec; - vec.x = matx4._30; - vec.z = matx4._32; - vec.y = matx4._31; - actor->mUnk_25C = vec.x; - actor->mUnk_260 = vec.y; - actor->mUnk_264 = vec.z; + vec.x = matx4._30; + vec.z = matx4._32; + vec.y = matx4._31; + actor->mUnk_25C.x = vec.x; + actor->mUnk_25C.y = vec.y; + actor->mUnk_25C.z = vec.z; param2->mUnk_92 = 2; ((u8 *) &modelRender->mRenderObj.mUnk_1C)[1] = 2; diff --git a/src/063_Shrine/Actor/ActorUnkCASE.cpp b/src/063_Shrine/Actor/ActorLobarrierShield.cpp similarity index 60% rename from src/063_Shrine/Actor/ActorUnkCASE.cpp rename to src/063_Shrine/Actor/ActorLobarrierShield.cpp index 12ccd3be..d704a67b 100644 --- a/src/063_Shrine/Actor/ActorUnkCASE.cpp +++ b/src/063_Shrine/Actor/ActorLobarrierShield.cpp @@ -1,9 +1,9 @@ -#include "Actor/ActorUnkCASE.hpp" +#include "Actor/ActorLobarrierShield.hpp" #include "Actor/Actor.hpp" #include "Actor/ActorId.hpp" +#include "Actor/ActorLobarrier.hpp" #include "Actor/ActorManager.hpp" #include "Actor/ActorShotArrow.hpp" -#include "Actor/ActorUnkCANS.hpp" #include "Actor/ActorUnkITWP.hpp" #include "CommonFuncs.hpp" #include "Physics/Cylinder.hpp" @@ -50,24 +50,32 @@ struct UnkStruct_data_ov063_021630c8 { const UnkStruct_data_ov063_021630c8 data_ov063_021630c8(0x5EC, 0x785, 0xFFFFFD48, 0x7AE, 0x112, 0xFFFFECA4); -static PTMF data_ov063_021630e0[0x6] = { - &ActorUnkCASE::func_ov063_0215af58, &ActorUnkCASE::func_ov063_0215af60, &ActorUnkCASE::func_ov063_0215afb8, - &ActorUnkCASE::func_ov063_0215b090, &ActorUnkCASE::func_ov063_0215b244, &ActorUnkCASE::func_ov063_0215b2c4, +static PTMF data_ov063_021630e0[ActorLobarrierShieldState_Max] = { + &ActorLobarrierShield::func_ov063_0215af58, // ActorLobarrierShieldState_Held + &ActorLobarrierShield::func_ov063_0215af60, // ActorLobarrierShieldState_Grabbing + &ActorLobarrierShield::func_ov063_0215afb8, // ActorLobarrierShieldState_Grabbed + &ActorLobarrierShield::func_ov063_0215b090, // ActorLobarrierShieldState_Thrown + &ActorLobarrierShield::func_ov063_0215b244, // ActorLobarrierShieldState_Releasing + &ActorLobarrierShield::func_ov063_0215b2c4, // ActorLobarrierShieldState_LyingOnGround }; -static PTMF data_ov063_02163110[0x6] = { - &ActorUnkCASE::func_ov063_0215af54, &ActorUnkCASE::func_ov063_0215af5c, &ActorUnkCASE::func_ov063_0215afa4, - &ActorUnkCASE::func_ov063_0215b054, &ActorUnkCASE::func_ov063_0215b1bc, &ActorUnkCASE::func_ov063_0215b2b0, +static PTMF data_ov063_02163110[ActorLobarrierShieldState_Max] = { + &ActorLobarrierShield::func_ov063_0215af54, // ActorLobarrierShieldState_Held + &ActorLobarrierShield::func_ov063_0215af5c, // ActorLobarrierShieldState_Grabbing + &ActorLobarrierShield::func_ov063_0215afa4, // ActorLobarrierShieldState_Grabbed + &ActorLobarrierShield::func_ov063_0215b054, // ActorLobarrierShieldState_Thrown + &ActorLobarrierShield::func_ov063_0215b1bc, // ActorLobarrierShieldState_Releasing + &ActorLobarrierShield::func_ov063_0215b2b0, // ActorLobarrierShieldState_LyingOnGround }; -DECL_PROFILE(ActorProfileUnkCASE); +DECL_PROFILE(ActorProfileLobarrierShield); // non-matching (profile is smaller than target) -Actor *ActorProfileUnkCASE::Create() { - return new(HeapIndex_2) ActorUnkCASE(); +Actor *ActorProfileLobarrierShield::Create() { + return new(HeapIndex_2) ActorLobarrierShield(); } -ActorProfileUnkCASE::ActorProfileUnkCASE() : +ActorProfileLobarrierShield::ActorProfileLobarrierShield() : ActorProfile_Derived1(ActorId_CASE) { VecFx32_Init(0, 0x666, 0, &mUnk_04.pos); mUnk_04.size = 0x800; @@ -77,17 +85,18 @@ UnkStruct_ov063_021631a0::UnkStruct_ov063_021631a0(G3d_Model *pModel) : UnkStruct_ov000_020b3268(pModel), mUnk_6C(ModelRender::func_ov000_02057f18(&data_ov063_02162568)) {} -ActorUnkCASE_150::ActorUnkCASE_150(Actor *param1) : +ActorLobarrierShield_150::ActorLobarrierShield_150(Actor *param1) : Actor_C4(param1, 1) { mUnk_20 = param1; mUnk_04 = 1; } -bool ActorUnkCASE_150::vfunc_00(RefStruct ref, unk32 param2) { - ActorUnkCASE *actor = (ActorUnkCASE *) mUnk_20; +bool ActorLobarrierShield_150::vfunc_00(RefStruct ref, unk32 param2) { + ActorLobarrierShield *actor = (ActorLobarrierShield *) mUnk_20; if (actor->mUnk_1F4 == 0) { bool cond = true; - if ((u32) actor->mState != 5 && actor->mState != 4) { + if ((u32) actor->mState != ActorLobarrierShieldState_LyingOnGround && + actor->mState != ActorLobarrierShieldState_Releasing) { cond = false; } if (!cond) { @@ -102,28 +111,28 @@ bool ActorUnkCASE_150::vfunc_00(RefStruct ref, unk32 param2) { return Actor_C4::vfunc_00(ref, param2); } -bool ActorUnkCASE_150::vfunc_04() { - ((ActorUnkCASE *) mUnk_20)->func_ov063_0215b854(); +bool ActorLobarrierShield_150::vfunc_04() { + ((ActorLobarrierShield *) mUnk_20)->func_ov063_0215b854(); return Actor_C4::vfunc_04(); } -void ActorUnkCASE_150::vfunc_0C(VecFx32 *param1) { - ((ActorUnkCASE *) mUnk_20)->func_ov063_0215b8e8(param1); +void ActorLobarrierShield_150::vfunc_0C(VecFx32 *param1) { + ((ActorLobarrierShield *) mUnk_20)->func_ov063_0215b8e8(param1); Actor_C4::vfunc_0C(param1); } -ActorUnkCASE_174::ActorUnkCASE_174(Actor *param1) { +ActorLobarrierShield_174::ActorLobarrierShield_174(Actor *param1) { mUnk_04 = 0; mUnk_2C = param1; } -void ActorUnkCASE_174::vfunc_10(const Actor *actor) { - ((ActorUnkCASE *) mUnk_2C)->func_ov063_0215b724(); +void ActorLobarrierShield_174::vfunc_10(const Actor *actor) { + ((ActorLobarrierShield *) mUnk_2C)->func_ov063_0215b724(); func_ov000_0207b70c(this, (Actor *) actor); } // Static -void ActorUnkCASE::func_ov063_0215acec(RefStruct *ref1, RefStruct ref2) { +void ActorLobarrierShield::func_ov063_0215acec(RefStruct *ref1, RefStruct ref2) { ActorParams params; params.mUnk_28 = 0; @@ -132,11 +141,11 @@ void ActorUnkCASE::func_ov063_0215acec(RefStruct *ref1, RefStruct ref2) { Actor::func_ov000_020973f4(ref1, &data_ov000_020b539c_eur, ActorId_CASE, ¶ms, 0); } -ActorUnkCASE::ActorUnkCASE() : - mUnk_0B0(G3d_GetModelPtr(GET_PROFILE(ActorProfileUnkCASE)->vfunc_04()->mUnk_50)), +ActorLobarrierShield::ActorLobarrierShield() : + mUnk_0B0(G3d_GetModelPtr(GET_PROFILE(ActorProfileLobarrierShield)->vfunc_04()->mUnk_50)), mUnk_120(0), mUnk_124(this), - mUnk_14C(NULL), + lobarrier(NULL), mUnk_150(this), mUnk_174(this), mUnk_1C8(0), @@ -150,64 +159,65 @@ ActorUnkCASE::ActorUnkCASE() : mUnk_40 = &mUnk_150; mUnk_124.mUnk_04 = 0; SET_FLAG2(mUnk_124.mUnk_04, ActorFlag_13); - mUnk_124.mUnk_24 = 1; + mUnk_124.mUnk_24 = true; mUnk_38 = (Actor_38 *) &mUnk_1E8; mUnk_38->mUnk_08 = 4; mUnk_A8 = (Actor_Derived2_A8_PTR *) &data_ov063_02162558; } -bool ActorUnkCASE::Init(unk32 param1) { - mUnk_14C = gpActorManager->func_01fff3b4(mUnk_5C.mUnk_28); +bool ActorLobarrierShield::Init(unk32 param1) { +#pragma unused(param1) + this->lobarrier = (ActorLobarrier *) gpActorManager->func_01fff3b4(mUnk_5C.mUnk_28); mUnk_0B0.func_ov000_02057c38(6, 2); - mUnk_0B0.func_ov000_0209a7b8(this, (UnkSystem4_UnkCallback) ActorUnkCASE::func_ov063_0215b99c); + mUnk_0B0.func_ov000_0209a7b8(this, (UnkSystem4_UnkCallback) ActorLobarrierShield::func_ov063_0215b99c); - this->func_ov063_0215aefc(0); + this->SetState(ActorLobarrierShieldState_Held); VecFx32_Init(0, 0, 0, &mVel); return true; } -void ActorUnkCASE::func_ov063_0215aefc(ActorState param1) { - mState = param1; +void ActorLobarrierShield::SetState(ActorState state) { + mState = state; mUnk_2C = data_ov000_020aecf8[0]; mUnk_120 = 0; - CALL_PTMF(PTMF, data_ov063_02163110[mState]); + CALL_PTMF(PTMF, data_ov063_02163110[mState]); } // Matched -void ActorUnkCASE::func_ov063_0215af54(void) {} +void ActorLobarrierShield::func_ov063_0215af54() {} // Matched -void ActorUnkCASE::func_ov063_0215af58(void) {} +void ActorLobarrierShield::func_ov063_0215af58() {} // Matched -void ActorUnkCASE::func_ov063_0215af5c(void) {} +void ActorLobarrierShield::func_ov063_0215af5c() {} -void ActorUnkCASE::func_ov063_0215af60(void) { +void ActorLobarrierShield::func_ov063_0215af60() { if (gpActorManager->func_01fff3b4(mUnk_1E4)) { return; } - if (mUnk_14C != NULL) { - ((ActorUnkCANS *) mUnk_14C)->func_ov063_0215a428(); + if (this->lobarrier != NULL) { + this->lobarrier->func_ov063_0215a428(); } - this->func_ov063_0215aefc(0); + this->SetState(ActorLobarrierShieldState_Held); } -void ActorUnkCASE::func_ov063_0215afa4(void) { +void ActorLobarrierShield::func_ov063_0215afa4() { mUnk_2C = 0; mVel.x = 0; mVel.z = 0; } -void ActorUnkCASE::func_ov063_0215afb8(void) { +void ActorLobarrierShield::func_ov063_0215afb8() { ActorUnkITWP *otherActor = (ActorUnkITWP *) gpActorManager->func_01fff3b4(mUnk_1E4); if (otherActor == NULL) { - this->func_ov063_0215aefc(4); + this->SetState(ActorLobarrierShieldState_Releasing); return; } @@ -226,15 +236,15 @@ void ActorUnkCASE::func_ov063_0215afb8(void) { mPrevPos.z = vec.z; } -void ActorUnkCASE::func_ov063_0215b054(void) { +void ActorLobarrierShield::func_ov063_0215b054() { mVel.x = mUnk_1D8; - mVel.y = 0; + mVel.y = FX_F32_TO_FX32(0.0f); mVel.z = mUnk_1E0; UNSET_FLAG2(*(s16 *) &mUnk_44, ActorFlag_5); this->mTimer.Reset(); } -void ActorUnkCASE::func_ov063_0215b090(void) { +void ActorLobarrierShield::func_ov063_0215b090() { if (this->mTimer.value < 4) { this->func_ov063_0215afb8(); this->mTimer.Update(); @@ -247,7 +257,7 @@ void ActorUnkCASE::func_ov063_0215b090(void) { VecFx32_Copy(&mPos, &mPrevPos); VecFx32_Add(&mPos, &mVel, &mPos); - if (mVel.x == 0 && mVel.z == 0) { + if (mVel.x == FX_F32_TO_FX32(0.0f) && mVel.z == FX_F32_TO_FX32(0.0f)) { mVel.y -= mUnk_2C; } @@ -261,19 +271,19 @@ void ActorUnkCASE::func_ov063_0215b090(void) { } } -void ActorUnkCASE::func_ov063_0215b1bc(void) { - mVel.x = 0; - mVel.z = 0; +void ActorLobarrierShield::func_ov063_0215b1bc() { + mVel.x = FX_F32_TO_FX32(0.0f); + mVel.z = FX_F32_TO_FX32(0.0f); VecFx32 vec; - VecFx32_Init(0, 0, FX_F32_TO_FX32(1.0f), &vec); + VecFx32_Init(FX_F32_TO_FX32(0.0f), FX_F32_TO_FX32(0.0f), FX_F32_TO_FX32(1.0f), &vec); func_01ffa7a0(&vec, &mUnk_1A4, &vec); s16 angle = func_01ffbbe0(vec.x, vec.z); MtxFx33_InitYRotation(&mUnk_1A4, SIN((u16) angle), COS((u16) angle)); } -void ActorUnkCASE::func_ov063_0215b244(void) { +void ActorLobarrierShield::func_ov063_0215b244() { mVel.y -= mUnk_2C; VecFx32_Copy(&mPos, &mPrevPos); VecFx32_Add(&mPos, &mVel, &mPos); @@ -281,41 +291,41 @@ void ActorUnkCASE::func_ov063_0215b244(void) { this->func_ov000_02098b8c(1, NULL); if ((mUnk_46 & 3) != 0) { - this->func_ov063_0215aefc(5); + this->SetState(ActorLobarrierShieldState_LyingOnGround); } } -void ActorUnkCASE::func_ov063_0215b2b0(void) { - mVel.x = 0; - mVel.z = 0; +void ActorLobarrierShield::func_ov063_0215b2b0() { + mVel.x = FX_F32_TO_FX32(0.0f); + mVel.z = FX_F32_TO_FX32(0.0f); mUnk_2C = 0; } // Matched -void ActorUnkCASE::func_ov063_0215b2c4(void) {} +void ActorLobarrierShield::func_ov063_0215b2c4() {} -void ActorUnkCASE::vfunc_24() { - if (mState != 1 && mState != 2) { +void ActorLobarrierShield::vfunc_24() { + if (mState != ActorLobarrierShieldState_Grabbing && mState != ActorLobarrierShieldState_Grabbed) { return; } this->Update(); } // non-matching -void ActorUnkCASE::Update() { +void ActorLobarrierShield::Update() { mUnk_150.mUnk_1C = 1; if (!this->func_ov017_020bef4c(0x4000) && mUnk_48 != 0) { - bool cond = true; - if (mState != 1 && mState != 2) { - cond = false; + bool grabbedByWhip = true; + if (this->mState != ActorLobarrierShieldState_Grabbing && this->mState != ActorLobarrierShieldState_Grabbed) { + grabbedByWhip = false; } - if (!cond) { + if (!grabbedByWhip) { return; } - if (mState == 3) { + if (this->mState == ActorLobarrierShieldState_Thrown) { this->func_ov063_0215b724(); return; } @@ -323,16 +333,16 @@ void ActorUnkCASE::Update() { mUnk_3C = &mUnk_124; - CALL_PTMF(PTMF, data_ov063_021630e0[mState]); + CALL_PTMF(PTMF, data_ov063_021630e0[mState]); VecFx32 *vec_base, *vec2; u16 ret1; fx16 x, y, z; fx32 x_pos, x_neg, z_pos, z_neg; - if (mUnk_14C != NULL) { + if (this->lobarrier != NULL) { VecFx32 vec1; - VecFx32 *mUnk_14C_vec = (VecFx32 *) (((u8 *) mUnk_14C) + 0x25C); + VecFx32 *mUnk_14C_vec = &this->lobarrier->mUnk_25C; vec1 = *mUnk_14C_vec; func_01ffb714(&vec1, &mPos, &vec1); @@ -340,17 +350,17 @@ void ActorUnkCASE::Update() { y = vec1.y; x = vec1.x; - ((VecFx16 *) &mUnk_150.mUnk_0E)->x = x; - ((VecFx16 *) &mUnk_150.mUnk_0E)->y = y; - ((VecFx16 *) &mUnk_150.mUnk_0E)->z = z; + mUnk_150.mUnk_0E.x = x; + mUnk_150.mUnk_0E.y = y; + mUnk_150.mUnk_0E.z = z; vec2 = data_027e0ce0->func_01fff148(0); - vec_base = (VecFx32 *) (((u8 *) mUnk_14C) + 0x25C); + vec_base = &this->lobarrier->mUnk_25C; z_neg = vec2->z; z_pos = vec_base->z; x_pos = vec_base->x; x_neg = vec2->x; - } else if (mState == 5) { + } else if (mState == ActorLobarrierShieldState_LyingOnGround) { VecFx32 vec1; vec1 = mUnk_1CC.vec; func_01ffb714(&vec1, &mPos, &vec1); @@ -359,9 +369,9 @@ void ActorUnkCASE::Update() { y = vec1.y; x = vec1.x; - ((VecFx16 *) &mUnk_150.mUnk_0E)->x = x; - ((VecFx16 *) &mUnk_150.mUnk_0E)->y = y; - ((VecFx16 *) &mUnk_150.mUnk_0E)->z = z; + mUnk_150.mUnk_0E.x = x; + mUnk_150.mUnk_0E.y = y; + mUnk_150.mUnk_0E.z = z; vec2 = data_027e0ce0->func_01fff148(0); vec_base = &mUnk_1CC.vec; @@ -388,7 +398,8 @@ void ActorUnkCASE::Update() { post: this->func_ov000_020989e0(); - if (((u32) mState == 5 || mState == 4) && (mUnk_124.mUnk_08 & 0x3FFFF) != 0) { + if (((u32) mState == ActorLobarrierShieldState_LyingOnGround || mState == ActorLobarrierShieldState_Releasing) && + (mUnk_124.mUnk_08 & 0x3FFFF) != 0) { switch (mUnk_124.mUnk_1C) { case 4: data_027e0d38->func_ov031_020d9c44(data_ov000_020aed00); @@ -407,7 +418,7 @@ post: } if (GET_FLAG(mFlags, ActorFlag_Alive)) { - if (mState == 5) { + if (mState == ActorLobarrierShieldState_LyingOnGround) { UnkStruct_ov000_0207de98 param2; VecFx32_Copy(&mPos, ¶m2.vec); param2.param1 = 0x548; @@ -417,12 +428,12 @@ post: } } -void ActorUnkCASE::vfunc_2C(unk32 param1) { +void ActorLobarrierShield::vfunc_2C(unk32 param1) { if (!this->func_01fff5d0(param1, 0)) { return; } - if (mUnk_14C == NULL || ((u32 *) mUnk_14C)[0x268 >> 2] == NULL) { + if (this->lobarrier == NULL || this->lobarrier->shield == NULL) { fx32 sin_val = SIN((u16) mUnk_1C8); fx32 cos_val = COS((u16) mUnk_1C8); @@ -436,14 +447,14 @@ void ActorUnkCASE::vfunc_2C(unk32 param1) { } // non-matching -void ActorUnkCASE::func_ov063_0215b6c8(VecFx32 *param1, UnkAngleStruct angle) { +void ActorLobarrierShield::func_ov063_0215b6c8(VecFx32 *param1, UnkAngleStruct angle) { VecFx32 vec = *param1; VecFx32_Copy(&vec, &mPos); VecFx32_Copy(&vec, &mPrevPos); this->mAngle.angle_s = angle.angle_s; } -void ActorUnkCASE::func_ov063_0215b724(void) { +void ActorLobarrierShield::func_ov063_0215b724() { this->func_ov000_020984d0(); data_027e0cec->func_ov000_0209feac(0xCC06, &mPos, 2, 0, 0); data_027e0cec->func_ov000_0209feac(0xCC07, &mPos, 2, 0, 0); @@ -452,29 +463,29 @@ void ActorUnkCASE::func_ov063_0215b724(void) { } // non-matching -void ActorUnkCASE::vfunc_10(Cylinder *param1) { - if (mUnk_14C != NULL) { - ((ActorUnkCASE *) mUnk_14C)->vfunc_10(param1); +void ActorLobarrierShield::vfunc_10(Cylinder *param1) { + if (this->lobarrier != NULL) { + this->lobarrier->vfunc_10(param1); return; } VecFx32_Copy(&mPos, ¶m1->pos); // doesn't match param1->size = 0x800; } -void ActorUnkCASE::func_ov063_0215b814(RefStruct ref) { +void ActorLobarrierShield::func_ov063_0215b814(RefStruct ref) { mUnk_1E4 = ref; - if (mUnk_14C != NULL) { - ((ActorUnkCANS *) mUnk_14C)->func_ov063_02158448(9); + if (this->lobarrier != NULL) { + this->lobarrier->SetState(ActorLobarrierState_LosingShield); } - this->func_ov063_0215aefc(1); + this->SetState(ActorLobarrierShieldState_Grabbing); } // non-matching -void ActorUnkCASE::func_ov063_0215b854(void) { - if (mUnk_14C != NULL) { - ActorUnkCANS *actorCans = (ActorUnkCANS *) mUnk_14C; +void ActorLobarrierShield::func_ov063_0215b854(void) { + if (this->lobarrier != NULL) { + ActorLobarrier *actorCans = this->lobarrier; VecFx32 vec = actorCans->mPos; VecFx32_Copy(&vec, &mPos); @@ -482,16 +493,16 @@ void ActorUnkCASE::func_ov063_0215b854(void) { actorCans->mUnk_234.Set(0, 20); - actorCans = (ActorUnkCANS *) mUnk_14C; + actorCans = this->lobarrier; actorCans->func_ov063_02158b0c(); - actorCans = (ActorUnkCANS *) mUnk_14C; + actorCans = this->lobarrier; actorCans->func_ov063_0215a428(); mUnk_124.mUnk_04 = ~0x38000; - mUnk_14C = NULL; + this->lobarrier = NULL; } - this->func_ov063_0215aefc(2); + this->SetState(ActorLobarrierShieldState_Grabbed); } static inline bool VecFx32_IsZero(VecFx32 *vec) { @@ -499,22 +510,22 @@ static inline bool VecFx32_IsZero(VecFx32 *vec) { } // non-matching -void ActorUnkCASE::func_ov063_0215b8e8(VecFx32 *param1) { +void ActorLobarrierShield::func_ov063_0215b8e8(VecFx32 *param1) { - if (mUnk_14C != NULL) { - ((ActorUnkCANS *) mUnk_14C)->func_ov063_0215a428(); + if (this->lobarrier != NULL) { + this->lobarrier->func_ov063_0215a428(); if (param1->x == 0 && param1->y == 0 && param1->z == 0) { - this->func_ov063_0215aefc(0); + this->SetState(ActorLobarrierShieldState_Held); return; } - ((ActorUnkCANS *) mUnk_14C)->func_ov063_02158b0c(); - mUnk_14C = NULL; + this->lobarrier->func_ov063_02158b0c(); + this->lobarrier = NULL; } - if (VecFx32_IsZero((VecFx32 *) param1)) { - this->func_ov063_0215aefc(4); + if (VecFx32_IsZero(param1)) { + this->SetState(ActorLobarrierShieldState_Releasing); } else { unk32 x = param1->x; unk32 y = param1->y; @@ -523,11 +534,11 @@ void ActorUnkCASE::func_ov063_0215b8e8(VecFx32 *param1) { mUnk_150.mUnk_04 = 0; #endif VecFx32_Init(x, y, z, (VecFx32 *) &mUnk_1D8); - this->func_ov063_0215aefc(3); + this->SetState(ActorLobarrierShieldState_Thrown); } } -void ActorUnkCASE::func_ov063_0215b99c(ActorUnkCASE *param1, UnkStruct_func_ov063_0215a678 *param2) { +void ActorLobarrierShield::func_ov063_0215b99c(ActorLobarrierShield *param1, UnkStruct_func_ov063_0215a678 *param2) { unk32 var1; if ((param2->mUnk_08 & 0x10) != 0) { var1 = param2->mUnk_AE; diff --git a/src/Main/System/OverlayManager.cpp b/src/Main/System/OverlayManager.cpp index f0bfcf00..5d058a47 100644 --- a/src/Main/System/OverlayManager.cpp +++ b/src/Main/System/OverlayManager.cpp @@ -26,8 +26,6 @@ struct OverlaySetup { }; extern OverlaySetup gOverlaySetups[]; -extern u32 *data_027e0ce0[]; - THUMB_BEGIN void OverlayManager::LoadIfNotLoaded(OverlaySlot slot, OverlayIndex index) { @@ -66,7 +64,7 @@ void OverlayManager::LoadOverlaySetup(s32 index) { this->LoadIfNotLoaded(OverlaySlot_2, pSetup->slot2Overlay); if (index == 5) { - func_ov007_02102850(data_027e0ce0); + func_ov007_02102850(&data_027e0ce0); } else { overlayId = pSetup->slot12Overlay; @@ -84,7 +82,7 @@ void OverlayManager::UnloadOverlaySetup() { this->Unload(OverlaySlot_3); if (this->mLoadedOverlays[2] == OverlayId_RailEdit) { - func_ov007_021028a0(data_027e0ce0); + func_ov007_021028a0(&data_027e0ce0); this->Unload(OverlaySlot_2); } } diff --git a/tools/configure.py b/tools/configure.py index 98a4dcbb..1285851d 100755 --- a/tools/configure.py +++ b/tools/configure.py @@ -998,8 +998,8 @@ config.libs = [ GameLib( "Overlay 63", [ - Object("063_Shrine/Actor/ActorUnkCANS.cpp"), - Object("063_Shrine/Actor/ActorUnkCASE.cpp"), + Object("063_Shrine/Actor/ActorLobarrier.cpp"), + Object("063_Shrine/Actor/ActorLobarrierShield.cpp"), Object("063_Shrine/Actor/ActorUnkRBLS.cpp"), Object("063_Shrine/Actor/ActorUnkRMSBase.cpp"), Object("063_Shrine/Actor/ActorUnkRMSD.cpp"),