thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-22 23:22:26 +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

37
engine/battle/core.asm
View file

@ -787,15 +787,24 @@ FaintEnemyPokemon:
ld a, [wIsInBattle]
dec a
jr z, .wild_win
xor a
ld [wFrequencyModifier], a
ld [wTempoModifier], a
call WaitForSoundToFinish
ld bc, $00
ld de, $80
ld a, SFX_FAINT_FALL
call PlaySoundWaitForCurrent
.sfxwait
ld a, [wChannelSoundIDs + CHAN5]
cp SFX_FAINT_FALL
jr z, .sfxwait
call PlayBattleSound
; xor a
; ld [wFrequencyModifier], a
; ld [wTempoModifier], a
; ld a, SFX_FAINT_FALL
; call PlaySoundWaitForCurrent
call WaitForSoundToFinish
;.sfxwait
; ld a, [wChannelSoundIDs + CHAN5]
; cp SFX_FAINT_FALL
; jr z, .sfxwait
ld a, SFX_FAINT_THUD
call PlaySound
call WaitForSoundToFinish
@ -878,7 +887,7 @@ EndLowHealthAlarm:
; the low health alarm and prevents it from reactivating until the next battle.
xor a
ld [wLowHealthAlarm], a ; turn off low health alarm
ld [wChannelSoundIDs + CHAN5], a
; ld [wChannelSoundIDs + CHAN5], a
inc a
ld [wLowHealthAlarmDisabled], a ; prevent it from reactivating
ret
@ -977,9 +986,9 @@ TrainerDefeatedText:
PlayBattleVictoryMusic:
push af
ld a, SFX_STOP_ALL_MUSIC
ld [wNewSoundID], a
; ld [wNewSoundID], a
call PlaySoundWaitForCurrent
ld c, BANK(Music_DefeatedTrainer)
ld c, 0 ; BANK(Music_DefeatedTrainer)
pop af
call PlayMusic
jp Delay3
@ -1884,7 +1893,7 @@ DrawPlayerHUDAndHPBar:
ld [hl], $0
ret z
xor a
ld [wChannelSoundIDs + CHAN5], a
; ld [wChannelSoundIDs + CHAN5], a
ret
.setLowHealthAlarm
ld hl, wLowHealthAlarm
@ -6973,8 +6982,8 @@ _LoadTrainerPic:
; unreferenced
ResetCryModifiers:
xor a
ld [wFrequencyModifier], a
ld [wTempoModifier], a
; ld [wFrequencyModifier], a
; ld [wTempoModifier], a
jp PlaySound
; animates the mon "growing" out of the pokeball