mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-06-30 03:59:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Only show adult trade items in the save editor if they're shuffled

Browse Source
This commit is contained in:
lilDavid
2022-08-06 12:56:29 -05:00
parent 6603a9a474
commit f41b939a71
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soh/src/code/z_adult_trade_shuffle.c
+6 -6
View File
@@ -13,10 +13,10 @@ void Randomizer_ConsumeAdultTradeItem(GlobalContext* globalCtx, u8 itemId) {
}
u8 Randomizer_GetNextAdultTradeItem() {
const u16 numTradeItems = ITEM_CLAIM_CHECK - ITEM_POCKET_EGG + 1;
u16 currentTradeItemIndex = INV_CONTENT(ITEM_TRADE_ADULT) - ITEM_POCKET_EGG;
const u8 numTradeItems = ITEM_CLAIM_CHECK - ITEM_POCKET_EGG + 1;
u8 currentTradeItemIndex = INV_CONTENT(ITEM_TRADE_ADULT) - ITEM_POCKET_EGG;
for (int i = 0; i < numTradeItems; i++) {
u16 tradeIndex = (currentTradeItemIndex + i + 1) % numTradeItems;
u8 tradeIndex = (currentTradeItemIndex + i + 1) % numTradeItems;
if (gSaveContext.adultTradeItems & (1 << tradeIndex)) {
return ITEM_POCKET_EGG + tradeIndex;
}
@@ -24,10 +24,10 @@ u8 Randomizer_GetNextAdultTradeItem() {
}
u8 Randomizer_GetPrevAdultTradeItem() {
const u16 numTradeItems = ITEM_CLAIM_CHECK - ITEM_POCKET_EGG + 1;
u16 currentTradeItemIndex = INV_CONTENT(ITEM_TRADE_ADULT) - ITEM_POCKET_EGG;
const u8 numTradeItems = ITEM_CLAIM_CHECK - ITEM_POCKET_EGG + 1;
u8 currentTradeItemIndex = INV_CONTENT(ITEM_TRADE_ADULT) - ITEM_POCKET_EGG;
for (int i = 0; i < numTradeItems; i++) {
u16 tradeIndex = (currentTradeItemIndex - i - 1 + numTradeItems) % numTradeItems;
u8 tradeIndex = (currentTradeItemIndex - i - 1 + numTradeItems) % numTradeItems;
if (gSaveContext.adultTradeItems & (1 << tradeIndex)) {
return ITEM_POCKET_EGG + tradeIndex;
}