From bc7baf6cd1e8f059edb28ff7a19f132056eeb75e Mon Sep 17 00:00:00 2001 From: scawful Date: Sat, 14 Jan 2023 18:04:45 -0600 Subject: [PATCH] Update labels, song positions, wolf mask RAM pos --- Menu/menu_draw.asm | 2 +- Menu/menu_select_item.asm | 8 ++++++++ Menu/menu_text.asm | 11 ++++++++++- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/Menu/menu_draw.asm b/Menu/menu_draw.asm index 74ce72d..02650c2 100644 --- a/Menu/menu_draw.asm +++ b/Menu/menu_draw.asm @@ -328,7 +328,7 @@ DrawYItems: LDY.w #ZoraMaskGFX JSR DrawMenuItem - LDA.w #$7EF34F ; 7EF34C + LDA.w #$7EF358 LDX.w #menu_offset(16,9) LDY.w #WolfMaskGFX JSR DrawMenuItem diff --git a/Menu/menu_select_item.asm b/Menu/menu_select_item.asm index f1368e0..95bb684 100644 --- a/Menu/menu_select_item.asm +++ b/Menu/menu_select_item.asm @@ -77,6 +77,14 @@ Menu_ItemCursorPositions: ; ----------------------------------------------------------------------------- +Menu_OcarinaSongPositions: + dw menu_offset(15,12) ; song of + dw menu_offset(15,15) ; song of + dw menu_offset(15,18) ; song of + +; ----------------------------------------------------------------------------- + + Menu_FindNextItem: { LDY.w $0202 : INY diff --git a/Menu/menu_text.asm b/Menu/menu_text.asm index b2b19e9..8d06a36 100644 --- a/Menu/menu_text.asm +++ b/Menu/menu_text.asm @@ -92,7 +92,7 @@ DrawPlaytimeLabel: ; ============================================================================= Menu_ItemNames: - dw "__SLINGSHOT___ " + dw "_____BOW______ " dw "__BOOMERANG___ " dw "___HOOKSHOT___ " dw "____BOMBS_____ " @@ -117,6 +117,15 @@ Menu_ItemNames: dw "__STONE_MASK__ " dw "____BOTTLE____ " +Menu_BottleIems: + dw "___MUSHROOM___ " + dw "_EMPTY_BOTTLE_ " + dw "__RED_POTION__ " + dw "_GREEN_POTION_ " + dw "_BLUE_POTION__ " + dw "____FAIRY_____ " + dw "__GOOD_BEE____ " + Menu_DrawItemName: { LDA.w $0202 : DEC