summaryrefslogtreecommitdiff
path: root/src/d/actor/d_a_npc_md.cpp
diff options
context:
space:
mode:
authorLagoLunatic <LagoLunatic@users.noreply.github.com>2025-01-17 20:58:43 -0500
committerLagoLunatic <LagoLunatic@users.noreply.github.com>2025-01-17 20:58:43 -0500
commite8adc6c9e540a8df0efdf2b0c22737ebc0481055 (patch)
treefc6cafc90e676ba194c40f3153a2081033564843 /src/d/actor/d_a_npc_md.cpp
parentc609b6780c28f05dd78d55adfafaf3352cdb71a6 (diff)
Rename more item enums
Diffstat (limited to 'src/d/actor/d_a_npc_md.cpp')
-rw-r--r--src/d/actor/d_a_npc_md.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/d/actor/d_a_npc_md.cpp b/src/d/actor/d_a_npc_md.cpp
index 8cf6de85..d8e1fbc6 100644
--- a/src/d/actor/d_a_npc_md.cpp
+++ b/src/d/actor/d_a_npc_md.cpp
@@ -329,17 +329,17 @@ s16 daNpc_Md_c::XyCheckCB(int i_itemBtn) {
if (selectItemNo == dItem_WIND_WAKER_e) {
return TRUE;
}
- if (selectItemNo == GOLDEN_FEATHER) {
+ if (selectItemNo == dItem_GOLDEN_FEATHER_e) {
if (!dComIfGs_isEventBit(0x2E40) || (dComIfGs_isEventBit(0x2E40) && m_seaTalk)) {
return TRUE;
}
}
} else if (isTypeM_Dai() || isTypeEdaichi()) {
- if (selectItemNo == GOLDEN_FEATHER && !dComIfGs_isEventBit(0x3B80)) {
+ if (selectItemNo == dItem_GOLDEN_FEATHER_e && !dComIfGs_isEventBit(0x3B80)) {
return TRUE;
}
}
- if (selectItemNo == GOLDEN_FEATHER) {
+ if (selectItemNo == dItem_GOLDEN_FEATHER_e) {
dComIfGs_onEventBit(0x2C08);
}
return FALSE;
@@ -356,7 +356,7 @@ s16 daNpc_Md_c::XyEventCB(int i_itemBtn) {
if (selectItemNo == dItem_WIND_WAKER_e) {
offDefaultTalkXY();
return mEventIdxTable[5];
- } else if (selectItemNo == GOLDEN_FEATHER) {
+ } else if (selectItemNo == dItem_GOLDEN_FEATHER_e) {
onDefaultTalkXY();
}
return -1;