From 1d2d2e4a2ab125487764c9d9a3fea10379442eb7 Mon Sep 17 00:00:00 2001 From: Aetias Date: Sun, 2 Feb 2025 10:50:27 +0100 Subject: [PATCH] Fix virtual function names in `UnkStruct_ov000_020beba8` --- config/eur/arm9/overlays/ov000/symbols.txt | 10 +++++----- config/eur/arm9/overlays/ov014/symbols.txt | 6 +++--- config/usa/arm9/overlays/ov000/symbols.txt | 10 +++++----- config/usa/arm9/overlays/ov014/symbols.txt | 6 +++--- include/Actor/Player/ActorBlast.hpp | 2 +- include/Actor/Player/ActorBomb.hpp | 4 ++-- include/Unknown/UnkStruct_ov000_020beba8.hpp | 10 +++++----- src/00_Core/Unknown/UnkStruct_ov000_020beba8.cpp | 8 ++++---- src/14_Land/Actor/Player/ActorBlast.cpp | 2 +- src/14_Land/Actor/Player/ActorBomb.cpp | 4 ++-- 10 files changed, 31 insertions(+), 31 deletions(-) diff --git a/config/eur/arm9/overlays/ov000/symbols.txt b/config/eur/arm9/overlays/ov000/symbols.txt index ebf28688..5fae9368 100644 --- a/config/eur/arm9/overlays/ov000/symbols.txt +++ b/config/eur/arm9/overlays/ov000/symbols.txt @@ -2747,11 +2747,11 @@ _ZN9EquipItem7GetAmmoEv kind:function(arm,size=0x2c) addr:0x20beb30 _ZN9EquipItem8GiveAmmoEj kind:function(arm,size=0x34) addr:0x20beb5c _ZNK9EquipItem9GetHitboxEP8Cylinder kind:function(arm,size=0x18) addr:0x20beb90 _ZN24UnkStruct_ov000_020beba8C1Ei kind:function(arm,size=0x18) addr:0x20beba8 -_ZN24UnkStruct_ov000_020beba88vfunc_04EPs kind:function(arm,size=0x18) addr:0x20bebc0 -_ZN24UnkStruct_ov000_020beba88vfunc_08EPs kind:function(arm,size=0x84) addr:0x20bebd8 -_ZN24UnkStruct_ov000_020beba88vfunc_0cEPi kind:function(arm,size=0x84) addr:0x20bec5c -_ZN24UnkStruct_ov000_020beba88vfunc_14EPi kind:function(arm,size=0x9c) addr:0x20bece0 -_ZN24UnkStruct_ov000_020beba88vfunc_10EPt kind:function(arm,size=0x50) addr:0x20bed7c +_ZN24UnkStruct_ov000_020beba88vfunc_08EPs kind:function(arm,size=0x18) addr:0x20bebc0 +_ZN24UnkStruct_ov000_020beba88vfunc_0cEPs kind:function(arm,size=0x84) addr:0x20bebd8 +_ZN24UnkStruct_ov000_020beba88vfunc_10EPi kind:function(arm,size=0x84) addr:0x20bec5c +_ZN24UnkStruct_ov000_020beba88vfunc_18EPi kind:function(arm,size=0x9c) addr:0x20bece0 +_ZN24UnkStruct_ov000_020beba88vfunc_14EPt kind:function(arm,size=0x50) addr:0x20bed7c _ZN24UnkStruct_ov000_020beba8D1Ev kind:function(arm,size=0x98) addr:0x20bedcc _ZN24UnkStruct_ov000_020beba8D0Ev kind:function(arm,size=0x14) addr:0x20bee64 func_ov000_020bee78 kind:function(arm,size=0x1c) addr:0x20bee78 diff --git a/config/eur/arm9/overlays/ov014/symbols.txt b/config/eur/arm9/overlays/ov014/symbols.txt index 8046d9f2..e8cf9e39 100644 --- a/config/eur/arm9/overlays/ov014/symbols.txt +++ b/config/eur/arm9/overlays/ov014/symbols.txt @@ -38,7 +38,7 @@ _Z14GetEquipShieldv kind:function(arm,size=0x10) addr:0x2120ed4 local _ZN10ActorArrow8vfunc_20Eb kind:function(arm,size=0x4e4) addr:0x2120ee4 func_ov014_021213c8 kind:function(arm,size=0x14) addr:0x21213c8 _ZN10ActorBlast6CreateEv kind:function(arm,size=0x30) addr:0x21213dc -_ZN15ActorBlast_Unk18vfunc_0cEPi kind:function(arm,size=0xa4) addr:0x212140c +_ZN15ActorBlast_Unk18vfunc_10EPi kind:function(arm,size=0xa4) addr:0x212140c _ZN10ActorBlastC2Ev kind:function(arm,size=0x8c) addr:0x21214b0 _ZN10ActorBlastD1Ev kind:function(arm,size=0x14) addr:0x212153c _ZN10ActorBlastD0Ev kind:function(arm,size=0x1c) addr:0x2121550 @@ -48,8 +48,8 @@ _ZN15ActorBlast_Unk1D1Ev kind:function(arm,size=0x14) addr:0x21219e4 _ZN10ActorBlast8vfunc_18Ej kind:function(arm,size=0x90) addr:0x21219f8 _ZN15ActorBlast_Unk1D0Ev kind:function(arm,size=0x1c) addr:0x2121a88 _ZN9ActorBomb6CreateEv kind:function(arm,size=0x30) addr:0x2121aa4 -_ZN14ActorBomb_Unk18vfunc_08EPs kind:function(arm,size=0x9c) addr:0x2121ad4 -_ZN14ActorBomb_Unk18vfunc_0cEPi kind:function(arm,size=0x74) addr:0x2121b70 +_ZN14ActorBomb_Unk18vfunc_0cEPs kind:function(arm,size=0x9c) addr:0x2121ad4 +_ZN14ActorBomb_Unk18vfunc_10EPi kind:function(arm,size=0x74) addr:0x2121b70 _ZN9ActorBombC2Ev kind:function(arm,size=0xf4) addr:0x2121be4 _ZN14ActorBomb_Unk2D1Ev kind:function(arm,size=0x1c) addr:0x2121cd8 _ZN9ActorBombD1Ev kind:function(arm,size=0x38) addr:0x2121cf4 diff --git a/config/usa/arm9/overlays/ov000/symbols.txt b/config/usa/arm9/overlays/ov000/symbols.txt index d243eee1..8106a5f5 100644 --- a/config/usa/arm9/overlays/ov000/symbols.txt +++ b/config/usa/arm9/overlays/ov000/symbols.txt @@ -2649,11 +2649,11 @@ _ZN9EquipItem7GetAmmoEv kind:function(arm,size=0x2c) addr:0x20bead0 _ZN9EquipItem8GiveAmmoEj kind:function(arm,size=0x34) addr:0x20beafc _ZNK9EquipItem9GetHitboxEP8Cylinder kind:function(arm,size=0x18) addr:0x20beb30 _ZN24UnkStruct_ov000_020beba8C1Ei kind:function(arm,size=0x18) addr:0x20beb48 -_ZN24UnkStruct_ov000_020beba88vfunc_04EPs kind:function(arm,size=0x18) addr:0x20beb60 -_ZN24UnkStruct_ov000_020beba88vfunc_08EPs kind:function(arm,size=0x84) addr:0x20beb78 -_ZN24UnkStruct_ov000_020beba88vfunc_0cEPi kind:function(arm,size=0x84) addr:0x20bebfc -_ZN24UnkStruct_ov000_020beba88vfunc_14EPi kind:function(arm,size=0x9c) addr:0x20bec80 -_ZN24UnkStruct_ov000_020beba88vfunc_10EPt kind:function(arm,size=0x50) addr:0x20bed1c +_ZN24UnkStruct_ov000_020beba88vfunc_08EPs kind:function(arm,size=0x18) addr:0x20beb60 +_ZN24UnkStruct_ov000_020beba88vfunc_0cEPs kind:function(arm,size=0x84) addr:0x20beb78 +_ZN24UnkStruct_ov000_020beba88vfunc_10EPi kind:function(arm,size=0x84) addr:0x20bebfc +_ZN24UnkStruct_ov000_020beba88vfunc_18EPi kind:function(arm,size=0x9c) addr:0x20bec80 +_ZN24UnkStruct_ov000_020beba88vfunc_14EPt kind:function(arm,size=0x50) addr:0x20bed1c _ZN24UnkStruct_ov000_020beba8D1Ev kind:function(arm,size=0x98) addr:0x20bed6c _ZN24UnkStruct_ov000_020beba8D0Ev kind:function(arm,size=0x14) addr:0x20bee04 func_ov000_020bee78 kind:function(arm,size=0x1c) addr:0x20bee18 diff --git a/config/usa/arm9/overlays/ov014/symbols.txt b/config/usa/arm9/overlays/ov014/symbols.txt index 9fe9591d..67d72044 100644 --- a/config/usa/arm9/overlays/ov014/symbols.txt +++ b/config/usa/arm9/overlays/ov014/symbols.txt @@ -38,7 +38,7 @@ _Z14GetEquipShieldv kind:function(arm,size=0x10) addr:0x2120e54 local _ZN10ActorArrow8vfunc_20Eb kind:function(arm,size=0x4e4) addr:0x2120e64 func_ov014_021213c8 kind:function(arm,size=0x14) addr:0x2121348 _ZN10ActorBlast6CreateEv kind:function(arm,size=0x30) addr:0x212135c -_ZN15ActorBlast_Unk18vfunc_0cEPi kind:function(arm,size=0xa4) addr:0x212138c +_ZN15ActorBlast_Unk18vfunc_10EPi kind:function(arm,size=0xa4) addr:0x212138c _ZN10ActorBlastC2Ev kind:function(arm,size=0x8c) addr:0x2121430 _ZN10ActorBlastD1Ev kind:function(arm,size=0x14) addr:0x21214bc _ZN10ActorBlastD0Ev kind:function(arm,size=0x1c) addr:0x21214d0 @@ -48,8 +48,8 @@ _ZN15ActorBlast_Unk1D1Ev kind:function(arm,size=0x14) addr:0x2121964 _ZN10ActorBlast8vfunc_18Ej kind:function(arm,size=0x90) addr:0x2121978 _ZN15ActorBlast_Unk1D0Ev kind:function(arm,size=0x1c) addr:0x2121a08 _ZN9ActorBomb6CreateEv kind:function(arm,size=0x30) addr:0x2121a24 -_ZN14ActorBomb_Unk18vfunc_08EPs kind:function(arm,size=0x9c) addr:0x2121a54 -_ZN14ActorBomb_Unk18vfunc_0cEPi kind:function(arm,size=0x74) addr:0x2121af0 +_ZN14ActorBomb_Unk18vfunc_0cEPs kind:function(arm,size=0x9c) addr:0x2121a54 +_ZN14ActorBomb_Unk18vfunc_10EPi kind:function(arm,size=0x74) addr:0x2121af0 _ZN9ActorBombC2Ev kind:function(arm,size=0xf4) addr:0x2121b64 _ZN14ActorBomb_Unk2D1Ev kind:function(arm,size=0x1c) addr:0x2121c58 _ZN9ActorBombD1Ev kind:function(arm,size=0x38) addr:0x2121c74 diff --git a/include/Actor/Player/ActorBlast.hpp b/include/Actor/Player/ActorBlast.hpp index c7148755..8b019515 100644 --- a/include/Actor/Player/ActorBlast.hpp +++ b/include/Actor/Player/ActorBlast.hpp @@ -54,6 +54,6 @@ class ActorBlast_Unk1 : public UnkStruct_ov000_020beba8 { /* 70 */ /* 00 */ virtual ~ActorBlast_Unk1(); - /* 0c */ virtual void vfunc_0c(s32 *param1); + /* 10 */ virtual void vfunc_10(s32 *param1); /* 18 */ }; diff --git a/include/Actor/Player/ActorBomb.hpp b/include/Actor/Player/ActorBomb.hpp index d2ba402c..cd5fa969 100644 --- a/include/Actor/Player/ActorBomb.hpp +++ b/include/Actor/Player/ActorBomb.hpp @@ -15,8 +15,8 @@ public: /* 10 */ /* 00 */ ~ActorBomb_Unk1() override; - /* 08 */ void vfunc_08(unk16 *param1) override; - /* 0c */ void vfunc_0c(s32 *param1) override; + /* 08 */ void vfunc_0c(unk16 *param1) override; + /* 0c */ void vfunc_10(s32 *param1) override; /* 18 */ }; diff --git a/include/Unknown/UnkStruct_ov000_020beba8.hpp b/include/Unknown/UnkStruct_ov000_020beba8.hpp index 5edcbe59..f9bbcead 100644 --- a/include/Unknown/UnkStruct_ov000_020beba8.hpp +++ b/include/Unknown/UnkStruct_ov000_020beba8.hpp @@ -11,12 +11,12 @@ public: /* c */ /* 00 */ virtual ~UnkStruct_ov000_020beba8(); - /* 04 */ virtual void vfunc_04(unk16 *param1); /* 08 */ virtual void vfunc_08(unk16 *param1); - /* 0c */ virtual void vfunc_0c(s32 *param1); - /* 10 */ virtual void vfunc_10(u16 *param1); - /* 14 */ virtual void vfunc_14(s32 *param1); - /* 18 */ + /* 0c */ virtual void vfunc_0c(unk16 *param1); + /* 10 */ virtual void vfunc_10(s32 *param1); + /* 14 */ virtual void vfunc_14(u16 *param1); + /* 18 */ virtual void vfunc_18(s32 *param1); + /* 1c */ UnkStruct_ov000_020beba8(unk32 param1); }; diff --git a/src/00_Core/Unknown/UnkStruct_ov000_020beba8.cpp b/src/00_Core/Unknown/UnkStruct_ov000_020beba8.cpp index 8830b4c1..1d46c6b3 100644 --- a/src/00_Core/Unknown/UnkStruct_ov000_020beba8.cpp +++ b/src/00_Core/Unknown/UnkStruct_ov000_020beba8.cpp @@ -1,9 +1,9 @@ #include "Unknown/UnkStruct_ov000_020beba8.hpp" UnkStruct_ov000_020beba8::UnkStruct_ov000_020beba8(unk32 param1) {} -void UnkStruct_ov000_020beba8::vfunc_04(unk16 *param1) {} void UnkStruct_ov000_020beba8::vfunc_08(unk16 *param1) {} -void UnkStruct_ov000_020beba8::vfunc_0c(s32 *param1) {} -void UnkStruct_ov000_020beba8::vfunc_14(s32 *param1) {} -void UnkStruct_ov000_020beba8::vfunc_10(u16 *param1) {} +void UnkStruct_ov000_020beba8::vfunc_0c(unk16 *param1) {} +void UnkStruct_ov000_020beba8::vfunc_10(s32 *param1) {} +void UnkStruct_ov000_020beba8::vfunc_18(s32 *param1) {} +void UnkStruct_ov000_020beba8::vfunc_14(u16 *param1) {} UnkStruct_ov000_020beba8::~UnkStruct_ov000_020beba8() {} diff --git a/src/14_Land/Actor/Player/ActorBlast.cpp b/src/14_Land/Actor/Player/ActorBlast.cpp index f8369b18..0f892335 100644 --- a/src/14_Land/Actor/Player/ActorBlast.cpp +++ b/src/14_Land/Actor/Player/ActorBlast.cpp @@ -3,7 +3,7 @@ ActorType ActorBlast::gType = ActorType(ActorTypeId_Blast, (ActorCreateFunc) ActorBlast::Create, NULL); ActorBlast *ActorBlast::Create() {} -void ActorBlast_Unk1::vfunc_0c(s32 *param1) {} +void ActorBlast_Unk1::vfunc_10(s32 *param1) {} ActorBlast::ActorBlast() {} ActorBlast::~ActorBlast() {} bool ActorBlast::vfunc_08() {} diff --git a/src/14_Land/Actor/Player/ActorBomb.cpp b/src/14_Land/Actor/Player/ActorBomb.cpp index 62454cce..1ee7c1bc 100644 --- a/src/14_Land/Actor/Player/ActorBomb.cpp +++ b/src/14_Land/Actor/Player/ActorBomb.cpp @@ -3,8 +3,8 @@ ActorType ActorBomb::gType = ActorType(ActorTypeId_Bomb, (ActorCreateFunc) ActorBomb::Create, NULL); ActorBomb *ActorBomb::Create() {} -void ActorBomb_Unk1::vfunc_08(unk16 *param1) {} -void ActorBomb_Unk1::vfunc_0c(s32 *param1) {} +void ActorBomb_Unk1::vfunc_0c(unk16 *param1) {} +void ActorBomb_Unk1::vfunc_10(s32 *param1) {} ActorBomb::ActorBomb() {} ActorBomb_Unk2::~ActorBomb_Unk2() {} ActorBomb::~ActorBomb() {}