mirror of
https://github.com/HarbourMasters/Shipwright.git
synced 2024-12-23 16:48:52 -05:00
Hide pot item cutscenes for very frequent items
This commit is contained in:
parent
fe7476a377
commit
0628cb990d
@ -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.
|
||||
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.
|
||||
if (showItemCutscene && !skipItemCutscene && !skipItemCutsceneRando) {
|
||||
if (showItemCutscene && !skipItemCutscene && !skipItemCutsceneRando && !isPotItemToSkip) {
|
||||
|
||||
func_808323B4(play, this);
|
||||
func_8083AE40(this, giEntry.objectId);
|
||||
|
Loading…
Reference in New Issue
Block a user