From 4d22280db080370cb5fa7d1a70a029e7473215fb Mon Sep 17 00:00:00 2001
From: scawful <justin.scofield@outlook.com>
Date: Sat, 29 Jun 2024 10:25:21 -0400
Subject: [PATCH] hide pyramid X draw behind MAPICON 3

---
 Overworld/world_map.asm | 37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/Overworld/world_map.asm b/Overworld/world_map.asm
index 5353102..8084ba5 100644
--- a/Overworld/world_map.asm
+++ b/Overworld/world_map.asm
@@ -73,6 +73,25 @@ MapIconDraw:
     LDA.l $7EF3C7 : CMP.b #$01 : BEQ .hall_of_secrets
                     CMP.b #$02 : BEQ .draw_crystals
                     CMP.b #$03 : BCS .draw_secret
+
+    ; Pyramid of Power
+    LDA.l $7EF37A : AND #$20 : BNE .skip_draw_x
+      ; X position
+      LDA.b #$05 : STA.l $7EC10B
+      LDA.b #$00 : STA.l $7EC10A
+      ; Y position
+      LDA.b #$00 : STA.l $7EC109
+      LDA.b #$54 : STA.l $7EC108
+
+      LDA.b #$68 : STA.b $0D
+      LDA.b #$34 : STA.b $0C ; Tile GFX
+
+      LDA.b #$00 : STA.b $0B ; 02 = 16x16, 00 = 8x8 
+      LDA.b #$07 : STA.l $7EC025
+
+      JSR HandleMapDrawIcon_noflash
+    .skip_draw_x
+
     .hall_of_secrets
     ; Draw Hall of Secrets
     LDA.l $7EF37A : AND #$20 : BNE .skip_hall_draw
@@ -94,24 +113,6 @@ MapIconDraw:
 
     .draw_secret
 
-    ; Pyramid of Power
-    LDA.l $7EF37A : AND #$20 : BNE .skip_draw_x
-      ; X position
-      LDA.b #$05 : STA.l $7EC10B
-      LDA.b #$00 : STA.l $7EC10A
-      ; Y position
-      LDA.b #$00 : STA.l $7EC109
-      LDA.b #$54 : STA.l $7EC108
-
-      LDA.b #$68 : STA.b $0D
-      LDA.b #$34 : STA.b $0C ; Tile GFX
-
-      LDA.b #$00 : STA.b $0B ; 02 = 16x16, 00 = 8x8 
-      LDA.b #$07 : STA.l $7EC025
-
-      JSR HandleMapDrawIcon_noflash
-    .skip_draw_x
-
     .draw_crystals
     ; Draw Crystal 1 
     LDA.l $7EF37A : AND #$02 : BNE .skip_draw_0