From 10a17debc08dfddf3afd885f0d9536feebda235c Mon Sep 17 00:00:00 2001 From: scawful Date: Sun, 9 Jun 2024 11:35:01 -0400 Subject: [PATCH] remove sanctuary_transition.asm --- Dungeons/dungeons.asm | 23 ++++++++++++++++++++++- Dungeons/sanctuary_transition.asm | 24 ------------------------ 2 files changed, 22 insertions(+), 25 deletions(-) delete mode 100644 Dungeons/sanctuary_transition.asm diff --git a/Dungeons/dungeons.asm b/Dungeons/dungeons.asm index 735026e..187e003 100644 --- a/Dungeons/dungeons.asm +++ b/Dungeons/dungeons.asm @@ -1,7 +1,28 @@ incsrc "Dungeons/keyblock.asm" print "End of keyblock.asm ", pc -incsrc "Dungeons/sanctuary_transition.asm" +; Disable Code +; ------------ +org $028BE7 +db $EA, $EA + +; Load Sanctuary music during Room 02 to 12 transition +; ---------------------------------------------------- +;org $028BDA +;db $14 + +; Room Number (Sanctuary) +;org $028BDE +;db $12 + +; Load Hyrule Castle music during Room 12 to 02 transition +; -------------------------------------------------------- +;org $028BE3 +;db $16 + +; Room Number (Sewers) +;org $028BE5 +;db $02 incsrc "Dungeons/entrances.asm" print "End of entrances.asm ", pc diff --git a/Dungeons/sanctuary_transition.asm b/Dungeons/sanctuary_transition.asm deleted file mode 100644 index 25f72d6..0000000 --- a/Dungeons/sanctuary_transition.asm +++ /dev/null @@ -1,24 +0,0 @@ -; Disable Code -; ------------ -org $028BE7 -db $EA, $EA - - -; Load Sanctuary music during Room 02 to 12 transition -; ---------------------------------------------------- -;org $028BDA -;db $14 - -; Room Number (Sanctuary) -;org $028BDE -;db $12 - - -; Load Hyrule Castle music during Room 12 to 02 transition -; -------------------------------------------------------- -;org $028BE3 -;db $16 - -; Room Number (Sewers) -;org $028BE5 -;db $02 \ No newline at end of file