diff --git a/audio.asm b/audio.asm
index ad1b2eb7..cb207997 100644
--- a/audio.asm
+++ b/audio.asm
@@ -254,7 +254,7 @@ OwnedMonValues:
 	db 10, 40, 60, 90, 120, 150, $ff
 
 ; crystal:
-    
+
 SECTION "Audio Engine 1", ROMX
 
 INCLUDE "crysaudio/engine.asm"
diff --git a/crysaudio/engine.asm b/crysaudio/engine.asm
index bc93939a..1e7cef4b 100644
--- a/crysaudio/engine.asm
+++ b/crysaudio/engine.asm
@@ -2385,9 +2385,6 @@ SetLRTracks:
 
 _PlayMusic::
 	call OpenSRAMForSound
-	ld a, e
-	and a
-	jp z, _MapSetup_Sound_Off
 	cp NUM_SONGS
 	ret nc ; sfx
 ; load music
diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm
index ff9e8d8a..c03dbf2c 100755
--- a/engine/battle/animations.asm
+++ b/engine/battle/animations.asm
@@ -3051,6 +3051,3 @@ PlayApplyingAttackSound:
 	ld [wTempoModifier], a
 	ld a, c
 	jp PlaySound 
-
-
-
diff --git a/engine/cable_club.asm b/engine/cable_club.asm
index aeee13f3..2ce923b5 100755
--- a/engine/cable_club.asm
+++ b/engine/cable_club.asm
@@ -830,7 +830,7 @@ TradeCenter_Trade:
 	ld [wAudioSavedROMBank], a
 	ld a, MUSIC_SAFARI_ZONE
 	ld [wNewSoundID], a
-	call PlaySound
+	call PlayMusic
 	ld c, 100
 	call DelayFrames
 	call ClearScreen
@@ -921,7 +921,7 @@ CableClub_Run:
 	ld [wAudioSavedROMBank], a
 	ld a, MUSIC_CELADON
 	ld [wNewSoundID], a
-	jp PlaySound
+	jp PlayMusic
 
 EmptyFunc3:
 	ret
diff --git a/home.asm b/home.asm
index 1b29f9b2..898b7608 100644
--- a/home.asm
+++ b/home.asm
@@ -3193,75 +3193,6 @@ DelayFrames::
 	jr nz, DelayFrames
 	ret
 
-PlaySoundWaitForCurrent::
-	push af
-	call WaitForSoundToFinish
-	pop af
-	jp PlaySound
-
-; Wait for sound to finish playing
-WaitForSoundToFinish::
-WaitSFX::
-; infinite loop until sfx is done playing
-	ld a, [wDanger]
-	and a
-	ret nz
-	ld a, [wSFXDontWait]
-	and a
-	ret nz
-	push hl
-
-.loop
-	; ch5 on?
-	ld hl, wChannel5 + wChannel1Flags1 - wChannel1 ; + CHANNEL_FLAGS1
-	bit 0, [hl]
-	jr nz, .loop
-	; ch6 on?
-	ld hl, wChannel6 + wChannel1Flags1 - wChannel1 ; + CHANNEL_FLAGS1
-	bit 0, [hl]
-	jr nz, .loop
-	; ch7 on?
-	ld hl, wChannel7 + wChannel1Flags1 - wChannel1 ; + CHANNEL_FLAGS1
-	bit 0, [hl]
-	jr nz, .loop
-	; ch8 on?
-	ld hl, wChannel8 + wChannel1Flags1 - wChannel1 ; + CHANNEL_FLAGS1
-	bit 0, [hl]
-	jr nz, .loop
-
-	pop hl
-	ret
-
-WaitForSongToFinish::
-.loop
-	call IsSongPlaying
-	jr c, .loop
-	ret
-
-IsSongPlaying::
-	; ch1 on?
-	ld hl, wChannel1 + wChannel1Flags1 - wChannel1 ; + CHANNEL_FLAGS1
-	bit 0, [hl]
-	jr nz, .playing
-	; ch2 on?
-	ld hl, wChannel2 + wChannel1Flags1 - wChannel1 ; + CHANNEL_FLAGS1
-	bit 0, [hl]
-	jr nz, .playing
-	; ch3 on?
-	ld hl, wChannel3 + wChannel1Flags1 - wChannel1 ; + CHANNEL_FLAGS1
-	bit 0, [hl]
-	jr nz, .playing
-	; ch4 on?
-	ld hl, wChannel4 + wChannel1Flags1 - wChannel1 ; + CHANNEL_FLAGS1
-	bit 0, [hl]
-	jr z, .notPlaying
-.playing
-	scf
-	ret
-.notPlaying
-	xor a
-	ret
-
 NamePointers::
 	dw MonsterNames
 	dw MoveNames
diff --git a/home/audio.asm b/home/audio.asm
index cdafc733..f0e1ec47 100644
--- a/home/audio.asm
+++ b/home/audio.asm
@@ -50,7 +50,7 @@ PlayDefaultMusicCommon::
 .walking
 	ld a, [wMapMusicSoundID]
 	ld b, a
-	call CompareMapMusicBankWithCurrentBank
+;	call CompareMapMusicBankWithCurrentBank
 	jr c, .next4
 
 .next3
@@ -71,20 +71,17 @@ PlayDefaultMusicCommon::
 	;call FadeMusic ; called in updatemusic
 	ret
 
-UpdateMusic6Times::
-	;jp UpdateSound
-	;ret ; XXX UpdateMusic
+;UpdateMusic6Times::
+;CompareMapMusicBankWithCurrentBank:
+;	ret
 
-CompareMapMusicBankWithCurrentBank:
-	ret
-
-; plays <s>music</s>SFX specified by a. If value is $ff, music is stopped
+; plays music or SFX specified by a. If value is $ff, music is stopped
 PlaySound::
 	push de
 	cp $ff
-    jr nz, .notff
-    xor a
-    call PlayMusic
+	jr nz, .notff
+	xor a
+	call PlayMusic
 	pop de
 	ret
 .notff
@@ -103,7 +100,7 @@ OpenSRAMForSound::
 	ld [MBC1SRamBank], a
 	ret
 
-;SoundRestart::
+;MapSetup_Sound_Off::
 ;	push hl
 ;	push de
 ;	push bc
@@ -111,16 +108,16 @@ OpenSRAMForSound::
 ;
 ;	call OpenSRAMForSound
 ;
-;	ld a, [hROMBank]
+;	ldh a, [hROMBank]
 ;	push af
-;	ld a, BANK(_SoundRestart)
-;	ld [hROMBank], a
+;	ld a, BANK(_MapSetup_Sound_Off)
+;	ldh [hROMBank], a
 ;	ld [MBC1RomBank], a
 ;
-;	call _SoundRestart
+;	call _MapSetup_Sound_Off
 ;
 ;	pop af
-;	ld [hROMBank], a
+;	ldh [hROMBank], a
 ;	ld [MBC1RomBank], a
 ;
 ;	pop af
@@ -129,26 +126,26 @@ OpenSRAMForSound::
 ;	pop hl
 ;	ret
 
-
 UpdateSound::
 ;	push hl
 ;	push de
 ;	push bc
 ;	push af
+
 	ld a, [wHaltAudio]
 	and a
 	ret nz
 
-	ld a, [hROMBank]
+	ldh a, [hROMBank]
 	push af
 	ld a, BANK(_UpdateSound)
-	ld [hROMBank], a
+	ldh [hROMBank], a
 	ld [MBC1RomBank], a
 
 	call _UpdateSound
 
 	pop af
-	ld [hROMBank], a
+	ldh [hROMBank], a
 	ld [MBC1RomBank], a
 
 ;	pop af
@@ -157,6 +154,19 @@ UpdateSound::
 ;	pop hl
 	ret
 
+_LoadMusicByte::
+; wCurMusicByte = [a:de]
+	ldh [hROMBank], a
+	ld [MBC1RomBank], a
+
+	ld a, [de]
+	ld [wCurMusicByte], a
+	ld a, BANK(LoadMusicByte)
+
+	ldh [hROMBank], a
+	ld [MBC1RomBank], a
+	ret
+
 PlayMusic::
 	ld e, a
 	xor a
@@ -168,28 +178,74 @@ PlayMusic::
 	push bc
 	push af
 
-	ld a, [hROMBank]
+	ldh a, [hROMBank]
 	push af
-	ld a, BANK(_PlayMusic) ; and BANK(_SoundRestart)
-	ld [hROMBank], a
+	ld a, BANK(_PlayMusic) ; aka BANK(_MapSetup_Sound_Off)
+	ldh [hROMBank], a
 	ld [MBC1RomBank], a
 
+	ld a, e
+	and a
+	jr z, .nomusic
+
 	call _PlayMusic
+	jr .end
 
+.nomusic
+	call _MapSetup_Sound_Off
+
+.end
 	pop af
-	ld [hROMBank], a
+	ldh [hROMBank], a
 	ld [MBC1RomBank], a
-	jr PopAllRet
+	pop af
+	pop bc
+	pop de
+	pop hl
+	ret
 
+;PlayMusic2::
+;	ld e, a
+;	xor a
+;	ld d, a
+; Stop playing music, then play music de.
+;
+;	push hl
+;	push de
+;	push bc
+;	push af
+;
+;	ldh a, [hROMBank]
+;	push af
+;	ld a, BANK(_PlayMusic)
+;	ldh [hROMBank], a
+;	ld [MBC1RomBank], a
+;
+;	push de
+;	ld de, MUSIC_NONE
+;	call _PlayMusic
+;	call DelayFrame
+;	pop de
+;	call _PlayMusic
+;
+;	pop af
+;	ldh [hROMBank], a
+;	ld [MBC1RomBank], a
+;
+;	pop af
+;	pop bc
+;	pop de
+;	pop hl
+;	ret
 
 PlayCry::
 ; Play monster a's cry.
-; Play a cry given parameters in header de
 
 	push hl
 	push de
 	push bc
 	push af
+
 	ld [wd11e], a
 	predef IndexToPokedex
 	ld a, [wd11e]
@@ -197,23 +253,18 @@ PlayCry::
 	ld e, a
 	ld d, 0
 
-; Save current bank
-	ld a, [hROMBank]
+	ldh a, [hROMBank]
 	push af
 
-; Cry headers are stuck in one bank.
+	; Cries are stuck in one bank.
 	ld a, BANK(PokemonCries)
-	ld [hROMBank], a
-	ld [$2000], a
+	ldh [hROMBank], a
+	ld [MBC1RomBank], a
 
-; Each header is 6 bytes long:
 	ld hl, PokemonCries
+rept 6 ; sizeof(mon_cry)
 	add hl, de
-	add hl, de
-	add hl, de
-	add hl, de
-	add hl, de
-	add hl, de
+endr
 
 	ld e, [hl]
 	inc hl
@@ -223,25 +274,29 @@ PlayCry::
 	ld a, [hli]
 	ld [wCryPitch], a
 	ld a, [hli]
-	ld [wCryPitch+1], a
+	ld [wCryPitch + 1], a
 	ld a, [hli]
 	ld [wCryLength], a
 	ld a, [hl]
-	ld [wCryLength+1], a
+	ld [wCryLength + 1], a
 
 	ld a, BANK(_PlayCry)
-	ld [hROMBank], a
-	ld [$2000], a
+	ldh [hROMBank], a
+	ld [MBC1RomBank], a
 
 	call _PlayCry
 
 	pop af
-	ld [hROMBank], a
-	ld [$2000], a
+	ldh [hROMBank], a
+	ld [MBC1RomBank], a
 	
 	call WaitForSoundToFinish
-	
-	jr PopAllRet
+
+	pop af
+	pop bc
+	pop de
+	pop hl
+	ret
 
 PlaySFX::
 ; Play sound effect de.
@@ -252,48 +307,97 @@ PlaySFX::
 	push bc
 	push af
 
-; Is something already playing?
-	;call CheckSFX
-	;jr nc, .play
-; Does it have priority?
-	;ld a, [wCurSFX]
-	;cp e
-	;jr c, .quit
+	; Is something already playing?
+;	call CheckSFX
+;	jr nc, .play
+
+	; Does it have priority?
+;	ld a, [wCurSFX]
+;	cp e
+;	jr c, .done
 
-PlaySFX_play
 .play
-	ld a, [hROMBank]
+	ldh a, [hROMBank]
 	push af
 	ld a, BANK(_PlaySFX)
-	ld [hROMBank], a
-	ld [$2000], a ; bankswitch
+	ldh [hROMBank], a
+	ld [MBC1RomBank], a
 
 	ld a, e
 	ld [wCurSFX], a
 	call _PlaySFX
 
 	pop af
-	ld [hROMBank], a
-	ld [$2000], a ; bankswitch
-.quit
-PopAllRet:
+	ldh [hROMBank], a
+	ld [MBC1RomBank], a
+
+.done
 	pop af
 	pop bc
 	pop de
 	pop hl
 	ret
 
-_LoadMusicByte::
-; CurMusicByte = [a:de]
-GLOBAL LoadMusicByte
+PlaySoundWaitForCurrent::
+WaitPlaySFX::
+	push af
+	call WaitForSoundToFinish
+	pop af
+	jp PlaySound
 
-	ld [hROMBank], a
-	ld [MBC1RomBank], a
+; Wait for sound to finish playing
+WaitForSoundToFinish::
+WaitSFX::
+	ld a, [wDanger]
+	and a
+	ret nz
+	ld a, [wSFXDontWait]
+	and a
+	ret nz
 
-	ld a, [de]
-	ld [wCurMusicByte], a
-	ld a, BANK(LoadMusicByte)
+; infinite loop until sfx is done playing
 
-	ld [hROMBank], a
-	ld [MBC1RomBank], a
+	push hl
+
+.wait
+	ld hl, wChannel5Flags1
+	bit 0, [hl]
+	jr nz, .wait
+	ld hl, wChannel6Flags1
+	bit 0, [hl]
+	jr nz, .wait
+	ld hl, wChannel7Flags1
+	bit 0, [hl]
+	jr nz, .wait
+	ld hl, wChannel8Flags1
+	bit 0, [hl]
+	jr nz, .wait
+
+	pop hl
+	ret
+
+WaitForSongToFinish::
+.loop
+	call IsSongPlaying
+	jr c, .loop
+	ret
+
+IsSongPlaying::
+; Return carry if any song channels are active.
+	ld a, [wChannel1Flags1]
+	bit 0, a
+	jr nz, .playing
+	ld a, [wChannel2Flags1]
+	bit 0, a
+	jr nz, .playing
+	ld a, [wChannel3Flags1]
+	bit 0, a
+	jr nz, .playing
+	ld a, [wChannel4Flags1]
+	bit 0, a
+	jr nz, .playing
+	and a
+	ret
+.playing
+	scf
 	ret
diff --git a/home/overworld.asm b/home/overworld.asm
index 0ffb9846..9053ab19 100644
--- a/home/overworld.asm
+++ b/home/overworld.asm
@@ -2398,7 +2398,7 @@ LoadMapData::
 	ld a, [wFlags_D733]
 	bit 1, a
 	jr nz, .restoreRomBank
-	call UpdateMusic6Times
+;	call UpdateMusic6Times
 	call PlayDefaultMusicFadeOutCurrent
 .restoreRomBank
 	pop af