From ded58e4e424e5d5a2c3b6dbfd795a59572b9c274 Mon Sep 17 00:00:00 2001 From: aMannus Date: Sat, 6 Jan 2024 21:10:09 +0100 Subject: [PATCH] Tweak items to skip cutscenes for --- soh/src/overlays/actors/ovl_player_actor/z_player.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/soh/src/overlays/actors/ovl_player_actor/z_player.c b/soh/src/overlays/actors/ovl_player_actor/z_player.c index 6622d232b..f80f24c2d 100644 --- a/soh/src/overlays/actors/ovl_player_actor/z_player.c +++ b/soh/src/overlays/actors/ovl_player_actor/z_player.c @@ -6669,8 +6669,10 @@ s32 func_8083E5A8(Player* this, PlayState* play) { // Automatically skip the pickup messages for very frequent items coming from pots with "Shuffle Pots" on. uint8_t isPotItemToSkip = interactedActor->id == ACTOR_EN_ITEM00 && interactedActor->params == ITEM00_SMALL_KEY && - (giEntry.itemId == ITEM_RUPEE_GREEN || giEntry.itemId == ITEM_RUPEE_BLUE || - giEntry.itemId == ITEM_HEART); + ((giEntry.itemId >= ITEM_RUPEE_GREEN && giEntry.itemId <= ITEM_RUPEE_RED) || + giEntry.itemId == ITEM_HEART || + (giEntry.itemId >= ITEM_NUTS_5 && giEntry.itemId <= ITEM_SEEDS_30) || + giEntry.itemId == ITEM_MAGIC_SMALL || giEntry.itemId == ITEM_MAGIC_LARGE); // Show cutscene when picking up a item. if (showItemCutscene && !skipItemCutscene && !skipItemCutsceneRando && !isPotItemToSkip) {