mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-10-09 05:31:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

daNpc_Bs1_c::next_msgStatus realmatch

Browse Source
This commit is contained in:
LagoLunatic
2026-09-26 22:47:20 -04:00
parent ebb3ac71ec
commit c4cd1c31ec
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/d_com_inf_game.h
+2 -2
View File
@@ -347,7 +347,7 @@ public:
resetItemTimer(0);
}
int getMessageRupee() { return mMessageRupee; }
s16 getMessageRupee() { return mMessageRupee; }
void setMessageRupee(s16 count) { mMessageRupee = count; }
void setAuctionRupee(s16 count) { mAuctionRupee = count; }
@@ -988,7 +988,7 @@ inline void dComIfGp_decItemTimer() {
g_dComIfG_gameInfo.play.decItemTimer();
}
inline int dComIfGp_getMessageRupee() {
inline s16 dComIfGp_getMessageRupee() {
return g_dComIfG_gameInfo.play.getMessageRupee();
}
src/d/actor/d_a_npc_bs1.cpp
+4 -5
View File
@@ -443,7 +443,6 @@ static void daNpc_Bs1_setPayRupee(int unknownParam1, int unknownParam2) {
/* 000010EC-00001F7C .text next_msgStatus__11daNpc_Bs1_cFPUl */
u16 daNpc_Bs1_c::next_msgStatus(u32* pMsgNo) {
u16 msgStatus = fopMsgStts_MSG_CONTINUES_e;
s32 rupee;
switch(*pMsgNo) {
case 0xF50:
@@ -803,7 +802,7 @@ u16 daNpc_Bs1_c::next_msgStatus(u32* pMsgNo) {
}
if(l_msg->mSelectNum == 0) {
rupee = dComIfGp_getMessageRupee();
int rupee = dComIfGp_getMessageRupee();
u8 status = dShop_BoughtErrorStatus(&mShopItems, 0, rupee);
if(status & 1) {
@@ -829,7 +828,7 @@ u16 daNpc_Bs1_c::next_msgStatus(u32* pMsgNo) {
fopAcM_seStart(this, JA_SE_SHOP_BOUGHT, 0);
mShopItems.hideSelectItem();
dComIfGp_setItemRupeeCount(-(int)rupee);
dComIfGp_setItemRupeeCount(-rupee);
if(mShopItems.getSelectItemNo() == dItemNo_BAIT_BAG_e) {
mShopItems.SoldOutItem(mShopItems.mSelectedItemIdx);
m76C[mShopItems.mSelectedItemIdx] = 1;
@@ -873,7 +872,7 @@ u16 daNpc_Bs1_c::next_msgStatus(u32* pMsgNo) {
}
if(l_msg->mSelectNum == 0) {
rupee = dComIfGp_getMessageRupee();
int rupee = dComIfGp_getMessageRupee();
u32 status = dShop_BoughtErrorStatus(&mShopItems, 0, rupee);
if(status & 0x20) {
@@ -891,7 +890,7 @@ u16 daNpc_Bs1_c::next_msgStatus(u32* pMsgNo) {
fopAcM_seStart(this, JA_SE_SHOP_BOUGHT, 0);
mShopItems.hideSelectItem();
dComIfGp_setItemRupeeCount(-(int)rupee);
dComIfGp_setItemRupeeCount(-rupee);
u8 itemNo = mShopItems.getSelectItemNo();
if(itemNo == dItemNo_EMPTY_BOTTLE_e || itemNo == dItemNo_HEART_PIECE_e || itemNo == dItemNo_COLLECT_MAP_30_e) {
mShopItems.SoldOutItem(mShopItems.mSelectedItemIdx);