From f6de58ac44cd7aeaf72df98b2bf1660311b6d4b7 Mon Sep 17 00:00:00 2001 From: scawful Date: Sun, 7 Jul 2024 22:05:33 -0400 Subject: [PATCH] update magic ring bitwise sram --- Items/all_items.asm | 1 + Oracle_main.asm | 12 ++++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Items/all_items.asm b/Items/all_items.asm index 97dc5a3..829211d 100644 --- a/Items/all_items.asm +++ b/Items/all_items.asm @@ -9,6 +9,7 @@ incsrc "Items/sword_collect.asm" incsrc "Items/goldstar.asm" incsrc "Items/portal_rod.asm" incsrc "Items/fishing_rod.asm" +incsrc "Items/magic_rings.asm" MagicBeanGfx: incbin "gfx/magic_bean.bin" diff --git a/Oracle_main.asm b/Oracle_main.asm index 9ad2ebf..448965d 100644 --- a/Oracle_main.asm +++ b/Oracle_main.asm @@ -19,7 +19,7 @@ ; 37 - Bunny Link GFX ; 38 - Wolf Link GFX ; 39 - Minish Link GFX -; 3A - StartupMasks, Palette_ArmorAndGloves, CgramAuxToMain +; 3A - Mask Routines, Custom Ancillae (Deku Bubble) ; 3B - GBC Link GFX ; 3C - Expanded Dialogue ; 3D - LW World Map @@ -50,9 +50,13 @@ OOSPROG2 = $7EF3C6 ; m - maku tree has met link (0: no | 1: yes) OOSPROG3 = $7EF3D4 -; 01 - Red Ring -; 02 - Green Ring -; 03 - Blue Ring +; ..pa slbh +; p - power +; a - armor +; s - steadfast +; l - light +; b - blast +; h - heart MAGICRINGS = $7EF3D8 ; 01 - Fishing Rod