Merge branch 'master' into audio-macros

This commit is contained in:
mid-kid
2020-02-04 16:01:30 +01:00
117 changed files with 18693 additions and 18128 deletions

View File

@@ -1,28 +1,29 @@
Music_JohtoWildBattleNight:
musicheader 3, 1, Music_JohtoWildBattleNight_Ch1
musicheader 1, 2, Music_JohtoWildBattleNight_Ch2
musicheader 1, 3, Music_JohtoWildBattleNight_Ch3
channel_count 3
channel 1, Music_JohtoWildBattleNight_Ch1
channel 2, Music_JohtoWildBattleNight_Ch2
channel 3, Music_JohtoWildBattleNight_Ch3
Music_JohtoWildBattleNight_Ch1:
tempo 107
volume $77
dutycycle $3
tone $0002
vibrato $10, $25
loopchannel 0, Music_JohtoWildBattle_Ch1.body
volume 7, 7
duty_cycle 3
pitch_offset 2
vibrato 16, 2, 5
sound_loop 0, Music_JohtoWildBattle_Ch1.body
Music_JohtoWildBattleNight_Ch2:
dutycycle $3
vibrato $20, $36
tone $0001
callchannel Music_JohtoWildBattle_Ch2.sub1
notetype $c, $c2
duty_cycle 3
vibrato 32, 3, 6
pitch_offset 1
sound_call Music_JohtoWildBattle_Ch2.sub1
note_type 12, 12, 2
octave 4
note G_, 6
tone $0001
dutycycle $2
loopchannel 0, Music_JohtoWildBattle_Ch2.body
pitch_offset 1
duty_cycle 2
sound_loop 0, Music_JohtoWildBattle_Ch2.body
Music_JohtoWildBattleNight_Ch3:
notetype $c, $11
loopchannel 0, Music_JohtoWildBattle_Ch3.body
note_type 12, 1, 1
sound_loop 0, Music_JohtoWildBattle_Ch3.body