From 5cbfdbabc5f7d6c10424b9c3a2dbad1c761a9ea0 Mon Sep 17 00:00:00 2001 From: Aetias Date: Sat, 1 Feb 2025 09:53:43 +0100 Subject: [PATCH] Fill out rest of ov054 --- config/eur/arm9/overlays/ov054/symbols.txt | 16 ++++++++-------- config/usa/arm9/overlays/ov054/symbols.txt | 16 ++++++++-------- include/Player/EquipScoop.hpp | 7 ++++--- include/Player/LinkStateItem.hpp | 3 +++ src/54_Scoop/Player/EquipScoop.cpp | 10 +++++++++- 5 files changed, 32 insertions(+), 20 deletions(-) diff --git a/config/eur/arm9/overlays/ov054/symbols.txt b/config/eur/arm9/overlays/ov054/symbols.txt index d1e9f1e2..3a0d951f 100644 --- a/config/eur/arm9/overlays/ov054/symbols.txt +++ b/config/eur/arm9/overlays/ov054/symbols.txt @@ -9,14 +9,14 @@ _ZN10EquipScoop19func_ov054_02198e08EP5Vec3p kind:function(arm,size=0x1c) addr:0 _ZN10EquipScoop20func_ov054_021980e24EP5Vec3p kind:function(arm,size=0x28) addr:0x2198e24 _ZN10EquipScoop8vfunc_38Ei kind:function(arm,size=0x94) addr:0x2198e4c _Z19func_ov054_02198ee0iPi kind:function(arm,size=0xc) addr:0x2198ee0 -_ZN10EquipScoop19func_ov054_02198eecEi kind:function(arm,size=0x10) addr:0x2198eec -func_ov054_02198efc kind:function(arm,size=0x3cc) addr:0x2198efc -func_ov054_021992c8 kind:function(arm,size=0x518) addr:0x21992c8 -func_ov054_021997e0 kind:function(arm,size=0x10) addr:0x21997e0 +_ZN13LinkStateItem19func_ov054_02198eecEv kind:function(arm,size=0x10) addr:0x2198eec +_ZN13LinkStateItem19func_ov054_02198efcEiij kind:function(arm,size=0x3cc) addr:0x2198efc +_ZN13LinkStateItem19func_ov054_021992c8Eiij kind:function(arm,size=0x518) addr:0x21992c8 +_Z13GetEquipScoopv kind:function(arm,size=0x10) addr:0x21997e0 _ZN13LinkStateItem14StopUsingScoopEv kind:function(arm,size=0xe4) addr:0x21997f0 -func_ov054_021998d4 kind:function(arm,size=0x40) addr:0x21998d4 +_Z19func_ov054_021998d4iiij kind:function(arm,size=0x40) addr:0x21998d4 data_ov054_02199914 kind:data(any) addr:0x2199914 -__sinit_ov054_02199924 kind:function(arm,size=0x30) addr:0x2199924 +__sinit_EquipScoop.cpp kind:function(arm,size=0x30) addr:0x2199924 data_ov054_02199960 kind:data(any) addr:0x2199960 data_ov054_02199964 kind:data(any) addr:0x2199964 data_ov054_02199968 kind:data(any) addr:0x2199968 @@ -30,5 +30,5 @@ data_ov054_021999c8 kind:data(any) addr:0x21999c8 data_ov054_021999d8 kind:data(any) addr:0x21999d8 data_ov054_021999e8 kind:data(any) addr:0x21999e8 data_ov054_02199a00 kind:data(any) addr:0x2199a00 -data_ov054_02199a20 kind:bss addr:0x2199a20 -data_ov054_02199a2c kind:bss addr:0x2199a2c +@870 kind:bss addr:0x2199a20 +_ZN10EquipScoop12gModelRenderE kind:bss addr:0x2199a2c diff --git a/config/usa/arm9/overlays/ov054/symbols.txt b/config/usa/arm9/overlays/ov054/symbols.txt index 998c5cb7..ecec7caa 100644 --- a/config/usa/arm9/overlays/ov054/symbols.txt +++ b/config/usa/arm9/overlays/ov054/symbols.txt @@ -9,14 +9,14 @@ _ZN10EquipScoop19func_ov054_02198e08EP5Vec3p kind:function(arm,size=0x1c) addr:0 _ZN10EquipScoop20func_ov054_021980e24EP5Vec3p kind:function(arm,size=0x28) addr:0x2198d84 _ZN10EquipScoop8vfunc_38Ei kind:function(arm,size=0x94) addr:0x2198dac _Z19func_ov054_02198ee0iPi kind:function(arm,size=0xc) addr:0x2198e40 -_ZN10EquipScoop19func_ov054_02198eecEi kind:function(arm,size=0x10) addr:0x2198e4c -func_ov054_02198efc kind:function(arm,size=0x3cc) addr:0x2198e5c -func_ov054_021992c8 kind:function(arm,size=0x518) addr:0x2199228 -func_ov054_021997e0 kind:function(arm,size=0x10) addr:0x2199740 +_ZN13LinkStateItem19func_ov054_02198eecEv kind:function(arm,size=0x10) addr:0x2198e4c +_ZN13LinkStateItem19func_ov054_02198efcEiij kind:function(arm,size=0x3cc) addr:0x2198e5c +_ZN13LinkStateItem19func_ov054_021992c8Eiij kind:function(arm,size=0x518) addr:0x2199228 +_Z13GetEquipScoopv kind:function(arm,size=0x10) addr:0x2199740 _ZN13LinkStateItem14StopUsingScoopEv kind:function(arm,size=0xe4) addr:0x2199750 -func_ov054_021998d4 kind:function(arm,size=0x40) addr:0x2199834 +_Z19func_ov054_021998d4iiij kind:function(arm,size=0x40) addr:0x2199834 data_ov054_02199914 kind:data(any) addr:0x2199874 -__sinit_ov054_02199924 kind:function(arm,size=0x30) addr:0x2199884 +__sinit_EquipScoop.cpp kind:function(arm,size=0x30) addr:0x2199884 data_ov054_02199960 kind:data(any) addr:0x21998c0 data_ov054_02199964 kind:data(any) addr:0x21998c4 data_ov054_02199968 kind:data(any) addr:0x21998c8 @@ -30,5 +30,5 @@ data_ov054_021999c8 kind:data(any) addr:0x2199928 data_ov054_021999d8 kind:data(any) addr:0x2199938 data_ov054_021999e8 kind:data(any) addr:0x2199948 data_ov054_02199a00 kind:data(any) addr:0x2199960 -data_ov054_02199a20 kind:bss addr:0x2199980 -data_ov054_02199a2c kind:bss addr:0x219998c +@870 kind:bss addr:0x2199980 +_ZN10EquipScoop12gModelRenderE kind:bss addr:0x219998c diff --git a/include/Player/EquipScoop.hpp b/include/Player/EquipScoop.hpp index 82f466e6..fadbbb24 100644 --- a/include/Player/EquipScoop.hpp +++ b/include/Player/EquipScoop.hpp @@ -3,16 +3,18 @@ #include "types.h" #include "Player/EquipItem.hpp" +#include "Render/ModelRender.hpp" class LinkStateItem; class EquipScoop : public EquipItem { -private: +public: + static ModelRender gModelRender; + /* 0 (base) */ /* 9 */ unk8 mUnk_9[3]; /* c */ -public: /* 00 */ virtual void vfunc_00() override; /* 04 */ virtual ~EquipScoop() override; /* 0c */ virtual ItemFlag GetId() const override; @@ -29,5 +31,4 @@ public: s32 func_ov054_02198e08(Vec3p *param1); bool func_ov054_021980e24(Vec3p *param1); - void func_ov054_02198eec(unk32 param1); }; diff --git a/include/Player/LinkStateItem.hpp b/include/Player/LinkStateItem.hpp index a961b4f7..564d656e 100644 --- a/include/Player/LinkStateItem.hpp +++ b/include/Player/LinkStateItem.hpp @@ -65,8 +65,11 @@ public: bool func_ov005_02106a50(); bool func_ov005_02106bbc(Vec3p *param1, unk32 param2, u32 param3); + bool func_ov054_02198efc(s32 param1, unk32 param2, u32 param3); + bool func_ov054_021992c8(unk32 param1, unk32 param2, u32 param3); void StopUsingScoop(); + void func_ov054_02198eec(); void func_ov055_02198f78(); void StopUsingBomb(s32 param1); void func_ov055_02199020(); diff --git a/src/54_Scoop/Player/EquipScoop.cpp b/src/54_Scoop/Player/EquipScoop.cpp index db740cfa..ba34e890 100644 --- a/src/54_Scoop/Player/EquipScoop.cpp +++ b/src/54_Scoop/Player/EquipScoop.cpp @@ -1,4 +1,7 @@ #include "Player/EquipScoop.hpp" +#include "Player/LinkStateItem.hpp" + +ModelRender EquipScoop::gModelRender; void EquipScoop::vfunc_00() {} void EquipScoop::vfunc_18() {} @@ -11,4 +14,9 @@ s32 EquipScoop::func_ov054_02198e08(Vec3p *param1) {} bool EquipScoop::func_ov054_021980e24(Vec3p *param1) {} void EquipScoop::vfunc_38(unk32 param1) {} void func_ov054_02198ee0(s32 param1, unk32 *param2) {} -void EquipScoop::func_ov054_02198eec(unk32 param1) {} +void LinkStateItem::func_ov054_02198eec() {} +bool LinkStateItem::func_ov054_02198efc(s32 param1, unk32 param2, u32 param3) {} +bool LinkStateItem::func_ov054_021992c8(unk32 param1, unk32 param2, u32 param3) {} +EquipScoop *GetEquipScoop() {} +void LinkStateItem::StopUsingScoop() {} +bool func_ov054_021998d4(s32 param1, s32 param2, unk32 param3, u32 param4) {}