From b66a45025a257b23964289d7de70ed46ebe16f77 Mon Sep 17 00:00:00 2001 From: scawful Date: Fri, 27 Jan 2023 01:28:44 -0600 Subject: [PATCH] HUD adjust draw pos for dungeon key digit icon --- {MakuTree => Events}/maku_tree.asm | 0 Menu/menu.asm | 3 +++ Menu/menu_hud.asm | 2 +- Oracle_main.asm | 4 ++-- 4 files changed, 6 insertions(+), 3 deletions(-) rename {MakuTree => Events}/maku_tree.asm (100%) diff --git a/MakuTree/maku_tree.asm b/Events/maku_tree.asm similarity index 100% rename from MakuTree/maku_tree.asm rename to Events/maku_tree.asm diff --git a/Menu/menu.asm b/Menu/menu.asm index c4d56d3..e9f9228 100644 --- a/Menu/menu.asm +++ b/Menu/menu.asm @@ -31,6 +31,9 @@ org $808B6B : LDX.w #$6040 org $8DDFB2 : LDA.l Menu_ItemIndex, X pullpc +; ============================================================================= +; Menu Bank + org $248000 incsrc "menu_gfx_table.asm" incsrc "menu_text.asm" diff --git a/Menu/menu_hud.asm b/Menu/menu_hud.asm index 8d12763..ca133d2 100644 --- a/Menu/menu_hud.asm +++ b/Menu/menu_hud.asm @@ -193,7 +193,7 @@ HUD_Update: ; The key digit, which is optionally drawn. ; Also check to see if the key spot is blank - LDA $05 : AND.w #$00FF : ORA.w #$2400 : STA $7EC764 + LDA $05 : AND.w #$00FF : ORA.w #$2400 : STA $7EC7A4 CMP.w #$247F : BNE .dontBlankKeyIcon ; If the key digit is blank, also blank out the key icon. diff --git a/Oracle_main.asm b/Oracle_main.asm index 4243b0a..833bcc0 100644 --- a/Oracle_main.asm +++ b/Oracle_main.asm @@ -73,8 +73,8 @@ namespace Oracle print "End of Events/intro.asm ", pc ; --------------------------------------------------------- - incsrc "MakuTree/maku_tree.asm" - print "End of MakuTree/maku_tree.asm ", pc + incsrc "Events/maku_tree.asm" + print "End of Events/maku_tree.asm ", pc ; --------------------------------------------------------- incsrc "Events/lostsea.asm"