mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-12-18 14:22:17 -05:00
Code Issues Projects Releases Wiki Activity

Tweak items to skip cutscenes for

Browse Source
This commit is contained in:
aMannus 2024-01-06 21:10:09 +01:00
parent ba9577c3b3
commit ded58e4e42
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
soh/src/overlays/actors/ovl_player_actor/z_player.c
View File

@ -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) {