mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-20 13:45:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add item button enum and talk button enum

Browse Source
This commit is contained in:
LagoLunatic
2025-01-06 00:23:55 -05:00
parent 4a0a89501d
commit 37dbfd75de
22 changed files with 343 additions and 292 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_agbsw0.cpp
+36 -12
View File
@@ -1791,37 +1791,61 @@ BOOL daAgbsw0_c::MoveCheck(s16 conditionNo) {
break;
case 0x11:
if(dComIfGp_getSelectItem(0) != dItem_BOW_e && dComIfGp_getSelectItem(1) != dItem_BOW_e && dComIfGp_getSelectItem(2) != dItem_BOW_e) {
if(
dComIfGp_getSelectItem(dItemBtn_X_e) != dItem_BOW_e &&
dComIfGp_getSelectItem(dItemBtn_Y_e) != dItem_BOW_e &&
dComIfGp_getSelectItem(dItemBtn_Z_e) != dItem_BOW_e
) {
return FALSE;
}
break;
case 0x12:
if(dComIfGp_getSelectItem(0) != dItem_BOOMERANG_e && dComIfGp_getSelectItem(1) != dItem_BOOMERANG_e && dComIfGp_getSelectItem(2) != dItem_BOOMERANG_e) {
if(
dComIfGp_getSelectItem(dItemBtn_X_e) != dItem_BOOMERANG_e &&
dComIfGp_getSelectItem(dItemBtn_Y_e) != dItem_BOOMERANG_e &&
dComIfGp_getSelectItem(dItemBtn_Z_e) != dItem_BOOMERANG_e
) {
return FALSE;
}
break;
case 0x13:
if(dComIfGp_getSelectItem(0) != dItem_DEKU_LEAF_e && dComIfGp_getSelectItem(1) != dItem_DEKU_LEAF_e && dComIfGp_getSelectItem(2) != dItem_DEKU_LEAF_e) {
if(
dComIfGp_getSelectItem(dItemBtn_X_e) != dItem_DEKU_LEAF_e &&
dComIfGp_getSelectItem(dItemBtn_Y_e) != dItem_DEKU_LEAF_e &&
dComIfGp_getSelectItem(dItemBtn_Z_e) != dItem_DEKU_LEAF_e
) {
return FALSE;
}
break;
case 0x14:
if(dComIfGp_getSelectItem(0) != dItem_GRAPPLING_HOOK_e && dComIfGp_getSelectItem(1) != dItem_GRAPPLING_HOOK_e && dComIfGp_getSelectItem(2) != dItem_GRAPPLING_HOOK_e) {
if(
dComIfGp_getSelectItem(dItemBtn_X_e) != dItem_GRAPPLING_HOOK_e &&
dComIfGp_getSelectItem(dItemBtn_Y_e) != dItem_GRAPPLING_HOOK_e &&
dComIfGp_getSelectItem(dItemBtn_Z_e) != dItem_GRAPPLING_HOOK_e
) {
return FALSE;
}
break;
case 0x15:
if(dComIfGp_getSelectItem(0) != dItem_BOMB_BAG_e && dComIfGp_getSelectItem(1) != dItem_BOMB_BAG_e && dComIfGp_getSelectItem(2) != dItem_BOMB_BAG_e) {
if(
dComIfGp_getSelectItem(dItemBtn_X_e) != dItem_BOMB_BAG_e &&
dComIfGp_getSelectItem(dItemBtn_Y_e) != dItem_BOMB_BAG_e &&
dComIfGp_getSelectItem(dItemBtn_Z_e) != dItem_BOMB_BAG_e
) {
return FALSE;
}
break;
case 0x16:
if(dComIfGp_getSelectItem(0) != dItem_HOOKSHOT_e && dComIfGp_getSelectItem(1) != dItem_HOOKSHOT_e && dComIfGp_getSelectItem(2) != dItem_HOOKSHOT_e) {
if(
dComIfGp_getSelectItem(dItemBtn_X_e) != dItem_HOOKSHOT_e &&
dComIfGp_getSelectItem(dItemBtn_Y_e) != dItem_HOOKSHOT_e &&
dComIfGp_getSelectItem(dItemBtn_Z_e) != dItem_HOOKSHOT_e
) {
return FALSE;
}
@@ -1912,9 +1936,9 @@ BOOL daAgbsw0_c::MoveCheck(s16 conditionNo) {
break;
case 0x25:
if (dComIfGp_checkPlayerStatus0(0, daPyStts0_SHIP_RIDE_e) &&
dComIfGp_getSelectItem(0) != dItem_BOMB_BAG_e &&
dComIfGp_getSelectItem(1) != dItem_BOMB_BAG_e &&
dComIfGp_getSelectItem(2) != dItem_BOMB_BAG_e)
dComIfGp_getSelectItem(dItemBtn_X_e) != dItem_BOMB_BAG_e &&
dComIfGp_getSelectItem(dItemBtn_Y_e) != dItem_BOMB_BAG_e &&
dComIfGp_getSelectItem(dItemBtn_Z_e) != dItem_BOMB_BAG_e)
{
return FALSE;
}
@@ -1922,9 +1946,9 @@ BOOL daAgbsw0_c::MoveCheck(s16 conditionNo) {
break;
case 0x26:
if (dComIfGp_checkPlayerStatus0(0, daPyStts0_SHIP_RIDE_e) &&
dComIfGp_getSelectItem(0) != dItem_GRAPPLING_HOOK_e &&
dComIfGp_getSelectItem(1) != dItem_GRAPPLING_HOOK_e &&
dComIfGp_getSelectItem(2) != dItem_GRAPPLING_HOOK_e)
dComIfGp_getSelectItem(dItemBtn_X_e) != dItem_GRAPPLING_HOOK_e &&
dComIfGp_getSelectItem(dItemBtn_Y_e) != dItem_GRAPPLING_HOOK_e &&
dComIfGp_getSelectItem(dItemBtn_Z_e) != dItem_GRAPPLING_HOOK_e)
{
return FALSE;
}
src/d/actor/d_a_npc_bs1.cpp
+2 -2
View File
@@ -115,9 +115,9 @@ static s16 daNpc_Bs1_XyEventCB(void* i_this, int value) {
return ((daNpc_Bs1_c*)i_this)->XyEventCB(value);
}
/* 000002E4-00000490 .text XyEventCB__11daNpc_Bs1_cFi */
s16 daNpc_Bs1_c::XyEventCB(int selectItemIdx) {
s16 daNpc_Bs1_c::XyEventCB(int i_itemBtn) {
s16 eventIdx = -1;
u8 selectedItem = (s32)dComIfGp_getSelectItem(selectItemIdx);
u8 selectedItem = (s32)dComIfGp_getSelectItem(i_itemBtn);
if (mType == 0) {
if (selectedItem == KAISEN_PRESENT1) {
eventIdx = mEventIdxs[0];
src/d/actor/d_a_npc_ji1.cpp
+2 -2
View File
@@ -231,8 +231,8 @@ daNpc_Ji1_HIO_c::daNpc_Ji1_HIO_c() {
}
/* 000003C0-000003E4 .text daNpc_Ji1_XyCheckCB__FPvi */
static s16 daNpc_Ji1_XyCheckCB(void*, int equippedItemIdx) {
return dComIfGp_getSelectItem(equippedItemIdx) == BOKO_BELT ? TRUE : FALSE;
static s16 daNpc_Ji1_XyCheckCB(void*, int i_itemBtn) {
return dComIfGp_getSelectItem(i_itemBtn) == BOKO_BELT ? TRUE : FALSE;
}
/* 000003E4-00000404 .text daJi1_CoHitCallback__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf */
src/d/actor/d_a_npc_kamome.cpp
+7 -7
View File
@@ -68,13 +68,13 @@ daNpc_kam_HIO_c::daNpc_kam_HIO_c() {
}
/* 00000240-00000260 .text daNpc_kam_XyCheckCB__FPvi */
static s16 daNpc_kam_XyCheckCB(void* i_this, int equippedItemIdx) {
return ((daNpc_kam_c*)i_this)->XyCheckCB(equippedItemIdx);
static s16 daNpc_kam_XyCheckCB(void* i_this, int i_itemBtn) {
return ((daNpc_kam_c*)i_this)->XyCheckCB(i_itemBtn);
}
/* 00000260-000002A4 .text XyCheckCB__11daNpc_kam_cFi */
s16 daNpc_kam_c::XyCheckCB(int equippedItemIdx) {
if (dComIfGp_getSelectItem(equippedItemIdx) == dItem_HYOI_PEAR_e) {
s16 daNpc_kam_c::XyCheckCB(int i_itemBtn) {
if (dComIfGp_getSelectItem(i_itemBtn) == dItem_HYOI_PEAR_e) {
return callDemoStartCheck();
} else {
return FALSE;
@@ -139,12 +139,12 @@ int daNpc_kam_c::callDemoStartCheck() {
}
/* 0000052C-0000054C .text daNpc_kam_XyEventCB__FPvi */
static s16 daNpc_kam_XyEventCB(void* i_this, int equippedItemIdx) {
return ((daNpc_kam_c*)i_this)->XyEventCB(equippedItemIdx);
static s16 daNpc_kam_XyEventCB(void* i_this, int i_itemBtn) {
return ((daNpc_kam_c*)i_this)->XyEventCB(i_itemBtn);
}
/* 0000054C-00000568 .text XyEventCB__11daNpc_kam_cFi */
s16 daNpc_kam_c::XyEventCB(int equippedItemIdx) {
s16 daNpc_kam_c::XyEventCB(int i_itemBtn) {
onEventAccept();
mCurrEventIdxIdx = 1; // "kamome_call"
return mEventIdxs[1];
src/d/actor/d_a_npc_md.cpp
+4 -4
View File
@@ -323,8 +323,8 @@ static s16 daNpc_Md_XyCheckCB(void* i_this, int param_1) {
}
/* 000006FC-000007FC .text XyCheckCB__10daNpc_Md_cFi */
s16 daNpc_Md_c::XyCheckCB(int equippedItemIdx) {
u8 selectItemNo = dComIfGp_getSelectItem(equippedItemIdx);
s16 daNpc_Md_c::XyCheckCB(int i_itemBtn) {
u8 selectItemNo = dComIfGp_getSelectItem(i_itemBtn);
if (isTypeSea()) {
if (selectItemNo == dItem_WIND_WAKER_e) {
return TRUE;
@@ -351,8 +351,8 @@ static s16 daNpc_Md_XyEventCB(void* i_this, int param_1) {
}
/* 0000081C-00000864 .text XyEventCB__10daNpc_Md_cFi */
s16 daNpc_Md_c::XyEventCB(int equippedItemIdx) {
u8 selectItemNo = dComIfGp_getSelectItem(equippedItemIdx);
s16 daNpc_Md_c::XyEventCB(int i_itemBtn) {
u8 selectItemNo = dComIfGp_getSelectItem(i_itemBtn);
if (selectItemNo == dItem_WIND_WAKER_e) {
offDefaultTalkXY();
return mEventIdxTable[5];
src/d/actor/d_a_npc_nz.cpp
+2 -2
View File
@@ -203,10 +203,10 @@ daNpc_Nz_HIO_c::daNpc_Nz_HIO_c() {
}
/* 00001010-000011A0 .text daNpc_Nz_XyCheckCB__FPvi */
static s16 daNpc_Nz_XyCheckCB(void* i_actor, int equippedItemIdx) {
static s16 daNpc_Nz_XyCheckCB(void* i_actor, int i_itemBtn) {
daNpc_Nz_c* i_this = static_cast<daNpc_Nz_c*>(i_actor);
if(dComIfGp_getSelectItem(equippedItemIdx) == BIRD_ESA_5) {
if(dComIfGp_getSelectItem(i_itemBtn) == BIRD_ESA_5) {
f32 temp2 = l_HIO.field_0x20;
daPy_py_c* player = daPy_getPlayerActorClass();
cXyz temp(player->current.pos);
src/d/actor/d_a_npc_people.cpp
+8 -8
View File
@@ -4268,13 +4268,13 @@ BOOL daNpcPeople_c::createHeap() {
}
/* 00000E0C-00000E2C .text daNpcPeople_XyCheckCB__FPvi */
static s16 daNpcPeople_XyCheckCB(void* i_this, int equippedItemIdx) {
return static_cast<daNpcPeople_c*>(i_this)->XyCheckCB(equippedItemIdx);
static s16 daNpcPeople_XyCheckCB(void* i_this, int i_itemBtn) {
return static_cast<daNpcPeople_c*>(i_this)->XyCheckCB(i_itemBtn);
}
/* 00000E2C-00000E4C .text daNpcPeople_XyEventCB__FPvi */
static s16 daNpcPeople_XyEventCB(void* i_this, int equippedItemIdx) {
return static_cast<daNpcPeople_c*>(i_this)->XyEventCB(equippedItemIdx);
static s16 daNpcPeople_XyEventCB(void* i_this, int i_itemBtn) {
return static_cast<daNpcPeople_c*>(i_this)->XyEventCB(i_itemBtn);
}
/* 00000E4C-00000E6C .text daNpcPeople_photoCB__FPvi */
@@ -7732,8 +7732,8 @@ void daNpcPeople_c::setWaitAnm() {
}
/* 0000884C-00008A10 .text XyCheckCB__13daNpcPeople_cFi */
s16 daNpcPeople_c::XyCheckCB(int equippedItemIdx) {
u8 itemNo = dComIfGp_getSelectItem(equippedItemIdx);
s16 daNpcPeople_c::XyCheckCB(int i_itemBtn) {
u8 itemNo = dComIfGp_getSelectItem(i_itemBtn);
switch(mNpcType) {
case 0x2:
@@ -7792,9 +7792,9 @@ s16 daNpcPeople_c::XyCheckCB(int equippedItemIdx) {
}
/* 00008A10-00008AC8 .text XyEventCB__13daNpcPeople_cFi */
s16 daNpcPeople_c::XyEventCB(int equippedItemIdx) {
s16 daNpcPeople_c::XyEventCB(int i_itemBtn) {
s16 ret = -1;
u8 itemNo = dComIfGp_getSelectItem(equippedItemIdx);
u8 itemNo = dComIfGp_getSelectItem(i_itemBtn);
switch(mNpcType) {
case 0x3:
src/d/actor/d_a_npc_roten.cpp
+11 -11
View File
@@ -1543,7 +1543,7 @@ daNpcRoten_c::daNpcRoten_c() {
field_0x9C1 = 0;
field_0x9C4 = 0;
field_0x99C = 1;
field_0x9C5 = 3;
mShownItemBtn = dItemBtn_NONE_e;
field_0x9BC = 0;
field_0x9C6 = 0;
field_0x9C7 = 0;
@@ -2395,7 +2395,7 @@ u16 daNpcRoten_c::next_msgStatus(u32* pMsgNo) {
*pMsgNo = l_msg_xy_koukan_first[mNpcNo];
}
dComIfGs_setReserveItemChange(field_0x9C5, temp + FLOWER_1);
dComIfGs_setReserveItemChange(mShownItemBtn, temp + FLOWER_1);
field_0x98C = NULL;
break;
}
@@ -2782,23 +2782,23 @@ BOOL daNpcRoten_c::isGetMap(u8 itemNo) {
}
/* 00003B30-00003C7C .text XyEventCB__12daNpcRoten_cFi */
s16 daNpcRoten_c::XyEventCB(int equippedItemIdx) {
s16 daNpcRoten_c::XyEventCB(int i_itemBtn) {
s16 eventIdx;
int itemNo = dComIfGp_getSelectItem(equippedItemIdx);
int itemNo = dComIfGp_getSelectItem(i_itemBtn);
field_0x9BE = itemNo - FLOWER_1;
if(isKoukanItem(itemNo) && dComIfGs_getEventReg(l_save_dat[mNpcNo].field_0x02) < 3 && !isGetMap(itemNo)) {
if(dComIfGp_event_getTalkXYBtn() == 1) {
field_0x9C5 = 0;
if(dComIfGp_event_getTalkXYBtn() == dTalkBtn_X_e) {
mShownItemBtn = dItemBtn_X_e;
}
else if(dComIfGp_event_getTalkXYBtn() == 2) {
field_0x9C5 = 1;
else if(dComIfGp_event_getTalkXYBtn() == dTalkBtn_Y_e) {
mShownItemBtn = dItemBtn_Y_e;
}
else if(dComIfGp_event_getTalkXYBtn() == 3) {
field_0x9C5 = 2;
else if(dComIfGp_event_getTalkXYBtn() == dTalkBtn_Z_e) {
mShownItemBtn = dItemBtn_Z_e;
}
else {
field_0x9C5 = 3;
mShownItemBtn = dItemBtn_NONE_e;
}
eventIdx = field_0x99E;
src/d/actor/d_a_obj_mknjd.cpp
+2 -2
View File
@@ -150,8 +150,8 @@ static s16 daObjMknjD_XyEventCB(void* i_this, int i_param2) {
}
/* 000002F0-00000314 .text XyCheckCB__Q210daObjMknjD5Act_cFi */
s16 daObjMknjD::Act_c::XyCheckCB(int i_itemIdx) {
return dComIfGp_getSelectItem(i_itemIdx) == dItem_WIND_WAKER_e ? 1 : 0;
s16 daObjMknjD::Act_c::XyCheckCB(int i_itemBtn) {
return dComIfGp_getSelectItem(i_itemBtn) == dItem_WIND_WAKER_e ? 1 : 0;
}
/* 00000314-0000031C .text XyEventCB__Q210daObjMknjD5Act_cFi */
src/d/actor/d_a_player_food.inc
+13 -13
View File
@@ -131,16 +131,16 @@ BOOL daPy_lk_c::procFoodThrow() {
if (esa) {
m3630 = fopAcM_GetID(esa);
if (mDemo.getDemoType() != 5) {
u8 btnIdx = dComIfGp_event_getTalkXYBtn();
if (btnIdx == 1) {
dComIfGs_setReserveBaitEmpty(0);
} else if (btnIdx == 2) {
dComIfGs_setReserveBaitEmpty(1);
u8 talkBtn = dComIfGp_event_getTalkXYBtn();
if (talkBtn == dTalkBtn_X_e) {
dComIfGs_setReserveBaitEmpty(dItemBtn_X_e);
} else if (talkBtn == dTalkBtn_Y_e) {
dComIfGs_setReserveBaitEmpty(dItemBtn_Y_e);
} else {
dComIfGs_setReserveBaitEmpty(2);
dComIfGs_setReserveBaitEmpty(dItemBtn_Z_e);
}
} else {
dComIfGs_setReserveBaitEmpty(mReadyItemIdx);
dComIfGs_setReserveBaitEmpty(mReadyItemBtn);
}
}
}
@@ -152,13 +152,13 @@ BOOL daPy_lk_c::procFoodSet_init() {
if (mCurProc == daPyProc_FOOD_SET_e) {
if (mDemo.getParam0() == 1) {
if (mEquipItem == dItem_HYOI_PEAR_e) {
u8 btnIdx = dComIfGp_event_getTalkXYBtn();
if (btnIdx == 1) {
dComIfGs_setEquipBottleItemEmpty(0);
} else if (btnIdx == 2) {
dComIfGs_setEquipBottleItemEmpty(1);
u8 talkBtn = dComIfGp_event_getTalkXYBtn();
if (talkBtn == dTalkBtn_X_e) {
dComIfGs_setEquipBottleItemEmpty(dItemBtn_X_e);
} else if (talkBtn == dTalkBtn_Y_e) {
dComIfGs_setEquipBottleItemEmpty(dItemBtn_Y_e);
} else {
dComIfGs_setEquipBottleItemEmpty(2);
dComIfGs_setEquipBottleItemEmpty(dItemBtn_Z_e);
}
}
src/d/actor/d_a_player_main.cpp
+30 -30
View File
@@ -292,9 +292,9 @@ void daPy_lk_c::voiceStart(u32 param_1) {
/* 801031A4-801031DC .text itemButton__9daPy_lk_cCFv */
BOOL daPy_lk_c::itemButton() const {
if (mReadyItemIdx == 0) {
if (mReadyItemBtn == dItemBtn_X_e) {
return m34C9 & 0x04;
} else if (mReadyItemIdx == 1) {
} else if (mReadyItemBtn == dItemBtn_Y_e) {
return m34C9 & 0x08;
} else {
return m34C9 & 0x10;
@@ -303,9 +303,9 @@ BOOL daPy_lk_c::itemButton() const {
/* 801031DC-80103214 .text itemTrigger__9daPy_lk_cCFv */
BOOL daPy_lk_c::itemTrigger() const {
if (mReadyItemIdx == 0) {
if (mReadyItemBtn == dItemBtn_X_e) {
return mPressedButtons & 0x04;
} else if (mReadyItemIdx == 1) {
} else if (mReadyItemBtn == dItemBtn_Y_e) {
return mPressedButtons & 0x08;
} else {
return mPressedButtons & 0x10;
@@ -314,26 +314,26 @@ BOOL daPy_lk_c::itemTrigger() const {
/* 80103214-80103258 .text getReadyItem__9daPy_lk_cFv */
int daPy_lk_c::getReadyItem() {
if (mReadyItemIdx == 0) {
return dComIfGp_getSelectItem(0);
} else if (mReadyItemIdx == 1) {
return dComIfGp_getSelectItem(1);
if (mReadyItemBtn == dItemBtn_X_e) {
return dComIfGp_getSelectItem(dItemBtn_X_e);
} else if (mReadyItemBtn == dItemBtn_Y_e) {
return dComIfGp_getSelectItem(dItemBtn_Y_e);
} else {
return dComIfGp_getSelectItem(2);
return dComIfGp_getSelectItem(dItemBtn_Z_e);
}
}
/* 80103258-801032E4 .text checkGroupItem__9daPy_lk_cFii */
BOOL daPy_lk_c::checkGroupItem(int param_1, int itemNo) {
if (param_1 == 0x105) {
if (param_1 == daPyItem_DRINK_BOTTLE_e) {
return checkDrinkBottleItem(itemNo);
} else if (param_1 == 0x106) {
} else if (param_1 == daPyItem_OPEN_BOTTLE_e) {
return checkOpenBottleItem(itemNo);
} else if (param_1 == 0x107) {
} else if (param_1 == daPyItem_ESA_e) {
return isEsa(itemNo);
} else if (param_1 == 0x108) {
} else if (param_1 == daPyItem_BOW_e) {
return checkBowItem(itemNo);
} else if (param_1 == 0x109) {
} else if (param_1 == daPyItem_PHOTOBOX_e) {
return checkPhotoBoxItem(itemNo);
} else {
return param_1 == itemNo;
@@ -343,16 +343,16 @@ BOOL daPy_lk_c::checkGroupItem(int param_1, int itemNo) {
/* 801032E4-801033E4 .text checkSetItemTrigger__9daPy_lk_cFii */
BOOL daPy_lk_c::checkSetItemTrigger(int param_1, int param_2) {
if (param_2 == 0 || !daPy_dmEcallBack_c::checkCurse()) {
if (mPressedButtons & 0x04 && checkGroupItem(param_1, dComIfGp_getSelectItem(0))) {
mReadyItemIdx = 0;
if (mPressedButtons & 0x04 && checkGroupItem(param_1, dComIfGp_getSelectItem(dItemBtn_X_e))) {
mReadyItemBtn = dItemBtn_X_e;
return TRUE;
}
if (mPressedButtons & 0x08 && checkGroupItem(param_1, dComIfGp_getSelectItem(1))) {
mReadyItemIdx = 1;
if (mPressedButtons & 0x08 && checkGroupItem(param_1, dComIfGp_getSelectItem(dItemBtn_Y_e))) {
mReadyItemBtn = dItemBtn_Y_e;
return TRUE;
}
if (mPressedButtons & 0x10 && checkGroupItem(param_1, dComIfGp_getSelectItem(2))) {
mReadyItemIdx = 2;
if (mPressedButtons & 0x10 && checkGroupItem(param_1, dComIfGp_getSelectItem(dItemBtn_Z_e))) {
mReadyItemBtn = dItemBtn_Z_e;
return TRUE;
}
}
@@ -1629,17 +1629,17 @@ BOOL daPy_lk_c::checkItemChangeFromButton() {
setAnimeEquipSword(1);
} else if (mPressedButtons & 0x04) {
if (checkNewItemChange(0)) {
mReadyItemIdx = 0;
mReadyItemBtn = dItemBtn_X_e;
return TRUE;
}
} else if (mPressedButtons & 0x08) {
if (checkNewItemChange(1)) {
mReadyItemIdx = 1;
mReadyItemBtn = dItemBtn_Y_e;
return TRUE;
}
} else if (mPressedButtons & 0x10) {
if (checkNewItemChange(2)) {
mReadyItemIdx = 2;
mReadyItemBtn = dItemBtn_Z_e;
return TRUE;
}
} else if (mPressedButtons & 0x01) {
@@ -1654,7 +1654,7 @@ BOOL daPy_lk_c::checkItemChangeFromButton() {
if (checkEquipHeavyBoots() && checkSetItemTrigger(dItem_IRON_BOOTS_e, 0)) {
return procBootsEquip_init(dItem_IRON_BOOTS_e);
} else if (checkSetItemTrigger(daPyItem_DRINK_BOTTLE_e, 0)) {
return procBottleDrink_init(dComIfGp_getSelectItem(mReadyItemIdx));
return procBottleDrink_init(dComIfGp_getSelectItem(mReadyItemBtn));
} else if (checkSetItemTrigger(FAIRY_BOTTLE, 0)) {
return procBottleOpen_init(FAIRY_BOTTLE);
} else if (mPressedButtons & 0x01) {
@@ -3294,15 +3294,15 @@ BOOL daPy_lk_c::execute() {
}
if (checkEquipHeavyBoots() &&
dComIfGp_getSelectItem(0) != dItem_IRON_BOOTS_e &&
dComIfGp_getSelectItem(1) != dItem_IRON_BOOTS_e &&
dComIfGp_getSelectItem(2) != dItem_IRON_BOOTS_e
dComIfGp_getSelectItem(dItemBtn_X_e) != dItem_IRON_BOOTS_e &&
dComIfGp_getSelectItem(dItemBtn_Y_e) != dItem_IRON_BOOTS_e &&
dComIfGp_getSelectItem(dItemBtn_Z_e) != dItem_IRON_BOOTS_e
) {
offNoResetFlg0(daPyFlg0_EQUIP_HEAVY_BOOTS);
} else if (checkEquipDragonShield() &&
dComIfGp_getSelectItem(0) != dItem_MAGIC_ARMOR_e &&
dComIfGp_getSelectItem(1) != dItem_MAGIC_ARMOR_e &&
dComIfGp_getSelectItem(2) != dItem_MAGIC_ARMOR_e
dComIfGp_getSelectItem(dItemBtn_X_e) != dItem_MAGIC_ARMOR_e &&
dComIfGp_getSelectItem(dItemBtn_Y_e) != dItem_MAGIC_ARMOR_e &&
dComIfGp_getSelectItem(dItemBtn_Z_e) != dItem_MAGIC_ARMOR_e
) {
offNoResetFlg1(daPyFlg1_EQUIP_DRAGON_SHIELD);
}