Remove last few red audio variables

This commit is contained in:
dannye 2021-03-29 00:42:28 -05:00
parent c1278c478e
commit 3508dc8e1d
28 changed files with 114 additions and 124 deletions

View file

@ -162,11 +162,11 @@ PewterMuseumGuyMovementScriptPointerTable::
dw PewterMovementScript_Done
PewterMovementScript_WalkToMuseum:
ld a, 0 ; BANK(Music_MuseumGuy)
ld [wAudioROMBank], a
ld [wAudioSavedROMBank], a
; ld a, 0 ; BANK(Music_MuseumGuy)
; ld [wAudioROMBank], a
; ld [wAudioSavedROMBank], a
ld a, MUSIC_MUSEUM_GUY
ld [wNewSoundID], a
; ld [wNewSoundID], a
call PlayMusic
ld a, [wSpriteIndex]
swap a
@ -218,11 +218,11 @@ PewterGymGuyMovementScriptPointerTable::
dw PewterMovementScript_Done
PewterMovementScript_WalkToGym:
ld a, 0 ; BANK(Music_MuseumGuy)
ld [wAudioROMBank], a
ld [wAudioSavedROMBank], a
; ld a, 0 ; BANK(Music_MuseumGuy)
; ld [wAudioROMBank], a
; ld [wAudioSavedROMBank], a
ld a, MUSIC_MUSEUM_GUY
ld [wNewSoundID], a
; ld [wNewSoundID], a
call PlayMusic
ld a, [wSpriteIndex]
swap a

View file

@ -39,18 +39,18 @@ AnimateHealingMachine:
call DelayFrames
dec b
jr nz, .partyLoop
ld a, [wAudioROMBank]
cp $1f ; BANK("Audio Engine 3")
ld [wAudioSavedROMBank], a
jr nz, .next
ld a, SFX_STOP_ALL_MUSIC
ld [wNewSoundID], a
call PlaySound
ld a, 0 ; BANK(Music_PkmnHealed)
ld [wAudioROMBank], a
.next
; ld a, [wAudioROMBank]
; cp BANK("Audio Engine 3")
; ld [wAudioSavedROMBank], a
; jr nz, .next
; ld a, SFX_STOP_ALL_MUSIC
; ld [wNewSoundID], a
; call PlaySound
; ld a, 0 ; BANK(Music_PkmnHealed)
; ld [wAudioROMBank], a
;.next
ld a, MUSIC_PKMN_HEALED
ld [wNewSoundID], a
; ld [wNewSoundID], a
call PlayMusic
ld d, $28
call FlashSprite8Times