diff --git a/include/d/d_save.h b/include/d/d_save.h index befab1da0..53ad456a1 100644 --- a/include/d/d_save.h +++ b/include/d/d_save.h @@ -171,7 +171,7 @@ public: void setReserveItemEmpty(u8); void setReserveItemEmpty(); void setReserveItem(u8); - bool checkReserveItemEmpty(); + u8 checkReserveItemEmpty(); u8 checkReserveItem(u8); u8 getBeast(int i_idx) { return mBeast[i_idx]; } diff --git a/src/d/d_cc_d.cpp b/src/d/d_cc_d.cpp index 41ed90c59..a41b3d257 100644 --- a/src/d/d_cc_d.cpp +++ b/src/d/d_cc_d.cpp @@ -199,7 +199,7 @@ u32 dCcD_GObjInf::ChkTgHit() { /* 800ABA08-800ABA48 .text ResetTgHit__12dCcD_GObjInfFv */ void dCcD_GObjInf::ResetTgHit() { - // cCcD_ObjHitInf::ResetTgHit(); + ClrTgHit(); ClrTgEffCounter(); } diff --git a/src/d/d_save.cpp b/src/d/d_save.cpp index 9bf9fd6a5..319325e33 100644 --- a/src/d/d_save.cpp +++ b/src/d/d_save.cpp @@ -300,7 +300,7 @@ void dSv_player_get_item_c::onBottleItem(u8 i_item) { } /* 80059740-80059848 .text isBottleItem__21dSv_player_get_item_cFUc */ -bool dSv_player_get_item_c::isBottleItem(u8 i_item) { +BOOL dSv_player_get_item_c::isBottleItem(u8 i_item) { switch (i_item) { case EMPTY_BSHIP: return mItemFlags[0] & 0x02; @@ -509,7 +509,7 @@ void dSv_player_bag_item_c::setReserveItem(u8 param_0) { } /* 8005A854-8005A878 .text checkReserveItemEmpty__21dSv_player_bag_item_cFv */ -bool dSv_player_bag_item_c::checkReserveItemEmpty() { +u8 dSv_player_bag_item_c::checkReserveItemEmpty() { return checkReserveItem(NO_ITEM); }