From 46be24b595e212f6a517e4db44e814869bff2337 Mon Sep 17 00:00:00 2001 From: lilDavid <1337lilDavid@gmail.com> Date: Sun, 7 Aug 2022 18:54:19 -0500 Subject: [PATCH] Add missing semicolons and return values --- soh/src/code/z_adult_trade_shuffle.c | 8 +++----- soh/src/overlays/actors/ovl_En_Hs/z_en_hs.c | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/soh/src/code/z_adult_trade_shuffle.c b/soh/src/code/z_adult_trade_shuffle.c index 437ab3f5a8..e9327dab68 100644 --- a/soh/src/code/z_adult_trade_shuffle.c +++ b/soh/src/code/z_adult_trade_shuffle.c @@ -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; } diff --git a/soh/src/overlays/actors/ovl_En_Hs/z_en_hs.c b/soh/src/overlays/actors/ovl_En_Hs/z_en_hs.c index 0ba6aae16f..1cbc1f1df0 100644 --- a/soh/src/overlays/actors/ovl_En_Hs/z_en_hs.c +++ b/soh/src/overlays/actors/ovl_En_Hs/z_en_hs.c @@ -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; }