Skip to content

Commit

Permalink
Tweak items to skip cutscenes for
Browse files Browse the repository at this point in the history
  • Loading branch information
aMannus committed Jan 6, 2024
1 parent ba9577c commit ded58e4
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions soh/src/overlays/actors/ovl_player_actor/z_player.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down

0 comments on commit ded58e4

Please sign in to comment.