diff --git a/crysaudio/music/TCG/credits.asm b/crysaudio/music/TCG/credits.asm index be7dd53c..1e639714 100644 --- a/crysaudio/music/TCG/credits.asm +++ b/crysaudio/music/TCG/credits.asm @@ -2907,10 +2907,13 @@ Music_TCGCredits_Ch3: ; fbb9d (3e:7b9d) sound_call Branch_fbd47 octave 2 .Loop2 - rept 2 + ;rept 2 note B_, 6 rest 7 - endr + ;--- + note B_, 6 + rest 7 + ;endr inc_octave ;cutoff 4 note G_, 13 @@ -2920,10 +2923,13 @@ Music_TCGCredits_Ch3: ; fbb9d (3e:7b9d) rest 7 sound_loop 2, .Loop2 .Loop3 - rept 2 + ;rept 2 note A_, 6 rest 7 - endr + ;--- + note A_, 6 + rest 7 + ;endr inc_octave ;cutoff 4 note F_, 13 @@ -2933,10 +2939,13 @@ Music_TCGCredits_Ch3: ; fbb9d (3e:7b9d) rest 7 sound_loop 2, .Loop3 .Loop4 - rept 2 + ;rept 2 note G#, 6 rest 7 - endr + ;--- + note G#, 6 + rest 7 + ;endr inc_octave ;cutoff 4 note F_, 13 @@ -3153,10 +3162,13 @@ Music_TCGCredits_Ch3: ; fbb9d (3e:7b9d) Branch_fbd47: octave 3 .Loop12 - rept 2 + ;rept 2 note C_, 6 rest 7 - endr + ;--- + note C_, 6 + rest 7 + ;endr ;cutoff 4 note G_, 13 ;cutoff 8 @@ -3168,10 +3180,13 @@ Branch_fbd47: Branch_fbd58: octave 2 .Loop13 - rept 2 + ;rept 2 note B_, 6 rest 7 - endr + ;--- + note B_, 6 + rest 7 + ;endr inc_octave ;cutoff 4 note G_, 13 @@ -3185,10 +3200,13 @@ Branch_fbd58: Branch_fbd6b: octave 2 .Loop14 - rept 2 + ;rept 2 note A_, 6 rest 7 - endr + ;--- + note A_, 6 + rest 7 + ;endr inc_octave ;cutoff 4 note G_, 13 @@ -3202,10 +3220,13 @@ Branch_fbd6b: Branch_fbd7e: octave 2 .Loop15 - rept 2 + ;rept 2 note G_, 6 rest 7 - endr + ;--- + note G_, 6 + rest 7 + ;endr inc_octave ;cutoff 4 note G_, 13 @@ -3219,10 +3240,13 @@ Branch_fbd7e: Branch_fbd91: octave 2 .Loop16 - rept 2 + ;rept 2 note F_, 6 rest 7 - endr + ;--- + note F_, 6 + rest 7 + ;endr inc_octave ;cutoff 4 note F_, 13 @@ -3236,10 +3260,13 @@ Branch_fbd91: Branch_fbda4: octave 2 .Loop17 - rept 2 + ;rept 2 note E_, 6 rest 7 - endr + ;--- + note E_, 6 + rest 7 + ;endr inc_octave ;cutoff 4 note E_, 13 @@ -3253,10 +3280,13 @@ Branch_fbda4: Branch_fbdb7: octave 2 .Loop18 - rept 2 + ;rept 2 note D_, 6 rest 7 - endr + ;--- + note D_, 6 + rest 7 + ;endr inc_octave ;cutoff 4 note F_, 13 @@ -3270,10 +3300,13 @@ Branch_fbdb7: Branch_fbdca: octave 2 .Loop19 - rept 2 + ;rept 2 note G_, 6 rest 7 - endr + ;--- + note G_, 6 + rest 7 + ;endr inc_octave ;cutoff 4 note F_, 13 @@ -3287,10 +3320,13 @@ Branch_fbdca: Branch_fbddd: octave 2 .Loop20 - rept 2 + ;rept 2 note F_, 6 rest 7 - endr + ;--- + note F_, 6 + rest 7 + ;endr inc_octave ;cutoff 4 note G#, 13 @@ -3304,10 +3340,13 @@ Branch_fbddd: Branch_fbdf0: octave 2 .Loop21 - rept 2 + ;rept 2 note A#, 6 rest 7 - endr + ;--- + note A#, 6 + rest 7 + ;endr inc_octave ;cutoff 4 note F_, 13 @@ -3336,10 +3375,13 @@ Branch_fbe03: Branch_fbe10: octave 2 .Loop22 - rept 2 + ;rept 2 note E_, 6 rest 7 - endr + ;--- + note E_, 6 + rest 7 + ;endr inc_octave ;cutoff 4 note G_, 13 diff --git a/crysaudio/music/TCG/dueltheme1.asm b/crysaudio/music/TCG/dueltheme1.asm index 10af9830..12eab8cf 100644 --- a/crysaudio/music/TCG/dueltheme1.asm +++ b/crysaudio/music/TCG/dueltheme1.asm @@ -527,10 +527,16 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) notetype1 9 octave 2 .Loop1 - rept 3 + ;rept 3 note D_, 1 rest 2 - endr + ;--- + note D_, 1 + rest 2 + ;--- + note D_, 1 + rest 2 + ;endr rest 1 dec_octave note A_, 1 @@ -1336,10 +1342,16 @@ Music_DuelTheme1_Ch3: ; f5a32 (3d:5a32) octave 2 .MainLoop .Loop1 - rept 3 + ;rept 3 note D_, 1 rest 2 - endr + ;--- + note D_, 1 + rest 2 + ;--- + note D_, 1 + rest 2 + ;endr rest 1 sound_call Branch_f5c47 sound_loop 4, .Loop1 diff --git a/crysaudio/music/TCG/dueltheme2.asm b/crysaudio/music/TCG/dueltheme2.asm index 442718a8..a8493ac3 100644 --- a/crysaudio/music/TCG/dueltheme2.asm +++ b/crysaudio/music/TCG/dueltheme2.asm @@ -423,10 +423,22 @@ Branch_f5f90: notetype1 9 octave 1 note D_, 1 - rept 5 + ;rept 5 note D_, 2 note D_, 1 - endr + ;--- + note D_, 2 + note D_, 1 + ;--- + note D_, 2 + note D_, 1 + ;--- + note D_, 2 + note D_, 1 + ;--- + note D_, 2 + note D_, 1 + ;endr note D_, 2 duty_cycle 1 notetype1 10 @@ -834,10 +846,22 @@ Branch_f618f: dec_octave dec_octave note D_, 1 - rept 5 + ;rept 5 note D_, 2 note D_, 1 - endr + ;--- + note D_, 2 + note D_, 1 + ;--- + note D_, 2 + note D_, 1 + ;--- + note D_, 2 + note D_, 1 + ;--- + note D_, 2 + note D_, 1 + ;endr note D_, 2 notetype1 7 ;frequency_offset 0 @@ -864,9 +888,13 @@ Music_DuelTheme2_Ch3: ; f61ac (3d:61ac) sound_call Branch_f62e5 sound_loop 44, .Loop2 .Loop3 - rept 3 + ;rept 3 sound_call Branch_f62e5 - endr + ;--- + sound_call Branch_f62e5 + ;--- + sound_call Branch_f62e5 + ;endr octave 2 ;cutoff 4 note D_, 2 @@ -1056,9 +1084,13 @@ Music_DuelTheme2_Ch3: ; f61ac (3d:61ac) dec_octave sound_loop 2, .Loop16 .Loop17 - rept 3 + ;rept 3 sound_call Branch_f62e5 - endr + ;--- + sound_call Branch_f62e5 + ;--- + sound_call Branch_f62e5 + ;endr octave 2 ;cutoff 4 note D_, 2 @@ -1136,9 +1168,19 @@ Music_DuelTheme2_Ch4: ; f62f3 (3d:62f3) sound_call Branch_f6396 .Loop6 sound_call Branch_f637c - rept 6 + ;rept 6 drum_note 2, 1 - endr + ;--- + drum_note 2, 1 + ;--- + drum_note 2, 1 + ;--- + drum_note 2, 1 + ;--- + drum_note 2, 1 + ;--- + drum_note 2, 1 + ;endr drum_note 2, 2 drum_note 6, 3 drum_note 2, 1 @@ -1187,9 +1229,19 @@ Music_DuelTheme2_Ch4: ; f62f3 (3d:62f3) sound_call Branch_f6396 .Loop10 sound_call Branch_f637c - rept 6 + ;rept 6 drum_note 2, 1 - endr + ;--- + drum_note 2, 1 + ;--- + drum_note 2, 1 + ;--- + drum_note 2, 1 + ;--- + drum_note 2, 1 + ;--- + drum_note 2, 1 + ;endr drum_note 2, 2 drum_note 6, 3 drum_note 2, 1 diff --git a/crysaudio/music/TCG/dueltheme3.asm b/crysaudio/music/TCG/dueltheme3.asm index 049ac5d8..f8b2974b 100644 --- a/crysaudio/music/TCG/dueltheme3.asm +++ b/crysaudio/music/TCG/dueltheme3.asm @@ -15,11 +15,23 @@ Music_DuelTheme3_Ch1: ; f63a1 (3d:63a1) octave 2 duty_cycle 0 .Loop1 - rept 4 + ;rept 4 notetype1 9 note F#, 2 rest 1 - endr + ;--- + notetype1 9 + note F#, 2 + rest 1 + ;--- + notetype1 9 + note F#, 2 + rest 1 + ;--- + notetype1 9 + note F#, 2 + rest 1 + ;endr notetype1 9 note E_, 2 notetype1 9 @@ -181,13 +193,31 @@ Music_DuelTheme3_Ch1: ; f63a1 (3d:63a1) duty_cycle 0 octave 2 .Loop8 - rept 4 + ;rept 4 notetype1 9 note F#, 1 notetype1 3 note F#, 1 rest 1 - endr + ;--- + notetype1 9 + note F#, 1 + notetype1 3 + note F#, 1 + rest 1 + ;--- + notetype1 9 + note F#, 1 + notetype1 3 + note F#, 1 + rest 1 + ;--- + notetype1 9 + note F#, 1 + notetype1 3 + note F#, 1 + rest 1 + ;endr notetype1 9 note F#, 1 notetype1 3 @@ -196,13 +226,31 @@ Music_DuelTheme3_Ch1: ; f63a1 (3d:63a1) note F#, 1 notetype1 3 note F#, 1 - rept 4 + ;rept 4 notetype1 9 note G_, 1 notetype1 3 note G_, 1 rest 1 - endr + ;--- + notetype1 9 + note G_, 1 + notetype1 3 + note G_, 1 + rest 1 + ;--- + notetype1 9 + note G_, 1 + notetype1 3 + note G_, 1 + rest 1 + ;--- + notetype1 9 + note G_, 1 + notetype1 3 + note G_, 1 + rest 1 + ;endr notetype1 9 note A_, 1 notetype1 3 @@ -321,13 +369,31 @@ Music_DuelTheme3_Ch1: ; f63a1 (3d:63a1) note E_, 2 duty_cycle 1 .Loop9 - rept 4 + ;rept 4 notetype1 9 note G#, 1 notetype1 3 note G#, 1 rest 1 - endr + ;--- + notetype1 9 + note G#, 1 + notetype1 3 + note G#, 1 + rest 1 + ;--- + notetype1 9 + note G#, 1 + notetype1 3 + note G#, 1 + rest 1 + ;--- + notetype1 9 + note G#, 1 + notetype1 3 + note G#, 1 + rest 1 + ;endr notetype1 9 note G#, 1 notetype1 3 @@ -336,13 +402,31 @@ Music_DuelTheme3_Ch1: ; f63a1 (3d:63a1) note G#, 1 notetype1 3 note G#, 1 - rept 4 + ;rept 4 notetype1 9 note A_, 1 notetype1 3 note A_, 1 rest 1 - endr + ;--- + notetype1 9 + note A_, 1 + notetype1 3 + note A_, 1 + rest 1 + ;--- + notetype1 9 + note A_, 1 + notetype1 3 + note A_, 1 + rest 1 + ;--- + notetype1 9 + note A_, 1 + notetype1 3 + note A_, 1 + rest 1 + ;endr notetype1 9 note A_, 1 notetype1 3 @@ -491,11 +575,23 @@ Music_DuelTheme3_Ch2: ; f6649 (3d:6649) duty_cycle 0 ;frequency_offset 3 .Loop1 - rept 4 + ;rept 4 notetype1 8 note F#, 2 rest 1 - endr + ;--- + notetype1 8 + note F#, 2 + rest 1 + ;--- + notetype1 8 + note F#, 2 + rest 1 + ;--- + notetype1 8 + note F#, 2 + rest 1 + ;endr notetype1 8 note E_, 2 notetype1 8 @@ -512,12 +608,16 @@ Music_DuelTheme3_Ch2: ; f6649 (3d:6649) rest 8 sound_loop 4, .Loop2 .Loop3 - rept 2 + ;rept 2 sound_call Branch_f67b2 - endr - rept 2 + ;--- + sound_call Branch_f67b2 + ;endr + ;rept 2 sound_call Branch_f680a - endr + ;--- + sound_call Branch_f680a + ;endr sound_loop 2, .Loop3 octave 2 notetype1 10 @@ -551,12 +651,16 @@ Music_DuelTheme3_Ch2: ; f6649 (3d:6649) duty_cycle 0 notetype1 9 .Loop4 - rept 2 + ;rept 2 sound_call Branch_f67b2 - endr - rept 2 + ;--- + sound_call Branch_f67b2 + ;endr + ;rept 2 sound_call Branch_f680a - endr + ;--- + sound_call Branch_f680a + ;endr sound_loop 2, .Loop4 vibrato 10, 3, 3 .Loop5 @@ -650,13 +754,31 @@ Music_DuelTheme3_Ch2: ; f6649 (3d:6649) note E_, 4 octave 3 .Loop6 - rept 4 + ;rept 4 notetype1 9 note C#, 1 notetype1 3 note C#, 1 rest 1 - endr + ;--- + notetype1 9 + note C#, 1 + notetype1 3 + note C#, 1 + rest 1 + ;--- + notetype1 9 + note C#, 1 + notetype1 3 + note C#, 1 + rest 1 + ;--- + notetype1 9 + note C#, 1 + notetype1 3 + note C#, 1 + rest 1 + ;endr notetype1 9 note C#, 1 notetype1 3 @@ -665,13 +787,31 @@ Music_DuelTheme3_Ch2: ; f6649 (3d:6649) note C#, 1 notetype1 3 note C#, 1 - rept 4 + ;rept 4 notetype1 9 note D_, 1 notetype1 3 note D_, 1 rest 1 - endr + ;--- + notetype1 9 + note D_, 1 + notetype1 3 + note D_, 1 + rest 1 + ;--- + notetype1 9 + note D_, 1 + notetype1 3 + note D_, 1 + rest 1 + ;--- + notetype1 9 + note D_, 1 + notetype1 3 + note D_, 1 + rest 1 + ;endr notetype1 9 note E_, 1 notetype1 3 @@ -684,13 +824,31 @@ Music_DuelTheme3_Ch2: ; f6649 (3d:6649) duty_cycle 1 inc_octave .Loop7 - rept 4 + ;rept 4 notetype1 8 note E_, 1 notetype1 3 note E_, 1 rest 1 - endr + ;--- + notetype1 8 + note E_, 1 + notetype1 3 + note E_, 1 + rest 1 + ;--- + notetype1 8 + note E_, 1 + notetype1 3 + note E_, 1 + rest 1 + ;--- + notetype1 8 + note E_, 1 + notetype1 3 + note E_, 1 + rest 1 + ;endr notetype1 8 note E_, 1 notetype1 3 @@ -699,13 +857,31 @@ Music_DuelTheme3_Ch2: ; f6649 (3d:6649) note E_, 1 notetype1 3 note E_, 1 - rept 4 + ;rept 4 notetype1 8 note D_, 1 notetype1 3 note D_, 1 rest 1 - endr + ;--- + notetype1 8 + note D_, 1 + notetype1 3 + note D_, 1 + rest 1 + ;--- + notetype1 8 + note D_, 1 + notetype1 3 + note D_, 1 + rest 1 + ;--- + notetype1 8 + note D_, 1 + notetype1 3 + note D_, 1 + rest 1 + ;endr notetype1 8 note D_, 1 notetype1 3 @@ -926,11 +1102,23 @@ Music_DuelTheme3_Ch3: ; f68c2 (3d:68c2) .MainLoop octave 2 .Loop1 - rept 4 + ;rept 4 ;cutoff 4 note F#, 2 rest 1 - endr + ;--- + ;cutoff 4 + note F#, 2 + rest 1 + ;--- + ;cutoff 4 + note F#, 2 + rest 1 + ;--- + ;cutoff 4 + note F#, 2 + rest 1 + ;endr ;cutoff 8 note E_, 2 note F_, 2 @@ -944,16 +1132,34 @@ Music_DuelTheme3_Ch3: ; f68c2 (3d:68c2) sound_loop 2, .Loop3 octave 2 .Loop4 - rept 4 + ;rept 4 note F#, 1 rest 2 - endr - note G_, 2 - note G_, 2 - rept 4 + ;--- note F#, 1 rest 2 - endr + ;--- + note F#, 1 + rest 2 + ;--- + note F#, 1 + rest 2 + ;endr + note G_, 2 + note G_, 2 + ;rept 4 + note F#, 1 + rest 2 + ;--- + note F#, 1 + rest 2 + ;--- + note F#, 1 + rest 2 + ;--- + note F#, 1 + rest 2 + ;endr note E_, 2 note F_, 2 sound_loop 2, .Loop4 @@ -1000,29 +1206,65 @@ Music_DuelTheme3_Ch3: ; f68c2 (3d:68c2) note E_, 4 dec_octave .Loop7 - rept 4 + ;rept 4 note F#, 1 rest 2 - endr + ;--- + note F#, 1 + rest 2 + ;--- + note F#, 1 + rest 2 + ;--- + note F#, 1 + rest 2 + ;endr note F#, 2 note F_, 2 - rept 4 + ;rept 4 note E_, 1 rest 2 - endr + ;--- + note E_, 1 + rest 2 + ;--- + note E_, 1 + rest 2 + ;--- + note E_, 1 + rest 2 + ;endr note E_, 2 note F_, 2 sound_loop 6, .Loop7 ;cutoff 7 .Loop8 inc_octave - rept 4 + ;rept 4 note F#, 1 dec_octave note F#, 1 note F#, 1 inc_octave - endr + ;--- + note F#, 1 + dec_octave + note F#, 1 + note F#, 1 + inc_octave + ;--- + note F#, 1 + dec_octave + note F#, 1 + note F#, 1 + inc_octave + ;--- + note F#, 1 + dec_octave + note F#, 1 + note F#, 1 + inc_octave + ;endr note F#, 1 dec_octave note F#, 1 @@ -1031,13 +1273,31 @@ Music_DuelTheme3_Ch3: ; f68c2 (3d:68c2) dec_octave note F#, 1 inc_octave - rept 4 + ;rept 4 note E_, 1 dec_octave note E_, 1 note E_, 1 inc_octave - endr + ;--- + note E_, 1 + dec_octave + note E_, 1 + note E_, 1 + inc_octave + ;--- + note E_, 1 + dec_octave + note E_, 1 + note E_, 1 + inc_octave + ;--- + note E_, 1 + dec_octave + note E_, 1 + note E_, 1 + inc_octave + ;endr note E_, 1 dec_octave note E_, 1 @@ -1232,11 +1492,23 @@ Music_DuelTheme3_Ch4: ; f6a3f (3d:6a3f) drum_speed 11 .MainLoop .Loop1 - rept 4 + ;rept 4 drum_note 5, 1 drum_note 4, 1 drum_note 4, 1 - endr + ;--- + drum_note 5, 1 + drum_note 4, 1 + drum_note 4, 1 + ;--- + drum_note 5, 1 + drum_note 4, 1 + drum_note 4, 1 + ;--- + drum_note 5, 1 + drum_note 4, 1 + drum_note 4, 1 + ;endr drum_note 5, 1 drum_note 4, 1 drum_note 5, 1 @@ -1516,14 +1788,42 @@ Branch_f6b7e: Branch_f6b9a: drum_speed 11 .Loop9 - rept 5 + ;rept 5 drum_note 1, 1 drum_speed 1 drum_note 4, 5 drum_note 3, 6 drum_speed 11 drum_note 2, 1 - endr + ;--- + drum_note 1, 1 + drum_speed 1 + drum_note 4, 5 + drum_note 3, 6 + drum_speed 11 + drum_note 2, 1 + ;--- + drum_note 1, 1 + drum_speed 1 + drum_note 4, 5 + drum_note 3, 6 + drum_speed 11 + drum_note 2, 1 + ;--- + drum_note 1, 1 + drum_speed 1 + drum_note 4, 5 + drum_note 3, 6 + drum_speed 11 + drum_note 2, 1 + ;--- + drum_note 1, 1 + drum_speed 1 + drum_note 4, 5 + drum_note 3, 6 + drum_speed 11 + drum_note 2, 1 + ;endr drum_note 1, 1 sound_loop 3, .Loop9 .Loop10 diff --git a/crysaudio/music/TCG/imakuni.asm b/crysaudio/music/TCG/imakuni.asm index ee7e1406..255e4f59 100644 --- a/crysaudio/music/TCG/imakuni.asm +++ b/crysaudio/music/TCG/imakuni.asm @@ -203,13 +203,19 @@ Music_Imakuni_Ch2: ; fae32 (3e:6e32) sound_call Branch_faea5 sound_loop 6, .Loop1 .Loop2 - rept 2 + ;rept 2 notetype0 3 rest 10 notetype0 1 note C_, 7 rest 8 - endr + ;--- + notetype0 3 + rest 10 + notetype0 1 + note C_, 7 + rest 8 + ;endr rest 15 note C_, 7 rest 8 @@ -264,9 +270,11 @@ Music_Imakuni_Ch2: ; fae32 (3e:6e32) .Loop4 note D_, 7 rest 8 - rept 2 + ;rept 2 rest 15 - endr + ;--- + rest 15 + ;endr sound_loop 4, .Loop4 note D_, 7 rest 8 @@ -284,11 +292,15 @@ Branch_faea5: notetype0 6 rest 10 notetype0 1 - rept 2 + ;rept 2 rest 15 note C#, 7 rest 8 - endr + ;--- + rest 15 + note C#, 7 + rest 8 + ;endr vibrato 8, 3, 3 notetype0 9 rest 10 diff --git a/crysaudio/music/TCG/pausemenu.asm b/crysaudio/music/TCG/pausemenu.asm index 9149baae..00a6ddf0 100644 --- a/crysaudio/music/TCG/pausemenu.asm +++ b/crysaudio/music/TCG/pausemenu.asm @@ -557,7 +557,7 @@ Music_PauseMenu_Ch4: ; f6ec8 (3d:6ec8) octave 1 .MainLoop .Loop1 - rept 7 + ;rept 7 drum_note 1, 1 drum_note 4, 1 drum_note 5, 2 @@ -572,7 +572,97 @@ Music_PauseMenu_Ch4: ; f6ec8 (3d:6ec8) drum_note 4, 1 drum_note 5, 1 drum_note 2, 1 - endr + ;--- + drum_note 1, 1 + drum_note 4, 1 + drum_note 5, 2 + drum_note 2, 1 + drum_note 4, 1 + drum_note 5, 1 + drum_note 3, 1 + drum_note 1, 1 + drum_note 4, 1 + drum_note 5, 2 + drum_note 2, 1 + drum_note 4, 1 + drum_note 5, 1 + drum_note 2, 1 + ;--- + drum_note 1, 1 + drum_note 4, 1 + drum_note 5, 2 + drum_note 2, 1 + drum_note 4, 1 + drum_note 5, 1 + drum_note 3, 1 + drum_note 1, 1 + drum_note 4, 1 + drum_note 5, 2 + drum_note 2, 1 + drum_note 4, 1 + drum_note 5, 1 + drum_note 2, 1 + ;--- + drum_note 1, 1 + drum_note 4, 1 + drum_note 5, 2 + drum_note 2, 1 + drum_note 4, 1 + drum_note 5, 1 + drum_note 3, 1 + drum_note 1, 1 + drum_note 4, 1 + drum_note 5, 2 + drum_note 2, 1 + drum_note 4, 1 + drum_note 5, 1 + drum_note 2, 1 + ;--- + drum_note 1, 1 + drum_note 4, 1 + drum_note 5, 2 + drum_note 2, 1 + drum_note 4, 1 + drum_note 5, 1 + drum_note 3, 1 + drum_note 1, 1 + drum_note 4, 1 + drum_note 5, 2 + drum_note 2, 1 + drum_note 4, 1 + drum_note 5, 1 + drum_note 2, 1 + ;--- + drum_note 1, 1 + drum_note 4, 1 + drum_note 5, 2 + drum_note 2, 1 + drum_note 4, 1 + drum_note 5, 1 + drum_note 3, 1 + drum_note 1, 1 + drum_note 4, 1 + drum_note 5, 2 + drum_note 2, 1 + drum_note 4, 1 + drum_note 5, 1 + drum_note 2, 1 + ;--- + drum_note 1, 1 + drum_note 4, 1 + drum_note 5, 2 + drum_note 2, 1 + drum_note 4, 1 + drum_note 5, 1 + drum_note 3, 1 + drum_note 1, 1 + drum_note 4, 1 + drum_note 5, 2 + drum_note 2, 1 + drum_note 4, 1 + drum_note 5, 1 + drum_note 2, 1 + ;endr drum_note 1, 1 drum_note 4, 1 drum_note 5, 2 @@ -583,9 +673,23 @@ Music_PauseMenu_Ch4: ; f6ec8 (3d:6ec8) drum_note 3, 4 drum_note 3, 3 drum_speed 7 - rept 8 + ;rept 8 drum_note 2, 1 - endr + ;--- + drum_note 2, 1 + ;--- + drum_note 2, 1 + ;--- + drum_note 2, 1 + ;--- + drum_note 2, 1 + ;--- + drum_note 2, 1 + ;--- + drum_note 2, 1 + ;--- + drum_note 2, 1 + ;endr sound_loop 2, .Loop1 sound_loop 0, .MainLoop ; 0xf6ef1 diff --git a/crysaudio/music/TCG/ronald.asm b/crysaudio/music/TCG/ronald.asm index 2f3f5c82..7cf909d6 100644 --- a/crysaudio/music/TCG/ronald.asm +++ b/crysaudio/music/TCG/ronald.asm @@ -1162,7 +1162,7 @@ Music_Ronald_Ch4: ; face0 (3e:6ce0) drum_note 2, 7 sound_loop 2, .Loop2 .Loop3 - rept 7 + ;rept 7 sound_call Branch_fad46 drum_note 4, 13 sound_call Branch_fad4f @@ -1174,16 +1174,97 @@ Music_Ronald_Ch4: ; face0 (3e:6ce0) drum_note 2, 13 drum_note 4, 6 drum_note 3, 7 - endr + ;--- + sound_call Branch_fad46 + drum_note 4, 13 + sound_call Branch_fad4f + drum_note 3, 7 + drum_note 1, 6 + drum_note 3, 7 + drum_note 5, 6 + drum_note 1, 7 + drum_note 2, 13 + drum_note 4, 6 + drum_note 3, 7 + ;--- + sound_call Branch_fad46 + drum_note 4, 13 + sound_call Branch_fad4f + drum_note 3, 7 + drum_note 1, 6 + drum_note 3, 7 + drum_note 5, 6 + drum_note 1, 7 + drum_note 2, 13 + drum_note 4, 6 + drum_note 3, 7 + ;--- + sound_call Branch_fad46 + drum_note 4, 13 + sound_call Branch_fad4f + drum_note 3, 7 + drum_note 1, 6 + drum_note 3, 7 + drum_note 5, 6 + drum_note 1, 7 + drum_note 2, 13 + drum_note 4, 6 + drum_note 3, 7 + ;--- + sound_call Branch_fad46 + drum_note 4, 13 + sound_call Branch_fad4f + drum_note 3, 7 + drum_note 1, 6 + drum_note 3, 7 + drum_note 5, 6 + drum_note 1, 7 + drum_note 2, 13 + drum_note 4, 6 + drum_note 3, 7 + ;--- + sound_call Branch_fad46 + drum_note 4, 13 + sound_call Branch_fad4f + drum_note 3, 7 + drum_note 1, 6 + drum_note 3, 7 + drum_note 5, 6 + drum_note 1, 7 + drum_note 2, 13 + drum_note 4, 6 + drum_note 3, 7 + ;--- + sound_call Branch_fad46 + drum_note 4, 13 + sound_call Branch_fad4f + drum_note 3, 7 + drum_note 1, 6 + drum_note 3, 7 + drum_note 5, 6 + drum_note 1, 7 + drum_note 2, 13 + drum_note 4, 6 + drum_note 3, 7 + ;endr sound_call Branch_fad46 drum_note 4, 13 sound_call Branch_fad4f drum_note 3, 3 drum_note 3, 4 - rept 4 + ;rept 4 drum_note 2, 6 drum_note 2, 7 - endr + ;--- + drum_note 2, 6 + drum_note 2, 7 + ;--- + drum_note 2, 6 + drum_note 2, 7 + ;--- + drum_note 2, 6 + drum_note 2, 7 + ;endr sound_loop 2, .Loop3 .Loop4 sound_call Branch_fad46