diff --git a/Overworld/world_map.asm b/Overworld/world_map.asm
index 6c5f14d..ef5ec6b 100644
--- a/Overworld/world_map.asm
+++ b/Overworld/world_map.asm
@@ -186,49 +186,42 @@ MapIconDraw:
     .lwprizes
 
     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
-    JMP .skip_draw_6
+                    CMP.b #$02 : BEQ .draw_secret
+                    CMP.b #$03 : BCS .draw_crystals
 
     .hall_of_secrets
-    ; Draw Hall of Secrets
-    LDA.l $7EF37A : AND #$20 : BNE .skip_hall_draw
-      ; X position
-      LDA.b #$0D : STA.l $7EC10B
-      LDA.b #$34 : STA.l $7EC10A
-      ; Y position
-      LDA.b #$03 : STA.l $7EC109
-      LDA.b #$0E : STA.l $7EC108
-      ; Tile GFX
-      LDA.b #$68 : STA.b $0D
-      LDA.b #$34 : STA.b $0C
-      ; Tile Size
-      LDA.b #$00 : STA.b $0B ; 02 = 16x16, 00 = 8x8 
-      LDA.b #$07 : STA.l $7EC025
-      JSR HandleMapDrawIcon
-      JMP restore_coords_and_exit
-    .skip_hall_draw
-    JMP .skip_draw_6
+    ; X position
+    LDA.b #$0D : STA.l $7EC10B
+    LDA.b #$34 : STA.l $7EC10A
+    ; Y position
+    LDA.b #$03 : STA.l $7EC109
+    LDA.b #$0E : STA.l $7EC108
+    ; Tile GFX
+    LDA.b #$68 : STA.b $0D
+    LDA.b #$34 : STA.b $0C
+    ; Tile Size
+    LDA.b #$00 : STA.b $0B ; 02 = 16x16, 00 = 8x8 
+    LDA.b #$07 : STA.l $7EC025
+    JSR HandleMapDrawIcon
+    JMP restore_coords_and_exit
 
-    .draw_secret
+    .draw_secret ; Pyramid of Power
+    ; 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
+    JMP .skip_draw_6
+    
 
     .draw_crystals
     ; Draw Crystal 1