summaryrefslogtreecommitdiff
path: root/src/d/d_com_inf_game.cpp
diff options
context:
space:
mode:
authorLagoLunatic <LagoLunatic@users.noreply.github.com>2024-06-07 14:04:18 -0400
committerLagoLunatic <LagoLunatic@users.noreply.github.com>2024-06-07 14:04:18 -0400
commite855019ab4a87e853a9993d7689d0750302bf50c (patch)
tree8ff64397b497b3e0da4cede98372bf1e839609f0 /src/d/d_com_inf_game.cpp
parent17e4446179a885b60eee9e732922d01420652144 (diff)
Rename some more item enum entries
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 cd99eb94..a43e5b9c 100644
--- a/src/d/d_com_inf_game.cpp
+++ b/src/d/d_com_inf_game.cpp
@@ -754,42 +754,42 @@ u8 dComIfGs_checkGetItem(u8 i_itemNo) {
get_item = 1;
}
break;
- case TRIFORCE1:
+ case dItem_TRIFORCE1_e:
if (dComIfGs_isTriforce(0)) {
get_item = 1;
}
break;
- case TRIFORCE2:
+ case dItem_TRIFORCE2_e:
if (dComIfGs_isTriforce(1)) {
get_item = 1;
}
break;
- case TRIFORCE3:
+ case dItem_TRIFORCE3_e:
if (dComIfGs_isTriforce(2)) {
get_item = 1;
}
break;
- case TRIFORCE4:
+ case dItem_TRIFORCE4_e:
if (dComIfGs_isTriforce(3)) {
get_item = 1;
}
break;
- case TRIFORCE5:
+ case dItem_TRIFORCE5_e:
if (dComIfGs_isTriforce(4)) {
get_item = 1;
}
break;
- case TRIFORCE6:
+ case dItem_TRIFORCE6_e:
if (dComIfGs_isTriforce(5)) {
get_item = 1;
}
break;
- case TRIFORCE7:
+ case dItem_TRIFORCE7_e:
if (dComIfGs_isTriforce(6)) {
get_item = 1;
}
break;
- case TRIFORCE8:
+ case dItem_TRIFORCE8_e:
if (dComIfGs_isTriforce(7)) {
get_item = 1;
}
@@ -878,42 +878,42 @@ u8 dComIfGs_checkGetItemNum(u8 i_itemNo) {
get_item = 1;
}
break;
- case TRIFORCE1:
+ case dItem_TRIFORCE1_e:
if (dComIfGs_isTriforce(0)) {
get_item = 1;
}
break;
- case TRIFORCE2:
+ case dItem_TRIFORCE2_e:
if (dComIfGs_isTriforce(1)) {
get_item = 1;
}
break;
- case TRIFORCE3:
+ case dItem_TRIFORCE3_e:
if (dComIfGs_isTriforce(2)) {
get_item = 1;
}
break;
- case TRIFORCE4:
+ case dItem_TRIFORCE4_e:
if (dComIfGs_isTriforce(3)) {
get_item = 1;
}
break;
- case TRIFORCE5:
+ case dItem_TRIFORCE5_e:
if (dComIfGs_isTriforce(4)) {
get_item = 1;
}
break;
- case TRIFORCE6:
+ case dItem_TRIFORCE6_e:
if (dComIfGs_isTriforce(5)) {
get_item = 1;
}
break;
- case TRIFORCE7:
+ case dItem_TRIFORCE7_e:
if (dComIfGs_isTriforce(6)) {
get_item = 1;
}
break;
- case TRIFORCE8:
+ case dItem_TRIFORCE8_e:
if (dComIfGs_isTriforce(7)) {
get_item = 1;
}
@@ -948,7 +948,7 @@ u8 dComIfGs_checkGetItemNum(u8 i_itemNo) {
get_item = dComIfGs_getArrowNum();
}
break;
- case BOMB_BAG:
+ case dItem_BOMB_BAG_e:
if (dComIfGs_getItem(13) != dItem_HEART_e) { // Bug?
get_item = dComIfGs_getBombNum();
}