From 151424be8a7f857aca89684d6059423e2d8e0adb Mon Sep 17 00:00:00 2001 From: Justin Scofield Date: Sun, 19 Jun 2022 16:25:39 -0400 Subject: [PATCH] moved equipment items to the quest screen --- Menu/menu_draw_items.asm | 40 +++++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/Menu/menu_draw_items.asm b/Menu/menu_draw_items.asm index f2456b8..a2b8d77 100644 --- a/Menu/menu_draw_items.asm +++ b/Menu/menu_draw_items.asm @@ -208,10 +208,6 @@ DrawYItems: LDY.w #BottlesGFX JSR DrawMenuItem - LDA.w #$7EF354 - LDX.w #menu_offset(10,20) - LDY.w #PowerGloveGFX - JSR DrawMenuItem LDA.w #$7EF345 LDX.w #menu_offset(10,2) @@ -248,10 +244,6 @@ DrawYItems: LDY.w #BottlesGFX JSR DrawMenuItem - LDA.w #$7EF355 - LDX.w #menu_offset(12,20) - LDY.w #PegasusBootsGFX - JSR DrawMenuItem LDA.w #$7EF350 LDX.w #menu_offset(13,2) @@ -288,10 +280,7 @@ DrawYItems: LDY.w #BottlesGFX JSR DrawMenuItem - LDA.w #$7EF356 - LDX.w #menu_offset(14,20) - LDY.w #FlippersGFX - JSR DrawMenuItem + LDA.w #$7EF34C ; ocarina LDX.w #menu_offset(16,2) @@ -323,11 +312,6 @@ DrawYItems: LDY.w #BottlesGFX JSR DrawMenuItem - LDA.w #$7EF357 - LDX.w #menu_offset(16,20) - LDY.w #MoonPearlGFX - JSR DrawMenuItem - RTS Menu_DrawQuestItems: @@ -353,4 +337,26 @@ Menu_DrawQuestItems: LDY.w #TunicGFX JSR DrawMenuItem + LDA.w #$7EF354 + LDX.w #menu_offset(17,2) + LDY.w #PowerGloveGFX + JSR DrawMenuItem + + + LDA.w #$7EF355 + LDX.w #menu_offset(17,5) + LDY.w #PegasusBootsGFX + JSR DrawMenuItem + + + LDA.w #$7EF356 + LDX.w #menu_offset(17,8) + LDY.w #FlippersGFX + JSR DrawMenuItem + + LDA.w #$7EF357 + LDX.w #menu_offset(17,11) + LDY.w #MoonPearlGFX + JSR DrawMenuItem + RTS \ No newline at end of file