Shield handling for pots and enemy drops and a few more NPCs

This commit is contained in:
2026-02-07 16:51:21 -06:00
parent 381868c3ce
commit 779c9a27ce
12 changed files with 112 additions and 40 deletions

View File

@@ -11,10 +11,8 @@ HeartPieceGet:
RTL
;--------------------------------------------------------------------------------
HeartGet:
STY.b $0C
JSL ShieldCheck
BCC .done
LDY.b $0C
BCC .skip
LDA.w SprItemMWPlayer, X : STA.l !MULTIWORLD_ITEM_PLAYER_ID
CPY.b #$26 : BNE .not_heart ; don't add a 1/4 heart if it's not a heart piece
@@ -26,7 +24,10 @@ HeartGet:
JSL Link_ReceiveItem
JSL MaybeUnlockTabletAnimation
SEC
.done
RTL
.skip
JSL MaybeFreeLinkFromTablet
CLC
RTL
;--------------------------------------------------------------------------------
HeartContainerGet: