From 19ac208ecc830d8e8732180d848a4726831734c2 Mon Sep 17 00:00:00 2001
From: scawful <justin.scofield@outlook.com>
Date: Wed, 3 Jul 2024 20:25:24 -0400
Subject: [PATCH] add eon abyss map progression checks

---
 Overworld/world_map.asm | 44 ++++++++++++++++++++++++++++-------------
 1 file changed, 30 insertions(+), 14 deletions(-)

diff --git a/Overworld/world_map.asm b/Overworld/world_map.asm
index 3b95633..e544732 100644
--- a/Overworld/world_map.asm
+++ b/Overworld/world_map.asm
@@ -50,22 +50,36 @@ MapIconDraw:
 
     .draw_prizes
     LDA.b $8A : AND.b #$40 : BEQ .lwprizes
-      ; TODO: Place the pendant positions
-      ; X position
-      LDA.b #$00 : STA.l $7EC10B
-      LDA.b #$89 : STA.l $7EC10A ; Upper nybble control Zoomed low X pos
-      ; Y position
-      LDA.b #$00 : STA.l $7EC109
-      LDA.b #$E4 : STA.l $7EC108 ; Upper nybble control Zoomed low Y pos
-      ; Tile GFX
-      LDA.b #$66 : STA.b $0D
-      LDA.b #$34 : STA.b $0C
-      ; Tile Size
-      LDA.b #$02 : STA.b $0B ; 02 = 16x16, 00 = 8x8 
-      LDA.b #$0E : STA.l $7EC025 ; OAM Slot used
 
-      JSR HandleMapDrawIcon
+      ; TODO: Draw the pendants and master sword based on progression
+      LDA.l OOSPROG : AND.b #$10 : BNE .check_master_sword
 
+      .check_master_sword
+      ; TODO: Draw the master sword on the light world
+      LDA.l OOSPROG : AND.b #$20 : BNE .check_fortress
+
+      .check_fortress
+      
+      LDA.l OOSPROG : AND.b #$40 : BNE .check_final_boss
+
+      .check_final_boss
+      AND.b #$80 : BNE .exit_dw
+        ; This is a skull icon, use this for the fortress or final boss?
+        ; X position
+        LDA.b #$00 : STA.l $7EC10B
+        LDA.b #$89 : STA.l $7EC10A ; Upper nybble control Zoomed low X pos
+        ; Y position
+        LDA.b #$00 : STA.l $7EC109
+        LDA.b #$E4 : STA.l $7EC108 ; Upper nybble control Zoomed low Y pos
+        ; Tile GFX
+        LDA.b #$66 : STA.b $0D
+        LDA.b #$34 : STA.b $0C
+        ; Tile Size
+        LDA.b #$02 : STA.b $0B ; 02 = 16x16, 00 = 8x8 
+        LDA.b #$0E : STA.l $7EC025 ; OAM Slot used
+
+        JSR HandleMapDrawIcon
+    .exit_dw
       JMP restore_coords_and_exit
 
     .lwprizes
@@ -278,6 +292,8 @@ FixMaskPaletteOnExit:
   RTL
 }
 
+warnpc $0AC387
+
 org $0ABC76
   JSL FixMaskPaletteOnExit