From 6bc4faa5f7e6bc5b3f8c67e71bd4a42e58d5afc8 Mon Sep 17 00:00:00 2001 From: YunataSavior <58997725+YunataSavior@users.noreply.github.com> Date: Fri, 18 Jul 2025 00:53:45 -0700 Subject: d_a_obj_brg matching (#2539) --- include/d/actor/d_a_obj_brg.h | 5 +++-- include/d/actor/d_a_player.h | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/d/actor/d_a_obj_brg.h b/include/d/actor/d_a_obj_brg.h index 711a2a0fb3..f92497a503 100644 --- a/include/d/actor/d_a_obj_brg.h +++ b/include/d/actor/d_a_obj_brg.h @@ -89,8 +89,9 @@ public: /* 0xB1EE */ u8 field_0xB1EE[0xB1EF - 0xB1EE]; /* 0xB1EF */ s8 field_0xb1ef; /* 0xB1F0 */ s8 field_0xb1f0; - /* 0xB1F1 */ u8 field_0xb1f1; - /* 0xB1F2 */ u8 field_0xb1f2[0xb1f8 - 0xB1F2]; + /* 0xB1F1 */ s8 field_0xb1f1; + /* 0xB1F2 */ s8 field_0xb1f2[2]; + /* 0xB1F4 */ u8 field_0xb1f4[0xb1f8 - 0xB1F4]; }; STATIC_ASSERT(sizeof(obj_brg_class) == 0xb1f8); diff --git a/include/d/actor/d_a_player.h b/include/d/actor/d_a_player.h index 24255bf29a..0da213cd2b 100644 --- a/include/d/actor/d_a_player.h +++ b/include/d/actor/d_a_player.h @@ -757,7 +757,7 @@ public: virtual BOOL checkCutCharge() const { return FALSE; } virtual BOOL checkCutTurnCharge() const { return FALSE; } virtual BOOL checkCutLargeJumpCharge() const { return FALSE; } - virtual bool getBokoFlamePos(cXyz*) { return FALSE; } + virtual BOOL getBokoFlamePos(cXyz*) { return FALSE; } virtual BOOL checkComboCutTurn() const { return FALSE; } virtual BOOL checkClimbMove() const { return FALSE; } virtual BOOL checkGrassWhistle() const { return FALSE; } -- cgit v1.2.3