Implement Armor Ring in Sprite_AttemptDamageToLinkPlusRecoil

2024-10-01 18:27:46 -04:00
parent ed0a8203f8
commit 305e093def
1 changed files with 17 additions and 7 deletions
--- a/Items/magic_rings.asm
+++ b/Items/magic_rings.asm
@@ -42,16 +42,25 @@ MagicRing_CheckForPower:
 }

 pushpc
-
+; Sprite_AttemptDamageToLinkPlusRecoil
+org $06F400
+  JSL MagicRing_CheckForArmor
 pullpc

+
+; $0373 - Damage queue for Link
+Sprite_BumpDamageGroups = $06F427
+
 ; Armor     - Defense Up, Attack Down
 MagicRing_CheckForArmor:
 {
+  LDA.w Sprite_BumpDamageGroups, Y : STA.w $0373
  LDA.l RingSlot1 : AND.b #$10 : BEQ +
  LDA.l RingSlot2 : AND.b #$10 : BEQ +
  LDA.l RingSlot3 : AND.b #$10 : BEQ +
-
+    ; Reduce the damage queue by half
+    LDA $0373 : BEQ +
+      LSR : STA $0373
  +
  RTL
 }
@@ -151,3 +160,4 @@ pushpc
 org $07810C
  JSL MagicRings_CheckForHeart
 pullpc
+