move magic rings sram to magic_rings.asm

This commit is contained in:
scawful
2024-07-08 10:52:08 -04:00
parent 8aaaaf9436
commit 4406c3cbc2
2 changed files with 15 additions and 9 deletions

View File

@@ -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 ++

View File

@@ -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