diff options
| author | hatal175 <hatal175@users.noreply.github.com> | 2024-01-08 12:10:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-08 12:10:05 +0200 |
| commit | a8a159ae2c18e2ce3c0f98b1cc54e36ed14cff60 (patch) | |
| tree | 81dfdf02a475a88f6f9ce3ba03daad018bbfac91 /include/rel | |
| parent | dea6243c35dbc373e39c3f4afcb1aba0063065f0 (diff) | |
Various Matches, J2DTextBoxEx and J2DTevs OK (#2025)
* Work on src/d/bg
* misc work
* J2dTextBoxEx OK
* J2DTevs OK
* Better return values for bool
Diffstat (limited to 'include/rel')
| -rw-r--r-- | include/rel/d/a/d_a_horse/d_a_horse.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/rel/d/a/d_a_horse/d_a_horse.h b/include/rel/d/a/d_a_horse/d_a_horse.h index e5004b38c4..9836edfd1f 100644 --- a/include/rel/d/a/d_a_horse/d_a_horse.h +++ b/include/rel/d/a/d_a_horse/d_a_horse.h @@ -171,7 +171,7 @@ public: void offStateFlg0(daHorse_FLG0 flag) { mStateFlg0 &= ~flag; } void onEndResetStateFlg0(daHorse_ERFLG0 i_flag) { mEndResetStateFlg0 |= i_flag;} void offNoDrawWait() { offStateFlg0(NO_DRAW_WAIT); } - int checkSpecialWallHit(const cXyz& param_0) { return (this->*mpCheckSpecialWallHitFn)(param_0); } + bool checkSpecialWallHit(const cXyz& param_0) { return (this->*mpCheckSpecialWallHitFn)(param_0); } MtxP getSaddleMtx() { return field_0x570->i_getAnmMtx(21); } MtxP getRootMtx() { return field_0x570->i_getAnmMtx(0); } f32 getAnmFrameMax(int i_idx) const { return field_0x5b0[i_idx].getEnd(); } @@ -279,7 +279,7 @@ public: /* 0x17C4 */ cXyz mDemoPos0; /* 0x17D0 */ u8 field_0x17d0[0x18A4 - 0x17D0]; /* 0x18A4 */ int (daHorse_c::*mpProcFn)(); - /* 0x18B0 */ int (daHorse_c::*mpCheckSpecialWallHitFn)(const cXyz&); + /* 0x18B0 */ bool (daHorse_c::*mpCheckSpecialWallHitFn)(const cXyz&); /* 0x18BC */ void (daHorse_c::*mpSetReinPosHandFn)(int); /* 0x18C8 */ void (daHorse_c::*mpSetReinPosNormalFn)(); /* 0x18D4 */ int (daHorse_c::*mpCallHorseFn)(const cXyz*); |