From 9b1c8683747bf0aeb831670340080833ad21eb8d Mon Sep 17 00:00:00 2001
From: scawful <justin.scofield@outlook.com>
Date: Mon, 14 Aug 2023 09:07:39 -0400
Subject: [PATCH] Overworld pit damage, Lv2 sword from chest

---
 Oracle_main.asm            | 11 ++++++++++-
 Overworld/master_sword.asm | 15 +++++++++++++++
 Overworld/pit_damage.asm   |  3 +++
 3 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 Overworld/master_sword.asm
 create mode 100644 Overworld/pit_damage.asm

diff --git a/Oracle_main.asm b/Oracle_main.asm
index 1efe1fd..d124a05 100644
--- a/Oracle_main.asm
+++ b/Oracle_main.asm
@@ -215,7 +215,16 @@ namespace Oracle
 
   print ""
 
+  ; ---------------------------------------------------------
+  ; Overworld
 
+  incsrc "Overworld/pit_damage.asm"
+  print  "End of Overworld/pit_damage.asm   ", pc
+
+  incsrc "Dungeons/master_sword.asm"
+  print  "End of master_sword.asm           ", pc
+
+  
   ; ---------------------------------------------------------
   ; Custom Menu and HUD
 
@@ -230,7 +239,7 @@ namespace Oracle
 
 
   ; ---------------------------------------------------------
-  incsrc "Util/all_items.asm"
+  ; incsrc "Util/all_items.asm"
   print  "End of Util/all_items.asm            ", pc
 
   ; Overworld area which has holes that hurt
diff --git a/Overworld/master_sword.asm b/Overworld/master_sword.asm
new file mode 100644
index 0000000..b7e1004
--- /dev/null
+++ b/Overworld/master_sword.asm
@@ -0,0 +1,15 @@
+; TODO: Make the pedestal sword the lv4 sword
+;       Change the dialogue for the sword pull
+
+; =========================================================
+; Get Lv2 Sword from chest
+; =========================================================
+
+; At 04/87CA, change D0 into 80
+org $0987CA
+db $80
+
+; Disable wind blowing sfx:
+; At 04/45D4, change 09 into 00
+org $08C5D4
+db $00
\ No newline at end of file
diff --git a/Overworld/pit_damage.asm b/Overworld/pit_damage.asm
new file mode 100644
index 0000000..aece48b
--- /dev/null
+++ b/Overworld/pit_damage.asm
@@ -0,0 +1,3 @@
+; Pit hole leads to Houlihan room only in area 05
+org $0794D9
+  LDA $8A : CMP #$05 : BEQ $0794E4
\ No newline at end of file