diff --git a/Music/dungeon_theme.asm b/Music/dungeon_theme.asm
index 7196c4a..a5c08a2 100644
--- a/Music/dungeon_theme.asm
+++ b/Music/dungeon_theme.asm
@@ -30,7 +30,7 @@ dw $0000
 
 
 .Channel0
-%SetMasterVolume($CA)
+%SetMasterVolume($9F)
 %SetTempo(97);
 %SetInstrument($09) ; Strings
 %SetDurationN($48, $7F) ; 1/4
diff --git a/Music/entrance_music_fix.asm b/Music/entrance_music_fix.asm
index 92491ff..74d44b5 100644
--- a/Music/entrance_music_fix.asm
+++ b/Music/entrance_music_fix.asm
@@ -1,13 +1,14 @@
 pushpc
 
 org $28424
-JML MyNewMusic
+JML EntranceMusicFix
 NOP #02
 MyReturn:
 
 pullpc
 
-MyNewMusic:
+org $328000
+EntranceMusicFix:
 LDA $A0 : CMP #$C9 : BNE +
 JML $028467 ; room was C9 Play village song
 +
@@ -17,14 +18,14 @@ JML $028467 ; room was 11 Play village song
 CMP #$22 : BNE +
 JML $028467 ; room was 22 Play village song
 +
-CMP #$1F : BNE +
+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 #$59 : BNE +
+CMP #$F3 : BNE +
 JML $028467 ; room was 63 Play forest song
 +
 ; Room was not any of the rooms above