From af227905cb5ef2ab7c0f5ee2f2d192f47eb5f87a Mon Sep 17 00:00:00 2001 From: scawful Date: Fri, 5 Jul 2024 16:54:28 -0400 Subject: [PATCH] update magic bag offsets and cursor --- Menu/menu.asm | 11 ++++------- Menu/menu_draw.asm | 6 +++--- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/Menu/menu.asm b/Menu/menu.asm index 8c7aa61..c20e90c 100644 --- a/Menu/menu.asm +++ b/Menu/menu.asm @@ -480,7 +480,7 @@ Menu_MagicBag: BRA .continue .move_right - LDA.w $020B : CMP.b #$06 : BCS .zero + LDA.w $020B : CMP.b #$03 : BCS .zero INC.w $020B BRA .continue @@ -512,12 +512,9 @@ Menu_MagicBag: } Menu_MagicBagCursorPositions: - dw menu_offset(6,2) ; banana - dw menu_offset(6,5) ; pineapple - dw menu_offset(6,8) ; - dw menu_offset(6,11) ; - dw menu_offset(6,14) ; - dw menu_offset(6,17) ; + dw menu_offset(8,6) ; banana + dw menu_offset(8,10) ; pineapple + dw menu_offset(8,14) ; goron rock meat ; ========================================================= ; 0D MENU SONG MENU diff --git a/Menu/menu_draw.asm b/Menu/menu_draw.asm index 4cd8211..be5dff4 100644 --- a/Menu/menu_draw.asm +++ b/Menu/menu_draw.asm @@ -772,19 +772,19 @@ Menu_DrawMagicItems: LDA.w #$0001 STA.w MenuItemValueSpoof : LDA.w #MenuItemValueSpoof - LDX.w #menu_offset(7,3) + LDX.w #menu_offset(9,7) LDY.w #BananaGFX JSR DrawMenuItem LDA.w #$0001 STA.w MenuItemValueSpoof : LDA.w #MenuItemValueSpoof - LDX.w #menu_offset(7,6) + LDX.w #menu_offset(9,11) LDY.w #PineappleGFX JSR DrawMenuItem LDA.w #$0001 STA.w MenuItemValueSpoof : LDA.w #MenuItemValueSpoof - LDX.w #menu_offset(7,9) + LDX.w #menu_offset(9,15) LDY.w #RockMeatGFX JSR DrawMenuItem