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

Misc clean up and small improvements

Browse source
This commit is contained in:
dannye 2021-03-28 02:23:54 -05:00
parent e8dd755e18
commit 459b5bd615
25 changed files with 326 additions and 160 deletions
Download patch file Download diff file Expand all files Collapse all files

46
audio/alternate_tempo.asm
View file

@ -1,29 +1,40 @@
; an alternate start for MeetRival which has a different first measure
Music_RivalAlternateStart::
ld c, 0 ; BANK(Music_MeetRival)
ld a, MUSIC_MEET_RIVAL
jp PlayMusic
;ld hl, wChannelCommandPointers
;ld de, Music_MeetRival_branch_b1a2
;call Audio1_OverwriteChannelPointer
;ld de, Music_MeetRival_branch_b21d
;call Audio1_OverwriteChannelPointer
;ld de, Music_MeetRival_branch_b2b5
; call PlayMusic
; ld hl, wChannelCommandPointers
; ld de, Music_MeetRival_branch_b1a2
; call Audio1_OverwriteChannelPointer
; ld de, Music_MeetRival_branch_b21d
; call Audio1_OverwriteChannelPointer
; ld de, Music_MeetRival_branch_b2b5
;Audio1_OverwriteChannelPointer:
; ld a, e
; ld [hli], a
; ld a, d
; ld [hli], a
; ret
; an alternate tempo for MeetRival which is slightly slower
Music_RivalAlternateTempo::
ld c, BANK(Music_MeetRival)
ld c, 0 ; BANK(Music_MeetRival)
ld a, MUSIC_MEET_RIVAL
jp PlayMusic
;ld hl, wChannelCommandPointers
;ld de, Music_MeetRival_branch_b119
;jp Audio1_OverwriteChannelPointer
; call PlayMusic
; ld hl, wChannelCommandPointers
; ld de, Music_MeetRival_branch_b119
; jp Audio1_OverwriteChannelPointer
; applies both the alternate start and alternate tempo
Music_RivalAlternateStartAndTempo::
jp Music_RivalAlternateStart
;ld hl, wChannelCommandPointers
;ld de, Music_MeetRival_branch_b19b
;jp Audio1_OverwriteChannelPointer
; call Music_RivalAlternateStart
; ld hl, wChannelCommandPointers
; ld de, Music_MeetRival_branch_b19b
; jp Audio1_OverwriteChannelPointer
; an alternate tempo for Cities1 which is used for the Hall of Fame room
Music_Cities1AlternateTempo::
@ -34,9 +45,10 @@ Music_Cities1AlternateTempo::
ld [wAudioFadeOutControl], a
ld c, 100
call DelayFrames ; wait for the fade-out to finish
ld c, BANK(Music_Cities1)
ld c, 0 ; BANK(Music_Cities1)
ld a, MUSIC_CITIES1
jp PlayMusic
;ld hl, wChannelCommandPointers
;ld de, Music_Cities1_branch_aa6f
;jp Audio1_OverwriteChannelPointer
; call PlayMusic
; ld hl, wChannelCommandPointers
; ld de, Music_Cities1_branch_aa6f
; jp Audio1_OverwriteChannelPointer

4
audio/engine_2.asm
View file

@ -163,7 +163,7 @@ Audio2_PlayNextNote:
ld a, c
cp Ch5
jr nz, .beginChecks
ld a, [wLowHealthAlarm] ; low health alarm enabled?
ld a, [wLowHealthAlarmOrig] ; 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, [wLowHealthAlarm]
ld a, [wLowHealthAlarmOrig]
bit 7, a
jr z, .skip
xor a

8
audio/low_health_alarm.asm
View file

@ -1,5 +1,5 @@
Music_DoLowHealthAlarm::
ld a, [wLowHealthAlarm]
ld a, [wLowHealthAlarmOrig]
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, [wLowHealthAlarm]
ld a, [wLowHealthAlarmOrig]
and $7f ;decrement alarm timer.
dec a
.asm_21395
; reset the timer and enable flag.
set 7, a
ld [wLowHealthAlarm], a
ld [wLowHealthAlarmOrig], a
ret
.disableAlarm
xor a
ld [wLowHealthAlarm], a ;disable alarm
ld [wLowHealthAlarmOrig], a ;disable alarm
ld [wChannelSoundIDs + Ch5], a ;re-enable sound channel?
ld de, .toneDataSilence
jr .playTone

4
audio/play_battle_music.asm
View file

@ -1,13 +1,13 @@
PlayBattleMusic::
xor a
ld [wAudioFadeOutControl], a
ld [wLowHealthAlarm], a
ld [wLowHealthAlarmOrig], a
ld [wMusicFade], a
dec a ; SFX_STOP_ALL_MUSIC
ld [wNewSoundID], a
call PlayMusic
call DelayFrame
;ld c, BANK(Music_GymLeaderBattle)
ld c, 0 ; BANK(Music_GymLeaderBattle)
ld a, [wGymLeaderNo]
and a
jr z, .notGymLeaderBattle

14
audio/pokedex_rating_sfx.asm
View file

@ -25,13 +25,13 @@ PlayPokedexRatingSfx::
jp PlayDefaultMusic
PokedexRatingSfxPointers:
db SFX_DENIED, BANK(SFX_Denied_1)
db SFX_POKEDEX_RATING, BANK(SFX_Pokedex_Rating_1)
db SFX_GET_ITEM_1, BANK(SFX_Get_Item1_1)
db SFX_CAUGHT_MON, BANK(SFX_Caught_Mon)
db SFX_LEVEL_UP, BANK(SFX_Level_Up)
db SFX_GET_KEY_ITEM, BANK(SFX_Get_Key_Item_1)
db SFX_GET_ITEM_2, BANK(SFX_Get_Item2_1)
db SFX_DENIED, 0 ; BANK(SFX_Denied_1)
db SFX_POKEDEX_RATING, 0 ; BANK(SFX_Pokedex_Rating_1)
db SFX_GET_ITEM_1, 0 ; BANK(SFX_Get_Item1_1)
db SFX_CAUGHT_MON, 0 ; BANK(SFX_Caught_Mon)
db SFX_LEVEL_UP, 0 ; BANK(SFX_Level_Up)
db SFX_GET_KEY_ITEM, 0 ; BANK(SFX_Get_Key_Item_1)
db SFX_GET_ITEM_2, 0 ; BANK(SFX_Get_Item2_1)
OwnedMonValues:
db 10, 40, 60, 90, 120, 150, $ff