From c59819bb93c6f272e0f6586fe98c2e7a0a20d391 Mon Sep 17 00:00:00 2001
From: scawful <justin.scofield@outlook.com>
Date: Mon, 19 Feb 2024 10:45:49 -0500
Subject: [PATCH] Remove entrance music fix asm

---
 Music/entrance_music_fix.asm | 35 -----------------------------------
 Oracle_main.asm              |  4 +---
 2 files changed, 1 insertion(+), 38 deletions(-)
 delete mode 100644 Music/entrance_music_fix.asm

diff --git a/Music/entrance_music_fix.asm b/Music/entrance_music_fix.asm
deleted file mode 100644
index 74d44b5..0000000
--- a/Music/entrance_music_fix.asm
+++ /dev/null
@@ -1,35 +0,0 @@
-pushpc
-
-org $28424
-JML EntranceMusicFix
-NOP #02
-MyReturn:
-
-pullpc
-
-org $328000
-EntranceMusicFix:
-LDA $A0 : CMP #$C9 : BNE +
-JML $028467 ; room was C9 Play village song
-+
-CMP #$11 : BNE +
-JML $028467 ; room was 11 Play village song
-+
-CMP #$22 : BNE +
-JML $028467 ; room was 22 Play village song
-+
-CMP #$39 : BNE +
-JML $028467 ; room was 1F Play village song
-+
-LDX #$05 ; Load Song 05 (Forest)
-CMP #$67 : BNE +
-JML $028467 ; room was 67 Play forest song
-+
-CMP #$F3 : BNE +
-JML $028467 ; room was 63 Play forest song
-+
-; Room was not any of the rooms above
-JML MyReturn ; return to normal code!
-
-
-; LDX #$05   for any time that you want to change what song loads
\ No newline at end of file
diff --git a/Oracle_main.asm b/Oracle_main.asm
index 3a8e547..fb0f170 100644
--- a/Oracle_main.asm
+++ b/Oracle_main.asm
@@ -20,7 +20,7 @@
 ;   2F - House Tag
 ;   30 - ZSprite Engine
 ;   31 - Sprites: all_sprites.asm
-;   32 -                        Entrance Music Fix 
+;   32 - Time System
 ;   33 - Custom Collision Tables
 ;   34 - Deku Link Code
 ;   35 - Deku Link GFX
@@ -97,8 +97,6 @@ namespace Oracle
   incsrc "Music/dungeon_theme.asm"
   print  "End of Music/dungeon_theme.asm    ", pc
 
-  ; incsrc "Music/entrance_music_fix.asm"
-
   print ""
 
   ; -------------------------------------------------------