Misc clean up and small improvements

home/audio.asm

@@ -51,7 +51,7 @@ PlayDefaultMusicCommon::
 	ld a, [wMapMusicSoundID]
 	ld b, a
 ;	call CompareMapMusicBankWithCurrentBank
-	jr c, .next4
+;	jr c, .next4
 
 .next3
 	ld a, [wLastMusicSoundID]
@@ -100,7 +100,7 @@ OpenSRAMForSound::
 	ld [MBC1SRamBank], a
 	ret
 
-;MapSetup_Sound_Off::
+;InitSound::
 ;	push hl
 ;	push de
 ;	push bc
@@ -110,11 +110,11 @@ OpenSRAMForSound::
 ;
 ;	ldh a, [hLoadedROMBank]
 ;	push af
-;	ld a, BANK(_MapSetup_Sound_Off)
+;	ld a, BANK(_InitSound)
 ;	ldh [hLoadedROMBank], a
 ;	ld [MBC1RomBank], a
 ;
-;	call _MapSetup_Sound_Off
+;	call _InitSound
 ;
 ;	pop af
 ;	ldh [hLoadedROMBank], a
@@ -155,7 +155,7 @@ UpdateSound::
 	ret
 
 _LoadMusicByte::
-; wCurMusicByte = [a:de]
+; [wCurMusicByte] = [a:de]
 	ldh [hLoadedROMBank], a
 	ld [MBC1RomBank], a
 
@@ -300,7 +300,7 @@ endr
 
 PlaySFX::
 ; Play sound effect de.
-; Sound effects are ordered by priority (lowest to highest)
+; Sound effects are ordered by priority (highest to lowest)
 
 	push hl
 	push de
@@ -348,7 +348,7 @@ WaitPlaySFX::
 ; Wait for sound to finish playing
 WaitForSoundToFinish::
 WaitSFX::
-	ld a, [wDanger]
+	ld a, [wLowHealthAlarm]
 	and a
 	ret nz
 	ld a, [wSFXDontWait]

home/overworld.asm

@@ -771,10 +771,9 @@ HandleBlackOut::
 	jp SpecialEnterMap
 
 StopMusic::
+	ld [wMusicFade], a
 	xor a
 	ld [wMusicFadeID], a
-	ld a, 1
-	ld [wMusicFade], a
 .wait0
 	ld a, [wMusicFadeCount]
 	and a

home/pokemon.asm

@@ -138,37 +138,41 @@ LoadFrontSpriteByMonIndex::
 	ret
 
 
-; PlayCry
+;PlayCry::
+; Play monster a's cry.
+;	call GetCryData
+;	call PlaySound
+;	jp WaitForSoundToFinish
 
-GetCryData::
+;GetCryData::
 ; Load cry data for monster a.
-	dec a
-	ld c, a
-	ld b, 0
-	ld hl, CryData
-	add hl, bc
-	add hl, bc
-	add hl, bc
+;	dec a
+;	ld c, a
+;	ld b, 0
+;	ld hl, CryData
+;	add hl, bc
+;	add hl, bc
+;	add hl, bc
 
-	ld a, BANK(CryData)
-	call BankswitchHome
-	ld a, [hli]
-	ld b, a ; cry id
-	ld a, [hli]
-	ld [wFrequencyModifier], a
-	ld a, [hl]
-	ld [wTempoModifier], a
-	call BankswitchBack
+;	ld a, BANK(CryData)
+;	call BankswitchHome
+;	ld a, [hli]
+;	ld b, a ; cry id
+;	ld a, [hli]
+;	ld [wFrequencyModifier], a
+;	ld a, [hl]
+;	ld [wTempoModifier], a
+;	call BankswitchBack
 
 	; Cry headers have 3 channels,
 	; and start from index CRY_SFX_START,
 	; so add 3 times the cry id.
-	ld a, b
-	ld c, $14 ; CRY_SFX_START
-	rlca ; * 2
-	add b
-	add c
-	ret
+;	ld a, b
+;	ld c, CRY_SFX_START
+;	rlca ; * 2
+;	add b
+;	add c
+;	ret
 
 DisplayPartyMenu::
 	ldh a, [hTileAnimations]

home/vblank.asm

@@ -50,9 +50,9 @@ VBlank::
 	ldh [hFrameCounter], a
 
 .skipDec
+	call UpdateSound
 ;	call FadeOutAudio
 
-	call UpdateSound
 ;	ld a, [wAudioROMBank] ; music ROM bank
 ;	ldh [hLoadedROMBank], a
 ;	ld [MBC1RomBank], a