diff options
| author | YunataSavior <58997725+YunataSavior@users.noreply.github.com> | 2025-11-23 21:14:20 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-11-23 21:14:20 -0800 |
| commit | 818bd2f0bf5319be3c78d5286a67fa6e13597690 (patch) | |
| tree | 7d8601210357acefce98f1320df422c74b7ec693 /include/d/actor | |
| parent | 0cc9ebd72409859c7225e542d0c62868a3327ca7 (diff) | |
Some npc_ks dbg work (#2854)
Diffstat (limited to 'include/d/actor')
| -rw-r--r-- | include/d/actor/d_a_npc_ks.h | 5 | ||||
| -rw-r--r-- | include/d/actor/d_a_obj_so.h | 9 | ||||
| -rw-r--r-- | include/d/actor/d_a_player.h | 2 |
3 files changed, 10 insertions, 6 deletions
diff --git a/include/d/actor/d_a_npc_ks.h b/include/d/actor/d_a_npc_ks.h index ce37742529..da08da68e1 100644 --- a/include/d/actor/d_a_npc_ks.h +++ b/include/d/actor/d_a_npc_ks.h @@ -151,7 +151,7 @@ public: /* 0x94E */ s16 field_0x94e; /* 0x950 */ dCcD_Stts mStts; /* 0x98C */ dCcD_Cyl field_0x98c; - /* 0xAC8 */ u8 field_0xac8[0xaec - 0xac8]; + /* 0xAC8 */ dCcU_AtInfo mAtInfo; // unused /* 0xAEC */ s8 field_0xaec; /* 0xAED */ s8 field_0xaed; /* 0xAEE */ s16 field_0xaee; @@ -167,7 +167,8 @@ public: /* 0xB6C */ cXyz field_0xb6c; /* 0xB78 */ cXyz field_0xb78; /* 0xB84 */ cXyz field_0xb84; - /* 0xB90 */ u8 field_0xb90[0xba8 - 0xb90]; + /* 0xB90 */ cXyz field_0xb90; // unused + /* 0xB90 */ cXyz field_0xb9c; // unused /* 0xBA8 */ cXyz field_0xba8; /* 0xBB4 */ f32 field_0xbb4; /* 0xBB8 */ f32 field_0xbb8; diff --git a/include/d/actor/d_a_obj_so.h b/include/d/actor/d_a_obj_so.h index 077762083f..872c95d22a 100644 --- a/include/d/actor/d_a_obj_so.h +++ b/include/d/actor/d_a_obj_so.h @@ -86,11 +86,14 @@ public: /* 0x1BC4 */ u8 field_0x1bc4[0x1bcc - 0x1bc4]; /* 0x1BCC */ u8 field_0x1bcc; - u8 partBreak() { + bool partBreak() { for (int i = 0; i < 8; i++) { - if (field_0x1a98[i] == 2) return 1; + if (field_0x1a98[i] == 2) { + return true; + } } - return 0; + + return false; } }; diff --git a/include/d/actor/d_a_player.h b/include/d/actor/d_a_player.h index 6eb58ebabf..634eb245e0 100644 --- a/include/d/actor/d_a_player.h +++ b/include/d/actor/d_a_player.h @@ -1111,7 +1111,7 @@ public: mDemo.setParam0(i_param1); } - void changeDemoParam1(s16 i_param1) { + void changeDemoParam1(int i_param1) { mDemo.setParam1(i_param1); } |