Merge branch 'master' of https://github.com/dannye/pokered-crysaudio

engine/events/hidden_objects/bills_house_pc.asm

@@ -53,7 +53,7 @@ BillsHouseInitiatedText::
 	text_promptbutton
 	text_asm
 	ld a, SFX_STOP_ALL_MUSIC
-	ld [wNewSoundID], a
+;	ld [wNewSoundID], a
 	call PlaySound
 	ld c, 16
 	call DelayFrames

engine/events/hidden_objects/safari_game.asm

@@ -30,16 +30,19 @@ SafariZoneGameStillGoing:
 SafariZoneGameOver:
 	call EnableAutoTextBoxDrawing
 	xor a
-	ld [wAudioFadeOutControl], a
+	ld [wMusicFade], a
 	dec a ; SFX_STOP_ALL_MUSIC
 	call PlaySound
-	ld c, BANK(SFX_Safari_Zone_PA)
+	ld c, 0 ; BANK(SFX_Safari_Zone_PA)
 	ld a, SFX_SAFARI_ZONE_PA
-	call PlayMusic
-.waitForMusicToPlay
-	ld a, [wChannelSoundIDs + CHAN5]
-	cp SFX_SAFARI_ZONE_PA
-	jr nz, .waitForMusicToPlay
+	call PlaySound
+
+	call WaitForSoundToFinish
+;.waitForMusicToPlay
+;	ld a, [wChannelSoundIDs + CHAN5]
+;	cp SFX_SAFARI_ZONE_PA
+;	jr nz, .waitForMusicToPlay
+
 	ld a, TEXT_SAFARI_GAME_OVER
 	ldh [hSpriteIndexOrTextID], a
 	call DisplayTextID

engine/events/hidden_objects/vermilion_gym_trash.asm

@@ -167,3 +167,10 @@ VermilionGymTrashFailText::
 	call PlaySound
 	call WaitForSoundToFinish
 	jp TextScriptEnd
+
+	; Trash cans are broken and can read the 255th entry sometimes for
+	; the second can.
+	; rgblink was placing stuff here, so the behavior was different from
+	; original Red.  This is the simplest non-code fix: allocate zeroes as
+	; far as the broken code could reach.
+		ds 255

engine/events/pokecenter.asm

@@ -24,13 +24,13 @@ DisplayPokemonCenterDialogue_::
 	predef HealParty
 	farcall AnimateHealingMachine ; do the healing machine animation
 	xor a
-	ld [wAudioFadeOutControl], a
-	ld a, [wAudioSavedROMBank]
-	ld [wAudioROMBank], a
+	ld [wMusicFade], a
+;	ld a, [wAudioSavedROMBank]
+;	ld [wAudioROMBank], a
 	ld a, [wMapMusicSoundID]
 	ld [wLastMusicSoundID], a
-	ld [wNewSoundID], a
-	call PlaySound
+;	ld [wNewSoundID], a
+	call PlayMusic
 	ld hl, PokemonFightingFitText
 	call PrintText
 	ld a, $14