EquipBombchu (#131)

* Map symbol in Game

* EquipBombchu 12%

* EquipBombchu 53%

* EquipBombchu 71%

* configure: Don't verify dsd version if `--dsd` specified

* EquipBombchu 89%

* Fix regression
This commit is contained in:
Aetias
2025-07-31 21:22:55 +02:00
committed by GitHub
parent 8ad6359c7d
commit 82f54b2f07
67 changed files with 1321 additions and 399 deletions
+22 -30
View File
@@ -3,28 +3,24 @@
#include "types.h"
#include "Actor/Actor.hpp"
#include "Map/TilePos.hpp"
#include "Player/EquipItem.hpp"
#include "Render/ModelRender.hpp"
#include "Unknown/UnkStruct_ov000_020beba8.hpp"
struct EquipBombchu_Unk1 {
/* 0 */ unk8 mUnk_0;
/* 1 */ unk8 mUnk_1;
/* 2 */
EquipBombchu_Unk1();
};
class EquipBombchu_Unk_02198d00 : public UnkStruct_ov000_020beba8 {
public:
/* 0 (base) */
/* c */
/* 0c */ unk8 mUnk_0c[4];
/* 10 */ TilePos mUnk_10;
/* 12 (padding) */
/* 14 */ Vec3p mUnk_14;
/* 20 */
/* 00 */ virtual ~EquipBombchu_Unk_02198d00() override;
/* 08 */ virtual void vfunc_08(unk16 *param1) override;
/* 08 */ virtual bool vfunc_08(UnkStruct_ov000_020beba8_08 *param1) override;
/* 0c */ virtual void vfunc_0c(unk16 *param1) override;
/* 10 */ virtual void vfunc_10(s32 *param1) override;
/* 14 */ virtual void vfunc_14(u16 *param1) override;
/* 10 */ virtual bool vfunc_10(s32 *param1) override;
/* 14 */ virtual bool vfunc_14(u16 *param1, s32 param2) override;
/* 1c */
inline EquipBombchu_Unk_02198d00() :
@@ -38,18 +34,16 @@ public:
/* 00 (base) */
/* 09 */ u8 mUnk_09[3];
/* 0c */ ActorRef mUnk_0c;
/* 0c */ u8 mUnk_14[0x4];
/* 18 */ u32 mUnk_18;
/* 1c */ EquipBombchu_Unk1 *mUnk_1c;
/* 0c */ ActorRef mBombchuRef;
/* 14 */ unk32 mUnk_14;
/* 18 */ s32 mUnk_18;
/* 1c */ TilePos *mUnk_1c;
/* 20 */ Vec3p mUnk_20;
/* 2c */ void *mUnk_2c;
/* 30 */ u32 mUnk_30;
/* 34 */ u32 mUnk_34;
/* 2c */ Vec3p mUnk_2c;
/* 38 */ Vec3p mUnk_38;
/* 44 */ u16 mUnk_44;
/* 46 */ u8 mUnk_46;
/* 47 */ char mUnk_47;
/* 44 */ s16 mUnk_44;
/* 46 */ bool mUnk_46;
/* 47 */ bool mUnk_47;
/* 48 */ bool mUnk_48;
/* 49 */ unk8 mUnk_49[3];
/* 4c */
@@ -69,19 +63,17 @@ public:
void func_ov014_0213eba4();
void func_ov014_0213ec40();
void func_ov014_0213ec64();
Actor *func_ov014_0213ed74();
Actor *func_ov014_0213ed74() const;
void *func_ov014_0213ed94(s32 param1);
void func_ov014_0213eda0();
void func_ov058_02199220();
void func_ov058_02199228();
void func_ov058_02199264();
void func_ov058_0219926c();
bool CheckUsable(unk32 param1) const;
Actor *func_ov058_02199400();
bool func_ov058_02199498(Vec3p *vec);
void func_ov058_02199ef0(unk16 param1);
void func_ov058_02199fd8(u32 param1);
unk32 func_ov058_0219a084(unk16 param1);
bool func_ov058_0219a3b4(unk16 param1);
unk32 func_ov058_02199ef0(TilePos param1);
unk32 func_ov058_02199fd8(TilePos param1);
unk32 func_ov058_0219a084(TilePos param1);
bool func_ov058_0219a3b4(TilePos param1);
};
+3 -3
View File
@@ -10,8 +10,8 @@
class EquipItem : public SysObject {
public:
/* 0 (vtable) */
/* 4 */ u16 mUnk_00;
/* 6 */ u16 mUnk_04;
/* 4 */ s16 mUnk_04;
/* 6 */ u16 mUnk_06;
/* 8 */ bool mInUse;
/* 9 */
@@ -40,6 +40,6 @@ public:
Vec3p *GetPlayerPos();
void func_ov000_020be99c(Vec3p *param1);
void func_ov000_020be9e4(s32 param1, s32 param2, s32 param3, s16 param4);
void func_ov000_020be9e4(Vec3p param3, s16 param4);
s16 GetAmmo() const;
};