From b3ba358f64e9459490031cb9c8e4227167e037bc Mon Sep 17 00:00:00 2001
From: scawful <justin.scofield@outlook.com>
Date: Tue, 29 Aug 2023 08:56:26 -0400
Subject: [PATCH] Add menu dungeon map names table

---
 Menu/menu_map_names.asm |  96 +++++++++++++++++++++++++++
 Menu/menu_text.asm      | 142 +++++-----------------------------------
 2 files changed, 112 insertions(+), 126 deletions(-)

diff --git a/Menu/menu_map_names.asm b/Menu/menu_map_names.asm
index 3e93eb5..6ca9c35 100644
--- a/Menu/menu_map_names.asm
+++ b/Menu/menu_map_names.asm
@@ -129,3 +129,99 @@ DarkWorldLocationNames:
   dw "_______________" ; 3D
   dw "_______________" ; 3E
   dw "_______________" ; 3F
+
+
+DungeonLocationNames:
+  dw "GANONS_LAIR_____", "________________", "________________", "________________" 
+  dw "________________", "ZORA_TEMPLE_____", "________________", "________________"
+  dw "________________", "________________", "________________", "________________"
+  dw "________________", "________________", "________________", "________________" ; 15
+
+  dw "________________", "________________", "________________", "________________"
+  dw "________________", "ZORA_TEMPLE_____", "SHRINE_COURAGE__", "ZORA_TEMPLE_____"
+  dw "MUSHROOM_GROTTO_", "MUSHROOM_GROTTO_", "MUSHROOM_GROTTO_", "________________"
+  dw "________________", "________________", "________________", "________________" ; 32 
+
+  dw "________________", "________________", "________________", "________________"
+  dw "________________", "________________", "________________", "________________"
+  dw "________________", "________________", "________________", "________________"
+  dw "________________", "________________", "________________", "________________" ; 48
+
+  dw "________________", "________________", "________________", "________________"
+  dw "________________", "________________", "________________", "________________"
+  dw "________________", "________________", "________________", "________________"
+  dw "________________", "________________", "________________", "________________" ; 64
+
+  dw "________________", "________________", "________________", "________________"
+  dw "________________", "________________", "________________", "________________"
+  dw "________________", "________________", "MUSHROOM_GROTTO_", "________________"
+  dw "________________", "________________", "________________", "________________"
+
+  dw "________________", "________________", "________________", "________________"
+  dw "________________", "________________", "________________", "________________"
+  dw "________________", "________________", "________________", "________________"
+  dw "________________", "________________", "________________", "________________" 
+
+  dw "________________", "________________", "________________", "________________"
+  dw "________________", "________________", "________________", "________________"
+  dw "________________", "________________", "________________", "________________"
+  dw "________________", "________________", "________________", "________________" 
+
+  dw "________________", "________________", "________________", "________________"
+  dw "________________", "________________", "________________", "________________"
+  dw "________________", "________________", "________________", "________________"
+  dw "________________", "________________", "________________", "________________" ; 128
+
+  dw "________________", "________________", "________________", "________________"
+  dw "________________", "________________", "________________", "________________"
+  dw "________________", "________________", "________________", "________________"
+  dw "________________", "________________", "________________", "________________" ; 144
+
+  dw "________________", "________________", "________________", "________________"
+  dw "________________", "________________", "________________", "________________"
+  dw "________________", "________________", "________________", "________________"
+  dw "________________", "________________", "________________", "________________" ; 160
+
+  dw "________________", "________________", "________________", "________________"
+  dw "KYDROGS_DEN_____", "________________", "________________", "________________"
+  dw "________________", "________________", "________________", "________________"
+  dw "________________", "________________", "________________", "________________" ; 176
+
+  dw "________________", "________________", "________________", "________________"
+  dw "________________", "________________", "________________", "________________"
+  dw "________________", "________________", "________________", "________________"
+  dw "________________", "________________", "________________", "________________" ; 192
+
+  dw "________________", "________________", "________________", "________________"
+  dw "________________", "________________", "________________", "________________"
+  dw "________________", "________________", "________________", "________________"
+  dw "________________", "________________", "________________", "________________" ; 208
+
+  dw "________________", "________________", "________________", "________________"
+  dw "________________", "________________", "________________", "________________"
+  dw "________________", "________________", "________________", "________________"
+  dw "________________", "________________", "________________", "________________" ; 224
+
+  dw "________________", "________________", "________________", "________________"
+  dw "________________", "________________", "________________", "________________"
+  dw "________________", "________________", "________________", "________________"
+  dw "________________", "________________", "________________", "________________" ; 240
+
+  dw "________________", "________________", "________________", "________________" ; 244
+  dw "________________", "________________", "________________", "________________"
+  dw "________________", "________________", "________________", "________________"
+  dw "________________", "________________", "________________", "________________" ; 256
+
+  dw "________________", "________________", "________________", "________________" ; 260
+  dw "YOUR_HOUSE______", "ZORA_CHAMBERS___", "________________", "________________"
+  dw "________________", "________________", "________________", "________________"
+  dw "________________", "________________", "________________", "________________" ; 272
+
+  dw "________________", "________________", "________________", "________________"
+  dw "________________", "________________", "________________", "________________"
+  dw "________________", "________________", "________________", "________________"
+  dw "________________", "________________", "________________", "________________" ; 288
+
+  dw "________________", "________________", "________________", "________________"
+  dw "________________", "________________", "________________", "________________" ; 295
+
diff --git a/Menu/menu_text.asm b/Menu/menu_text.asm
index 72d61aa..088c299 100644
--- a/Menu/menu_text.asm
+++ b/Menu/menu_text.asm
@@ -123,7 +123,7 @@ Menu_DrawItemName:
   LDA.w $0202 : BEQ .no_items
   DEC : ASL #5 : TAX
   LDY.w #$000
-  
+
 .loop
   LDA.w Menu_ItemNames, X ; Load your text character
   STA.w $1692, Y ; <- into the buffer
@@ -134,129 +134,27 @@ Menu_DrawItemName:
 
 ; Draw Bottle Description
 .bottle_1
-  REP #$30
-  LDX #$0000 : JMP .draw_bottle
+  REP #$30 : LDX #$0000 : JMP .draw_bottle
 .bottle_2
-  REP #$30
-  LDX #$0001 : JMP .draw_bottle
+  REP #$30 : LDX #$0001 : JMP .draw_bottle
 .bottle_3
-  REP #$30
-  LDX #$0002 : JMP .draw_bottle
+  REP #$30 : LDX #$0002 : JMP .draw_bottle
 .bottle_4
-  REP #$30
-  LDX #$0003
+  REP #$30 : LDX #$0003
+
 .draw_bottle
   LDA.l $7EF35C, X : AND.w #$00FF 
   DEC : ASL #5 : TAX
   LDY.w #$0000
 .draw_bottle_loop
-
   LDA.w Menu_BottleItems, X : STA.w $1692, Y
-  INX : INX 
-  INY : INY : CPY #$001C : BCC .draw_bottle_loop
+  INX #2 : INY #2 
+  CPY #$001C : BCC .draw_bottle_loop
   RTS
 }
 
 ; =============================================================================
 
-; ;LDX.w $7E00A0 		; load room number
-; -------------------------------------
-TestLocationName:
-  dw "GANONS_LAIR_____", "________________", "________________", "________________" 
-  dw "________________", "ZORA_TEMPLE_____", "________________", "________________"
-  dw "________________", "________________", "________________", "________________"
-  dw "________________", "________________", "________________", "________________" ; 15
-
-  dw "________________", "________________", "________________", "________________"
-  dw "________________", "ZORA_TEMPLE_____", "SHRINE_COURAGE__", "ZORA_TEMPLE_____"
-  dw "MUSHROOM_GROTTO_", "MUSHROOM_GROTTO_", "MUSHROOM_GROTTO_", "________________"
-  dw "________________", "________________", "________________", "________________" ; 32 
-
-  dw "________________", "________________", "________________", "________________"
-  dw "________________", "________________", "________________", "________________"
-  dw "________________", "________________", "________________", "________________"
-  dw "________________", "________________", "________________", "________________" ; 48
-
-  dw "________________", "________________", "________________", "________________"
-  dw "________________", "________________", "________________", "________________"
-  dw "________________", "________________", "________________", "________________"
-  dw "________________", "________________", "________________", "________________" ; 64
-
-  dw "________________", "________________", "________________", "________________"
-  dw "________________", "________________", "________________", "________________"
-  dw "________________", "________________", "MUSHROOM_GROTTO_", "________________"
-  dw "________________", "________________", "________________", "________________"
-
-  dw "________________", "________________", "________________", "________________"
-  dw "________________", "________________", "________________", "________________"
-  dw "________________", "________________", "________________", "________________"
-  dw "________________", "________________", "________________", "________________" 
-
-  dw "________________", "________________", "________________", "________________"
-  dw "________________", "________________", "________________", "________________"
-  dw "________________", "________________", "________________", "________________"
-  dw "________________", "________________", "________________", "________________" 
-
-  dw "________________", "________________", "________________", "________________"
-  dw "________________", "________________", "________________", "________________"
-  dw "________________", "________________", "________________", "________________"
-  dw "________________", "________________", "________________", "________________" ; 128
-
-  dw "________________", "________________", "________________", "________________"
-  dw "________________", "________________", "________________", "________________"
-  dw "________________", "________________", "________________", "________________"
-  dw "________________", "________________", "________________", "________________" ; 144
-
-  dw "________________", "________________", "________________", "________________"
-  dw "________________", "________________", "________________", "________________"
-  dw "________________", "________________", "________________", "________________"
-  dw "________________", "________________", "________________", "________________" ; 160
-
-  dw "________________", "________________", "________________", "________________"
-  dw "KYDROGS_DEN_____", "________________", "________________", "________________"
-  dw "________________", "________________", "________________", "________________"
-  dw "________________", "________________", "________________", "________________" ; 176
-
-  dw "________________", "________________", "________________", "________________"
-  dw "________________", "________________", "________________", "________________"
-  dw "________________", "________________", "________________", "________________"
-  dw "________________", "________________", "________________", "________________" ; 192
-
-  dw "________________", "________________", "________________", "________________"
-  dw "________________", "________________", "________________", "________________"
-  dw "________________", "________________", "________________", "________________"
-  dw "________________", "________________", "________________", "________________" ; 208
-
-  dw "________________", "________________", "________________", "________________"
-  dw "________________", "________________", "________________", "________________"
-  dw "________________", "________________", "________________", "________________"
-  dw "________________", "________________", "________________", "________________" ; 224
-
-  dw "________________", "________________", "________________", "________________"
-  dw "________________", "________________", "________________", "________________"
-  dw "________________", "________________", "________________", "________________"
-  dw "________________", "________________", "________________", "________________" ; 240
-
-  dw "________________", "________________", "________________", "________________" ; 244
-  dw "________________", "________________", "________________", "________________"
-  dw "________________", "________________", "________________", "________________"
-  dw "________________", "________________", "________________", "________________" ; 256
-
-  dw "________________", "________________", "________________", "________________" ; 260
-  dw "YOUR_HOUSE______", "ZORA_CHAMBERS___", "________________", "________________"
-  dw "________________", "________________", "________________", "________________"
-  dw "________________", "________________", "________________", "________________" ; 272
-
-  dw "________________", "________________", "________________", "________________"
-  dw "________________", "________________", "________________", "________________"
-  dw "________________", "________________", "________________", "________________"
-  dw "________________", "________________", "________________", "________________" ; 288
-
-  dw "________________", "________________", "________________", "________________"
-  dw "________________", "________________", "________________", "________________" ; 295
-
-; -------------------------------------
-
 DrawLocationName:
 {
   REP #$30
@@ -266,7 +164,7 @@ DrawLocationName:
   BEQ .indoors
   
   LDA.b $8A
-  ASL : ASL : ASL : ASL : ASL
+  ASL #5
   LDY.w #$000
   TAX 
 
@@ -278,15 +176,13 @@ DrawLocationName:
   RTS
 
 .indoors
-  LDA.b $A0
-  ASL : ASL : ASL : ASL : ASL
+  LDA.b $A0 ; Load current room
+  ASL #5
   TAY
   LDX.w #$0000
 
 .draw_indoors_loop
-  LDA.w TestLocationName, Y
-  STA.w $12CC, X
-
+  LDA.w DungeonLocationNames, Y : STA.w $12CC, X
   
   INY : INY 
   INX : INX : CPX #$0020 : BCC .draw_indoors_loop
@@ -302,11 +198,8 @@ Menu_DrawSelect:
   LDX.w #$16
 
 .loop
-  LDA.w SelectItemTXT, X
-  STA.w $1194, X
-
-  DEX : DEX
-  BPL .loop
+  LDA.w SelectItemTXT, X : STA.w $1194, X
+  DEX #2 : BPL .loop
 
   RTS
 }
@@ -319,11 +212,8 @@ Menu_DrawQuestStatus:
   LDX.w #$16
 
 .loop
-  LDA.w QuestStatusTXT, X
-  STA.w $1194, X
-
-  DEX : DEX
-  BPL .loop
+  LDA.w QuestStatusTXT, X : STA.w $1194, X
+  DEX #2 : BPL .loop
 
   RTS
 }