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

Fix pokeflute in battle sfx

Browse source 
and other small improvements
This commit is contained in:
dannye 2021-03-28 23:23:45 -05:00
parent 5f87413b23
commit c1278c478e
28 changed files with 108 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

4
audio/engine_2.asm
View file

@ -163,7 +163,7 @@ Audio2_PlayNextNote:
ld a, c
cp Ch5
jr nz, .beginChecks
ld a, [wLowHealthAlarmOrig] ; low health alarm enabled?
ld a, [wLowHealthAlarm] ; low health alarm enabled?
bit 7, a
ret nz
.beginChecks
@ -976,7 +976,7 @@ Audio2_ResetCryModifiers:
ld a, c
cp Ch5
jr nz, .skip
ld a, [wLowHealthAlarmOrig]
ld a, [wLowHealthAlarm]
bit 7, a
jr z, .skip
xor a

3
audio/headers/sfxheaders2.asm
View file

@ -165,3 +165,6 @@ SFX_Battle_36::
SFX_Silph_Scope::
audio_header SFX_Silph_Scope, Ch5
SFX_PokefluteInBattle::
audio_header SFX_PokefluteInBattle, Ch5, Ch6, Ch7

8
audio/low_health_alarm.asm
View file

@ -1,5 +1,5 @@
Music_DoLowHealthAlarm::
ld a, [wLowHealthAlarmOrig]
ld a, [wLowHealthAlarm]
cp $ff
jr z, .disableAlarm
@ -21,19 +21,19 @@ Music_DoLowHealthAlarm::
.asm_2138a
ld a, $86
ld [wChannelSoundIDs + Ch5], a ;disable sound channel?
ld a, [wLowHealthAlarmOrig]
ld a, [wLowHealthAlarm]
and $7f ;decrement alarm timer.
dec a
.asm_21395
; reset the timer and enable flag.
set 7, a
ld [wLowHealthAlarmOrig], a
ld [wLowHealthAlarm], a
ret
.disableAlarm
xor a
ld [wLowHealthAlarmOrig], a ;disable alarm
ld [wLowHealthAlarm], a ;disable alarm
ld [wChannelSoundIDs + Ch5], a ;re-enable sound channel?
ld de, .toneDataSilence
jr .playTone

2
audio/play_battle_music.asm
View file

@ -1,7 +1,7 @@
PlayBattleMusic::
xor a
ld [wAudioFadeOutControl], a
ld [wLowHealthAlarmOrig], a
ld [wLowHealthAlarm], a
ld [wMusicFade], a
dec a ; SFX_STOP_ALL_MUSIC
ld [wNewSoundID], a

1
audio/pokedex_rating_sfx.asm
View file

@ -21,7 +21,6 @@ PlayPokedexRatingSfx::
ld a, [hli]
ld c, [hl]
call PlaySound
call WaitForSoundToFinish
jp PlayDefaultMusic
PokedexRatingSfxPointers:

4
audio/sfx/pokeflute_ch5_ch6.asm
View file

@ -1,8 +1,8 @@
SFX_Pokeflute_Ch5:
SFX_PokefluteInBattle_Ch5:
tempo 256
SFX_Pokeflute_Ch6:
SFX_PokefluteInBattle_Ch6:
execute_music
note_type 8, 0, 0
rest 5

2
audio/sfx/pokeflute_ch7.asm
View file

@ -1,4 +1,4 @@
SFX_Pokeflute_Ch7:
SFX_PokefluteInBattle_Ch7:
execute_music
vibrato 16, 1, 4
note_type 8, 1, 0