From 4b4256133b2445b5aaf2070b2d1accc46ef329d3 Mon Sep 17 00:00:00 2001
From: scawful <justin.scofield@outlook.com>
Date: Tue, 19 Nov 2024 20:47:49 -0500
Subject: [PATCH] Adjust world map icons/ram, show level 1 icon alone, 2-7
 grouped

---
 Core/symbols.asm        | 16 ++++++++--------
 Overworld/world_map.asm |  7 +++++--
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/Core/symbols.asm b/Core/symbols.asm
index 14d28d1..018823a 100644
--- a/Core/symbols.asm
+++ b/Core/symbols.asm
@@ -55,14 +55,14 @@ OOSPROG         = $7EF3D6
 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
+;   0x00 - Red X on Maku Tree/Maku Warp
+;   0x01 - Red X on Hall of Secrets
+;   0x02 - Red X on Kalyxo Pyramid
+;   0x03 - Toadstool Woods Crystal
+;   0x04 - Kalyxo Crystals All
+;   0x05 -
+;   0x06 -
+;   0x07 -
 ;   0x08 - Skull on GT        | Climb Ganon's Tower
 MAPICON         = $7EF3C7
 
diff --git a/Overworld/world_map.asm b/Overworld/world_map.asm
index 6a03ec7..68e74f9 100644
--- a/Overworld/world_map.asm
+++ b/Overworld/world_map.asm
@@ -221,7 +221,8 @@ MapIconDraw:
 
   LDA.l $7EF3C7 : CMP.b #$01 : BEQ .hall_of_secrets
                   CMP.b #$02 : BEQ .draw_secret
-                  CMP.b #$03 : BCS .draw_crystals
+                  CMP.b #$03 : BEQ .draw_crystal_1
+                  CMP.b #$04 : BCS .draw_crystals
                   JSL DrawEonEscapeIcon
                   JSR HandleMapDrawIcon
                   JMP restore_coords_and_exit
@@ -236,7 +237,7 @@ MapIconDraw:
     JSR HandleMapDrawIcon_noflash
     JMP .skip_draw_6
 
-  .draw_crystals
+  .draw_crystal_1
     ; Draw Crystal 1
     LDA.l $7EF37A : AND #$02 : BNE .skip_draw_0
       ; X position
@@ -253,7 +254,9 @@ MapIconDraw:
       LDA.b #$0E : STA.l $7EC025 ; OAM Slot used
       JSR HandleMapDrawIcon
     .skip_draw_0
+    JMP restore_coords_and_exit
 
+  .draw_crystals
     ; Draw Crystal 2
     LDA.l $7EF37A : AND #$10 : BNE .skip_draw_1
       ; X position (2)