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

Hide pot item cutscenes for very frequent items

Browse Source
This commit is contained in:
aMannus 2023-12-14 15:47:28 +01:00
parent fe7476a377
commit 0628cb990d
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6363,8 +6363,14 @@ s32 func_8083E5A8(Player* this, PlayState* play) {
// this specifically for items coming from bushes/rocks/enemies when the player has already picked that item up. // this specifically for items coming from bushes/rocks/enemies when the player has already picked that item up.
uint8_t skipItemCutsceneRando = IS_RANDO && Item_CheckObtainability(giEntry.itemId) != ITEM_NONE && isDropToSkip; uint8_t skipItemCutsceneRando = IS_RANDO && Item_CheckObtainability(giEntry.itemId) != ITEM_NONE && isDropToSkip;
// Automatically skip the pickup messages for very frequent items coming from pots with "Shuffle Pot Contents" 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);
// Show cutscene when picking up a item. // Show cutscene when picking up a item.
if (showItemCutscene && !skipItemCutscene && !skipItemCutsceneRando) { if (showItemCutscene && !skipItemCutscene && !skipItemCutsceneRando && !isPotItemToSkip) {
func_808323B4(play, this); func_808323B4(play, this);
func_8083AE40(this, giEntry.objectId); func_8083AE40(this, giEntry.objectId);