From 1abe75ddb18008f17738bdcdaf4fb554bdb446c6 Mon Sep 17 00:00:00 2001
From: scawful <justin.scofield@outlook.com>
Date: Tue, 19 Nov 2024 14:56:38 -0500
Subject: [PATCH] Add maku tree map indicator during intro Move map icon and
 dungeon id documentation to symbols.asm

---
 Core/symbols.asm        | 31 +++++++++++++++++++++++++++++++
 Oracle_main.asm         |  8 --------
 Overworld/world_map.asm | 24 ++----------------------
 3 files changed, 33 insertions(+), 30 deletions(-)

diff --git a/Core/symbols.asm b/Core/symbols.asm
index 5361ca8..14d28d1 100644
--- a/Core/symbols.asm
+++ b/Core/symbols.asm
@@ -54,6 +54,37 @@ OOSPROG         = $7EF3D6
 ;   f - Flipped by fortune tellers to decide fortune set to give
 OOSPROG2       = $7EF3C6
 
+; Map icon
+;   0x00 - Red X on castle    | Save zelda
+;   0x01 - Red X on Kakariko  | Talk to villagers about elders
+;   0x02 - Red X on Eastern   | Talk to Sahasrahla
+;   0x03 - Pendants and MS    | Obtain the master sword
+;   0x04 - Master sword on LW | Grab the master sword
+;   0x05 - Skull on castle    | Kill Agahnim
+;   0x06 - Crystal on POD     | Get the first crystal
+;   0x07 - Crystals           | Get all 7 crystals
+;   0x08 - Skull on GT        | Climb Ganon's Tower
+MAPICON         = $7EF3C7
+
+; Dungeon ID Legend
+; Mushroom Grotto ID 0x0C (Palace of Darkness)
+; Tail Palace ID 0x0A (Swamp Palace)
+; Kalyxo Castle ID 0x10 (Skull Woods)
+; Zora Temple ID 0x16 (Thieves Town)
+; Glacia Estate 0x12 (Ice Palace)
+; Goron Mines 0x0E (Misery Mire)
+; Dragon Ship 0x18 (Turtle Rock)
+
+; .wbs tipm
+;   p - Palace of Darkness
+;   s - Swamp Palace
+;   w - Skull Woods
+;   b - Thieves' Town
+;   i - Ice Palace
+;   m - Misery Mire
+;   t - Turtle Rock
+CRYSTALS        = $7EF37A
+
 ; .... ...m
 ;   m - maku tree has met link (0: no | 1: yes)
 OOSPROG3       = $7EF3D4
diff --git a/Oracle_main.asm b/Oracle_main.asm
index a895b59..f04a2ce 100644
--- a/Oracle_main.asm
+++ b/Oracle_main.asm
@@ -25,14 +25,6 @@
 ;   3F  - DW ZS Tile32
 ;   40  - LW World Map
 ;   41  - DW World Map
-
-; Mushroom Grotto ID 0x0C (Palace of Darkness)
-; Tail Palace ID 0x0A (Swamp Palace)
-; Kalyxo Castle ID 0x10 (Skull Woods)
-; Zora Temple ID 0x16 (Thieves Town)
-; Glacia Estate 0x12 (Ice Palace)
-; Goron Mines 0x0E (Misery Mire)
-; Dragon Ship 0x18 (Turtle Rock)
 ; =========================================================
 
 ; ZSCustomOverworld version
diff --git a/Overworld/world_map.asm b/Overworld/world_map.asm
index 918d2f3..6a03ec7 100644
--- a/Overworld/world_map.asm
+++ b/Overworld/world_map.asm
@@ -7,28 +7,6 @@ org $0AC589
 org $0AC51C
     WorldMap_HandleSpriteBlink:
 
-; Map icon
-;   0x00 - Red X on castle    | Save zelda
-;   0x01 - Red X on Kakariko  | Talk to villagers about elders
-;   0x02 - Red X on Eastern   | Talk to Sahasrahla
-;   0x03 - Pendants and MS    | Obtain the master sword
-;   0x04 - Master sword on LW | Grab the master sword
-;   0x05 - Skull on castle    | Kill Agahnim
-;   0x06 - Crystal on POD     | Get the first crystal
-;   0x07 - Crystals           | Get all 7 crystals
-;   0x08 - Skull on GT        | Climb Ganon's Tower
-MAPICON         = $7EF3C7
-
-; .wbs tipm
-;   p - Palace of Darkness
-;   s - Swamp Palace
-;   w - Skull Woods
-;   b - Thieves' Town
-;   i - Ice Palace
-;   m - Misery Mire
-;   t - Turtle Rock
-CRYSTALS        = $7EF37A
-
 pullpc
 
 DrawWisdomPendant:
@@ -244,6 +222,8 @@ MapIconDraw:
   LDA.l $7EF3C7 : CMP.b #$01 : BEQ .hall_of_secrets
                   CMP.b #$02 : BEQ .draw_secret
                   CMP.b #$03 : BCS .draw_crystals
+                  JSL DrawEonEscapeIcon
+                  JSR HandleMapDrawIcon
                   JMP restore_coords_and_exit
 
   .hall_of_secrets