Fix dig game

bookofmudora.asm

@@ -53,6 +53,17 @@ RTL
 GiveBonkItem:
     LDA.w SprItemMWPlayer, X : STA.l !MULTIWORLD_ITEM_PLAYER_ID
     LDA.w SprSourceItemId, X
+
+    PHY : TAY
+    JSL ShieldCheck
+    TYA : PLY
+    BCS +
+
+    STZ.w $0DD0, X
+    PLA : PLA : PLA ; remove the stored return address
+    JML $85FC9D
+
++
     JSR AbsorbKeyCheck : BCC .notKey
         PHY : LDY.b #$24 : JSL AddInventory : PLY ; do inventory processing for a small key
         LDA.l CurrentSmallKeys : INC A : STA.l CurrentSmallKeys

decryption.asm

@@ -72,18 +72,27 @@ JML Dungeon_OpenKeyedObject_nextChest
 
 		TXA : LSR
 		JSL RetrieveValueFromEncryptedTable
-		JSL ShieldCheck
 		STA.b Scrap0C
 
 	PLA : STA.b Scrap02 : PLA : STA.b Scrap00
 
 	LDA.l ChestData, X : ASL A : BCC .smallChest
 
-	JSL ShieldCheck : BCC .couldntFindChest
+	PHY
+	LDY.b Scrap0C
+	JSL ShieldCheck
+	STY.b Scrap0C
+	PLY
+	BCC .couldntFindChest
 	JML Dungeon_OpenKeyedObject_bigChest ;(bank01.asm line #13783)
 
 .smallChest
-	JSL ShieldCheck : BCC .couldntFindChest
+	PHY
+	LDY.b Scrap0C
+	JSL ShieldCheck
+	STY.b Scrap0C
+	PLY
+	BCC .couldntFindChest
 	JML Dungeon_OpenKeyedObject_smallChest
 
 .couldntFindChest

dungeondrops.asm

@@ -88,6 +88,7 @@ RTL
 
 PrizeReceiveItem:
         PHA
+        LDA.b #$00 : STA.l BossDropTouched
         JSL BossPrizeGetPlayer : STA.l !MULTIWORLD_ITEM_PLAYER_ID
         PLA
         CMP.b #$6A : BNE +
@@ -105,7 +106,7 @@ RTL
 SetItemPose:
         PHA
         LDA.w DungeonID : BMI .one_handed
-        LDA.w RoomItemsTaken : BIT.b #$80 : BNE +
+        JSL CheckBossDropTouched : BNE +
                 .one_handed
                 PLA
                 JML Link_ReceiveItem_not_cool_pose
@@ -134,7 +135,7 @@ SetCutsceneFlag:
         PHX
         LDY.b #$01 ; wrote over
         LDA.w DungeonID : BMI .no_cutscene
-        LDA.w RoomItemsTaken : BIT.b #$80 : BNE .dungeon_prize
+        JSL CheckBossDropTouched : BNE .dungeon_prize
                 .no_cutscene
                 SEP #$30
                 PLX
@@ -155,7 +156,7 @@ AnimatePrizeCutscene:
         LDA.w ItemReceiptMethod : CMP.b #$03 : BNE +
                 JSR CrystalOrPendantBehavior : BCC +
                         LDA.w DungeonID : BMI +
-                        LDA.w RoomItemsTaken : BIT.b #$80 : BEQ +
+                        JSL CheckBossDropTouched : BEQ +
                                 SEC
                                 RTL
         +
@@ -172,13 +173,13 @@ PrizeDropSparkle:
 RTL
 
 HandleDropSFX:
-        LDA.w RoomItemsTaken : BIT.b #$80 : BEQ .no_sound
+	JSL CheckBossDropTouched : BEQ .no_sound
 	JSR CrystalOrPendantBehavior : BCC .no_sound
 	SEC
 	RTL
-        .no_sound
+.no_sound
 	CLC
-RTL
+	RTL
 
 HandleCrystalsField:
         TAX
@@ -192,7 +193,7 @@ RTL
 MaybeKeepLootID:
         PHA
         LDA.w DungeonID : BMI .no_prize
-        LDA.w RoomItemsTaken : BIT.b #$80 : BNE .prize
+        JSL CheckBossDropTouched : BNE .prize
                 .no_prize
                 STZ.w ItemReceiptID
                 STZ.w ItemReceiptPose
@@ -216,6 +217,15 @@ CheckSpawnPrize:
         SEP #$21
 RTL
 
+CheckBossDropTouched:
+; Out: z - boss drop not touched
+	LDA.w RoomItemsTaken
+	AND.b #$80
+	BNE .done
+	LDA.l BossDropTouched
+.done
+	RTL
+
 CheckDungeonCompletion:
         LDX.w DungeonID
         REP #$20

glitched.asm

@@ -70,7 +70,7 @@ GetAgahnimLightning:
 ;1 = Forbid
 AllowJoypadInput:
 	LDA.l PermitSQFromBosses : BEQ .fullCheck
-	LDA.w RoomItemsTaken : AND.b #$80 : BEQ .fullCheck
+	JSL CheckBossDropTouched : BEQ .fullCheck
 		LDA.w MedallionFlag : ORA.w CutsceneFlag ; we have heart container, do short check
 RTL
 	.fullCheck

halfmagicbat.asm

@@ -2,13 +2,20 @@
 ; Randomize Half Magic Bat
 ;--------------------------------------------------------------------------------
 GetMagicBatItem:
-	JSL ItemSet_MagicBat
 	%GetPossiblyEncryptedItem(MagicBatItem, SpriteItemValues)
 	CMP.b #$FF : BEQ .normalLogic
 	TAY
-	PHA : LDA.l MagicBatItem_Player : STA.l !MULTIWORLD_ITEM_PLAYER_ID : PLA
+	PHA
+	JSL ShieldCheck
+	BCC .have_shield
+	LDA.l MagicBatItem_Player : STA.l !MULTIWORLD_ITEM_PLAYER_ID
+	JSL ItemSet_MagicBat
+	PLA
 	STZ.b ItemReceiptMethod ; 0 = Receiving item from an NPC or message
 	JML Link_ReceiveItem
+.have_shield
+	PLA
+	RTL
 .normalLogic
 	LDA.l HalfMagic
 	STA.l MagicConsumption

heartpieces.asm

@@ -5,8 +5,17 @@ HeartPieceGet:
     PHX : PHY
     LDA.w SprItemMWPlayer, X : STA.l !MULTIWORLD_SPRITEITEM_PLAYER_ID
     LDY.w SprSourceItemId, X
+    JSL HeartGet
+    BCC +
     JSL MaybeMarkDigSpotCollected
-    .skipLoad
+    +
+    PLY : PLX
+    RTL
+;--------------------------------------------------------------------------------
+HeartGet:
+    JSL ShieldCheck
+    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
         CMP.b #$00 : BNE .not_heart
@@ -16,15 +25,27 @@ HeartPieceGet:
     STZ.w ItemReceiptMethod ; 0 = Receiving item from an NPC or message
     JSL Link_ReceiveItem
     JSL MaybeUnlockTabletAnimation
-
+    SEC
-    PLY : PLX
+    RTL
-RTL
+.skip
+    JSL MaybeFreeLinkFromTablet
+    CLC
+    RTL
 ;--------------------------------------------------------------------------------
 HeartContainerGet:
     PHX : PHY
     JSL IncrementBossSword
     LDY.w SprSourceItemId, X
-    BRA HeartPieceGet_skipLoad
+    JSL HeartGet
+    PLY : PLX
+    BCC +
+    LDA.w RoomItemsTaken
+    ORA.b #$80
+    STA.w RoomItemsTaken
++
+    LDA.b #$01
+    STA.l BossDropTouched
+RTL
 ;--------------------------------------------------------------------------------
 DrawHeartPieceGFX:
     PHP

hooks.asm

@@ -1053,8 +1053,12 @@ Overworld_Entrance_BRANCH_EPSILON: ; go here to lock doors
 org $81C50D : JSL CheckDungeonWorld
 org $81C517 : JSL CheckDungeonCompletion
 org $81C523 : JSL CheckDungeonCompletion
-org $81C710 : JSL CheckSpawnPrize
+org $81C709 : JSL CheckBossDropTouched : NOP
-BCS RoomTag_GetHeartForPrize_spawn_prize : BRA RoomTag_GetHeartForPrize_delete_tag
+org $81C710
+	JSL CheckSpawnPrize
+	BCS RoomTag_GetHeartForPrize_spawn_prize
+	BRA RoomTag_GetHeartForPrize_delete_tag
+	warnpc $81C731
 org $81C742 : JSL SpawnDungeonPrize : PLA : RTS
 org $8799EA : JML SetItemPose
 org $88C415 : JSL PendantMusicCheck
@@ -1066,6 +1070,7 @@ org $88C622 : BCC ItemReceipt_Animate_continue
 org $88C6BA : JSL CheckPoseItemCoordinates
 org $88C6C3 : JSL PrepPrizeVRAMHigh
 org $88C6F4 : JSL PrepPrizeVRAMLow
+org $88CAC4 : JSL CheckBossDropTouched : NOP
 org $88CAD6 : JSL HandleDropSFX : NOP #2
 org $88CADC : BCC Ancilla29_MilestoneItemReceipt_skip_crystal_sfx
 org $88CAE9 : JSL PrepPrizeTile
@@ -2005,7 +2010,7 @@ org $85EE53 ; <- 2EE53 - mushroom.asm : 22
 JSL ItemCheck_Mushroom : NOP #2
 ;--------------------------------------------------------------------------------
 org $85EE8C ; <- 2EE8C - mushroom.asm : 69
-JSL ItemSet_Mushroom : NOP
+JSL ItemSet_Mushroom : NOP #5
 ;--------------------------------------------------------------------------------
 org $85F53E ; <- 2F53E - sprite_potion_shop.asm : 40
 JSL ItemCheck_Powder : CMP.b #$20
@@ -2033,7 +2038,10 @@ org $85EF79 ; <- 2EF79 - sprite_heart_upgrades.asm:128 (JSL Sprite_PrepAndDrawSi
 JSL DrawHeartContainerGFX
 ;--------------------------------------------------------------------------------
 org $85EFCE ; <- 2EFCE - sprite_heart_upgrades.asm:176 (JSL Link_ReceiveItem)
-JSL HeartContainerGet
+JSL HeartContainerGet ; this also handles setting the boss-killed flag if appropriate
+PLX
+RTS
+warnpc $85EFDC
 ;--------------------------------------------------------------------------------
 ;--------------------------------------------------------------------------------
 org $8799B1 ; 399B1 - Bank07.asm:4063 (CPY.b #$3E : BNE .notHeartContainer)
@@ -2059,10 +2067,13 @@ JSL HeartPieceSpawnDelayFix
 ;--------------------------------------------------------------------------------
 org $85F08A ; <- 2F08A - sprite_heart_upgrades.asm : 324 - (LDA $7EF36B : INC A : AND.b #$03 : STA $7EF36B : BNE .got_4_piecese) item determination
 JSL HeartPieceGet
+PHP
 JSL DynamicDrawCleanup
+PLP : BCC +
 JSL IsMedallion
 BCS + : BRA Sprite_EB_HeartPiece_handle_flags : + ; Don't change OW flags if we're
 STZ.w SpriteAITable, X : RTS                      ; getting a tablet item
+warnpc $85F0C0
 ;--------------------------------------------------------------------------------
 org $86C0B0 ; <- 340B0 - sprite prep
 JSL HeartPieceSpritePrep
@@ -2858,3 +2869,6 @@ JSL LinkAwaken
 org $879A31
 JSL TuckLink
 NOP #2
+
+org $80F950
+NOP #2

inventory.asm

@@ -650,14 +650,21 @@ CollectPowder:
   BNE +
   ; if for any reason the item value is 0 reload it, just in case
     %GetPossiblyEncryptedItem(WitchItem, SpriteItemValues) : TAY
-  + PHA
+  +
+  PHA
+  JSL ShieldCheck
+  BCC .skip
+
+
   LDA.l WitchItem_Player : STA.l !MULTIWORLD_ITEM_PLAYER_ID
   LDA.b #$01 : STA.l ShopEnableCount
   PLA
   STZ.w ItemReceiptMethod ; item from NPC
   JSL Link_ReceiveItem
-  PHA : LDA.b #$00 : STA.l ShopEnableCount : STA.l PowderFlag : PLA
+  PHA : LDA.b #$00 : STA.l ShopEnableCount : STA.l PowderFlag
   JSL ItemSet_Powder
+.skip
+  PLA
 RTL
 ;--------------------------------------------------------------------------------
 

itemdatatables.asm

@@ -416,10 +416,10 @@ macro SpriteProps(id, chest_width, standing_width, chest_pal, standing_pal, addr
 	pullpc
 endmacro
 
-%SpriteProps($00, 0, 2, $05, $02, PalettesVanilla_blue_ice+$0E)         ; 00 - Fighter sword & Shield
+%SpriteProps($00, 0, 0, $05, $80, PalettesCustom_fighter_shield)        ; 00 - Fighter sword & Shield
-%SpriteProps($01, 0, 2, $05, $05, PalettesCustom_master_sword)          ; 01 - Master sword
+%SpriteProps($01, 0, 0, $05, $80, PalettesCustom_fighter_shield)        ; 01 - Master sword
-%SpriteProps($02, 0, 2, $05, $01, PalettesCustom_tempered_sword)        ; 02 - Tempered sword
+%SpriteProps($02, 0, 0, $05, $80, PalettesCustom_fighter_shield)        ; 02 - Tempered sword
-%SpriteProps($03, 0, 2, $05, $04, PalettesCustom_golden_sword)          ; 03 - Golden sword
+%SpriteProps($03, 0, 0, $05, $80, PalettesCustom_fighter_shield)        ; 03 - Golden sword
 %SpriteProps($04, 0, 0, $05, $80, PalettesCustom_fighter_shield)        ; 04 - Fighter shield
 %SpriteProps($05, 2, 2, $05, $80, PalettesCustom_red_shield)            ; 05 - Fire shield
 %SpriteProps($06, 2, 2, $05, $80, PalettesCustom_mirror_shield)         ; 06 - Mirror shield
@@ -489,7 +489,7 @@ endmacro
 %SpriteProps($46, 2, 2, $04, $04, PalettesVanilla_green_blue_guard+$0E) ; 46 - 300 rupees
 %SpriteProps($47, 2, 2, $04, $04, PalettesVanilla_green_blue_guard+$0E) ; 47 - 20 rupees green
 %SpriteProps($48, 2, 0, $02, $80, PalettesCustom_fighter_shield)        ; 48 - Full bottle (good bee)
-%SpriteProps($49, 0, 2, $05, $02, PalettesCustom_fighter_shield)        ; 49 - Tossed fighter sword
+%SpriteProps($49, 0, 0, $05, $80, PalettesCustom_fighter_shield)        ; 49 - Tossed fighter sword
 %SpriteProps($4A, 2, 0, $02, $80, PalettesCustom_fighter_shield)        ; 4A - Active Flute
 %SpriteProps($4B, 2, 0, $01, $80, PalettesCustom_fighter_shield)        ; 4B - Boots
 %SpriteProps($4C, 2, 2, $04, $04, PalettesVanilla_green_blue_guard+$0E) ; 4C - Bomb capacity (50)
@@ -1220,10 +1220,10 @@ ItemReceiptGraphicsOffsets:
 ; for receipt and non-receipt drawing.
 ;===================================================================================================
 StandingItemGraphicsOffsets:
-	dw $0860                               ; 00 - Fighter Sword and Shield
+	dw BigDecompressionBuffer+$09E0        ; 00 - Fighter Sword and Shield
-	dw $00E0                               ; 01 - Master Sword
+	dw BigDecompressionBuffer+$09E0        ; 01 - Master Sword
-	dw $0120                               ; 02 - Tempered Sword
+	dw BigDecompressionBuffer+$09E0        ; 02 - Tempered Sword
-	dw $0160                               ; 03 - Butter Sword
+	dw BigDecompressionBuffer+$09E0        ; 03 - Butter Sword
 	dw BigDecompressionBuffer+$09E0        ; 04 - Fighter Shield
 	dw BigDecompressionBuffer+$1940        ; 05 - Fire Shield
 	dw BigDecompressionBuffer+$0C80        ; 06 - Mirror Shield
@@ -1293,7 +1293,7 @@ StandingItemGraphicsOffsets:
 	dw BigDecompressionBuffer+$0DA0        ; 46 - 300 rupees
 	dw BigDecompressionBuffer+$0000        ; 47 - 20 rupees green
 	dw BigDecompressionBuffer+$09E0        ; 48 - Full bottle (good bee)
-	dw $00A0                               ; 49 - Tossed fighter sword
+	dw BigDecompressionBuffer+$09E0        ; 49 - Tossed fighter sword
 	dw BigDecompressionBuffer+$09E0        ; 4A - Active Flute
 	dw BigDecompressionBuffer+$09E0        ; 4B - Boots
 

keydrop/standing_items.asm

@@ -696,6 +696,14 @@ KeyGet:
         LDA.l StandingItemsOn : BNE +
             PLA : RTL
         + LDY.w SprSourceItemId, X
+
+        JSL ShieldCheck
+        BCS .not_replaced
+            PLA : PLA : PLA ; remove stored address to jump back to
+            PLA ; restore the A value going into KeyGet
+            JML $86D1A8
+        .not_replaced
+
         LDA.w SprItemIndex, X : STA.w SpawnedItemIndex
         LDA.w SprItemFlags, X : STA.w SpawnedItemFlag
         STY.b Scrap00

multiworld.asm

@@ -202,13 +202,22 @@ RTL
 
 Multiworld_BottleVendor_GiveBottle:
 {
+	PHA
+	JSL ShieldCheck
+	PLA
+	BCC .no_take_shield
+
 	PHA : PHP
 	SEP #$20
 	LDA.l BottleMerchant_Player : STA.l !MULTIWORLD_ITEM_PLAYER_ID
 	PLP : PLA
 
 	JSL Link_ReceiveItem ; thing we wrote over
-RTL
+	RTL
+
+.no_take_shield
+	PLA : PLA : PLA : PLX
+	JML $85EB3A
 }
 
 Multiworld_MiddleAgedMan_ReactToSecretKeepingResponse:

npcitems.asm

@@ -99,10 +99,8 @@ RTL
 
 ItemSet_OldMan:
 	PHA
-	TYA : STA.b $0C
 	JSL ShieldCheck
 	BCC .skip
-	LDA.b $0C : TAY
 
 	LDA.l OldManItem_Player : STA.l !MULTIWORLD_ITEM_PLAYER_ID
 	PLA
@@ -119,10 +117,8 @@ RTL
 
 ItemSet_SickKid:
 	PHA
-	TYA : STA.b $0C
 	JSL ShieldCheck
 	BCC .skip
-	LDA.b $0C : TAY
 
 	LDA.l SickKidItem_Player : STA.l !MULTIWORLD_ITEM_PLAYER_ID
 	PLA
@@ -135,10 +131,8 @@ RTL
 
 ItemSet_TreeKid:
 	PHA
-	TYA : STA.b $0C
 	JSL ShieldCheck
 	BCC .skip
-	LDA.b $0C : TAY
 
 	LDA.l TreeKidItem_Player : STA.l !MULTIWORLD_ITEM_PLAYER_ID
 	PLA
@@ -151,10 +145,8 @@ RTL
 
 ItemSet_Sahasrala:
 	PHA
-	TYA : STA.b $0C
 	JSL ShieldCheck
 	BCC .skip
-	LDA.b $0C : TAY
 
 	LDA.l SahasralaItem_Player : STA.l !MULTIWORLD_ITEM_PLAYER_ID
 	PLA
@@ -171,10 +163,8 @@ RTL
 
 ItemSet_Library:
 	PHA
-	TYA : STA.b $0C
 	JSL ShieldCheck
 	BCC .skip
-	LDA.b $0C : TAY
 
 	LDA.l LibraryItem_Player : STA.l !MULTIWORLD_ITEM_PLAYER_ID
 	PLA
@@ -187,15 +177,23 @@ RTL
 
 ItemSet_Mushroom:
 	PHA
-		LDA.l NpcFlags+1 : ORA.b #$10 : STA.l NpcFlags+1
 		LDY.w SprSourceItemId, X ; Retrieve stored item type
 		BNE +
 			; if for any reason the item value is 0 reload it, just in case
 			%GetPossiblyEncryptedItem(MushroomItem, SpriteItemValues) : TAY
 		+
+
+		JSL ShieldCheck
+		BCC .skip
 	LDA.l MushroomItem_Player : STA.l !MULTIWORLD_ITEM_PLAYER_ID
-	PLA
 	STZ.w ItemReceiptMethod ; thing we wrote over - the mushroom is an npc for item purposes apparently
+	PLA
+
+	JSL Link_ReceiveItem
+	PHA
+	LDA.l NpcFlags+1 : ORA.b #$10 : STA.l NpcFlags+1
+.skip
+	PLA
 RTL
 
 ItemSet_Powder:
@@ -273,20 +271,16 @@ MarkThrownItem:
 	LDA.b OverworldIndex : CMP.b #$81 : BNE .catfish
 
 	.zora
-	TYA : STA.b $0C
 	JSL ShieldCheck
 	BCC .skip
-	LDA.b $0C : TAY
 
 	JSL ItemSet_ZoraKing
 	LDA.l ZoraItem_Player : STA.l !MULTIWORLD_ITEM_PLAYER_ID
 	BRA .done
 
 	.catfish
-	TYA : STA.b $0C
 	JSL ShieldCheck
 	BCC .skip
-	LDA.b $0C : TAY
 	JSL ItemSet_Catfish
 
 	LDA.l CatfishItem_Player : STA.l !MULTIWORLD_ITEM_PLAYER_ID

pikit.asm

@@ -74,7 +74,11 @@ LinkAwaken:
 	RTL
 
 BigChest_ShieldCheck:
+	PHY
+	LDY.b $0C
 	JSL ShieldCheck
+	STY.b $0C
+	PLY
 	BCC .no_open
 	LDA.l BigKeyField
 	AND.l BitMasks, X
@@ -82,9 +86,13 @@ BigChest_ShieldCheck:
 	RTL
 
 SmallChest_ShieldCheck:
+	PHY
+	LDY.b $0C
 	JSL ShieldCheck
+	STY.b $0C
+	PLY
 	BCC .no_open
-	LDA.w DungeonID
+	LDA.w $0402
 	ORA.w RoomFlagMask, Y
 .no_open
 	RTL
@@ -93,13 +101,14 @@ ShieldCheck:
 	PHP
 	REP #$30
 	PHX
-	LDA.b $0C
+	TYA
 	AND.w #$00FF
 	TAX
 	LDA.l PikitItemList, X
 	AND.w #$00FF
 	BNE .replace
 	PLX
+	PLP
 	SEC
 	RTL
 
@@ -109,8 +118,7 @@ ShieldCheck:
 	BNE .already_have_shield
 	TXA
 	STA.l PikitItem
-	LDA.w #$0004
+	LDY.w #$0004
-	STA.b $0C
 	PLX
 	PLP
 	SEC

ram.asm

@@ -619,7 +619,8 @@ HexToDecDigit3: skip 1             ;
 HexToDecDigit4: skip 1             ;
 HexToDecDigit5: skip 1             ;
 SpriteSkipEOR: skip 2              ; Used in utilities.asm to determine when to skip drawing sprites. Zero-padded
-skip $2B                           ; Unused
+skip $2A                           ; Unused
+BossDropTouched: skip 1
 AltTextFlag: skip 2                ; dialog.asm: Determines whether to load from vanilla decompression buffer
                                    ; or from a secondary buffer (used for things like free dungeon item text)
 BossKills: skip 1                  ;

swordswap.asm

@@ -132,6 +132,12 @@ GetSmithSword:
 	.buy
 		LDA.l SmithItem_Player : STA.l !MULTIWORLD_ITEM_PLAYER_ID
 		LDA.l SmithItem : TAY
+
+		JSL ShieldCheck
+		BCS +
+		JML $86B4A5
+
+		+
 		STZ.w ItemReceiptMethod ; Item from NPC
 		PHX : JSL Link_ReceiveItem : PLX
 

tablets.asm

@@ -73,6 +73,26 @@ MaybeUnlockTabletAnimation:
 	PLP : PLA
 RTL
 ;--------------------------------------------------------------------------------
+MaybeFreeLinkFromTablet:
+	PHA : PHP
+		JSL IsMedallion : BCC +
+			STZ.w MedallionFlag ; disable falling-medallion mode
+			STZ.w ForceSwordUp ; release link from item-up pose
+			LDA.b #$00 : STA.b LinkState ; set link to ground state
+			STZ.w CutsceneFlag
+			STZ.w NoDamage
+
+			REP #$20 ; set 16-bit accumulator
+				LDA.b OverworldIndex : CMP.w #$0030 : BNE ++ ; Desert
+					SEP #$20 ; set 8-bit accumulator
+					LDA.b #$02 : STA.b LinkDirection ; face link forward
+					LDA.b #$3C : STA.b LinkIncapacitatedTimer ; lock link for 60f
+				++
+			SEP #$20 ; set 8-bit accumulator
+		+
+	PLP : PLA
+RTL
+;--------------------------------------------------------------------------------
 IsMedallion:
 	REP #$20 ; set 16-bit accumulator
 	LDA.b OverworldIndex

vanillalabels.asm

@@ -192,6 +192,7 @@ LoadBackgroundGraphics_arbitrary                           = $80E64D
 RoomTag_GetHeartForPrize                                   = $81C709
 RoomTag_GetHeartForPrize_spawn_prize                       = $81C731
 RoomTag_GetHeartForPrize_delete_tag                        = $81C749
+RoomTag_GetHeartForPrize_exit                              = $81C74D
 Underworld_SetBossOrSancMusicUponEntry                     = $828AD9
 ResetThenCacheRoomEntryProperties                          = $828C73
 RecoverPositionAfterDrowning                               = $829485