mirror
/
Shipwright
mirror of https://github.com/HarbourMasters/Shipwright.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add missing semicolons and return values

This commit is contained in:
lilDavid 2022-08-07 18:54:19 -05:00
parent f885195fc9
commit 46be24b595
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
soh/src/code/z_adult_trade_shuffle.c
View File

@ -5,11 +5,7 @@
void Randomizer_ConsumeAdultTradeItem(GlobalContext* globalCtx, u8 itemId) {
gSaveContext.adultTradeItems &= ~ADULT_TRADE_FLAG(itemId);
if (gSaveContext.adultTradeItems == 0) {
Inventory_ReplaceItem(globalCtx, itemId, ITEM_NONE);
} else {
Inventory_ReplaceItem(globalCtx, itemId, Randomizer_GetNextAdultTradeItem());
}
Inventory_ReplaceItem(globalCtx, itemId, Randomizer_GetNextAdultTradeItem());
}
u8 Randomizer_GetNextAdultTradeItem() {
@ -21,6 +17,7 @@ u8 Randomizer_GetNextAdultTradeItem() {
return ITEM_POCKET_EGG + tradeIndex;
}
}
return ITEM_NONE;
}
u8 Randomizer_GetPrevAdultTradeItem() {
@ -32,4 +29,5 @@ u8 Randomizer_GetPrevAdultTradeItem() {
return ITEM_POCKET_EGG + tradeIndex;
}
}
return ITEM_NONE;
}

2
soh/src/overlays/actors/ovl_En_Hs/z_en_hs.c
View File

@ -82,7 +82,7 @@ void EnHs_Init(Actor* thisx, GlobalContext* globalCtx) {
bool shouldDespawn;
bool tradedMushroom = gSaveContext.itemGetInf[3] & 1;
if (gSaveContext.n64ddFlag) {
shouldDespawn = tradedMushroom && !(gSaveContext.adultTradeItems & ADULT_TRADE_FLAG(ITEM_COJIRO))
shouldDespawn = tradedMushroom && !(gSaveContext.adultTradeItems & ADULT_TRADE_FLAG(ITEM_COJIRO));
} else {
shouldDespawn = tradedMushroom;
}