mirror of
https://github.com/thornAvery/kep-hack.git
synced 2026-02-06 15:45:24 +13:00
Misc clean up and small improvements
This commit is contained in:
dannye
parent
e8dd755e18
commit
459b5bd615
25 changed files with 326 additions and 160 deletions
|
|
@ -236,7 +236,7 @@ UpdateChannels:
|
|||
dw .Channel8
|
||||
|
||||
.Channel1:
|
||||
ld a, [wDanger] ; XXX
|
||||
ld a, [wLowHealthAlarm]
|
||||
bit DANGER_ON_F, a
|
||||
ret nz
|
||||
.Channel5:
|
||||
|
|
@ -527,7 +527,7 @@ _CheckSFX:
|
|||
ret
|
||||
|
||||
PlayDanger:
|
||||
ld a, [wDanger] ; XXX
|
||||
ld a, [wLowHealthAlarm]
|
||||
bit DANGER_ON_F, a
|
||||
ret z
|
||||
|
||||
|
|
@ -575,7 +575,7 @@ PlayDanger:
|
|||
.noreset
|
||||
; Make sure the danger sound is kept on
|
||||
or 1 << DANGER_ON_F
|
||||
ld [wDanger], a ; XXX
|
||||
ld [wLowHealthAlarm], a
|
||||
|
||||
; Enable channel 1 if it's off
|
||||
ld a, [wSoundOutput]
|
||||
|
|
|
|||
|
|
@ -106,7 +106,7 @@ FIRST_MUSIC_CMD EQU const_value
|
|||
|
||||
const octave_cmd ; $d0
|
||||
octave: MACRO
|
||||
assert 0 < (\1) && (\1) <= 8, "octave must be 1-8"
|
||||
assert 1 <= (\1) && (\1) <= 8, "octave must be 1-8"
|
||||
db octave_cmd | 8 - (\1) ; octave
|
||||
ENDM
|
||||
|
||||
|
|
|
|||
|
|
@ -633,17 +633,17 @@ Music_MewtwoStage_branch_49043:
|
|||
sound_ret
|
||||
|
||||
; unreferenced
|
||||
; note_type 2, 12, 8
|
||||
; octave 3
|
||||
; note B_, 1
|
||||
; volume_envelope 10, 8
|
||||
; note G_, 1
|
||||
; volume_envelope 7, 8
|
||||
; note D#, 1
|
||||
; volume_envelope 4, 8
|
||||
; octave 2
|
||||
; note B_, 1
|
||||
; sound_ret
|
||||
note_type 2, 12, 8
|
||||
octave 3
|
||||
note B_, 1
|
||||
volume_envelope 10, 8
|
||||
note G_, 1
|
||||
volume_envelope 7, 8
|
||||
note D#, 1
|
||||
volume_envelope 4, 8
|
||||
octave 2
|
||||
note B_, 1
|
||||
sound_ret
|
||||
|
||||
Music_MewtwoStage_branch_49062:
|
||||
note_type 3, 12, 8
|
||||
|
|
|
|||
|
|
@ -1063,6 +1063,8 @@ Sfx_RegisterPhoneNumber_Ch5:
|
|||
rest 8
|
||||
sound_ret
|
||||
|
||||
toggle_sfx ; unused
|
||||
|
||||
Sfx_RegisterPhoneNumber_Ch6:
|
||||
toggle_sfx
|
||||
duty_cycle 3
|
||||
|
|
@ -1085,6 +1087,8 @@ Sfx_RegisterPhoneNumber_Ch6:
|
|||
rest 8
|
||||
sound_ret
|
||||
|
||||
toggle_sfx ; unused
|
||||
|
||||
Sfx_RegisterPhoneNumber_Ch7:
|
||||
toggle_sfx
|
||||
note_type 12, 2, 5
|
||||
|
|
@ -1104,6 +1108,8 @@ Sfx_RegisterPhoneNumber_Ch7:
|
|||
rest 8
|
||||
sound_ret
|
||||
|
||||
toggle_sfx ; unused
|
||||
|
||||
Sfx_RegisterPhoneNumber_Ch8:
|
||||
toggle_sfx
|
||||
sfx_toggle_noise 4
|
||||
|
|
@ -1113,6 +1119,8 @@ Sfx_RegisterPhoneNumber_Ch8:
|
|||
rest 16
|
||||
sound_ret
|
||||
|
||||
toggle_sfx ; unused
|
||||
|
||||
Sfx_3rdPlace:
|
||||
channel_count 3
|
||||
channel 5, Sfx_3rdPlace_Ch5
|
||||
|
|
@ -1136,6 +1144,8 @@ Sfx_3rdPlace_Ch5:
|
|||
note D_, 6
|
||||
sound_ret
|
||||
|
||||
toggle_sfx ; unused
|
||||
|
||||
Sfx_3rdPlace_Ch6:
|
||||
toggle_sfx
|
||||
duty_cycle 2
|
||||
|
|
@ -1151,6 +1161,8 @@ Sfx_3rdPlace_Ch6:
|
|||
note G_, 6
|
||||
sound_ret
|
||||
|
||||
toggle_sfx ; unused
|
||||
|
||||
Sfx_3rdPlace_Ch7:
|
||||
toggle_sfx
|
||||
note_type 12, 2, 5
|
||||
|
|
@ -1166,6 +1178,8 @@ Sfx_3rdPlace_Ch7:
|
|||
note B_, 6
|
||||
sound_ret
|
||||
|
||||
toggle_sfx ; unused
|
||||
|
||||
Sfx_GetEgg:
|
||||
channel_count 4
|
||||
channel 5, Sfx_GetEgg_Ch5
|
||||
|
|
@ -1203,6 +1217,8 @@ Sfx_GetEgg_Ch5:
|
|||
rest 9
|
||||
sound_ret
|
||||
|
||||
toggle_sfx ; unused
|
||||
|
||||
Sfx_GetEgg_Ch6:
|
||||
toggle_sfx
|
||||
vibrato 18, 3, 4
|
||||
|
|
@ -1230,6 +1246,8 @@ Sfx_GetEgg_Ch6:
|
|||
rest 9
|
||||
sound_ret
|
||||
|
||||
toggle_sfx ; unused
|
||||
|
||||
Sfx_GetEgg_Ch7:
|
||||
toggle_sfx
|
||||
note_type 8, 2, 5
|
||||
|
|
@ -1247,6 +1265,8 @@ Sfx_GetEgg_Ch7:
|
|||
rest 9
|
||||
sound_ret
|
||||
|
||||
toggle_sfx ; unused
|
||||
|
||||
Sfx_GetEgg_Ch8:
|
||||
toggle_sfx
|
||||
sfx_toggle_noise 4
|
||||
|
|
@ -1257,6 +1277,8 @@ Sfx_GetEgg_Ch8:
|
|||
rest 12
|
||||
sound_ret
|
||||
|
||||
toggle_sfx ; unused
|
||||
|
||||
Sfx_MoveDeleted:
|
||||
channel_count 4
|
||||
channel 5, Sfx_MoveDeleted_Ch5
|
||||
|
|
@ -1292,6 +1314,8 @@ Sfx_MoveDeleted_Ch5:
|
|||
rest 6
|
||||
sound_ret
|
||||
|
||||
toggle_sfx ; unused
|
||||
|
||||
Sfx_MoveDeleted_Ch6:
|
||||
toggle_sfx
|
||||
duty_cycle 3
|
||||
|
|
@ -1326,6 +1350,8 @@ Sfx_MoveDeleted_Ch6:
|
|||
rest 6
|
||||
sound_ret
|
||||
|
||||
toggle_sfx ; unused
|
||||
|
||||
Sfx_MoveDeleted_Ch7:
|
||||
toggle_sfx
|
||||
note_type 6, 2, 5
|
||||
|
|
@ -1351,6 +1377,8 @@ Sfx_MoveDeleted_Ch7:
|
|||
rest 6
|
||||
sound_ret
|
||||
|
||||
toggle_sfx ; unused
|
||||
|
||||
Sfx_MoveDeleted_Ch8:
|
||||
toggle_sfx
|
||||
sfx_toggle_noise 3
|
||||
|
|
@ -1361,6 +1389,8 @@ Sfx_MoveDeleted_Ch8:
|
|||
rest 6
|
||||
sound_ret
|
||||
|
||||
toggle_sfx ; unused
|
||||
|
||||
Sfx_2ndPlace:
|
||||
channel_count 4
|
||||
channel 5, Sfx_2ndPlace_Ch5
|
||||
|
|
@ -1400,6 +1430,8 @@ Sfx_2ndPlace_Ch5:
|
|||
rest 6
|
||||
sound_ret
|
||||
|
||||
toggle_sfx ; unused
|
||||
|
||||
Sfx_2ndPlace_Ch6:
|
||||
toggle_sfx
|
||||
duty_cycle 2
|
||||
|
|
@ -1422,6 +1454,8 @@ Sfx_2ndPlace_Ch6:
|
|||
rest 6
|
||||
sound_ret
|
||||
|
||||
toggle_sfx ; unused
|
||||
|
||||
Sfx_2ndPlace_Ch7:
|
||||
toggle_sfx
|
||||
note_type 8, 2, 5
|
||||
|
|
@ -1458,6 +1492,8 @@ Sfx_2ndPlace_Ch7:
|
|||
rest 6
|
||||
sound_ret
|
||||
|
||||
toggle_sfx ; unused
|
||||
|
||||
Sfx_2ndPlace_Ch8:
|
||||
toggle_sfx
|
||||
sfx_toggle_noise 3
|
||||
|
|
@ -1471,6 +1507,8 @@ Sfx_2ndPlace_Ch8:
|
|||
rest 6
|
||||
sound_ret
|
||||
|
||||
toggle_sfx ; unused
|
||||
|
||||
Sfx_1stPlace:
|
||||
channel_count 4
|
||||
channel 5, Sfx_1stPlace_Ch5
|
||||
|
|
@ -1517,6 +1555,8 @@ Sfx_1stPlace_Ch5:
|
|||
rest 6
|
||||
sound_ret
|
||||
|
||||
toggle_sfx ; unused
|
||||
|
||||
Sfx_1stPlace_Ch6:
|
||||
toggle_sfx
|
||||
duty_cycle 3
|
||||
|
|
@ -1539,6 +1579,8 @@ Sfx_1stPlace_Ch6:
|
|||
rest 6
|
||||
sound_ret
|
||||
|
||||
toggle_sfx ; unused
|
||||
|
||||
Sfx_1stPlace_Ch7:
|
||||
toggle_sfx
|
||||
note_type 12, 2, 5
|
||||
|
|
@ -1561,6 +1603,8 @@ Sfx_1stPlace_Ch7:
|
|||
rest 6
|
||||
sound_ret
|
||||
|
||||
toggle_sfx ; unused
|
||||
|
||||
Sfx_1stPlace_Ch8:
|
||||
toggle_sfx
|
||||
sfx_toggle_noise 4
|
||||
|
|
@ -1580,6 +1624,8 @@ Sfx_1stPlace_Ch8:
|
|||
rest 6
|
||||
sound_ret
|
||||
|
||||
toggle_sfx ; unused
|
||||
|
||||
Sfx_ChooseACard:
|
||||
channel_count 4
|
||||
channel 5, Sfx_ChooseACard_Ch5
|
||||
|
|
@ -1631,6 +1677,8 @@ Sfx_ChooseACard_Ch5:
|
|||
rest 12
|
||||
sound_ret
|
||||
|
||||
toggle_sfx ; unused
|
||||
|
||||
Sfx_ChooseACard_Ch6:
|
||||
toggle_sfx
|
||||
duty_cycle 3
|
||||
|
|
@ -1661,6 +1709,8 @@ Sfx_ChooseACard_Ch6:
|
|||
rest 12
|
||||
sound_ret
|
||||
|
||||
toggle_sfx ; unused
|
||||
|
||||
Sfx_ChooseACard_Ch7:
|
||||
toggle_sfx
|
||||
note_type 6, 2, 5
|
||||
|
|
@ -1695,6 +1745,8 @@ Sfx_ChooseACard_Ch7:
|
|||
rest 12
|
||||
sound_ret
|
||||
|
||||
toggle_sfx ; unused
|
||||
|
||||
Sfx_ChooseACard_Ch8:
|
||||
toggle_sfx
|
||||
sfx_toggle_noise 4
|
||||
|
|
@ -1718,6 +1770,8 @@ Sfx_ChooseACard_Ch8:
|
|||
note B_, 16
|
||||
sound_ret
|
||||
|
||||
toggle_sfx ; unused
|
||||
|
||||
Sfx_GetTm:
|
||||
channel_count 4
|
||||
channel 5, Sfx_GetTm_Ch5
|
||||
|
|
@ -1749,6 +1803,8 @@ Sfx_GetTm_Ch5:
|
|||
rest 6
|
||||
sound_ret
|
||||
|
||||
toggle_sfx ; unused
|
||||
|
||||
Sfx_GetTm_Ch6:
|
||||
toggle_sfx
|
||||
duty_cycle 3
|
||||
|
|
@ -1770,6 +1826,8 @@ Sfx_GetTm_Ch6:
|
|||
rest 6
|
||||
sound_ret
|
||||
|
||||
toggle_sfx ; unused
|
||||
|
||||
Sfx_GetTm_Ch7:
|
||||
toggle_sfx
|
||||
note_type 6, 2, 5
|
||||
|
|
@ -1799,6 +1857,8 @@ Sfx_GetTm_Ch7:
|
|||
rest 6
|
||||
sound_ret
|
||||
|
||||
toggle_sfx ; unused
|
||||
|
||||
Sfx_GetTm_Ch8:
|
||||
toggle_sfx
|
||||
sfx_toggle_noise 4
|
||||
|
|
@ -1817,6 +1877,8 @@ Sfx_GetTm_Ch8:
|
|||
rest 6
|
||||
sound_ret
|
||||
|
||||
toggle_sfx ; unused
|
||||
|
||||
Sfx_GetBadge:
|
||||
channel_count 4
|
||||
channel 5, Sfx_GetBadge_Ch5
|
||||
|
|
@ -1843,6 +1905,8 @@ Sfx_GetBadge_Ch5:
|
|||
rest 6
|
||||
sound_ret
|
||||
|
||||
toggle_sfx ; unused
|
||||
|
||||
.sub1:
|
||||
rest 5
|
||||
octave 3
|
||||
|
|
@ -1912,6 +1976,8 @@ Sfx_GetBadge_Ch6:
|
|||
rest 6
|
||||
sound_ret
|
||||
|
||||
toggle_sfx ; unused
|
||||
|
||||
Sfx_GetBadge_Ch7:
|
||||
toggle_sfx
|
||||
note_type 6, 2, 5
|
||||
|
|
@ -1949,6 +2015,8 @@ Sfx_GetBadge_Ch7:
|
|||
rest 6
|
||||
sound_ret
|
||||
|
||||
toggle_sfx ; unused
|
||||
|
||||
Sfx_GetBadge_Ch8:
|
||||
toggle_sfx
|
||||
sfx_toggle_noise 4
|
||||
|
|
@ -1973,6 +2041,8 @@ Sfx_GetBadge_Ch8:
|
|||
rest 6
|
||||
sound_ret
|
||||
|
||||
toggle_sfx ; unused
|
||||
|
||||
Sfx_QuitSlots:
|
||||
channel_count 4
|
||||
channel 5, Sfx_QuitSlots_Ch5
|
||||
|
|
@ -2010,6 +2080,8 @@ Sfx_QuitSlots_Ch5:
|
|||
rest 6
|
||||
sound_ret
|
||||
|
||||
toggle_sfx ; unused
|
||||
|
||||
Sfx_QuitSlots_Ch6:
|
||||
toggle_sfx
|
||||
duty_cycle 2
|
||||
|
|
@ -2035,6 +2107,8 @@ Sfx_QuitSlots_Ch6:
|
|||
rest 6
|
||||
sound_ret
|
||||
|
||||
toggle_sfx ; unused
|
||||
|
||||
Sfx_QuitSlots_Ch7:
|
||||
toggle_sfx
|
||||
note_type 8, 2, 5
|
||||
|
|
@ -2064,6 +2138,8 @@ Sfx_QuitSlots_Ch7:
|
|||
rest 6
|
||||
sound_ret
|
||||
|
||||
toggle_sfx ; unused
|
||||
|
||||
Sfx_QuitSlots_Ch8:
|
||||
toggle_sfx
|
||||
sfx_toggle_noise 3
|
||||
|
|
@ -2082,6 +2158,8 @@ Sfx_QuitSlots_Ch8:
|
|||
rest 6
|
||||
sound_ret
|
||||
|
||||
toggle_sfx ; unused
|
||||
|
||||
Sfx_Protect:
|
||||
channel_count 2
|
||||
channel 5, Sfx_Protect_Ch5
|
||||
|
|
@ -2970,6 +3048,8 @@ Sfx_DexFanfareLessThan20_Ch5:
|
|||
note D_, 6
|
||||
sound_ret
|
||||
|
||||
toggle_sfx ; unused
|
||||
|
||||
Sfx_DexFanfareLessThan20_Ch6:
|
||||
toggle_sfx
|
||||
note_type 8, 12, 1
|
||||
|
|
@ -2987,6 +3067,8 @@ Sfx_DexFanfareLessThan20_Ch6:
|
|||
note F#, 6
|
||||
sound_ret
|
||||
|
||||
toggle_sfx ; unused
|
||||
|
||||
Sfx_DexFanfareLessThan20_Ch7:
|
||||
toggle_sfx
|
||||
note_type 8, 2, 5
|
||||
|
|
@ -3013,6 +3095,8 @@ Sfx_DexFanfareLessThan20_Ch7:
|
|||
rest 6
|
||||
sound_ret
|
||||
|
||||
toggle_sfx ; unused
|
||||
|
||||
Sfx_DexFanfareLessThan20_Ch8:
|
||||
toggle_sfx
|
||||
sfx_toggle_noise 4
|
||||
|
|
@ -3022,6 +3106,8 @@ Sfx_DexFanfareLessThan20_Ch8:
|
|||
rest 12
|
||||
sound_ret
|
||||
|
||||
toggle_sfx ; unused
|
||||
|
||||
Sfx_DexFanfare140169:
|
||||
channel_count 4
|
||||
channel 5, Sfx_DexFanfare140169_Ch5
|
||||
|
|
@ -3056,6 +3142,8 @@ Sfx_DexFanfare140169_Ch5:
|
|||
rest 8
|
||||
sound_ret
|
||||
|
||||
toggle_sfx ; unused
|
||||
|
||||
Sfx_DexFanfare140169_Ch6:
|
||||
toggle_sfx
|
||||
duty_cycle 2
|
||||
|
|
@ -3080,6 +3168,8 @@ Sfx_DexFanfare140169_Ch6:
|
|||
rest 8
|
||||
sound_ret
|
||||
|
||||
toggle_sfx ; unused
|
||||
|
||||
Sfx_DexFanfare140169_Ch7:
|
||||
toggle_sfx
|
||||
note_type 12, 2, 5
|
||||
|
|
@ -3112,6 +3202,8 @@ Sfx_DexFanfare140169_Ch7:
|
|||
rest 4
|
||||
sound_ret
|
||||
|
||||
toggle_sfx ; unused
|
||||
|
||||
Sfx_DexFanfare140169_Ch8:
|
||||
toggle_sfx
|
||||
sfx_toggle_noise 4
|
||||
|
|
@ -3127,6 +3219,8 @@ Sfx_DexFanfare140169_Ch8:
|
|||
note D_, 8
|
||||
sound_ret
|
||||
|
||||
toggle_sfx ; unused
|
||||
|
||||
Sfx_DexFanfare170199:
|
||||
channel_count 4
|
||||
channel 5, Sfx_DexFanfare170199_Ch5
|
||||
|
|
@ -3161,6 +3255,8 @@ Sfx_DexFanfare170199_Ch5:
|
|||
rest 4
|
||||
sound_ret
|
||||
|
||||
toggle_sfx ; unused
|
||||
|
||||
Sfx_DexFanfare170199_Ch6:
|
||||
toggle_sfx
|
||||
vibrato 18, 3, 4
|
||||
|
|
@ -3187,6 +3283,8 @@ Sfx_DexFanfare170199_Ch6:
|
|||
rest 4
|
||||
sound_ret
|
||||
|
||||
toggle_sfx ; unused
|
||||
|
||||
Sfx_DexFanfare170199_Ch7:
|
||||
toggle_sfx
|
||||
note_type 8, 2, 5
|
||||
|
|
@ -3213,6 +3311,8 @@ Sfx_DexFanfare170199_Ch7:
|
|||
rest 4
|
||||
sound_ret
|
||||
|
||||
toggle_sfx ; unused
|
||||
|
||||
Sfx_DexFanfare170199_Ch8:
|
||||
toggle_sfx
|
||||
sfx_toggle_noise 4
|
||||
|
|
@ -3233,6 +3333,8 @@ Sfx_DexFanfare170199_Ch8:
|
|||
note B_, 16
|
||||
sound_ret
|
||||
|
||||
db sound_loop_cmd ; unused
|
||||
|
||||
Sfx_DexFanfare200229:
|
||||
channel_count 4
|
||||
channel 5, Sfx_DexFanfare200229_Ch5
|
||||
|
|
@ -3265,6 +3367,8 @@ Sfx_DexFanfare200229_Ch5:
|
|||
rest 4
|
||||
sound_ret
|
||||
|
||||
toggle_sfx ; unused
|
||||
|
||||
Sfx_DexFanfare200229_Ch6:
|
||||
toggle_sfx
|
||||
vibrato 18, 3, 4
|
||||
|
|
@ -3286,6 +3390,8 @@ Sfx_DexFanfare200229_Ch6:
|
|||
rest 4
|
||||
sound_ret
|
||||
|
||||
toggle_sfx ; unused
|
||||
|
||||
Sfx_DexFanfare200229_Ch7:
|
||||
toggle_sfx
|
||||
note_type 8, 2, 5
|
||||
|
|
@ -3328,6 +3434,8 @@ Sfx_DexFanfare200229_Ch7:
|
|||
rest 6
|
||||
sound_ret
|
||||
|
||||
toggle_sfx ; unused
|
||||
|
||||
Sfx_DexFanfare200229_Ch8:
|
||||
toggle_sfx
|
||||
sfx_toggle_noise 4
|
||||
|
|
@ -3355,6 +3463,8 @@ Sfx_DexFanfare200229_Ch8:
|
|||
note B_, 12
|
||||
sound_ret
|
||||
|
||||
toggle_sfx ; unused
|
||||
|
||||
Sfx_DexFanfare230Plus:
|
||||
channel_count 4
|
||||
channel 5, Sfx_DexFanfare230Plus_Ch5
|
||||
|
|
@ -3408,6 +3518,8 @@ Sfx_DexFanfare230Plus_Ch5:
|
|||
rest 2
|
||||
sound_ret
|
||||
|
||||
toggle_sfx ; unused
|
||||
|
||||
Sfx_DexFanfare230Plus_Ch6:
|
||||
toggle_sfx
|
||||
vibrato 18, 3, 4
|
||||
|
|
@ -3441,6 +3553,8 @@ Sfx_DexFanfare230Plus_Ch6:
|
|||
rest 2
|
||||
sound_ret
|
||||
|
||||
toggle_sfx ; unused
|
||||
|
||||
Sfx_DexFanfare230Plus_Ch7:
|
||||
toggle_sfx
|
||||
note_type 8, 2, 5
|
||||
|
|
@ -3488,6 +3602,8 @@ Sfx_DexFanfare230Plus_Ch7:
|
|||
rest 2
|
||||
sound_ret
|
||||
|
||||
toggle_sfx ; unused
|
||||
|
||||
Sfx_DexFanfare230Plus_Ch8:
|
||||
toggle_sfx
|
||||
sfx_toggle_noise 4
|
||||
|
|
@ -3522,6 +3638,8 @@ Sfx_DexFanfare230Plus_Ch8:
|
|||
note D_, 6
|
||||
sound_ret
|
||||
|
||||
toggle_sfx ; unused
|
||||
|
||||
Sfx_NotVeryEffective:
|
||||
channel_count 1
|
||||
channel 8, Sfx_NotVeryEffective_Ch8
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue