Move ov054 documentation from Ghidra

6 files changed, 47 insertions, 29 deletions

diff --git a/config/eur/arm9/overlays/ov054/symbols.txt b/config/eur/arm9/overlays/ov054/symbols.txt
index dc0fb1b8..d1e9f1e2 100644
--- a/config/eur/arm9/overlays/ov054/symbols.txt
+++ b/config/eur/arm9/overlays/ov054/symbols.txt
@@ -1,19 +1,19 @@
-func_ov054_02198d00 kind:function(arm,size=0x2c) addr:0x2198d00
-func_ov054_02198d2c kind:function(arm,size=0x4) addr:0x2198d2c
-func_ov054_02198d30 kind:function(arm,size=0x8) addr:0x2198d30
-func_ov054_02198d38 kind:function(arm,size=0x10) addr:0x2198d38
-func_ov054_02198d48 kind:function(arm,size=0x20) addr:0x2198d48
-func_ov054_02198d68 kind:function(arm,size=0x9c) addr:0x2198d68
-func_ov054_02198e04 kind:function(arm,size=0x4) addr:0x2198e04
-func_ov054_02198e08 kind:function(arm,size=0x1c) addr:0x2198e08
-func_ov054_02198e24 kind:function(arm,size=0x28) addr:0x2198e24
-func_ov054_02198e4c kind:function(arm,size=0x94) addr:0x2198e4c
-func_ov054_02198ee0 kind:function(arm,size=0xc) addr:0x2198ee0
-func_ov054_02198eec kind:function(arm,size=0x10) addr:0x2198eec
+_ZN10EquipScoop8vfunc_00Ev kind:function(arm,size=0x2c) addr:0x2198d00
+_ZN10EquipScoop8vfunc_18Ev kind:function(arm,size=0x4) addr:0x2198d2c
+_ZNK10EquipScoop8vfunc_40Ev kind:function(arm,size=0x8) addr:0x2198d30
+_ZNK10EquipScoop8vfunc_44Ei kind:function(arm,size=0x10) addr:0x2198d38
+_ZNK10EquipScoop8vfunc_48Ei kind:function(arm,size=0x20) addr:0x2198d48
+_ZNK10EquipScoop8IsUsableEi kind:function(arm,size=0x9c) addr:0x2198d68
+_ZN10EquipScoop8vfunc_30Ev kind:function(arm,size=0x4) addr:0x2198e04
+_ZN10EquipScoop19func_ov054_02198e08EP5Vec3p kind:function(arm,size=0x1c) addr:0x2198e08
+_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
-_ZN10EquipScoop9StopUsingEP13LinkStateItem kind:function(arm,size=0xe4) addr:0x21997f0
+_ZN13LinkStateItem14StopUsingScoopEv kind:function(arm,size=0xe4) addr:0x21997f0
 func_ov054_021998d4 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
diff --git a/config/usa/arm9/overlays/ov054/symbols.txt b/config/usa/arm9/overlays/ov054/symbols.txt
index 2c7feb5c..998c5cb7 100644
--- a/config/usa/arm9/overlays/ov054/symbols.txt
+++ b/config/usa/arm9/overlays/ov054/symbols.txt
@@ -1,19 +1,19 @@
-func_ov054_02198d00 kind:function(arm,size=0x2c) addr:0x2198c60
-func_ov054_02198d2c kind:function(arm,size=0x4) addr:0x2198c8c
-func_ov054_02198d30 kind:function(arm,size=0x8) addr:0x2198c90
-func_ov054_02198d38 kind:function(arm,size=0x10) addr:0x2198c98
-func_ov054_02198d48 kind:function(arm,size=0x20) addr:0x2198ca8
-func_ov054_02198d68 kind:function(arm,size=0x9c) addr:0x2198cc8
-func_ov054_02198e04 kind:function(arm,size=0x4) addr:0x2198d64
-func_ov054_02198e08 kind:function(arm,size=0x1c) addr:0x2198d68
-func_ov054_02198e24 kind:function(arm,size=0x28) addr:0x2198d84
-func_ov054_02198e4c kind:function(arm,size=0x94) addr:0x2198dac
-func_ov054_02198ee0 kind:function(arm,size=0xc) addr:0x2198e40
-func_ov054_02198eec kind:function(arm,size=0x10) addr:0x2198e4c
+_ZN10EquipScoop8vfunc_00Ev kind:function(arm,size=0x2c) addr:0x2198c60
+_ZN10EquipScoop8vfunc_18Ev kind:function(arm,size=0x4) addr:0x2198c8c
+_ZNK10EquipScoop8vfunc_40Ev kind:function(arm,size=0x8) addr:0x2198c90
+_ZNK10EquipScoop8vfunc_44Ei kind:function(arm,size=0x10) addr:0x2198c98
+_ZNK10EquipScoop8vfunc_48Ei kind:function(arm,size=0x20) addr:0x2198ca8
+_ZNK10EquipScoop8IsUsableEi kind:function(arm,size=0x9c) addr:0x2198cc8
+_ZN10EquipScoop8vfunc_30Ev kind:function(arm,size=0x4) addr:0x2198d64
+_ZN10EquipScoop19func_ov054_02198e08EP5Vec3p kind:function(arm,size=0x1c) addr:0x2198d68
+_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
-_ZN10EquipScoop9StopUsingEP13LinkStateItem kind:function(arm,size=0xe4) addr:0x2199750
+_ZN13LinkStateItem14StopUsingScoopEv kind:function(arm,size=0xe4) addr:0x2199750
 func_ov054_021998d4 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
diff --git a/include/Player/EquipScoop.hpp b/include/Player/EquipScoop.hpp
index dfc95103..82f466e6 100644
--- a/include/Player/EquipScoop.hpp
+++ b/include/Player/EquipScoop.hpp
@@ -25,7 +25,9 @@ public:
     /* 48 */ virtual unk32 vfunc_48(unk32 param1) const override;

     /* 50 */

 

-    static void StopUsing(LinkStateItem *param1);

-

     EquipScoop();

+

+    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 4b26a458..104c764c 100644
--- a/include/Player/LinkStateItem.hpp
+++ b/include/Player/LinkStateItem.hpp
@@ -64,4 +64,6 @@ public:
     void func_ov005_02106980(unk32 param, s32 param2, s32 *param3);
     bool func_ov005_02106a50();
     bool func_ov005_02106bbc(Vec3p *param1, unk32 param2, u32 param3);
+
+    void StopUsingScoop();
 };
diff --git a/src/00_Core/Player/LinkStateItem.cpp b/src/00_Core/Player/LinkStateItem.cpp
index bb6c8f08..c5926856 100644
--- a/src/00_Core/Player/LinkStateItem.cpp
+++ b/src/00_Core/Player/LinkStateItem.cpp
@@ -57,7 +57,7 @@ ARM void LinkStateItem::OnStateLeave(s32 param1) {
             pData_027e103c->mUnk_2a            = 0;
             pData_027e103c->func_ov000_020cf9dc(0, 0);
             break;
-        case ItemFlag_Shovel: EquipScoop::StopUsing(this); break;
+        case ItemFlag_Shovel: this->StopUsingScoop(); break;
     }
 
     if (this->mEquipId != ItemFlag_None) {
diff --git a/src/54_Scoop/Player/EquipScoop.cpp b/src/54_Scoop/Player/EquipScoop.cpp
new file mode 100644
index 00000000..db740cfa
--- /dev/null
+++ b/src/54_Scoop/Player/EquipScoop.cpp
@@ -0,0 +1,14 @@
+#include "Player/EquipScoop.hpp"
+
+void EquipScoop::vfunc_00() {}
+void EquipScoop::vfunc_18() {}
+unk32 EquipScoop::vfunc_40() const {}
+unk32 EquipScoop::vfunc_44(unk32 param1) const {}
+unk32 EquipScoop::vfunc_48(unk32 param1) const {}
+bool EquipScoop::IsUsable(unk32 param1) const {}
+void EquipScoop::vfunc_30() {}
+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) {}