summaryrefslogtreecommitdiff
path: root/src/d/d_com_inf_game.cpp
diff options
context:
space:
mode:
authorLagoLunatic <LagoLunatic@users.noreply.github.com>2025-01-06 00:23:55 -0500
committerLagoLunatic <LagoLunatic@users.noreply.github.com>2025-01-06 00:23:55 -0500
commit37dbfd75de367d41e5a2edffa00b1b6027b1bd8e (patch)
tree6525c7b1e2086d4cbffd97c0c15df1391bec5b1a /src/d/d_com_inf_game.cpp
parent4a0a89501d765c5682e76ed5e05cd45648977614 (diff)
Add item button enum and talk button enum
Diffstat (limited to 'src/d/d_com_inf_game.cpp')
-rw-r--r--src/d/d_com_inf_game.cpp34
1 files changed, 17 insertions, 17 deletions
diff --git a/src/d/d_com_inf_game.cpp b/src/d/d_com_inf_game.cpp
index 59ce40a4..a04c807c 100644
--- a/src/d/d_com_inf_game.cpp
+++ b/src/d/d_com_inf_game.cpp
@@ -1280,16 +1280,16 @@ void dComIfGs_setPlayerRecollectionData() {
tbl = 3;
dComIfGp_setPlayerInfoBufferStageNo(4);
} else {
- dComIfGs_setSelectItem(0, dInvSlot_NONE_e);
- dComIfGs_setSelectItem(1, dInvSlot_NONE_e);
- dComIfGs_setSelectItem(2, dInvSlot_NONE_e);
+ dComIfGs_setSelectItem(dItemBtn_X_e, dInvSlot_NONE_e);
+ dComIfGs_setSelectItem(dItemBtn_Y_e, dInvSlot_NONE_e);
+ dComIfGs_setSelectItem(dItemBtn_Z_e, dInvSlot_NONE_e);
return;
}
if (dComIfGs_getpPlayerStatusC(tbl)->mRecollectItem.mItems[0] != dItem_TELESCOPE_e) {
- dComIfGs_setSelectItem(0, dInvSlot_NONE_e);
- dComIfGs_setSelectItem(1, dInvSlot_NONE_e);
- dComIfGs_setSelectItem(2, dInvSlot_NONE_e);
+ dComIfGs_setSelectItem(dItemBtn_X_e, dInvSlot_NONE_e);
+ dComIfGs_setSelectItem(dItemBtn_Y_e, dInvSlot_NONE_e);
+ dComIfGs_setSelectItem(dItemBtn_Z_e, dInvSlot_NONE_e);
return;
}
@@ -1382,15 +1382,15 @@ void dComIfGs_setPlayerRecollectionData() {
// 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]);
- dComIfGs_setSelectItem(0, dInvSlot_NONE_e);
- dComIfGs_setSelectItem(1, dInvSlot_NONE_e);
- dComIfGs_setSelectItem(2, dInvSlot_NONE_e);
+ dComIfGs_setSelectItem(dItemBtn_X_e, dInvSlot_NONE_e);
+ dComIfGs_setSelectItem(dItemBtn_Y_e, dInvSlot_NONE_e);
+ dComIfGs_setSelectItem(dItemBtn_Z_e, dInvSlot_NONE_e);
}
/* 80055318-80055580 .text dComIfGs_revPlayerRecollectionData__Fv */
@@ -1487,9 +1487,9 @@ void dComIfGs_revPlayerRecollectionData() {
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);
+ dComIfGs_setSelectItem(dItemBtn_X_e, dInvSlot_NONE_e);
+ dComIfGs_setSelectItem(dItemBtn_Y_e, dInvSlot_NONE_e);
+ dComIfGs_setSelectItem(dItemBtn_Z_e, dInvSlot_NONE_e);
}
/* 80055580-8005586C .text dComIfGs_exchangePlayerRecollectionData__Fv */