mirror of
https://github.com/thornAvery/kep-hack.git
synced 2026-02-06 15:45:24 +13:00
Remove last few red audio variables
This commit is contained in:
parent
c1278c478e
commit
3508dc8e1d
28 changed files with 114 additions and 124 deletions
|
|
@ -32,19 +32,19 @@ PlayDefaultMusicCommon::
|
|||
|
||||
.next
|
||||
ld b, a
|
||||
ld a, d
|
||||
and a ; should current music be faded out first?
|
||||
ld a, 0 ; BANK(Music_BikeRiding)
|
||||
jr nz, .next2
|
||||
; ld a, d
|
||||
; and a ; should current music be faded out first?
|
||||
; ld a, 0 ; BANK(Music_BikeRiding)
|
||||
; jr nz, .next2
|
||||
|
||||
; Only change the audio ROM bank if the current music isn't going to be faded
|
||||
; out before the default music begins.
|
||||
ld [wAudioROMBank], a
|
||||
; ld [wAudioROMBank], a
|
||||
|
||||
.next2
|
||||
;.next2
|
||||
; [wAudioSavedROMBank] will be copied to [wAudioROMBank] after fading out the
|
||||
; current music (if the current music is faded out).
|
||||
ld [wAudioSavedROMBank], a
|
||||
; ld [wAudioSavedROMBank], a
|
||||
jr .next3
|
||||
|
||||
.walking
|
||||
|
|
@ -69,7 +69,7 @@ PlayDefaultMusicCommon::
|
|||
|
||||
ld a, b
|
||||
ld [wLastMusicSoundID], a
|
||||
ld [wNewSoundID], a
|
||||
; ld [wNewSoundID], a
|
||||
ld [wMusicFadeID], a
|
||||
ret
|
||||
|
||||
|
|
|
|||
|
|
@ -97,9 +97,9 @@ rLCDC_DEFAULT EQU %11100011
|
|||
|
||||
predef LoadSGB
|
||||
|
||||
ld a, 0 ; BANK(SFX_Shooting_Star)
|
||||
ld [wAudioROMBank], a
|
||||
ld [wAudioSavedROMBank], a
|
||||
; ld a, 0 ; BANK(SFX_Shooting_Star)
|
||||
; ld [wAudioROMBank], a
|
||||
; ld [wAudioSavedROMBank], a
|
||||
ld a, $9c
|
||||
ldh [hAutoBGTransferDest + 1], a
|
||||
xor a
|
||||
|
|
@ -126,12 +126,12 @@ ClearVram::
|
|||
|
||||
|
||||
StopAllSounds::
|
||||
ld a, 0 ; BANK("Audio Engine 1")
|
||||
ld [wAudioROMBank], a
|
||||
ld [wAudioSavedROMBank], a
|
||||
; ld a, 0 ; BANK("Audio Engine 1")
|
||||
; ld [wAudioROMBank], a
|
||||
; ld [wAudioSavedROMBank], a
|
||||
xor a
|
||||
ld [wAudioFadeOutControl], a
|
||||
ld [wNewSoundID], a
|
||||
; ld [wNewSoundID], a
|
||||
ld [wLastMusicSoundID], a
|
||||
dec a
|
||||
jp PlaySound
|
||||
|
|
|
|||
|
|
@ -409,9 +409,9 @@ PlayTrainerMusic::
|
|||
ld [wAudioFadeOutControl], a
|
||||
ld a, SFX_STOP_ALL_MUSIC
|
||||
call PlaySound
|
||||
ld a, 0 ; BANK(Music_MeetEvilTrainer)
|
||||
ld [wAudioROMBank], a
|
||||
ld [wAudioSavedROMBank], a
|
||||
; ld a, 0 ; BANK(Music_MeetEvilTrainer)
|
||||
; ld [wAudioROMBank], a
|
||||
; ld [wAudioSavedROMBank], a
|
||||
ld a, [wEngagedTrainerClass]
|
||||
ld b, a
|
||||
ld hl, EvilTrainerList
|
||||
|
|
@ -436,7 +436,7 @@ PlayTrainerMusic::
|
|||
.maleTrainer
|
||||
ld a, MUSIC_MEET_MALE_TRAINER
|
||||
.PlaySound
|
||||
ld [wNewSoundID], a
|
||||
; ld [wNewSoundID], a
|
||||
jp PlayMusic
|
||||
|
||||
INCLUDE "data/trainers/encounter_types.asm"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue