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

d_save progress

Browse Source
This commit is contained in:
LagoLunatic
2023-11-29 02:37:56 -05:00
parent 8479c1e1f3
commit aa229ec23e
3 changed files with 108 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/d_com_inf_game.h
+44 -2
View File
@@ -413,6 +413,11 @@ public:
void setSelectItem(int idx, u8 itemNo) { mSelectItem[idx] = itemNo; }
void setSelectEquip(int idx, u8 itemNo) { mSelectEquip[idx] = itemNo; }
void setItem(u8 slot, u8 i_itemNo) {
field_0x493d = slot;
field_0x493e = i_itemNo;
}
void setAStatus(u8 status) { mCurrButtonBAction = status; }
void setDoStatus(u8 status) { mCurrButtonAAction = status; }
void setRStatusForce(u8 status) { field_0x4930 = status; }
@@ -727,14 +732,26 @@ inline u8 dComIfGs_getItemBeast(int param_0) {
return g_dComIfG_gameInfo.save.getPlayer().getBagItem().getBeast(param_0);
}
inline void dComIfGs_setItemBeast(int i_idx, u8 i_itemNo) {
g_dComIfG_gameInfo.save.getPlayer().getBagItem().setBeast(i_idx, i_itemNo);
}
inline u8 dComIfGs_getItemBait(int param_0) {
return g_dComIfG_gameInfo.save.getPlayer().getBagItem().getBait(param_0);
}
inline void dComIfGs_setItemBait(int i_idx, u8 i_itemNo) {
g_dComIfG_gameInfo.save.getPlayer().getBagItem().setBait(i_idx, i_itemNo);
}
inline u8 dComIfGs_getItemReserve(int param_0) {
return g_dComIfG_gameInfo.save.getPlayer().getBagItem().getReserve(param_0);
}
inline void dComIfGs_setItemReserve(int i_idx, u8 i_itemNo) {
g_dComIfG_gameInfo.save.getPlayer().getBagItem().setReserve(i_idx, i_itemNo);
}
inline OSTime dComIfGs_getDateIpl() {
return g_dComIfG_gameInfo.save.getPlayer().getPlayerStatusB().getDateIpl();
}
@@ -764,8 +781,29 @@ inline u8 dComIfGs_getItem(int i_invIdx) {
}
}
inline void dComIfGs_setItem(int i_idx, u8 i_itemNo) {
g_dComIfG_gameInfo.save.getPlayer().getItem().setItem(i_idx, i_itemNo);
/**
* Sets a specific inventory slot to contain a particular item.
* @param i_invIdx The index of the inventory slot.
* @param i_itemNo The item number of the item to place in that slot, or 0xFF for no item.
*/
inline void dComIfGs_setItem(int i_invIdx, u8 i_itemNo) {
if (i_invIdx < 0x15) {
g_dComIfG_gameInfo.save.getPlayer().getItem().setItem(i_invIdx, i_itemNo);
} else if (i_invIdx < 0x18) {
return;
} else if (i_invIdx < 0x18 + 8) {
dComIfGs_setItemBeast(i_invIdx - 0x18, i_itemNo);
} else if (i_invIdx < 0x24) {
return;
} else if (i_invIdx < 0x24 + 8) {
dComIfGs_setItemBait(i_invIdx - 0x24, i_itemNo);
} else if (i_invIdx < 0x30) {
return;
} else if (i_invIdx < 0x30 + 8) {
dComIfGs_setItemReserve(i_invIdx - 0x30, i_itemNo);
} else {
return;
}
}
inline u8 dComIfGs_getBeast(int i_idx) {
@@ -1973,6 +2011,10 @@ inline void dComIfGp_setSelectEquip(int idx, u8 itemNo) {
g_dComIfG_gameInfo.play.setSelectEquip(idx, itemNo);
}
inline void dComIfGp_setItem(u8 slot, u8 i_itemNo) {
g_dComIfG_gameInfo.play.setItem(slot, i_itemNo);
}
inline void dComIfGp_setCurrentGrafPort(J2DOrthoGraph* i_graf) {
g_dComIfG_gameInfo.play.setCurrentGrafPort(i_graf);
}
include/d/d_save.h
+3
View File
@@ -205,8 +205,11 @@ public:
u8 checkReserveItem(u8);
u8 getBeast(int i_idx) { return mBeast[i_idx]; }
void setBeast(int i_idx, u8 i_itemNo) { mBeast[i_idx] = i_itemNo; }
u8 getBait(int i_idx) { return mBait[i_idx]; }
void setBait(int i_idx, u8 i_itemNo) { mBait[i_idx] = i_itemNo; }
u8 getReserve(int i_idx) { return mReserve[i_idx]; }
void setReserve(int i_idx, u8 i_itemNo) { mReserve[i_idx] = i_itemNo; }
/* 0x00 */ u8 mBeast[8];
/* 0x08 */ u8 mBait[8];
src/d/d_save.cpp
+61 -14
View File
@@ -79,33 +79,80 @@ void dSv_player_item_c::init() {
}
/* 80058C7C-80058E1C .text setBottleItemIn__17dSv_player_item_cFUcUc */
void dSv_player_item_c::setBottleItemIn(u8, u8) {
/* Nonmatching */
void dSv_player_item_c::setBottleItemIn(u8 prevItemNo, u8 newItemNo) {
for (int bottleIdx = 0; bottleIdx < 4; bottleIdx++) {
if (mItems[0xE + bottleIdx] == prevItemNo) {
mItems[0xE + bottleIdx] = newItemNo;
for (int btnIdx = 0; btnIdx < 3; btnIdx++) {
if (dComIfGs_getSelectItem(btnIdx) == 0xE + bottleIdx) {
dComIfGp_setSelectItem(btnIdx);
}
}
break;
}
}
}
/* 80058E1C-80058E44 .text setEmptyBottleItemIn__17dSv_player_item_cFUc */
void dSv_player_item_c::setEmptyBottleItemIn(u8 param_0) {
setBottleItemIn(EMPTY_BOTTLE, param_0);
void dSv_player_item_c::setEmptyBottleItemIn(u8 i_itemNo) {
setBottleItemIn(EMPTY_BOTTLE, i_itemNo);
}
/* 80058E44-80058F74 .text setEmptyBottle__17dSv_player_item_cFv */
void dSv_player_item_c::setEmptyBottle() {
/* Nonmatching */
for (int bottleIdx = 0; bottleIdx < 4; bottleIdx++) {
int invIdx = 0xE + bottleIdx;
if (dComIfGs_getItem((u8)invIdx) == NO_ITEM) {
dComIfGs_setItem((u8)invIdx, EMPTY_BOTTLE);
break;
}
}
}
/* 80058F74-8005918C .text setEquipBottleItemIn__17dSv_player_item_cFUcUc */
void dSv_player_item_c::setEquipBottleItemIn(u8, u8) {
/* Nonmatching */
void dSv_player_item_c::setEquipBottleItemIn(u8 i_btnIdx, u8 i_itemNo) {
u8 invIdx = dComIfGs_getSelectItem(i_btnIdx);
if (invIdx < 0xE) {
return;
}
if (invIdx > 0x11) {
return;
}
mItems[invIdx] = i_itemNo;
dComIfGs_setItem(dComIfGs_getSelectItem(i_btnIdx), i_itemNo);
dComIfGp_setItem(dComIfGs_getSelectItem(i_btnIdx), i_itemNo);
dComIfGp_setSelectItem(i_btnIdx);
}
/* 8005918C-800591B0 .text setEquipBottleItemEmpty__17dSv_player_item_cFUc */
void dSv_player_item_c::setEquipBottleItemEmpty(u8 param_0) {
setEquipBottleItemIn(param_0, EMPTY_BOTTLE);
void dSv_player_item_c::setEquipBottleItemEmpty(u8 i_itemNo) {
setEquipBottleItemIn(i_itemNo, EMPTY_BOTTLE);
}
/* 800591B0-80059408 .text setEquipBottleItemIn__17dSv_player_item_cFUc */
void dSv_player_item_c::setEquipBottleItemIn(u8) {
/* Nonmatching */
void dSv_player_item_c::setEquipBottleItemIn(u8 i_itemNo) {
u8 btnIdx = dComIfGp_event_getTalkXYBtn();
if (btnIdx == 1) {
btnIdx = 0;
} else if (btnIdx == 2) {
btnIdx = 1;
} else if (btnIdx == 3) {
btnIdx = 2;
} else {
return;
}
u8 invIdx = dComIfGs_getSelectItem(btnIdx);
if (invIdx < 0xE) {
return;
}
if (invIdx > 0x11) {
return;
}
mItems[invIdx] = i_itemNo;
dComIfGs_setItem(dComIfGs_getSelectItem(btnIdx), i_itemNo);
dComIfGp_setItem(dComIfGs_getSelectItem(btnIdx), i_itemNo);
dComIfGp_setSelectItem(btnIdx);
}
/* 80059408-8005942C .text setEquipBottleItemEmpty__17dSv_player_item_cFv */
@@ -463,7 +510,7 @@ void dSv_player_get_bag_item_c::onBeast(u8 i_no) {
/* 8005A960-8005A9F8 .text isBeast__25dSv_player_get_bag_item_cFUc */
BOOL dSv_player_get_bag_item_c::isBeast(u8 i_no) {
JUT_ASSERT(1265, 0 <= i_no && i_no < 8);
return mBeastFlags & (u8)(1 << i_no) ? true : false;
return mBeastFlags & (u8)(1 << i_no) ? TRUE : FALSE;
}
/* 8005A9F8-8005AA8C .text onBait__25dSv_player_get_bag_item_cFUc */
@@ -475,7 +522,7 @@ void dSv_player_get_bag_item_c::onBait(u8 i_no) {
/* 8005AA8C-8005AB24 .text isBait__25dSv_player_get_bag_item_cFUc */
BOOL dSv_player_get_bag_item_c::isBait(u8 i_no) {
JUT_ASSERT(1310, 0 <= i_no && i_no < 8);
return mBaitFlags & (u8)(1 << i_no) ? true : false;
return mBaitFlags & (u8)(1 << i_no) ? TRUE : FALSE;
}
/* 8005AB24-8005ABB4 .text onReserve__25dSv_player_get_bag_item_cFUc */
@@ -487,7 +534,7 @@ void dSv_player_get_bag_item_c::onReserve(u8 i_no) {
/* 8005ABB4-8005AC48 .text isReserve__25dSv_player_get_bag_item_cFUc */
BOOL dSv_player_get_bag_item_c::isReserve(u8 i_no) {
JUT_ASSERT(1355, 0 <= i_no && i_no < 32);
return mReserveFlags & (1 << i_no) ? true : false;
return mReserveFlags & (1 << i_no) ? TRUE : FALSE;
}
/* 8005AC48-8005ACA8 .text init__28dSv_player_bag_item_record_cFv */