From ee9a1184056a35f349802bdb5849973b7b652bf4 Mon Sep 17 00:00:00 2001
From: scawful <justin.scofield@outlook.com>
Date: Sat, 8 Jun 2024 09:28:24 -0400
Subject: [PATCH] add multiple pit areas which lead to entrances, graveyard and
 lava lands

---
 Overworld/overworld.asm | 32 +++++++++++++++++++++++---------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/Overworld/overworld.asm b/Overworld/overworld.asm
index 6c1c7e3..5dd16cc 100644
--- a/Overworld/overworld.asm
+++ b/Overworld/overworld.asm
@@ -26,14 +26,6 @@ org $0EF587
   BNE EXIT_0EF581
   .on_dark_dm
 
-; Pit hole leads to room only in area 4F (final boss)
-; TODO: Make this index a table of areas 
-org $0794D9
-  LDA $8A : CMP #$57 : BEQ .overworld_pit_transition
-  JSL $01FFD9 ; TakeDamageFromPit
-  RTS
-.overworld_pit_transition
-
 incsrc "Overworld/world_map.asm"
 
 incsrc "Overworld/master_sword.asm"
@@ -62,11 +54,33 @@ LoadDarkWorldIntro:
   LDA.l $7EF3CA
   RTL
 }
-; pushpc
+pushpc
 
 org $028192
   JSL LoadDarkWorldIntro
 
+pullpc
+
+LoadOverworldPitAreas:
+{
+  LDA $8A : CMP.b #$0F : BEQ .allow_transition
+            CMP.b #$57 : BEQ .allow_transition
+  SEC ; fall in the pit
+  RTL
+
+  .allow_transition
+  CLC ; allow transition
+  RTL
+}
+
+org $0794D9
+  ; LDA $8A : CMP #$57 : BEQ .overworld_pit_transition
+  JSL LoadOverworldPitAreas : BCC .overworld_pit_transition
+  JSL $01FFD9 ; TakeDamageFromPit
+  RTS
+.overworld_pit_transition
+
+; incsrc "Overworld/special_areas.asm"
 
 incsrc "Overworld/overlays.asm"
 print  "End of Overworld/overlays.asm     ", pc
\ No newline at end of file