diff --git a/crysaudio/music/TCG2/credits.asm b/crysaudio/music/TCG2/credits.asm
index 4b9e154c..ad071dde 100644
--- a/crysaudio/music/TCG2/credits.asm
+++ b/crysaudio/music/TCG2/credits.asm
@@ -1683,18 +1683,48 @@ Music_TCG2Credits_Ch2: ; 1de32a (77:632a)
 	note D_, 14
 	speed 1
 .Loop6
-	rept 4
+	;rept 4
 	note G_, 11
 	rest 4
 	note G_, 11
 	rest 3
-	endr
-	rept 4
+	;---
+	note G_, 11
+	rest 4
+	note G_, 11
+	rest 3
+	;---
+	note G_, 11
+	rest 4
+	note G_, 11
+	rest 3
+	;---
+	note G_, 11
+	rest 4
+	note G_, 11
+	rest 3
+	;endr
+	;rept 4
 	note D_, 11
 	rest 4
 	note D_, 11
 	rest 3
-	endr
+	;---
+	note D_, 11
+	rest 4
+	note D_, 11
+	rest 3
+	;---
+	note D_, 11
+	rest 4
+	note D_, 11
+	rest 3
+	;---
+	note D_, 11
+	rest 4
+	note D_, 11
+	rest 3
+	;endr
 	sound_loop 3, .Loop6
 .Loop7
 	note G_, 11
diff --git a/crysaudio/music/TCG2/diddly6.asm b/crysaudio/music/TCG2/diddly6.asm
index d024c2b5..bc39c1f2 100644
--- a/crysaudio/music/TCG2/diddly6.asm
+++ b/crysaudio/music/TCG2/diddly6.asm
@@ -306,9 +306,21 @@ Music_Diddly6_Ch4: ; 1f7812 (7d:7812)
 	sound_loop 7, .Loop1
 .Loop2
 	drum_note 3, 6
-	rept 7
+	;rept 7
 	drum_note 3, 5
-	endr
+	;---
+	drum_note 3, 5
+	;---
+	drum_note 3, 5
+	;---
+	drum_note 3, 5
+	;---
+	drum_note 3, 5
+	;---
+	drum_note 3, 5
+	;---
+	drum_note 3, 5
+	;endr
 	sound_loop 3, .Loop2
 	;musicef 0
 .Loop3
diff --git a/crysaudio/music/TCG2/grblimp.asm b/crysaudio/music/TCG2/grblimp.asm
index a14ea62b..0f8dad10 100644
--- a/crysaudio/music/TCG2/grblimp.asm
+++ b/crysaudio/music/TCG2/grblimp.asm
@@ -805,10 +805,16 @@ Music_GRBlimp_Ch4: ; 1e7f50 (79:7f50)
 	drum_note 3, 3
 	;musicef 253
 	drum_note 3, 4
-	rept 3
+	;rept 3
 	drum_note 3, 3
 	drum_note 3, 4
-	endr
+	;---
+	drum_note 3, 3
+	drum_note 3, 4
+	;---
+	drum_note 3, 3
+	drum_note 3, 4
+	;endr
 	;musicef 0
 	drum_note 2, 14
 	drum_note 2, 14
@@ -826,10 +832,16 @@ Music_GRBlimp_Ch4: ; 1e7f50 (79:7f50)
 	drum_note 3, 3
 	;musicef 253
 	drum_note 3, 4
-	rept 3
+	;rept 3
 	drum_note 3, 3
 	drum_note 3, 4
-	endr
+	;---
+	drum_note 3, 3
+	drum_note 3, 4
+	;---
+	drum_note 3, 3
+	drum_note 3, 4
+	;endr
 	;musicef 0
 	sound_loop 11, .Loop1
 	drum_note 2, 14
diff --git a/crysaudio/music/TCG2/groverworld.asm b/crysaudio/music/TCG2/groverworld.asm
index d9db8ccd..b00a9383 100644
--- a/crysaudio/music/TCG2/groverworld.asm
+++ b/crysaudio/music/TCG2/groverworld.asm
@@ -2024,13 +2024,19 @@ Music_GROverworld_Ch4: ; 1eb5e4 (7a:75e4)
 	drum_note 3, 6
 	drum_note 3, 5
 	drum_note 3, 5
-	rept 2
+	;rept 2
 	;musicef 254
 	drum_note 2, 16
 	rest 1
 	;musicef 2
 	drum_note 2, 16
-	endr
+	;---
+	;musicef 254
+	drum_note 2, 16
+	rest 1
+	;musicef 2
+	drum_note 2, 16
+	;endr
 	;musicef 0
 	drum_note 2, 16
 	rest 1
diff --git a/crysaudio/music/TCG2/titlescreen.asm b/crysaudio/music/TCG2/titlescreen.asm
index 3303cc5f..9e990dcf 100644
--- a/crysaudio/music/TCG2/titlescreen.asm
+++ b/crysaudio/music/TCG2/titlescreen.asm
@@ -30,12 +30,22 @@ Music_TCG2TitleScreen_Ch2: ; 1e96cc (7a:56cc)
 	;musicdc 1
 	note G_, 15
 	;musicdc 17
-	rept 3
+	;rept 3
 	note G_, 4
 	;musicdc 1
 	note G_, 1
 	;musicdc 17
-	endr
+	;---
+	note G_, 4
+	;musicdc 1
+	note G_, 1
+	;musicdc 17
+	;---
+	note G_, 4
+	;musicdc 1
+	note G_, 1
+	;musicdc 17
+	;endr
 	sound_loop 4, .Loop1
 	;musicf3
 	;musicdc 17
@@ -1651,12 +1661,17 @@ Music_TCG2TitleScreen_Ch1: ; 1e9abd (7a:5abd)
 	note E_, 5
 	;musicdc 16
 	note E_, 2
-	rept 2
+	;rept 2
 	;musicdc 17
 	note E_, 8
 	;musicdc 16
 	note E_, 7
-	endr
+	;---
+	;musicdc 17
+	note E_, 8
+	;musicdc 16
+	note E_, 7
+	;endr
 	inc_octave
 	;musicf1 64
 	;musicf2