Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update audio macros and arguments

Browse Source 
and update related labels/constants/comments
this fixes a lot of mistakes and maximizes compatibility with red
This commit is contained in:
dannye
2019-09-02 03:40:58 -05:00
parent abee217ce0
commit fc051f2130
115 changed files with 18560 additions and 18044 deletions
Download Patch File Download Diff File Expand all files Collapse all files

338
audio/music/rivalbattle.asm
View File

@@ -1,62 +1,63 @@
Music_RivalBattle:
musicheader 3, 1, Music_RivalBattle_Ch1
musicheader 1, 2, Music_RivalBattle_Ch2
musicheader 1, 3, Music_RivalBattle_Ch3
channel_count 3
channel 1, Music_RivalBattle_Ch1
channel 2, Music_RivalBattle_Ch2
channel 3, Music_RivalBattle_Ch3
Music_RivalBattle_Ch1:
tempo 102
volume $77
dutycycle $3
tone $0002
vibrato $8, $15
notetype $c, $b2
volume 7, 7
duty_cycle 3
pitch_offset 2
vibrato 8, 1, 5
note_type 12, 11, 2
octave 3
note F#, 2
note A#, 4
intensity $b7
volume_envelope 11, 7
note A#, 10
intensity $b2
volume_envelope 11, 2
note F#, 2
octave 4
note C#, 4
intensity $b7
volume_envelope 11, 7
note C#, 6
note E_, 4
Music_RivalBattle_branch_e9777:
intensity $b2
volume_envelope 11, 2
octave 2
note A#, 6
intensity $b7
volume_envelope 11, 7
octave 3
note C#, 6
intensity $b2
volume_envelope 11, 2
note D#, 4
loopchannel 3, Music_RivalBattle_branch_e9777
intensity $b2
sound_loop 3, Music_RivalBattle_branch_e9777
volume_envelope 11, 2
octave 2
note A#, 2
octave 3
note C#, 4
intensity $b7
volume_envelope 11, 7
note C#, 10
Music_RivalBattle_branch_e978f:
intensity $b2
volume_envelope 11, 2
octave 3
note G#, 6
intensity $b7
volume_envelope 11, 7
note B_, 6
intensity $b2
volume_envelope 11, 2
octave 4
note C#, 4
loopchannel 3, Music_RivalBattle_branch_e978f
intensity $b2
sound_loop 3, Music_RivalBattle_branch_e978f
volume_envelope 11, 2
octave 3
note G#, 2
note B_, 4
intensity $4d
volume_envelope 4, -5
note B_, 10
Music_RivalBattle_branch_e97a6:
intensity $b7
volume_envelope 11, 7
note A#, 6
note F#, 6
note D#, 4
@@ -64,21 +65,21 @@ Music_RivalBattle_branch_e97a6:
note F#, 4
note G#, 2
note A#, 6
intensity $b2
volume_envelope 11, 2
note F_, 1
note D#, 1
note C#, 1
note D#, 1
intensity $b7
volume_envelope 11, 7
note F_, 4
intensity $b2
volume_envelope 11, 2
note G#, 1
note F#, 1
note F_, 1
note F#, 1
intensity $b7
volume_envelope 11, 7
note G#, 4
intensity $b6
volume_envelope 11, 6
note G#, 2
note A#, 2
note B_, 2
@@ -90,7 +91,7 @@ Music_RivalBattle_branch_e97a6:
note B_, 2
octave 4
note E_, 2
intensity $b7
volume_envelope 11, 7
octave 3
note A#, 6
note F#, 6
@@ -106,7 +107,7 @@ Music_RivalBattle_branch_e97a6:
note C#, 6
octave 3
note G#, 4
intensity $b5
volume_envelope 11, 5
note C#, 2
note F_, 2
note G#, 2
@@ -117,32 +118,32 @@ Music_RivalBattle_branch_e97a6:
note G#, 2
note F_, 2
note G#, 2
intensity $b7
volume_envelope 11, 7
note F#, 10
intensity $b4
volume_envelope 11, 4
octave 2
note B_, 2
octave 3
note D#, 2
note F#, 2
intensity $b7
volume_envelope 11, 7
note F_, 4
note D#, 4
note C#, 2
note D#, 6
intensity $a0
volume_envelope 10, 0
note F_, 8
intensity $a7
volume_envelope 10, 7
note F_, 8
intensity $a0
volume_envelope 10, 0
octave 2
note A#, 8
intensity $a7
volume_envelope 10, 7
note A#, 8
intensity $b7
volume_envelope 11, 7
octave 3
note F#, 10
intensity $b5
volume_envelope 11, 5
octave 2
note B_, 2
octave 3
@@ -156,17 +157,17 @@ Music_RivalBattle_branch_e97a6:
note F#, 2
note F_, 2
note G#, 2
intensity $a0
volume_envelope 10, 0
note A#, 16
intensity $a7
volume_envelope 10, 7
note A#, 16
intensity $a0
volume_envelope 10, 0
note B_, 8
intensity $a7
volume_envelope 10, 7
note B_, 4
intensity $b7
volume_envelope 11, 7
note G#, 4
intensity $b5
volume_envelope 11, 5
octave 4
note E_, 2
note D#, 2
@@ -203,8 +204,8 @@ Music_RivalBattle_branch_e9837:
note A#, 2
octave 4
note D#, 2
loopchannel 2, Music_RivalBattle_branch_e9837
intensity $94
sound_loop 2, Music_RivalBattle_branch_e9837
volume_envelope 9, 4
octave 3
note D#, 8
octave 2
@@ -212,14 +213,14 @@ Music_RivalBattle_branch_e9837:
octave 3
note G_, 8
note F_, 8
intensity $96
volume_envelope 9, 6
octave 2
note G#, 8
note A#, 8
note B_, 8
octave 3
note C#, 8
intensity $b7
volume_envelope 11, 7
octave 4
note D#, 8
octave 3
@@ -233,16 +234,16 @@ Music_RivalBattle_branch_e9837:
note B_, 8
octave 4
note C#, 8
intensity $a0
volume_envelope 10, 0
note D#, 8
intensity $a7
volume_envelope 10, 7
note D#, 8
intensity $a0
volume_envelope 10, 0
octave 3
note G_, 8
intensity $a7
volume_envelope 10, 7
note G_, 8
intensity $b7
volume_envelope 11, 7
note D#, 8
note C#, 8
note D#, 4
@@ -251,7 +252,7 @@ Music_RivalBattle_branch_e9837:
note B_, 4
octave 3
note C#, 4
intensity $c7
volume_envelope 12, 7
octave 2
note A#, 6
octave 3
@@ -283,13 +284,13 @@ Music_RivalBattle_branch_e9837:
note B_, 6
octave 3
note C#, 10
loopchannel 0, Music_RivalBattle_branch_e97a6
sound_loop 0, Music_RivalBattle_branch_e97a6
Music_RivalBattle_Ch2:
dutycycle $3
vibrato $8, $36
tone $0001
notetype $c, $c2
duty_cycle 3
vibrato 8, 3, 6
pitch_offset 1
note_type 12, 12, 2
octave 4
note E_, 1
note D#, 1
@@ -327,94 +328,94 @@ Music_RivalBattle_Ch2:
note C_, 1
octave 2
note B_, 1
intensity $c2
volume_envelope 12, 2
octave 4
note D#, 6
intensity $c7
volume_envelope 12, 7
octave 3
note F#, 6
intensity $c2
volume_envelope 12, 2
note G#, 4
Music_RivalBattle_branch_e98ea:
intensity $c2
volume_envelope 12, 2
note D#, 6
intensity $c7
volume_envelope 12, 7
note F#, 6
intensity $c2
volume_envelope 12, 2
note G#, 4
loopchannel 2, Music_RivalBattle_branch_e98ea
intensity $c2
sound_loop 2, Music_RivalBattle_branch_e98ea
volume_envelope 12, 2
note D#, 2
note F#, 4
intensity $c7
volume_envelope 12, 7
note F#, 8
intensity $a2
volume_envelope 10, 2
note B_, 1
octave 4
note C_, 1
Music_RivalBattle_branch_e9903:
intensity $c2
volume_envelope 12, 2
note C#, 6
intensity $c7
volume_envelope 12, 7
note E_, 6
intensity $c2
volume_envelope 12, 2
note F#, 4
loopchannel 3, Music_RivalBattle_branch_e9903
intensity $c2
sound_loop 3, Music_RivalBattle_branch_e9903
volume_envelope 12, 2
note C#, 2
note E_, 4
intensity $b0
volume_envelope 11, 0
note E_, 4
intensity $b7
volume_envelope 11, 7
note E_, 6
Music_RivalBattle_branch_e991a:
callchannel Music_RivalBattle_branch_e99e0
intensity $b0
sound_call Music_RivalBattle_branch_e99e0
volume_envelope 11, 0
note G#, 8
intensity $b7
volume_envelope 11, 7
note G#, 8
callchannel Music_RivalBattle_branch_e99e0
intensity $4e
sound_call Music_RivalBattle_branch_e99e0
volume_envelope 4, -6
note G#, 8
intensity $b7
volume_envelope 11, 7
note G#, 8
intensity $b0
volume_envelope 11, 0
octave 3
note B_, 10
intensity $b7
volume_envelope 11, 7
note B_, 6
intensity $b0
volume_envelope 11, 0
octave 4
note C#, 8
octave 3
note B_, 8
intensity $b0
volume_envelope 11, 0
note A#, 10
intensity $b7
volume_envelope 11, 7
note A#, 6
intensity $2f
volume_envelope 2, -7
note D#, 10
intensity $b7
volume_envelope 11, 7
note D#, 6
intensity $b0
volume_envelope 11, 0
note B_, 10
intensity $b7
volume_envelope 11, 7
note B_, 6
intensity $c7
volume_envelope 12, 7
octave 4
note C#, 8
octave 3
note B_, 8
intensity $b0
volume_envelope 11, 0
octave 4
note D#, 16
intensity $b7
volume_envelope 11, 7
note D#, 16
intensity $b0
volume_envelope 11, 0
note E_, 4
intensity $b7
volume_envelope 11, 7
note E_, 6
intensity $c7
volume_envelope 12, 7
note E_, 2
note G#, 2
note B_, 2
@@ -422,36 +423,36 @@ Music_RivalBattle_branch_e991a:
note C#, 8
octave 4
note B_, 8
intensity $b0
volume_envelope 11, 0
note A#, 10
intensity $b7
volume_envelope 11, 7
note A#, 6
intensity $b0
volume_envelope 11, 0
note A_, 10
intensity $b7
volume_envelope 11, 7
note A_, 6
intensity $b0
volume_envelope 11, 0
note G#, 10
intensity $b7
volume_envelope 11, 7
note G#, 6
intensity $b0
volume_envelope 11, 0
note G_, 10
intensity $b7
volume_envelope 11, 7
note G_, 6
intensity $a4
volume_envelope 10, 4
octave 3
note G_, 8
note D#, 8
note A#, 8
note G#, 8
intensity $a6
volume_envelope 10, 6
octave 2
note B_, 8
octave 3
note C#, 8
note D#, 8
note F_, 8
intensity $c7
volume_envelope 12, 7
octave 4
note G_, 8
note D#, 8
@@ -463,89 +464,89 @@ Music_RivalBattle_branch_e991a:
note C#, 8
note D#, 8
note F_, 8
intensity $b0
volume_envelope 11, 0
note G_, 16
note D#, 16
octave 3
note B_, 8
note A#, 8
note G#, 8
intensity $c7
volume_envelope 12, 7
note F_, 8
Music_RivalBattle_branch_e99a6:
intensity $c2
volume_envelope 12, 2
octave 3
note A#, 6
intensity $c7
volume_envelope 12, 7
octave 4
note C#, 6
intensity $c2
volume_envelope 12, 2
note D#, 4
loopchannel 3, Music_RivalBattle_branch_e99a6
intensity $c2
sound_loop 3, Music_RivalBattle_branch_e99a6
volume_envelope 12, 2
octave 3
note A#, 2
octave 4
note C#, 4
intensity $b7
volume_envelope 11, 7
note C#, 6
intensity $9a
volume_envelope 9, -2
note C#, 4
Music_RivalBattle_branch_e99c1:
intensity $c2
volume_envelope 12, 2
octave 3
note G#, 6
intensity $c7
volume_envelope 12, 7
note B_, 6
intensity $c2
volume_envelope 12, 2
octave 4
note C#, 4
loopchannel 3, Music_RivalBattle_branch_e99c1
intensity $c2
sound_loop 3, Music_RivalBattle_branch_e99c1
volume_envelope 12, 2
octave 3
note G#, 2
note B_, 4
intensity $c7
volume_envelope 12, 7
note B_, 6
intensity $6a
volume_envelope 6, -2
octave 4
note D_, 4
loopchannel 0, Music_RivalBattle_branch_e991a
sound_loop 0, Music_RivalBattle_branch_e991a
Music_RivalBattle_branch_e99e0:
intensity $c7
volume_envelope 12, 7
note D#, 10
intensity $c4
volume_envelope 12, 4
octave 3
note A#, 2
octave 4
note D#, 2
note F#, 2
intensity $c5
volume_envelope 12, 5
note F_, 4
note D#, 4
intensity $c2
volume_envelope 12, 2
note C#, 2
intensity $c7
volume_envelope 12, 7
note D#, 6
intensity $b0
volume_envelope 11, 0
note F_, 8
intensity $b7
volume_envelope 11, 7
note F_, 8
endchannel
sound_ret
Music_RivalBattle_Ch3:
notetype $c, $19
note_type 12, 1, -1
octave 3
note F#, 2
note A#, 2
note __, 2
rest 2
note A#, 10
octave 3
note F#, 2
octave 4
note C#, 2
note __, 2
rest 2
note C#, 6
octave 3
note C#, 2
@@ -558,7 +559,7 @@ Music_RivalBattle_branch_e9a0c:
note E_, 2
note D#, 2
note C#, 2
loopchannel 4, Music_RivalBattle_branch_e9a0c
sound_loop 4, Music_RivalBattle_branch_e9a0c
Music_RivalBattle_branch_e9a17:
octave 3
note C#, 2
@@ -571,7 +572,7 @@ Music_RivalBattle_branch_e9a17:
note C#, 2
octave 2
note B_, 2
loopchannel 3, Music_RivalBattle_branch_e9a17
sound_loop 3, Music_RivalBattle_branch_e9a17
octave 3
note C#, 2
note E_, 2
@@ -583,7 +584,7 @@ Music_RivalBattle_branch_e9a17:
note C#, 2
note D_, 2
Music_RivalBattle_branch_e9a30:
callchannel Music_RivalBattle_branch_e9b47
sound_call Music_RivalBattle_branch_e9b47
octave 2
note A#, 2
octave 4
@@ -600,7 +601,7 @@ Music_RivalBattle_branch_e9a30:
note A#, 2
octave 3
note G#, 2
callchannel Music_RivalBattle_branch_e9b50
sound_call Music_RivalBattle_branch_e9b50
note C#, 2
note G#, 2
octave 4
@@ -611,7 +612,7 @@ Music_RivalBattle_branch_e9a30:
note C_, 2
octave 2
note B_, 2
callchannel Music_RivalBattle_branch_e9b47
sound_call Music_RivalBattle_branch_e9b47
octave 2
note A#, 2
octave 3
@@ -628,12 +629,12 @@ Music_RivalBattle_branch_e9a30:
note A#, 2
octave 3
note F_, 2
callchannel Music_RivalBattle_branch_e9b50
sound_call Music_RivalBattle_branch_e9b50
Music_RivalBattle_branch_e9a66:
note C#, 2
note G#, 2
loopchannel 4, Music_RivalBattle_branch_e9a66
callchannel Music_RivalBattle_branch_e9b5c
sound_loop 4, Music_RivalBattle_branch_e9a66
sound_call Music_RivalBattle_branch_e9b5c
note G#, 2
note F#, 2
Music_RivalBattle_branch_e9a71:
@@ -641,7 +642,7 @@ Music_RivalBattle_branch_e9a71:
note A#, 2
octave 3
note F_, 2
loopchannel 4, Music_RivalBattle_branch_e9a71
sound_loop 4, Music_RivalBattle_branch_e9a71
octave 2
note A#, 2
octave 3
@@ -656,17 +657,17 @@ Music_RivalBattle_branch_e9a71:
note F#, 2
note F_, 2
note D#, 2
callchannel Music_RivalBattle_branch_e9b5c
sound_call Music_RivalBattle_branch_e9b5c
octave 2
note B_, 2
octave 3
note D_, 2
callchannel Music_RivalBattle_branch_e9b65
sound_call Music_RivalBattle_branch_e9b65
octave 3
note D#, 2
octave 4
note D#, 2
callchannel Music_RivalBattle_branch_e9b65
sound_call Music_RivalBattle_branch_e9b65
octave 3
note D#, 2
note A#, 2
@@ -697,31 +698,31 @@ Music_RivalBattle_branch_e9a71:
Music_RivalBattle_branch_e9ab3:
note D#, 2
note A#, 2
loopchannel 4, Music_RivalBattle_branch_e9ab3
sound_loop 4, Music_RivalBattle_branch_e9ab3
Music_RivalBattle_branch_e9ab9:
note D#, 2
note A_, 2
loopchannel 4, Music_RivalBattle_branch_e9ab9
sound_loop 4, Music_RivalBattle_branch_e9ab9
Music_RivalBattle_branch_e9abf:
note D#, 2
note G#, 2
loopchannel 4, Music_RivalBattle_branch_e9abf
sound_loop 4, Music_RivalBattle_branch_e9abf
Music_RivalBattle_branch_e9ac5:
note D#, 2
note G_, 2
loopchannel 12, Music_RivalBattle_branch_e9ac5
sound_loop 12, Music_RivalBattle_branch_e9ac5
Music_RivalBattle_branch_e9acb:
octave 2
note B_, 2
octave 3
note D#, 2
loopchannel 4, Music_RivalBattle_branch_e9acb
sound_loop 4, Music_RivalBattle_branch_e9acb
Music_RivalBattle_branch_e9ad3:
octave 2
note B_, 2
octave 3
note F#, 2
loopchannel 4, Music_RivalBattle_branch_e9ad3
sound_loop 4, Music_RivalBattle_branch_e9ad3
note D#, 2
note G_, 2
note A#, 2
@@ -780,7 +781,7 @@ Music_RivalBattle_branch_e9b10:
note A#, 2
octave 3
note D#, 2
loopchannel 7, Music_RivalBattle_branch_e9b10
sound_loop 7, Music_RivalBattle_branch_e9b10
note E_, 2
note D#, 2
Music_RivalBattle_branch_e9b1a:
@@ -788,7 +789,7 @@ Music_RivalBattle_branch_e9b1a:
note A#, 2
octave 3
note D#, 2
loopchannel 6, Music_RivalBattle_branch_e9b1a
sound_loop 6, Music_RivalBattle_branch_e9b1a
octave 2
note A#, 2
octave 3
@@ -800,7 +801,7 @@ Music_RivalBattle_branch_e9b28:
note G#, 2
octave 3
note C#, 2
loopchannel 7, Music_RivalBattle_branch_e9b28
sound_loop 7, Music_RivalBattle_branch_e9b28
note D_, 2
note C#, 2
Music_RivalBattle_branch_e9b32:
@@ -808,7 +809,7 @@ Music_RivalBattle_branch_e9b32:
note G#, 2
octave 3
note C#, 2
loopchannel 4, Music_RivalBattle_branch_e9b32
sound_loop 4, Music_RivalBattle_branch_e9b32
octave 2
note B_, 2
note G#, 2
@@ -818,15 +819,15 @@ Music_RivalBattle_branch_e9b32:
note E_, 2
note D#, 2
note D_, 2
loopchannel 0, Music_RivalBattle_branch_e9a30
sound_loop 0, Music_RivalBattle_branch_e9a30
Music_RivalBattle_branch_e9b47:
octave 2
note A#, 2
octave 3
note D#, 2
loopchannel 4, Music_RivalBattle_branch_e9b47
endchannel
sound_loop 4, Music_RivalBattle_branch_e9b47
sound_ret
Music_RivalBattle_branch_e9b50:
note C#, 2
@@ -840,15 +841,15 @@ Music_RivalBattle_branch_e9b50:
octave 3
note C#, 2
note G#, 2
endchannel
sound_ret
Music_RivalBattle_branch_e9b5c:
octave 2
note B_, 2
octave 3
note F#, 2
loopchannel 7, Music_RivalBattle_branch_e9b5c
endchannel
sound_loop 7, Music_RivalBattle_branch_e9b5c
sound_ret
Music_RivalBattle_branch_e9b65:
octave 3
@@ -856,5 +857,6 @@ Music_RivalBattle_branch_e9b65:
note A#, 2
octave 4
note D#, 2
loopchannel 2, Music_RivalBattle_branch_e9b65
endchannel
sound_loop 2, Music_RivalBattle_branch_e9b65
sound_ret