diff options
| author | Jasper St. Pierre <jstpierre@mecheye.net> | 2024-12-27 01:23:55 -0800 |
|---|---|---|
| committer | Jasper St. Pierre <jstpierre@mecheye.net> | 2024-12-27 01:23:55 -0800 |
| commit | 929027bfc1850bc913ac5bace0f04476e5f1394c (patch) | |
| tree | 469d2e972614b1a32780d0e48b2bb8f904720528 /src/d/d_com_inf_game.cpp | |
| parent | 2db35c0108f84ec4736e4d4515abe50823e8c833 (diff) | |
document inventory slots
Diffstat (limited to 'src/d/d_com_inf_game.cpp')
| -rw-r--r-- | src/d/d_com_inf_game.cpp | 140 |
1 files changed, 70 insertions, 70 deletions
diff --git a/src/d/d_com_inf_game.cpp b/src/d/d_com_inf_game.cpp index ad34c0f6..17a532ac 100644 --- a/src/d/d_com_inf_game.cpp +++ b/src/d/d_com_inf_game.cpp @@ -945,12 +945,12 @@ u8 dComIfGs_checkGetItemNum(u8 i_itemNo) { } break; case dItem_BOW_e: - if (dComIfGs_getItem(12) != dItem_HEART_e) { // Bug? + if (dComIfGs_getItem(dInvSlot_BOW_e) != dItem_HEART_e) { // Bug? get_item = dComIfGs_getArrowNum(); } break; case dItem_BOMB_BAG_e: - if (dComIfGs_getItem(13) != dItem_HEART_e) { // Bug? + if (dComIfGs_getItem(dInvSlot_BOMB_e) != dItem_HEART_e) { // Bug? get_item = dComIfGs_getBombNum(); } break; @@ -1280,16 +1280,16 @@ void dComIfGs_setPlayerRecollectionData() { tbl = 3; dComIfGp_setPlayerInfoBufferStageNo(4); } else { - dComIfGs_setSelectItem(0, dItem_NONE_e); - dComIfGs_setSelectItem(1, dItem_NONE_e); - dComIfGs_setSelectItem(2, dItem_NONE_e); + dComIfGs_setSelectItem(0, dInvSlot_NONE_e); + dComIfGs_setSelectItem(1, dInvSlot_NONE_e); + dComIfGs_setSelectItem(2, dInvSlot_NONE_e); return; } - + if (dComIfGs_getpPlayerStatusC(tbl)->mRecollectItem.mItems[0] != dItem_TELESCOPE_e) { - dComIfGs_setSelectItem(0, dItem_NONE_e); - dComIfGs_setSelectItem(1, dItem_NONE_e); - dComIfGs_setSelectItem(2, dItem_NONE_e); + dComIfGs_setSelectItem(0, dInvSlot_NONE_e); + dComIfGs_setSelectItem(1, dInvSlot_NONE_e); + dComIfGs_setSelectItem(2, dInvSlot_NONE_e); return; } @@ -1298,36 +1298,36 @@ void dComIfGs_setPlayerRecollectionData() { dSv_player_item_record2_c tmp_record2; dSv_player_collect_c tmp_collect; dSv_player_item_c tmp_item; - + tmp_sttsA.mMaxLife = dComIfGs_getMaxLife(); tmp_sttsA.mLife = dComIfGs_getLife(); tmp_sttsA.mMaxMagic = dComIfGs_getMaxMagic(); tmp_sttsA.mMagic = dComIfGs_getMagic(); - + tmp_max.mItemMax2.mArrowNum = dComIfGs_getArrowMax(); tmp_record2.mArrowNum = dComIfGs_getArrowNum(); tmp_max.mItemMax2.mBombNum = dComIfGs_getBombMax(); tmp_record2.mBombNum = dComIfGs_getBombNum(); tmp_record2.mPictureNum = dComIfGs_getPictureNum(); - + tmp_collect.mCollect[0] = dComIfGs_checkCollect(0); tmp_collect.mCollect[1] = dComIfGs_checkCollect(1); tmp_collect.mCollect[2] = dComIfGs_checkCollect(2); tmp_collect.mCollect[3] = dComIfGs_checkCollect(3); tmp_collect.mCollect[4] = dComIfGs_checkCollect(4); - + tmp_sttsA.mSelectEquip[0] = dComIfGs_getSelectEquip(0); tmp_sttsA.mSelectEquip[1] = dComIfGs_getSelectEquip(1); tmp_sttsA.mSelectEquip[2] = dComIfGs_getSelectEquip(2); tmp_sttsA.mSelectEquip[3] = dComIfGs_getSelectEquip(3); tmp_sttsA.mSelectEquip[4] = dComIfGs_getSelectEquip(4); - + tmp_item.mItems[14] = dComIfGs_getItem(14); tmp_item.mItems[15] = dComIfGs_getItem(15); tmp_item.mItems[16] = dComIfGs_getItem(16); tmp_item.mItems[17] = dComIfGs_getItem(17); tmp_item.mItems[8] = dComIfGs_getItem(8); - + // TODO: This matches but could probably be cleaned up somehow. dSv_player_status_c_c* stts = dComIfGs_getpPlayerStatusC(tbl); u32 buffer = (u32)dComIfGp_getPlayerInfoBuffer(); @@ -1338,7 +1338,7 @@ void dComIfGs_setPlayerRecollectionData() { memcpy((void*)(buffer + offsetof(dSv_player_status_c_c, mRecollectBagItem)), dComIfGs_getpBagItem(), sizeof(stts->mRecollectBagItem)); memcpy((void*)(buffer + offsetof(dSv_player_status_c_c, mRecollectBagItemRecord)), dComIfGs_getpBagItemRecord(), sizeof(stts->mRecollectBagItemRecord)); memcpy((void*)(buffer + offsetof(dSv_player_status_c_c, mRecollectCollect)), dComIfGs_getpCollect(), sizeof(stts->mRecollectCollect)); - + memcpy(dComIfGs_getpPlayerStatusA(), &stts->mRecollectStatusA, sizeof(stts->mRecollectStatusA)); memcpy(dComIfGs_getpItem(), &stts->mRecollectItem, sizeof(stts->mRecollectItem)); memcpy(&dComIfGs_getpItemRecord()->mItemRecord2, &stts->mRecollectItemRecord, sizeof(stts->mRecollectItemRecord)); @@ -1346,24 +1346,24 @@ void dComIfGs_setPlayerRecollectionData() { memcpy(dComIfGs_getpBagItem(), &stts->mRecollectBagItem, sizeof(stts->mRecollectBagItem)); memcpy(dComIfGs_getpBagItemRecord(), &stts->mRecollectBagItemRecord, sizeof(stts->mRecollectBagItemRecord)); memcpy(dComIfGs_getpCollect(), &stts->mRecollectCollect, sizeof(stts->mRecollectCollect)); - + dComIfGs_setMaxLife(tmp_sttsA.mMaxLife); dComIfGs_setLife(tmp_sttsA.mLife); dComIfGs_setMaxMagic(tmp_sttsA.mMaxMagic); dComIfGs_setMagic(tmp_sttsA.mMagic); - + dComIfGs_setArrowMax(tmp_max.mItemMax2.mArrowNum); dComIfGs_setArrowNum(tmp_record2.mArrowNum); dComIfGs_setBombMax(tmp_max.mItemMax2.mBombNum); dComIfGs_setBombNum(tmp_record2.mBombNum); dComIfGs_setPictureNum(tmp_record2.mPictureNum); - + dComIfGs_setCollect(0, tmp_collect.mCollect[0]); dComIfGs_setCollect(1, tmp_collect.mCollect[1]); dComIfGs_setCollect(2, tmp_collect.mCollect[2]); dComIfGs_setCollect(3, tmp_collect.mCollect[3]); dComIfGs_setCollect(4, tmp_collect.mCollect[4]); - + dComIfGs_setSelectEquip(0, tmp_sttsA.mSelectEquip[0]); dComIfGs_setSelectEquip(1, tmp_sttsA.mSelectEquip[1]); dComIfGs_setSelectEquip(2, tmp_sttsA.mSelectEquip[2]); @@ -1372,7 +1372,7 @@ void dComIfGs_setPlayerRecollectionData() { // Usually the wallet size would be set via dComIfGs_setWalletSize instead. // TODO: Investigate this more. dComIfGs_setSelectEquip(4, tmp_sttsA.mSelectEquip[4]); - + dComIfGp_setSelectEquip(0, dComIfGs_getSelectEquip(0)); dComIfGp_setSelectEquip(1, dComIfGs_getSelectEquip(1)); dComIfGp_setSelectEquip(2, dComIfGs_getSelectEquip(2)); @@ -1381,16 +1381,16 @@ void dComIfGs_setPlayerRecollectionData() { // It seems to set dComIfG_play_c's mMesgAnime value to the current wallet size value. // TODO: Investigate this more. dComIfGp_setSelectEquip(4, dComIfGs_getSelectEquip(4)); - + dComIfGs_setItem(14, tmp_item.mItems[14]); dComIfGs_setItem(15, tmp_item.mItems[15]); dComIfGs_setItem(16, tmp_item.mItems[16]); dComIfGs_setItem(17, tmp_item.mItems[17]); dComIfGs_setItem(8, tmp_item.mItems[8]); - - dComIfGs_setSelectItem(0, dItem_NONE_e); - dComIfGs_setSelectItem(1, dItem_NONE_e); - dComIfGs_setSelectItem(2, dItem_NONE_e); + + dComIfGs_setSelectItem(0, dInvSlot_NONE_e); + dComIfGs_setSelectItem(1, dInvSlot_NONE_e); + dComIfGs_setSelectItem(2, dInvSlot_NONE_e); } /* 80055318-80055580 .text dComIfGs_revPlayerRecollectionData__Fv */ @@ -1406,36 +1406,36 @@ void dComIfGs_revPlayerRecollectionData() { dSv_player_item_record2_c tmp_record2; dSv_player_collect_c tmp_collect; dSv_player_item_c tmp_item; - + tmp_sttsA.mMaxLife = dComIfGs_getMaxLife(); tmp_sttsA.mLife = dComIfGs_getLife(); tmp_sttsA.mMaxMagic = dComIfGs_getMaxMagic(); tmp_sttsA.mMagic = dComIfGs_getMagic(); - + tmp_max.mItemMax2.mArrowNum = dComIfGs_getArrowMax(); tmp_record2.mArrowNum = dComIfGs_getArrowNum(); tmp_max.mItemMax2.mBombNum = dComIfGs_getBombMax(); tmp_record2.mBombNum = dComIfGs_getBombNum(); tmp_record2.mPictureNum = dComIfGs_getPictureNum(); - + tmp_collect.mCollect[0] = dComIfGs_checkCollect(0); tmp_collect.mCollect[1] = dComIfGs_checkCollect(1); tmp_collect.mCollect[2] = dComIfGs_checkCollect(2); tmp_collect.mCollect[3] = dComIfGs_checkCollect(3); tmp_collect.mCollect[4] = dComIfGs_checkCollect(4); - + tmp_sttsA.mSelectEquip[0] = dComIfGs_getSelectEquip(0); tmp_sttsA.mSelectEquip[1] = dComIfGs_getSelectEquip(1); tmp_sttsA.mSelectEquip[2] = dComIfGs_getSelectEquip(2); tmp_sttsA.mSelectEquip[3] = dComIfGs_getSelectEquip(3); tmp_sttsA.mSelectEquip[4] = dComIfGs_getSelectEquip(4); - + tmp_item.mItems[14] = dComIfGs_getItem(14); tmp_item.mItems[15] = dComIfGs_getItem(15); tmp_item.mItems[16] = dComIfGs_getItem(16); tmp_item.mItems[17] = dComIfGs_getItem(17); tmp_item.mItems[8] = dComIfGs_getItem(8); - + // TODO: This matches but could probably be cleaned up somehow. u32 buffer = (u32)dComIfGp_getPlayerInfoBuffer(); memcpy(dComIfGs_getpPlayerStatusA(), (void*)(buffer + offsetof(dSv_player_status_c_c, mRecollectStatusA)), sizeof(dSv_player_status_c_c().mRecollectStatusA)); @@ -1445,24 +1445,24 @@ void dComIfGs_revPlayerRecollectionData() { memcpy(dComIfGs_getpBagItem(), (void*)(buffer + offsetof(dSv_player_status_c_c, mRecollectBagItem)), sizeof(dSv_player_status_c_c().mRecollectBagItem)); memcpy(dComIfGs_getpBagItemRecord(), (void*)(buffer + offsetof(dSv_player_status_c_c, mRecollectBagItemRecord)), sizeof(dSv_player_status_c_c().mRecollectBagItemRecord)); memcpy(dComIfGs_getpCollect(), (void*)(buffer + offsetof(dSv_player_status_c_c, mRecollectCollect)), sizeof(dSv_player_status_c_c().mRecollectCollect)); - + dComIfGs_setMaxLife(tmp_sttsA.mMaxLife); dComIfGs_setLife(tmp_sttsA.mLife); dComIfGs_setMaxMagic(tmp_sttsA.mMaxMagic); dComIfGs_setMagic(tmp_sttsA.mMagic); - + dComIfGs_setArrowMax(tmp_max.mItemMax2.mArrowNum); dComIfGs_setArrowNum(tmp_record2.mArrowNum); dComIfGs_setBombMax(tmp_max.mItemMax2.mBombNum); dComIfGs_setBombNum(tmp_record2.mBombNum); dComIfGs_setPictureNum(tmp_record2.mPictureNum); - + dComIfGs_setCollect(0, tmp_collect.mCollect[0]); dComIfGs_setCollect(1, tmp_collect.mCollect[1]); dComIfGs_setCollect(2, tmp_collect.mCollect[2]); dComIfGs_setCollect(3, tmp_collect.mCollect[3]); dComIfGs_setCollect(4, tmp_collect.mCollect[4]); - + dComIfGs_setSelectEquip(0, tmp_sttsA.mSelectEquip[0]); dComIfGs_setSelectEquip(1, tmp_sttsA.mSelectEquip[1]); dComIfGs_setSelectEquip(2, tmp_sttsA.mSelectEquip[2]); @@ -1471,7 +1471,7 @@ void dComIfGs_revPlayerRecollectionData() { // Usually the wallet size would be set via dComIfGs_setWalletSize instead. // TODO: Investigate this more. dComIfGs_setSelectEquip(4, tmp_sttsA.mSelectEquip[4]); - + dComIfGp_setSelectEquip(0, dComIfGs_getSelectEquip(0)); dComIfGp_setSelectEquip(1, dComIfGs_getSelectEquip(1)); dComIfGp_setSelectEquip(2, dComIfGs_getSelectEquip(2)); @@ -1480,16 +1480,16 @@ void dComIfGs_revPlayerRecollectionData() { // It seems to set dComIfG_play_c's mMesgAnime value to the current wallet size value. // TODO: Investigate this more. dComIfGp_setSelectEquip(4, dComIfGs_getSelectEquip(4)); - - dComIfGs_setItem(14, tmp_item.mItems[14]); - dComIfGs_setItem(15, tmp_item.mItems[15]); - dComIfGs_setItem(16, tmp_item.mItems[16]); - dComIfGs_setItem(17, tmp_item.mItems[17]); - dComIfGs_setItem(8, tmp_item.mItems[8]); - - dComIfGs_setSelectItem(0, dItem_NONE_e); - dComIfGs_setSelectItem(1, dItem_NONE_e); - dComIfGs_setSelectItem(2, dItem_NONE_e); + + dComIfGs_setItem(dInvSlot_BOTTLE0_e, tmp_item.mItems[dInvSlot_BOTTLE0_e]); + dComIfGs_setItem(dInvSlot_BOTTLE1_e, tmp_item.mItems[dInvSlot_BOTTLE1_e]); + dComIfGs_setItem(dInvSlot_BOTTLE2_e, tmp_item.mItems[dInvSlot_BOTTLE2_e]); + dComIfGs_setItem(dInvSlot_BOTTLE3_e, tmp_item.mItems[dInvSlot_BOTTLE3_e]); + dComIfGs_setItem(dInvSlot_CAMERA_e, tmp_item.mItems[dInvSlot_CAMERA_e]); + + dComIfGs_setSelectItem(0, dInvSlot_NONE_e); + dComIfGs_setSelectItem(1, dInvSlot_NONE_e); + dComIfGs_setSelectItem(2, dInvSlot_NONE_e); } /* 80055580-8005586C .text dComIfGs_exchangePlayerRecollectionData__Fv */ @@ -1503,36 +1503,36 @@ void dComIfGs_exchangePlayerRecollectionData() { dSv_player_item_record2_c tmp_record2; dSv_player_collect_c tmp_collect; dSv_player_item_c tmp_item; - + tmp_sttsA.mMaxLife = dComIfGs_getMaxLife(); tmp_sttsA.mLife = dComIfGs_getLife(); tmp_sttsA.mMaxMagic = dComIfGs_getMaxMagic(); tmp_sttsA.mMagic = dComIfGs_getMagic(); - + tmp_max.mItemMax2.mArrowNum = dComIfGs_getArrowMax(); tmp_record2.mArrowNum = dComIfGs_getArrowNum(); tmp_max.mItemMax2.mBombNum = dComIfGs_getBombMax(); tmp_record2.mBombNum = dComIfGs_getBombNum(); tmp_record2.mPictureNum = dComIfGs_getPictureNum(); - + tmp_collect.mCollect[0] = dComIfGs_checkCollect(0); tmp_collect.mCollect[1] = dComIfGs_checkCollect(1); tmp_collect.mCollect[2] = dComIfGs_checkCollect(2); tmp_collect.mCollect[3] = dComIfGs_checkCollect(3); tmp_collect.mCollect[4] = dComIfGs_checkCollect(4); - + tmp_sttsA.mSelectEquip[0] = dComIfGs_getSelectEquip(0); tmp_sttsA.mSelectEquip[1] = dComIfGs_getSelectEquip(1); tmp_sttsA.mSelectEquip[2] = dComIfGs_getSelectEquip(2); tmp_sttsA.mSelectEquip[3] = dComIfGs_getSelectEquip(3); tmp_sttsA.mSelectEquip[4] = dComIfGs_getSelectEquip(4); - - tmp_item.mItems[14] = dComIfGs_getItem(14); - tmp_item.mItems[15] = dComIfGs_getItem(15); - tmp_item.mItems[16] = dComIfGs_getItem(16); - tmp_item.mItems[17] = dComIfGs_getItem(17); - tmp_item.mItems[8] = dComIfGs_getItem(8); - + + tmp_item.mItems[dInvSlot_BOTTLE0_e] = dComIfGs_getItem(dInvSlot_BOTTLE0_e); + tmp_item.mItems[dInvSlot_BOTTLE1_e] = dComIfGs_getItem(dInvSlot_BOTTLE1_e); + tmp_item.mItems[dInvSlot_BOTTLE2_e] = dComIfGs_getItem(dInvSlot_BOTTLE2_e); + tmp_item.mItems[dInvSlot_BOTTLE3_e] = dComIfGs_getItem(dInvSlot_BOTTLE3_e); + tmp_item.mItems[dInvSlot_CAMERA_e] = dComIfGs_getItem(dInvSlot_CAMERA_e); + // TODO: This matches but could probably be cleaned up somehow. dSv_player_status_c_c stts; memcpy(&stts, dComIfGp_getPlayerInfoBuffer(), sizeof(stts)); @@ -1544,7 +1544,7 @@ void dComIfGs_exchangePlayerRecollectionData() { memcpy((void*)(buffer + offsetof(dSv_player_status_c_c, mRecollectBagItem)), dComIfGs_getpBagItem(), sizeof(stts.mRecollectBagItem)); memcpy((void*)(buffer + offsetof(dSv_player_status_c_c, mRecollectBagItemRecord)), dComIfGs_getpBagItemRecord(), sizeof(stts.mRecollectBagItemRecord)); memcpy((void*)(buffer + offsetof(dSv_player_status_c_c, mRecollectCollect)), dComIfGs_getpCollect(), sizeof(stts.mRecollectCollect)); - + u8* stts_buffer = (u8*)&stts; memcpy(dComIfGs_getpPlayerStatusA(), stts_buffer + offsetof(dSv_player_status_c_c, mRecollectStatusA), sizeof(stts.mRecollectStatusA)); memcpy(dComIfGs_getpItem(), stts_buffer + offsetof(dSv_player_status_c_c, mRecollectItem), sizeof(stts.mRecollectItem)); @@ -1553,24 +1553,24 @@ void dComIfGs_exchangePlayerRecollectionData() { memcpy(dComIfGs_getpBagItem(), stts_buffer + offsetof(dSv_player_status_c_c, mRecollectBagItem), sizeof(stts.mRecollectBagItem)); memcpy(dComIfGs_getpBagItemRecord(), stts_buffer + offsetof(dSv_player_status_c_c, mRecollectBagItemRecord), sizeof(stts.mRecollectBagItemRecord)); memcpy(dComIfGs_getpCollect(), stts_buffer + offsetof(dSv_player_status_c_c, mRecollectCollect), sizeof(stts.mRecollectCollect)); - + dComIfGs_setMaxLife(tmp_sttsA.mMaxLife); dComIfGs_setLife(tmp_sttsA.mLife); dComIfGs_setMaxMagic(tmp_sttsA.mMaxMagic); dComIfGs_setMagic(tmp_sttsA.mMagic); - + dComIfGs_setArrowMax(tmp_max.mItemMax2.mArrowNum); dComIfGs_setArrowNum(tmp_record2.mArrowNum); dComIfGs_setBombMax(tmp_max.mItemMax2.mBombNum); dComIfGs_setBombNum(tmp_record2.mBombNum); dComIfGs_setPictureNum(tmp_record2.mPictureNum); - + dComIfGs_setCollect(0, tmp_collect.mCollect[0]); dComIfGs_setCollect(1, tmp_collect.mCollect[1]); dComIfGs_setCollect(2, tmp_collect.mCollect[2]); dComIfGs_setCollect(3, tmp_collect.mCollect[3]); dComIfGs_setCollect(4, tmp_collect.mCollect[4]); - + dComIfGs_setSelectEquip(0, tmp_sttsA.mSelectEquip[0]); dComIfGs_setSelectEquip(1, tmp_sttsA.mSelectEquip[1]); dComIfGs_setSelectEquip(2, tmp_sttsA.mSelectEquip[2]); @@ -1579,7 +1579,7 @@ void dComIfGs_exchangePlayerRecollectionData() { // Usually the wallet size would be set via dComIfGs_setWalletSize instead. // TODO: Investigate this more. dComIfGs_setSelectEquip(4, tmp_sttsA.mSelectEquip[4]); - + dComIfGp_setSelectEquip(0, dComIfGs_getSelectEquip(0)); dComIfGp_setSelectEquip(1, dComIfGs_getSelectEquip(1)); dComIfGp_setSelectEquip(2, dComIfGs_getSelectEquip(2)); @@ -1588,12 +1588,12 @@ void dComIfGs_exchangePlayerRecollectionData() { // It seems to set dComIfG_play_c's mMesgAnime value to the current wallet size value. // TODO: Investigate this more. dComIfGp_setSelectEquip(4, dComIfGs_getSelectEquip(4)); - - dComIfGs_setItem(14, tmp_item.mItems[14]); - dComIfGs_setItem(15, tmp_item.mItems[15]); - dComIfGs_setItem(16, tmp_item.mItems[16]); - dComIfGs_setItem(17, tmp_item.mItems[17]); - dComIfGs_setItem(8, tmp_item.mItems[8]); + + dComIfGs_setItem(dInvSlot_BOTTLE0_e, tmp_item.mItems[dInvSlot_BOTTLE0_e]); + dComIfGs_setItem(dInvSlot_BOTTLE1_e, tmp_item.mItems[dInvSlot_BOTTLE1_e]); + dComIfGs_setItem(dInvSlot_BOTTLE2_e, tmp_item.mItems[dInvSlot_BOTTLE2_e]); + dComIfGs_setItem(dInvSlot_BOTTLE3_e, tmp_item.mItems[dInvSlot_BOTTLE3_e]); + dComIfGs_setItem(dInvSlot_CAMERA_e, tmp_item.mItems[dInvSlot_CAMERA_e]); } /* 8005586C-800559E8 .text dComIfGs_setSelectEquip__FiUc */ |
