diff --git a/Items/magic_rings.asm b/Items/magic_rings.asm index 5905e51..6c2746e 100644 --- a/Items/magic_rings.asm +++ b/Items/magic_rings.asm @@ -1,10 +1,21 @@ ; ========================================================= ; Magic Rings +; ..pa slbh +; p - power +; a - armor +; s - steadfast +; l - light +; b - blast +; h - heart +MAGICRINGS = $7EF3D8 + ; Power - Attack Up, Defense Down ; Armor - Defense Up, Attack Down +; ========================================================= ; Steadfast - Less knockback + MagicRing_CheckForSteadfast: { LDA.l MAGICRINGS : AND.b #$08 : BEQ + @@ -23,6 +34,7 @@ org $07E1BE JSL MagicRing_CheckForSteadfast pullpc +; ========================================================= ; Light - Sword beam at -2 hearts MagicRing_CheckForLight: @@ -45,6 +57,7 @@ org $079C77 JSL MagicRing_CheckForLight pullpc +; ========================================================= ; Blast - Bomb Damage up MagicRing_CheckForBlast: @@ -65,7 +78,9 @@ org $06ECBF JSL MagicRing_CheckForBlast pullpc +; ========================================================= ; Heart - Slowly regenerate hearts + MagicRings_CheckForHeart: { LDA.l MAGICRINGS : AND.b #$01 : BEQ ++ diff --git a/Oracle_main.asm b/Oracle_main.asm index 3b7c5be..2e58d13 100644 --- a/Oracle_main.asm +++ b/Oracle_main.asm @@ -48,15 +48,6 @@ OOSPROG2 = $7EF3C6 ; m - maku tree has met link (0: no | 1: yes) OOSPROG3 = $7EF3D4 -; ..pa slbh -; p - power -; a - armor -; s - steadfast -; l - light -; b - blast -; h - heart -MAGICRINGS = $7EF3D8 - ; 01 - Fishing Rod ; 02 - Portal Rod CUSTOMRODS = $7EF351