diff options
| author | Jcw87 <Jcw87@users.noreply.github.com> | 2026-01-05 03:55:35 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-01-05 03:55:35 -0800 |
| commit | 22dc7a37dbc844b0eccba65025cf7f0950b98259 (patch) | |
| tree | b8fc9158a2c8b9b8b2a025a5d5d2040d2473b333 /include | |
| parent | 767e3ba17ea514010cbc4f2015f8ffc1d4d87286 (diff) | |
fix functions not returning values (#3018)
Diffstat (limited to 'include')
| -rw-r--r-- | include/JSystem/J2DGraph/J2DWindow.h | 7 | ||||
| -rw-r--r-- | include/d/actor/d_a_npc_hoz.h | 2 | ||||
| -rw-r--r-- | include/d/actor/d_a_obj_bemos.h | 1 |
3 files changed, 9 insertions, 1 deletions
diff --git a/include/JSystem/J2DGraph/J2DWindow.h b/include/JSystem/J2DGraph/J2DWindow.h index f467b953db..0d194c4995 100644 --- a/include/JSystem/J2DGraph/J2DWindow.h +++ b/include/JSystem/J2DGraph/J2DWindow.h @@ -9,9 +9,16 @@ class JUTTexture; enum J2DTextureBase { TEXTUREBASE_0 = 0, + TEXTUREBASE_1 = 1, + TEXTUREBASE_2 = 2, + TEXTUREBASE_3 = 3, }; enum J2DWindowMirror { + WINDOWMIRROR_39 = 39, + WINDOWMIRROR_114 = 114, + WINDOWMIRROR_141 = 141, + WINDOWMIRROR_216 = 216, }; /** diff --git a/include/d/actor/d_a_npc_hoz.h b/include/d/actor/d_a_npc_hoz.h index 5234e1bdc2..0a0b10eada 100644 --- a/include/d/actor/d_a_npc_hoz.h +++ b/include/d/actor/d_a_npc_hoz.h @@ -100,7 +100,7 @@ public: static cutFunc mCutList[]; private: - /* 0xE40 */ u8 field_0xE40[0xE44 - 0xE40]; + /* 0xE40 */ int field_0xE40; /* 0xE44 */ dCcD_Cyl mCyl; /* 0xF80 */ u8 mType; /* 0xF84 */ daStartAndGoal_c* field_0xf84; diff --git a/include/d/actor/d_a_obj_bemos.h b/include/d/actor/d_a_obj_bemos.h index bf28ec9eca..713794c3b1 100644 --- a/include/d/actor/d_a_obj_bemos.h +++ b/include/d/actor/d_a_obj_bemos.h @@ -46,6 +46,7 @@ public: }; Bgc_c(); + static void chk_wall_touch(const fopAc_ac_c*, const daObjBm_c::BgcSrc_c*, short); void wall_pos(fopAc_ac_c const*, daObjBm_c::BgcSrc_c const*, int, s16, f32); bool chk_wall_pre(fopAc_ac_c const*, daObjBm_c::BgcSrc_c const*, int, s16); |
