d_item 40%

include/d/d_com_inf_game.h

@@ -654,7 +654,7 @@ inline dSv_player_bag_item_c* dComIfGs_getpBagItem() {
     return g_dComIfG_gameInfo.save.getPlayer().getpBagItem();
 }
 
-inline BOOL dComIfGs_checkReserveItem(u8 i_itemNo) {
+inline u8 dComIfGs_checkReserveItem(u8 i_itemNo) {
     return dComIfGs_getpBagItem()->checkReserveItem(i_itemNo);
 }
 
@@ -925,6 +925,14 @@ inline BOOL dComIfGs_isSymbol(u8 i_no) {
     return g_dComIfG_gameInfo.save.getPlayer().getCollect().isSymbol(i_no);
 }
 
+inline BOOL dComIfGs_isDungeonItemMap() {
+    return g_dComIfG_gameInfo.save.getMemory().getBit().isDungeonItemMap();
+}
+
+inline BOOL dComIfGs_isDungeonItemCompass() {
+    return g_dComIfG_gameInfo.save.getMemory().getBit().isDungeonItemCompass();
+}
+
 inline BOOL dComIfGs_isDungeonItemBossKey() {
     return g_dComIfG_gameInfo.save.getMemory().getBit().isDungeonItemBossKey();
 }
@@ -1021,6 +1029,10 @@ inline void dComIfGs_onGetItemBait(u8 i_bait) {
     g_dComIfG_gameInfo.save.getPlayer().getGetBagItem().onBait(i_bait);
 }
 
+inline BOOL dComIfGs_isGetBottleItem(u8 i_itemNo) {
+    return g_dComIfG_gameInfo.save.getPlayer().getGetItem().isBottleItem(i_itemNo);
+}
+
 inline s16 dComIfGs_getWindY() {
     return g_dComIfG_gameInfo.save.getPlayer().getPlayerStatusB().getWindY();
 }

include/d/d_item.h

@@ -379,7 +379,7 @@ int item_getcheck_func_lithograph14();
 int item_getcheck_func_lithograph15();
 int item_getcheck_func_lithograph16();
 
-void getRotenItemNumInBag();
+int getRotenItemNumInBag();
 BOOL isDaizaItem(u8 itemNo);
 BOOL isBomb(u8 itemNo);
 BOOL isArrow(u8 itemNo);

include/d/d_save.h

@@ -102,7 +102,7 @@ public:
     void onItem(int, u8);
     BOOL isItem(int, u8);
     void onBottleItem(u8);
-    bool isBottleItem(u8);
+    BOOL isBottleItem(u8);
 
     /* 0x0 */ u8 mItemFlags[21];
 };  // Size: 0x15

src/d/actor/d_a_arrow.cpp

@@ -666,9 +666,9 @@ BOOL daArrow_c::procMove() {
             if (hitActor) {
                 JntHit_c* jntHit = fopAcM_GetJntHit(hitActor);
                 if (mArrowType == TYPE_LIGHT) {
-                    if (fpcM_GetName(mCps.GetAtHitAc()) == PROC_BGN
-                     || fpcM_GetName(mCps.GetAtHitAc()) == PROC_BGN2
-                     || fpcM_GetName(mCps.GetAtHitAc()) == PROC_BGN3) {
+                    if (fpcM_GetName(mCps.GetAtHitAc()) == PROC_BGN ||
+                        fpcM_GetName(mCps.GetAtHitAc()) == PROC_BGN2 ||
+                        fpcM_GetName(mCps.GetAtHitAc()) == PROC_BGN3) {
                         // Hit Puppet Ganon.
                         if (hitWasBlocked) {
                             field_0x6a8 = hitPos;

src/d/actor/d_a_item.cpp

@@ -1307,8 +1307,8 @@ void daItem_c::mode_wait() {
         break;
     }
     
-    if (mAcch.ChkWaterHit() && mAcch.m_wtr.GetHeight() > current.pos.y
-        || (daSea_ChkArea(current.pos.x, current.pos.z) && daSea_calcWave(current.pos.x, current.pos.z) > current.pos.y))
+    if (mAcch.ChkWaterHit() && mAcch.m_wtr.GetHeight() > current.pos.y ||
+        (daSea_ChkArea(current.pos.x, current.pos.z) && daSea_calcWave(current.pos.x, current.pos.z) > current.pos.y))
     {
         mode_water_init();
     }

src/d/actor/d_a_mbdoor.cpp

@@ -269,8 +269,8 @@ BOOL daMbdoor_c::CreateInit() {
         mCurActionIdx = 1;
         field_0x2b0 = 0;
         field_0x2b2 = 0;
-    } else if ((type == 0 && (swbit != 0xFF && !dComIfGs_isSwitch(swbit, fopAcM_GetRoomNo(this))))
-            || (type == 1 && (swbit == 0xFF || dComIfGs_isSwitch(swbit, fopAcM_GetRoomNo(this))))) {
+    } else if ((type == 0 && (swbit != 0xFF && !dComIfGs_isSwitch(swbit, fopAcM_GetRoomNo(this)))) ||
+               (type == 1 && (swbit == 0xFF || dComIfGs_isSwitch(swbit, fopAcM_GetRoomNo(this))))) {
         mCurActionIdx = 1;
         field_0x2b0 = 0;
         field_0x2b2 = 0;