Update TCG songs

2025-09-16 18:30:50 +12:00 · 2023-01-13 21:58:00 -06:00 · 2023-01-13 21:58:00 -06:00 · 867f70ab1e
parent aab4d20881
commit 867f70ab1e
5 changed files with 385 additions and 935 deletions
--- a/crysaudio/music/TCG/club2.asm
+++ b/crysaudio/music/TCG/club2.asm
@ -8,26 +8,23 @@ Music_Club2_Ch1:
 	speed 6
 	duty_cycle 2
 	stereo_panning TRUE, TRUE
-;	cutoff 8
-.MainLoop
+.MainLoop:
 	octave 4
-.Loop1
+.Loop1:
 	volume_envelope 7, 5
 	note G_, 4
 	note E_, 4
 	note C_, 4
 	volume_envelope 7, 7
-	note F#, 4
-;	tie
 	note F#, 16
+	rest 4
 	volume_envelope 7, 5
 	note G_, 4
 	note A_, 4
 	note B_, 4
 	volume_envelope 7, 7
-	note F#, 4
-;	tie
 	note F#, 16
+	rest 4
 	sound_loop 8, .Loop1
 	volume_envelope 7, 5
 	note G_, 4
@ -36,17 +33,15 @@ Music_Club2_Ch1:
 	note B_, 4
 	inc_octave
 	volume_envelope 7, 7
-	note B_, 4
-;	tie
 	note B_, 16
+	rest 4
 	volume_envelope 7, 5
 	note G_, 4
 	note D_, 4
 	note C_, 4
 	volume_envelope 7, 7
-	note B_, 4
-;	tie
 	note B_, 16
+	rest 4
 	dec_octave
 	volume_envelope 7, 5
 	note F#, 4
@ -83,29 +78,24 @@ Music_Club2_Ch1:
 	note F#, 4
 	note A_, 4
 	note A_, 3
-;	tie
 	speed 1
 	note A_, 3
 	inc_octave
 	volume_envelope 7, 7
 	rest 4
 	note D_, 5
-;	tie
 	speed 6
-	note D_, 15
-;	tie
 	note D_, 16
+	rest 15
 	sound_loop 0, .MainLoop

-
 Music_Club2_Ch2:
 	speed 6
 	duty_cycle 2
 	stereo_panning TRUE, TRUE
-;	cutoff 8
-.MainLoop
+.MainLoop:
 	octave 2
-.Loop1
+.Loop1:
 	volume_envelope 7, 5
 	note C_, 4
 	note G_, 4
@ -113,9 +103,8 @@ Music_Club2_Ch2:
 	note G_, 4
 	inc_octave
 	volume_envelope 7, 7
-	note D_, 4
-;	tie
 	note D_, 16
+	rest 4
 	dec_octave
 	dec_octave
 	volume_envelope 7, 5
@ -125,9 +114,8 @@ Music_Club2_Ch2:
 	inc_octave
 	note C_, 4
 	volume_envelope 7, 7
-	note D_, 4
-;	tie
 	note D_, 16
+	rest 4
 	dec_octave
 	dec_octave
 	sound_loop 8, .Loop1
@ -140,9 +128,8 @@ Music_Club2_Ch2:
 	note G_, 4
 	inc_octave
 	volume_envelope 7, 7
-	note G_, 4
-;	tie
 	note G_, 16
+	rest 4
 	dec_octave
 	dec_octave
 	dec_octave
@ -154,9 +141,8 @@ Music_Club2_Ch2:
 	note A_, 4
 	inc_octave
 	volume_envelope 7, 7
-	note C_, 4
-;	tie
 	note C_, 16
+	rest 4
 	dec_octave
 	dec_octave
 	volume_envelope 7, 5
@ -195,7 +181,6 @@ Music_Club2_Ch2:
 	inc_octave
 	note D_, 4
 	note E_, 3
-;	tie
 	speed 1
 	note E_, 3
 	dec_octave
@ -204,26 +189,19 @@ Music_Club2_Ch2:
 	inc_octave
 	volume_envelope 7, 7
 	note F#, 7
-;	tie
 	speed 6
-	note F#, 14
-;	tie
-	note F#, 16
+	note F#, 15
+	rest 15
 	sound_loop 0, .MainLoop

-
 Music_Club2_Ch3:
 	speed 6
 	channel_volume 1
 	stereo_panning TRUE, TRUE
 	fade_wave 10
-;	vibrato_type 4
 	vibrato 35, 3, 3
-;	cutoff 6
-;	echo 64
-.MainLoop
+.MainLoop:
 	channel_volume 3
-;	cutoff 8
 	rest 2
 	octave 5
 	note G_, 4
@ -239,89 +217,62 @@ Music_Club2_Ch3:
 	rest 2
 	rest 14
 	channel_volume 2
-;	echo 96
 	sound_call Branch_fa1cf
 	octave 5
-;	cutoff 8
 	note G_, 8
 	sound_call Branch_fa1cf
-;	echo 64
 	channel_volume 1
 	octave 4
-;	cutoff 8
 	note G_, 8
 	sound_call Branch_fa1f3
 	octave 4
 	note G_, 16
-;	tie
 	note G_, 12
 	rest 16
 	rest 8
-;	cutoff 8
 	note E_, 8
 	sound_call Branch_fa1f3
 	octave 4
 	note G_, 16
-;	tie
 	note G_, 12
-;	tie
 	note G_, 16
-;	tie
 	note G_, 8
 	rest 4
-;	cutoff 8
 	note A_, 2
 	note G_, 2
-;	cutoff 6
 	note F#, 16
-;	tie
 	note F#, 12
 	rest 4
 	note F#, 1
-;	tie
 	note G_, 15
-;	tie
 	note G_, 12
 	rest 4
 	note G#, 1
-;	tie
 	note A_, 15
-;	tie
 	note A_, 16
 	rest 16
 	rest 16
-;	echo 96
 	sound_loop 0, .MainLoop

 Branch_fa1cf:
-;	cutoff 6
 	octave 6
 	note C#, 1
-;	tie
 	note D_, 15
-;	tie
 	note D_, 12
-;	cutoff 8
 	note C_, 2
 	dec_octave
 	note B_, 2
-;	cutoff 6
 	note G_, 16
-;	tie
 	note G_, 8
 	rest 4
-;	cutoff 8
 	note E_, 4
 	note B_, 4
 	inc_octave
 	note C_, 4
 	dec_octave
 	note B_, 4
-;	cutoff 6
 	note A_, 16
-;	tie
 	note A_, 8
-;	tie
 	note A_, 16
 	rest 4
 	sound_ret
@ -329,21 +280,16 @@ Branch_fa1cf:
 Branch_fa1f3:
 	octave 5
 	note C#, 1
-;	tie
 	note D_, 15
-;	tie
 	note D_, 4
 	note E_, 4
 	dec_octave
 	note B_, 4
 	inc_octave
 	note C_, 4
-;	cutoff 6
 	note D_, 16
-;	tie
 	note D_, 8
 	rest 4
-;	cutoff 8
 	note C_, 2
 	dec_octave
 	note B_, 2
@ -351,5 +297,4 @@ Branch_fa1f3:
 	note C_, 2
 	dec_octave
 	note B_, 2
-;	cutoff 6
 	sound_ret
--- a/crysaudio/music/TCG/dueltheme1.asm
+++ b/crysaudio/music/TCG/dueltheme1.asm
--- a/crysaudio/music/TCG/hallofhonor.asm
+++ b/crysaudio/music/TCG/hallofhonor.asm
@ -7,13 +7,12 @@ Music_HallOfHonor:
 Music_HallOfHonor_Ch1:
 	speed 7
 	stereo_panning TRUE, TRUE
-;	cutoff 8
 	duty_cycle 2
-.Loop1
+.Loop1:
 	sound_call Branch_fb016
 	sound_loop 4, .Loop1
-.MainLoop
-.Loop2
+.MainLoop:
+.Loop2:
 	sound_call Branch_fb016
 	sound_loop 8, .Loop2
 	octave 4
@ -22,7 +21,7 @@ Music_HallOfHonor_Ch1:
 	volume_envelope 2, 7
 	note C_, 1
 	sound_call Branch_fb044
-.Loop3
+.Loop3:
 	volume_envelope 5, 5
 	note C_, 1
 	volume_envelope 2, 7
@ -97,20 +96,17 @@ Branch_fb044:
 	note F_, 1
 	sound_ret

-
 Music_HallOfHonor_Ch2:
 	speed 7
 	stereo_panning TRUE, TRUE
-;	cutoff 8
 	duty_cycle 2
-;	frequency_offset -1
 	rest 2
 	speed 1
 	rest 4
 	speed 7
 	volume_envelope 1, 7
-.Loop1
-	sound_call Branch_fb1ec
+.Loop1:
+	sound_call Branch_fb1ec_Ch2
 	sound_loop 3, .Loop1
 	octave 4
 	note C_, 1
@ -129,72 +125,75 @@ Music_HallOfHonor_Ch2:
 	speed 1
 	rest 3
 	speed 7
-;	frequency_offset 0
-.MainLoop
+.MainLoop:
 	octave 1
 	duty_cycle 1
-.Loop2
+.Loop2:
 	sound_call Branch_fb0bb
 	octave 1
 	volume_envelope 6, -5
-	note E_, 5
-	volume_envelope 13, 0
-	note E_, 11
-;	tie
-	note E_, 12
+	note E_, 14
+	volume_envelope 13, 8
+	note E_, 14
 	sound_loop 3, .Loop2
 	sound_call Branch_fb0bb
 	octave 1
 	volume_envelope 6, -5
-	note G_, 5
-	volume_envelope 13, 0
-	note G_, 11
-;	tie
-	note G_, 12
+	note G_, 14
+	volume_envelope 13, 8
+	note G_, 14
 	sound_loop 0, .MainLoop

 Branch_fb0bb:
 	octave 1
 	volume_envelope 6, -5
-	note F_, 5
-	volume_envelope 13, 0
-	note F_, 11
-;	tie
-	note F_, 12
+	note F_, 14
+	volume_envelope 13, 8
+	note F_, 14
 	volume_envelope 6, -5
-	note E_, 5
-	volume_envelope 13, 0
-	note E_, 11
-;	tie
-	note E_, 12
+	note E_, 14
+	volume_envelope 13, 8
+	note E_, 14
 	volume_envelope 6, -5
-	note D_, 5
-	volume_envelope 13, 0
-	note D_, 11
-;	tie
-	note D_, 12
+	note D_, 14
+	volume_envelope 13, 8
+	note D_, 14
 	sound_ret

+Branch_fb1ec_Ch2:
+	octave 5
+	note C_, 1
+	rest 1
+	note F_, 1
+	rest 1
+	note G_, 1
+	rest 1
+	note F_, 1
+	rest 1
+	inc_octave
+	note C_, 1
+	rest 1
+	dec_octave
+	note F_, 1
+	rest 1
+	note G_, 1
+	rest 1
+	sound_ret

 Music_HallOfHonor_Ch3:
 	speed 7
 	channel_volume 2
 	stereo_panning TRUE, TRUE
 	fade_wave 12
-;	vibrato_type 4
 	vibrato 35, 2, 4
-;	cutoff 6
-;	echo 64
 	rest 3
 	channel_volume 3
-;	cutoff 8
-;	frequency_offset -1
-.Loop1
+.Loop1:
 	rest 14
 	sound_loop 4, .Loop1
-.MainLoop
+.MainLoop:
 	octave 6
-.Loop2
+.Loop2:
 	sound_call Branch_fb1ec
 	sound_loop 7, .Loop2
 	note C_, 1
@ -211,175 +210,113 @@ Music_HallOfHonor_Ch3:
 	dec_octave
 	note F_, 1
 	channel_volume 1
-;	frequency_offset 0
 	octave 5
 	speed 1
-;	cutoff 6
 	note B_, 3
 	inc_octave
 	note C_, 4
-;	tie
 	speed 7
 	note C_, 15
-;	tie
 	note C_, 8
 	dec_octave
-;	cutoff 8
 	note B_, 2
-;	cutoff 4
 	note A_, 2
-;	cutoff 6
 	note G_, 6
 	note C_, 10
-;	tie
 	note C_, 12
 	speed 1
-;	cutoff 8
 	note B_, 3
 	inc_octave
-;	cutoff 6
 	note C_, 4
-;	tie
 	speed 7
 	note C_, 15
-;	tie
 	note C_, 6
 	dec_octave
-;	cutoff 8
 	note B_, 2
 	inc_octave
 	note C_, 2
-;	cutoff 4
 	note D_, 2
 	dec_octave
 	speed 1
-;	cutoff 8
 	note F#, 3
-;	cutoff 6
 	note G_, 4
-;	tie
 	speed 7
 	note G_, 15
-;	tie
 	note G_, 6
-;	cutoff 8
 	note G_, 2
 	note A_, 2
-;	cutoff 4
 	note B_, 2
 	speed 1
-;	cutoff 8
 	note B_, 3
 	inc_octave
 	note C_, 4
-;	tie
 	speed 7
 	note C_, 15
-;	tie
 	note C_, 8
 	dec_octave
 	note B_, 2
-;	cutoff 4
 	note A_, 2
-;	cutoff 6
 	note G_, 6
-;	cutoff 8
 	speed 1
 	note B_, 3
 	inc_octave
-;	cutoff 6
 	note C_, 4
-;	tie
 	speed 7
 	note C_, 9
-;	tie
 	note C_, 6
 	dec_octave
-;	cutoff 8
 	note G_, 2
 	inc_octave
 	note C_, 2
-;	cutoff 4
 	note E_, 2
 	speed 1
-;	cutoff 8
 	note E_, 3
 	note F_, 4
-;	tie
 	speed 7
 	note F_, 1
 	note E_, 2
-;	cutoff 4
 	note C_, 2
-;	cutoff 7
 	note C_, 10
-;	tie
 	note C_, 10
-;	cutoff 4
 	note E_, 2
 	speed 1
-;	cutoff 8
 	note E_, 3
 	note F_, 4
-;	tie
 	speed 7
 	note F_, 1
 	note E_, 2
-;	cutoff 4
 	note C_, 2
-;	cutoff 6
 	note C_, 10
-;	tie
 	note C_, 12
 	speed 1
-;	cutoff 8
 	note F#, 3
-;	cutoff 7
 	note G_, 4
-;	tie
 	speed 7
 	note G_, 15
-;	tie
 	note G_, 8
-;	cutoff 8
 	note F_, 2
-;	cutoff 4
 	note E_, 2
-;	cutoff 8
 	note F_, 2
-;	cutoff 4
 	note E_, 2
 	note C_, 2
 	dec_octave
-;	cutoff 7
 	note G_, 10
-;	tie
 	note G_, 10
-;	cutoff 8
 	note E_, 2
 	note F_, 2
 	inc_octave
-;	cutoff 4
 	note C_, 2
-;	cutoff 7
 	note C_, 12
-;	tie
 	note C_, 10
 	dec_octave
-;	cutoff 8
 	note E_, 2
 	note F_, 2
 	inc_octave
-;	cutoff 4
 	note C_, 2
-;	cutoff 6
 	note C_, 12
-;	tie
 	note C_, 12
 	rest 3
 	channel_volume 3
-;	frequency_offset -1
-;	cutoff 8
 	sound_loop 0, .MainLoop

 Branch_fb1ec:
--- a/crysaudio/music/TCG/medal.asm
+++ b/crysaudio/music/TCG/medal.asm
@ -6,12 +6,10 @@ Music_Medal:

 Music_Medal_Ch1:
 	stereo_panning TRUE, TRUE
-;	vibrato_type 1
 	vibrato 20, 3, 3
-;	cutoff 8
 	octave 2
 	duty_cycle 1
-	volume_envelope 10, 0
+	volume_envelope 10, 8
 	speed 1
 	note E_, 5
 	note A_, 5
@ -33,49 +31,40 @@ Music_Medal_Ch1:
 	note E_, 5
 	speed 15
 	note A_, 2
-;	tie
 	speed 1
 	note A_, 10
 	volume_envelope 3, 7
 	note A_, 5
-	volume_envelope 10, 0
-;	cutoff 7
+	volume_envelope 10, 8
 	note A_, 5
 	note A_, 5
 	note A_, 5
-;	cutoff 8
 	note A_, 15
 	volume_envelope 3, 7
 	note A_, 5
-	volume_envelope 10, 0
+	volume_envelope 10, 8
 	note A_, 16
 	volume_envelope 3, 7
 	note A_, 5
-	volume_envelope 10, 0
+	volume_envelope 10, 8
 	note A_, 16
 	volume_envelope 3, 7
 	note A_, 6
-	volume_envelope 10, 0
+	volume_envelope 10, 8
 	speed 9
-	note A_, 5
-;	tie
-	note A_, 8
-;	tie
+	note A_, 13
 	speed 1
 	note A_, 2
 	volume_envelope 3, 7
 	note A_, 16
 	sound_ret

-
 Music_Medal_Ch2:
 	stereo_panning TRUE, TRUE
-;	vibrato_type 1
 	vibrato 20, 3, 3
-;	cutoff 8
 	octave 1
 	duty_cycle 0
-	volume_envelope 9, 0
+	volume_envelope 9, 8
 	speed 1
 	note A_, 5
 	inc_octave
@ -96,61 +85,49 @@ Music_Medal_Ch2:
 	inc_octave
 	speed 15
 	note C_, 2
-;	tie
 	speed 1
 	note C_, 10
 	volume_envelope 2, 7
 	note C_, 5
-	volume_envelope 10, 0
-;	cutoff 7
+	volume_envelope 10, 8
 	note C_, 5
 	note C_, 5
 	note C_, 5
-;	cutoff 8
 	note D_, 15
 	volume_envelope 3, 7
 	note D_, 5
-	volume_envelope 9, 0
+	volume_envelope 9, 8
 	note D_, 16
 	volume_envelope 2, 7
 	note D_, 5
-	volume_envelope 9, 0
+	volume_envelope 9, 8
 	note D_, 16
 	volume_envelope 3, 7
 	note D_, 6
-	volume_envelope 9, 0
+	volume_envelope 9, 8
 	speed 9
-	note C#, 5
-;	tie
-	note C#, 8
-;	tie
+	note C#, 13
 	speed 1
 	note C#, 2
 	volume_envelope 2, 7
 	note C#, 16
 	sound_ret

-
 Music_Medal_Ch3:
 	stereo_panning TRUE, TRUE
 	fade_wave 11
 	channel_volume 1
-;	cutoff 8
-;	echo 0
 	octave 2
 	speed 1
 	speed 15
 	rest 4
 	note F_, 2
-;	tie
 	speed 1
 	note F_, 10
 	rest 5
-;	cutoff 7
 	note F_, 5
 	note F_, 5
 	note F_, 5
-;	cutoff 8
 	note A#, 15
 	rest 5
 	note A#, 16
@ -159,7 +136,6 @@ Music_Medal_Ch3:
 	rest 6
 	speed 9
 	note A_, 13
-;	tie
 	speed 1
 	note A_, 2
 	sound_ret
--- a/crysaudio/music/TCG/overworld.asm
+++ b/crysaudio/music/TCG/overworld.asm