Fill out rest of ov054

This commit is contained in:
Aetias
2025-02-01 09:53:43 +01:00
parent 526b6b8d72
commit 5cbfdbabc5
5 changed files with 32 additions and 20 deletions
+8 -8
View File
@@ -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
+8 -8
View File
@@ -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
+4 -3
View File
@@ -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);
};
+3
View File
@@ -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();
+9 -1
View File
@@ -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) {}