thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-22 15:12:18 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
dannye 2023-04-19 21:08:01 -05:00
commit 8021cbdf04
530 changed files with 153841 additions and 14088 deletions
Download patch file Download diff file Expand all files Collapse all files

12
home/trainers.asm
View file

@ -442,12 +442,12 @@ PlayTrainerMusic::
and a
ret nz
xor a
ld [wAudioFadeOutControl], a
ld [wMusicFade], a
ld a, SFX_STOP_ALL_MUSIC
call PlaySound
ld a, 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
@ -472,7 +472,7 @@ PlayTrainerMusic::
.maleTrainer
ld a, MUSIC_MEET_MALE_TRAINER
.PlaySound
ld [wNewSoundID], a
jp PlaySound
; ld [wNewSoundID], a
jp PlayMusic
INCLUDE "data/trainers/encounter_types.asm"