From bfbb9b77e8b55fa2acdaf2c4267b5221fabb410b Mon Sep 17 00:00:00 2001
From: padz <yenatch@github.com>
Date: Fri, 30 Nov 2012 05:55:29 -0500
Subject: [PATCH] remove deprecated music files

---
 music/johtotrainerbatle.asm | 1346 -----------------------------------
 music/rockettheme2.asm      |  323 ---------
 2 files changed, 1669 deletions(-)
 delete mode 100644 music/johtotrainerbatle.asm
 delete mode 100644 music/rockettheme2.asm

diff --git a/music/johtotrainerbatle.asm b/music/johtotrainerbatle.asm
deleted file mode 100644
index 3221b44c0..000000000
--- a/music/johtotrainerbatle.asm
+++ /dev/null
@@ -1,1346 +0,0 @@
-_Music_JohtoTrainerBatle: ; 0xf6096
-	db $80
-	dw _Music_JohtoTrainerBatle_Ch1
-	db $01
-	dw _Music_JohtoTrainerBatle_Ch2
-	db $02
-	dw _Music_JohtoTrainerBatle_Ch3
-; 0xf609f
-
-_Music_JohtoTrainerBatle_Ch1: ; 0xf609f
-	tempo $0066
-	volume $77
-	dutycycle $03
-	tone $0002
-	vibrato $12, $15
-	notetype $0c, $92
-	note $07
-	octave 3
-	note $a0
-	note $90
-	note $80
-	note $90
-	intensity $b2
-	note $10
-	octave 2
-	note $c0
-	note $b0
-	note $c0
-	octave 3
-	note $20
-	note $10
-	octave 2
-	note $c0
-	octave 3
-	note $10
-	note $30
-	note $20
-	note $10
-	note $20
-	note $40
-	note $30
-	note $20
-	note $30
-	note $50
-	note $40
-	note $30
-	note $40
-	note $55
-	note $55
-	note $53
-	note $51
-	note $31
-	note $51
-	note $65
-	intensity $b7
-	note $33
-	intensity $b2
-	note $55
-	note $35
-	note $53
-	note $51
-	note $31
-	note $51
-	note $65
-	intensity $b7
-	note $63
-	intensity $b2
-	octave 4
-	note $55
-	note $55
-	note $53
-	note $51
-	note $31
-	note $51
-	note $61
-	octave 3
-	note $a1
-	note $b1
-	intensity $b7
-	note $c3
-	intensity $b2
-	octave 4
-	note $55
-	note $55
-	note $53
-	note $51
-	note $31
-	note $51
-	note $65
-	intensity $b7
-	note $83
-	intensity $b4
-	callchannel _Music_JohtoTrainerBatle_sub_0xf629f
-	intensity $b7
-	note $b3
-	intensity $b3
-	note $80
-	note $60
-	note $50
-	note $80
-	intensity $b7
-	octave 4
-	note $13
-	intensity $b3
-	octave 3
-	note $a0
-	note $80
-	note $60
-	note $a0
-	intensity $b7
-	octave 4
-	note $33
-	intensity $b3
-	note $10
-	octave 3
-	note $b0
-	note $a0
-	octave 4
-	note $10
-	intensity $b5
-	note $61
-	note $51
-	note $31
-	note $11
-	callchannel _Music_JohtoTrainerBatle_sub_0xf629f
-	intensity $b7
-	note $63
-	note $51
-	note $61
-	octave 4
-	note $13
-	octave 3
-	note $b1
-	octave 4
-	note $11
-	intensity $a0
-	octave 3
-	note $67
-	intensity $a7
-	note $67
-	intensity $b7
-	note $a5
-	note $55
-	note $b3
-	octave 4
-	note $25
-	note $63
-	note $51
-	note $31
-	note $61
-	note $51
-	note $61
-	note $51
-	note $31
-	note $21
-	octave 3
-	note $b1
-	note $a1
-	note $b1
-	intensity $a0
-	note $a7
-	intensity $a7
-	note $a7
-	intensity $b7
-	note $57
-	note $37
-	note $57
-	note $67
-	note $57
-	note $37
-	note $87
-	note $67
-	note $37
-	note $17
-	note $37
-	note $47
-	note $37
-	note $17
-	note $37
-	note $47
-	note $37
-	note $47
-	note $57
-	note $67
-	intensity $b4
-	note $81
-	octave 4
-	note $11
-	octave 3
-	note $b1
-	note $91
-	note $81
-	note $61
-	note $41
-	note $61
-	note $81
-	octave 4
-	note $21
-	note $11
-	note $21
-	note $41
-	note $21
-	note $11
-	octave 3
-	note $b1
-	intensity $b5
-	note $41
-	note $31
-	intensity $b2
-	note $43
-	intensity $b7
-	note $17
-	note $43
-	note $23
-	note $13
-	note $43
-	intensity $b5
-	note $51
-	note $41
-	intensity $b2
-	note $53
-	intensity $b7
-	note $27
-	note $63
-	note $43
-	note $23
-	note $63
-	intensity $b5
-	note $71
-	note $61
-	intensity $b2
-	note $73
-	intensity $b7
-	note $37
-	note $73
-	note $53
-	note $33
-	note $73
-	note $87
-	note $47
-	note $b7
-	note $87
-	intensity $a0
-	note $43
-	intensity $a7
-	note $4b
-	note $0f
-	intensity $b7
-	note $67
-	intensity $b4
-	note $83
-	note $43
-	note $63
-	note $81
-	note $41
-	note $63
-	octave 2
-	note $b3
-	intensity $b7
-	octave 3
-	note $67
-	intensity $b4
-	note $83
-	note $43
-	note $63
-	note $81
-	note $41
-	note $63
-	note $63
-	loopchannel $02, $61bd
-	intensity $b7
-	note $67
-	intensity $b4
-	note $83
-	note $43
-	note $63
-	note $91
-	note $81
-	intensity $b7
-	note $67
-	note $67
-	intensity $b5
-	note $83
-	note $43
-	note $63
-	note $81
-	note $41
-	intensity $b7
-	note $67
-	note $67
-	intensity $b5
-	note $83
-	note $43
-	note $63
-	note $81
-	note $41
-	intensity $3f
-	note $97
-	intensity $b7
-	note $97
-	intensity $a0
-	octave 4
-	note $17
-	intensity $a7
-	note $17
-	intensity $b2
-	octave 3
-	note $45
-	note $45
-	note $43
-	note $45
-	note $45
-	intensity $b7
-	note $63
-	intensity $b2
-	note $45
-	note $45
-	note $43
-	note $45
-	note $45
-	intensity $4c
-	note $63
-	intensity $b7
-	note $95
-	note $85
-	note $63
-	note $43
-	note $63
-	note $83
-	note $43
-	note $63
-	octave 4
-	note $21
-	note $11
-	octave 3
-	note $63
-	octave 4
-	note $21
-	note $11
-	octave 3
-	note $61
-	note $81
-	note $91
-	octave 4
-	note $11
-	note $21
-	note $11
-	octave 3
-	note $b1
-	note $91
-	note $85
-	note $45
-	note $83
-	octave 4
-	note $23
-	note $13
-	octave 3
-	note $b3
-	note $93
-	note $63
-	note $21
-	note $41
-	note $63
-	note $21
-	note $41
-	note $b3
-	note $93
-	note $83
-	note $63
-	intensity $90
-	octave 2
-	note $b7
-	octave 3
-	note $47
-	octave 2
-	note $b7
-	octave 3
-	note $87
-	intensity $a0
-	note $47
-	note $b7
-	note $87
-	octave 4
-	note $47
-	intensity $a0
-	octave 3
-	note $b7
-	intensity $a7
-	note $b7
-	intensity $b7
-	note $85
-	note $b5
-	note $91
-	note $81
-	intensity $a0
-	note $47
-	intensity $a7
-	note $47
-	intensity $b4
-	note $b5
-	note $83
-	note $81
-	note $bb
-	note $0f
-	note $07
-	intensity $a0
-	octave 4
-	note $33
-	intensity $a7
-	note $3b
-	intensity $a0
-	note $67
-	intensity $a7
-	note $67
-	intensity $b3
-	callchannel _Music_JohtoTrainerBatle_sub_0xf629f
-	note $63
-	note $51
-	note $61
-	octave 4
-	note $13
-	octave 3
-	note $b1
-	octave 4
-	note $11
-	intensity $a0
-	octave 3
-	note $69
-	intensity $a7
-	note $65
-	loopchannel $00, $6102 ; end
-; 0xf629f
-
-_Music_JohtoTrainerBatle_sub_0xf629f: ; 0xf629f
-; subroutine
-	octave 3
-	note $51
-	note $31
-	note $51
-	note $a1
-	note $c1
-	note $a1
-	note $81
-	note $a1
-	octave 4
-	note $11
-	octave 3
-	note $a1
-	note $c1
-	note $81
-	note $a1
-	note $51
-	note $61
-	note $31
-	endchannel ; end
-; 0xf62b3
-
-_Music_JohtoTrainerBatle_Ch2: ; 0xf62b3
-	dutycycle $03
-	vibrato $08, $36
-	tone $0001
-	notetype $0c, $c2
-	octave 4
-	note $90
-	note $80
-	note $70
-	note $60
-	note $90
-	note $30
-	note $40
-	note $50
-	note $90
-	note $40
-	note $30
-	note $40
-	note $90
-	note $30
-	note $20
-	note $30
-	note $90
-	note $20
-	note $10
-	note $20
-	note $90
-	octave 3
-	note $b0
-	note $c0
-	octave 4
-	note $10
-	note $90
-	octave 3
-	note $c0
-	note $b0
-	note $c0
-	octave 4
-	note $90
-	octave 3
-	note $b0
-	note $a0
-	note $b0
-	intensity $c2
-	octave 4
-	note $a5
-	callchannel _Music_JohtoTrainerBatle_sub_0xf649a
-	intensity $c2
-	note $a5
-	callchannel _Music_JohtoTrainerBatle_sub_0xf649a
-	intensity $c2
-	octave 5
-	note $15
-	note $15
-	note $13
-	note $15
-	note $15
-	intensity $c7
-	note $23
-	intensity $c2
-	note $11
-	intensity $a4
-	octave 3
-	note $51
-	note $a1
-	intensity $c2
-	octave 5
-	note $11
-	intensity $a4
-	octave 3
-	note $51
-	note $a1
-	intensity $c2
-	octave 5
-	note $11
-	intensity $a4
-	octave 3
-	note $51
-	intensity $c2
-	octave 5
-	note $11
-	intensity $a4
-	octave 3
-	note $51
-	note $c1
-	intensity $c2
-	octave 5
-	note $11
-	intensity $a4
-	octave 4
-	note $11
-	note $51
-	intensity $c7
-	note $c3
-	callchannel _Music_JohtoTrainerBatle_sub_0xf649a
-	intensity $3e
-	note $b7
-	intensity $c7
-	note $b7
-	callchannel _Music_JohtoTrainerBatle_sub_0xf649a
-	intensity $c4
-	note $33
-	octave 3
-	note $b1
-	octave 4
-	note $31
-	note $61
-	note $51
-	note $31
-	note $61
-	note $51
-	note $31
-	note $51
-	note $61
-	note $b1
-	note $a1
-	note $b1
-	octave 5
-	note $31
-	intensity $b0
-	note $27
-	intensity $b7
-	note $23
-	intensity $c7
-	octave 4
-	note $b3
-	intensity $b0
-	note $af
-	intensity $b7
-	note $af
-	intensity $c3
-	octave 3
-	note $a1
-	note $81
-	note $a1
-	intensity $c7
-	note $b3
-	intensity $c3
-	note $a1
-	note $81
-	note $b1
-	loopchannel $03, $635a
-	note $a1
-	octave 4
-	note $31
-	note $11
-	octave 3
-	note $b1
-	note $a1
-	note $81
-	note $a1
-	note $b1
-	note $81
-	note $61
-	note $81
-	intensity $c7
-	note $93
-	intensity $c3
-	note $81
-	note $61
-	note $91
-	loopchannel $03, $6376
-	note $61
-	octave 4
-	note $11
-	octave 3
-	note $b1
-	note $91
-	note $81
-	note $61
-	note $81
-	note $91
-	intensity $c7
-	note $85
-	octave 4
-	note $35
-	note $11
-	note $31
-	note $63
-	note $53
-	note $33
-	note $13
-	intensity $b0
-	note $49
-	intensity $b7
-	note $45
-	intensity $90
-	note $87
-	intensity $97
-	note $87
-	intensity $c7
-	octave 3
-	note $67
-	note $43
-	note $63
-	note $83
-	note $63
-	note $43
-	note $83
-	note $97
-	note $63
-	note $83
-	note $93
-	note $83
-	note $63
-	note $93
-	note $a7
-	note $73
-	note $93
-	note $a3
-	note $93
-	note $73
-	note $a3
-	intensity $b0
-	note $b7
-	note $b7
-	intensity $b0
-	octave 4
-	note $47
-	intensity $b7
-	note $47
-	intensity $62
-	callchannel _Music_JohtoTrainerBatle_sub_0xf649a
-	intensity $82
-	callchannel _Music_JohtoTrainerBatle_sub_0xf649a
-	intensity $92
-	callchannel _Music_JohtoTrainerBatle_sub_0xf649a
-	intensity $a2
-	callchannel _Music_JohtoTrainerBatle_sub_0xf649a
-	octave 4
-	note $41
-	octave 3
-	note $b1
-	octave 4
-	note $81
-	octave 3
-	note $b1
-	octave 4
-	note $41
-	octave 3
-	note $b1
-	octave 4
-	note $81
-	octave 3
-	note $b1
-	loopchannel $08, $63dd
-	callchannel _Music_JohtoTrainerBatle_sub_0xf649a
-	octave 3
-	note $b1
-	intensity $c7
-	octave 4
-	note $17
-	callchannel _Music_JohtoTrainerBatle_sub_0xf649a
-	note $81
-	intensity $c7
-	note $67
-	callchannel _Music_JohtoTrainerBatle_sub_0xf649a
-	octave 3
-	note $b1
-	intensity $b0
-	octave 4
-	note $17
-	intensity $b7
-	note $17
-	intensity $1f
-	note $4b
-	intensity $c7
-	note $43
-	intensity $c2
-	octave 3
-	note $83
-	note $41
-	note $85
-	note $83
-	note $81
-	note $61
-	note $41
-	note $85
-	intensity $c7
-	note $93
-	intensity $c2
-	note $83
-	note $41
-	note $85
-	note $83
-	note $85
-	note $85
-	intensity $4c
-	note $93
-	callchannel _Music_JohtoTrainerBatle_sub_0xf649a
-	intensity $b0
-	note $67
-	intensity $b7
-	note $67
-	intensity $b0
-	note $97
-	intensity $b7
-	note $97
-	callchannel _Music_JohtoTrainerBatle_sub_0xf649a
-	intensity $b0
-	note $27
-	intensity $b7
-	note $27
-	intensity $c7
-	note $23
-	note $13
-	octave 3
-	note $b3
-	note $93
-	note $85
-	note $41
-	note $b7
-	note $b5
-	note $81
-	octave 4
-	note $47
-	note $45
-	octave 3
-	note $b1
-	octave 4
-	note $87
-	note $85
-	note $41
-	note $b7
-	note $85
-	note $b5
-	note $91
-	note $81
-	intensity $b0
-	note $47
-	intensity $b7
-	note $47
-	intensity $c7
-	note $45
-	note $b5
-	note $91
-	note $81
-	intensity $b0
-	note $47
-	intensity $b7
-	note $47
-	intensity $c7
-	octave 3
-	note $a5
-	octave 4
-	note $55
-	note $31
-	note $51
-	note $83
-	note $73
-	note $53
-	note $33
-	intensity $b0
-	note $67
-	intensity $b7
-	note $67
-	intensity $b0
-	note $b7
-	intensity $b7
-	note $b7
-	callchannel _Music_JohtoTrainerBatle_sub_0xf649a
-	intensity $c7
-	note $33
-	octave 3
-	note $b1
-	octave 4
-	note $31
-	note $61
-	note $51
-	note $31
-	note $61
-	loopchannel $00, $632a ; end
-; 0xf649a
-
-_Music_JohtoTrainerBatle_sub_0xf649a: ; 0xf649a
-; subroutine
-	octave 3
-	note $a5
-	note $a3
-	note $a5
-	note $a5
-	intensity $c7
-	note $b3
-	endchannel ; end
-; 0xf64a3
-
-_Music_JohtoTrainerBatle_sub_0xf64a3: ; 0xf64a3
-; subroutine
-	intensity $c7
-	octave 3
-	note $a5
-	octave 4
-	note $55
-	note $31
-	note $51
-	note $83
-	note $73
-	note $53
-	note $33
-	intensity $b0
-	note $67
-	intensity $b7
-	note $67
-	endchannel ; end
-; 0xf64b6
-
-_Music_JohtoTrainerBatle_sub_0xf64b6: ; 0xf64b6
-; subroutine
-	octave 3
-	note $b1
-	note $41
-	octave 4
-	note $41
-	octave 3
-	note $41
-	endchannel ; end
-; 0xf64be
-
-_Music_JohtoTrainerBatle_sub_0xf64be: ; 0xf64be
-; subroutine
-	intensity $c7
-	octave 4
-	note $63
-	intensity $c4
-	octave 3
-	note $b1
-	octave 4
-	note $61
-	note $91
-	note $81
-	note $61
-	note $41
-	note $30
-	note $40
-	note $30
-	note $40
-	note $61
-	endchannel ; end
-; 0xf64d2
-
-_Music_JohtoTrainerBatle_sub_0xf64d2: ; 0xf64d2
-; subroutine
-	intensity $c7
-	octave 4
-	note $45
-	note $b5
-	note $91
-	note $81
-	note $93
-	note $83
-	note $63
-	note $43
-	endchannel ; end
-; 0xf64de
-
-_Music_JohtoTrainerBatle_Ch3: ; 0xf64de
-	notetype $0c, $19
-	octave 4
-	note $50
-	note $40
-	note $30
-	note $20
-	note $30
-	note $20
-	note $10
-	octave 3
-	note $c0
-	octave 4
-	note $10
-	octave 3
-	note $c0
-	note $b0
-	note $a0
-	note $b0
-	note $a0
-	note $90
-	note $80
-	note $90
-	note $80
-	note $70
-	note $60
-	note $70
-	note $60
-	note $50
-	note $40
-	note $51
-	note $b1
-	note $a1
-	note $91
-	note $a1
-	note $51
-	note $71
-	note $81
-	note $51
-	note $71
-	note $81
-	note $51
-	loopchannel $03, $6501
-	note $a1
-	note $51
-	note $71
-	note $81
-	note $51
-	note $71
-	note $81
-	note $91
-	callchannel _Music_JohtoTrainerBatle_sub_0xf6676
-	octave 4
-	note $11
-	octave 3
-	note $81
-	note $a1
-	note $b1
-	octave 4
-	note $11
-	note $21
-	note $11
-	octave 3
-	note $b1
-	callchannel _Music_JohtoTrainerBatle_sub_0xf6676
-	octave 4
-	note $11
-	octave 3
-	note $81
-	note $a1
-	note $b1
-	note $81
-	note $a1
-	note $b1
-	note $81
-	callchannel _Music_JohtoTrainerBatle_sub_0xf6676
-	note $51
-	callchannel _Music_JohtoTrainerBatle_sub_0xf6676
-	callchannel _Music_JohtoTrainerBatle_sub_0xf6676
-	callchannel _Music_JohtoTrainerBatle_sub_0xf6676
-	note $a1
-	callchannel _Music_JohtoTrainerBatle_sub_0xf6676
-	callchannel _Music_JohtoTrainerBatle_sub_0xf6676
-	callchannel _Music_JohtoTrainerBatle_sub_0xf6676
-	note $51
-	note $a1
-	note $51
-	note $a1
-	note $51
-	note $31
-	note $51
-	note $61
-	callchannel _Music_JohtoTrainerBatle_sub_0xf6676
-	note $51
-	octave 4
-	note $61
-	note $51
-	note $31
-	octave 3
-	note $a1
-	note $91
-	note $a1
-	note $b1
-	callchannel _Music_JohtoTrainerBatle_sub_0xf6676
-	note $31
-	note $a1
-	note $31
-	note $a1
-	note $31
-	note $a1
-	note $81
-	note $a1
-	callchannel _Music_JohtoTrainerBatle_sub_0xf6676
-	note $31
-	octave 4
-	note $31
-	note $11
-	octave 3
-	note $b1
-	note $a1
-	note $81
-	note $a1
-	note $b1
-	callchannel _Music_JohtoTrainerBatle_sub_0xf6676
-	note $11
-	note $81
-	note $11
-	note $81
-	note $11
-	note $81
-	note $61
-	note $81
-	callchannel _Music_JohtoTrainerBatle_sub_0xf6676
-	note $11
-	octave 4
-	note $11
-	octave 3
-	note $b1
-	note $91
-	note $81
-	note $61
-	note $41
-	note $31
-	note $87
-	note $67
-	note $57
-	note $47
-	octave 3
-	note $41
-	note $b1
-	note $41
-	note $b1
-	note $41
-	note $b1
-	note $a1
-	octave 4
-	note $11
-	loopchannel $02, $6591
-	callchannel _Music_JohtoTrainerBatle_sub_0xf6676
-	note $11
-	octave 4
-	note $11
-	octave 3
-	note $b1
-	note $91
-	note $81
-	note $61
-	note $41
-	note $81
-	note $21
-	note $91
-	loopchannel $07, $65ac
-	note $c1
-	note $a1
-	note $31
-	note $a1
-	loopchannel $05, $65b4
-	note $c1
-	note $a1
-	note $91
-	note $71
-	note $91
-	note $a1
-	note $b3
-	note $43
-	loopchannel $04, $65c0
-	octave 4
-	note $83
-	octave 3
-	note $b3
-	loopchannel $04, $65c6
-	callchannel _Music_JohtoTrainerBatle_sub_0xf6676
-	note $41
-	note $67
-	callchannel _Music_JohtoTrainerBatle_sub_0xf6676
-	octave 4
-	note $11
-	octave 3
-	note $b7
-	loopchannel $02, $65ce
-	octave 4
-	note $27
-	note $17
-	octave 3
-	note $b7
-	note $97
-	note $67
-	note $87
-	note $97
-	note $b7
-	note $67
-	note $87
-	note $93
-	note $41
-	note $91
-	octave 4
-	note $17
-	note $17
-	note $47
-	octave 3
-	note $b1
-	note $91
-	note $81
-	note $61
-	note $41
-	note $b1
-	note $41
-	note $b1
-	note $41
-	note $b1
-	octave 4
-	note $21
-	octave 3
-	note $b1
-	note $41
-	note $b1
-	octave 4
-	note $21
-	note $11
-	octave 3
-	note $b1
-	note $91
-	note $81
-	note $91
-	note $41
-	note $b1
-	note $41
-	note $b1
-	note $41
-	note $b1
-	octave 4
-	note $21
-	octave 3
-	note $b1
-	note $41
-	note $b1
-	octave 4
-	note $11
-	note $21
-	note $41
-	note $21
-	note $11
-	octave 3
-	note $b1
-	note $41
-	note $b1
-	loopchannel $08, $661e
-	note $21
-	note $91
-	loopchannel $06, $6624
-	note $21
-	octave 4
-	note $11
-	octave 3
-	note $b1
-	note $91
-	note $41
-	note $b1
-	loopchannel $08, $6630
-	note $21
-	note $91
-	loopchannel $04, $6636
-	note $21
-	octave 4
-	note $21
-	note $11
-	octave 3
-	note $b1
-	note $81
-	note $91
-	note $b1
-	octave 4
-	note $11
-	octave 3
-	note $47
-	note $27
-	note $17
-	octave 2
-	note $b7
-	octave 3
-	note $b7
-	note $97
-	note $87
-	note $67
-	octave 4
-	note $47
-	note $47
-	octave 3
-	note $b7
-	note $b7
-	note $87
-	note $87
-	note $47
-	note $43
-	note $b3
-	note $af
-	octave 4
-	note $1f
-	octave 3
-	note $bf
-	octave 4
-	note $3f
-	octave 3
-	note $af
-	octave 4
-	note $1f
-	octave 3
-	note $bf
-	octave 4
-	note $37
-	note $01
-	octave 3
-	note $a1
-	note $b1
-	octave 4
-	note $31
-	loopchannel $00, $6531 ; end
-; 0xf6676
-
-_Music_JohtoTrainerBatle_sub_0xf6676: ; 0xf6676
-; subroutine
-	octave 4
-	note $11
-	octave 3
-	note $81
-	note $a1
-	note $b1
-	note $81
-	note $a1
-	note $b1
-	note $81
-	endchannel ; end
-; 0xf6681
-
-_Music_JohtoTrainerBatle_sub_0xf6681: ; 0xf6681
-; subroutine
-	octave 3
-	note $51
-	note $a1
-	note $51
-	note $a1
-	note $51
-	note $71
-	note $81
-	note $a1
-	note $51
-	note $a1
-	note $51
-	note $a1
-	note $51
-	note $71
-	note $81
-	endchannel ; end
-; 0xf6692
-
-_Music_JohtoTrainerBatle_sub_0xf6692: ; 0xf6692
-; subroutine
-	octave 3
-	note $61
-	note $b1
-	note $61
-	note $b1
-	note $61
-	note $a1
-	note $b1
-	octave 4
-	note $31
-	endchannel ; end
-; 0xf669d
-
-_Music_JohtoTrainerBatle_sub_0xf669d: ; 0xf669d
-; subroutine
-	octave 3
-	note $51
-	note $a1
-	loopchannel $04, $669d
-	endchannel ; end
-; 0xf66a5
-
-_Music_JohtoTrainerBatle_sub_0xf66a5: ; 0xf66a5
-; subroutine
-	note $31
-	note $a1
-	loopchannel $04, $66a5
-	endchannel ; end
-; 0xf66ac
-
-_Music_JohtoTrainerBatle_sub_0xf66ac: ; 0xf66ac
-; subroutine
-	octave 3
-	note $11
-	note $81
-	loopchannel $04, $66ac
-	endchannel ; end
-; 0xf66b4
-
-_Music_JohtoTrainerBatle_sub_0xf66b4: ; 0xf66b4
-; subroutine
-	note $b3
-	note $41
-	note $b1
-	octave 4
-	note $21
-	note $11
-	octave 3
-	note $b1
-	note $91
-	note $80
-	note $90
-	note $80
-	note $90
-	note $b1
-	endchannel ; end
-; 0xf66c3
diff --git a/music/rockettheme2.asm b/music/rockettheme2.asm
deleted file mode 100644
index df62149fc..000000000
--- a/music/rockettheme2.asm
+++ /dev/null
@@ -1,323 +0,0 @@
-_Music_RocketTheme_sub_0xf74e6: ; 0xf74e6
-; subroutine
-	note $40
-	note $00
-	note $30
-	note $00
-	note $20
-	note $00
-	note $10
-	note $02
-	octave2
-	note $60
-	note $90
-	note $c0
-	octave3
-	note $30
-	note $60
-	note $90
-	endchannel ; end
-; 0xf74f7
-
-_Music_RocketTheme_sub_0xf74f7: ; 0xf74f7
-; subroutine
-	note $01
-	octave3
-	note $40
-	note $04
-	note $43
-	octave2
-	note $a1
-	octave3
-	note $40
-	note $60
-	note $75
-	note $40
-	note $02
-	note $70
-	note $00
-	note $40
-	note $00
-	octave4
-	note $70
-	note $00
-	endchannel ; end
-; 0xf750c
-
-_Music_RocketTheme_sub_0xf750c: ; 0xf750c
-; subroutine
-	note $01
-	octave2
-	note $c0
-	note $06
-	octave3
-	note $10
-	note $04
-	endchannel ; end
-; 0xf7514
-
-INCBIN "baserom.gbc", $f7514, $f7547 - $f7514
-
-_Music_RocketTheme_sub_0xf7547: ; 0xf7547
-; subroutine
-	note $40
-	note $00
-	note $30
-	note $00
-	note $20
-	note $00
-	note $10
-	note $02
-	octave3
-	note $c5
-	dutycycle $00
-	endchannel ; end
-; 0xf7554
-
-_Music_RocketTheme_sub_0xf7554: ; 0xf7554
-; subroutine
-	note $01
-	octave4
-	note $40
-	note $04
-	note $63
-	note $10
-	note $30
-	note $40
-	note $60
-	note $75
-	note $40
-	note $02
-	note $70
-	note $00
-	note $40
-	note $00
-	octave5
-	note $40
-	note $00
-	endchannel ; end
-; 0xf7568
-
-_Music_RocketTheme_sub_0xf7568: ; 0xf7568
-; subroutine
-	note $01
-	octave3
-	note $60
-	note $06
-	note $70
-	note $04
-	endchannel ; end
-; 0xf756f
-
-_Music_RocketTheme_sub_0xf756f: ; 0xf756f
-; subroutine
-	intensity $63
-	note $90
-	note $60
-	note $30
-	octave2
-	note $c0
-	intensity $a3
-	octave3
-	note $a0
-	note $70
-	note $40
-	note $10
-	intensity $c3
-	note $b0
-	note $80
-	note $50
-	note $20
-	intensity $f3
-	note $c0
-	note $90
-	note $60
-	note $30
-	endchannel ; end
-; 0xf758a
-
-_Music_RocketTheme_sub_0xf758a: ; 0xf758a
-; subroutine
-	octave3
-	note $01
-	note $80
-	note $04
-	note $a7
-	note $b5
-	note $a0
-	note $02
-	note $b0
-	note $00
-	note $a0
-	note $00
-	endchannel ; end
-; 0xf7597
-
-INCBIN "baserom.gbc", $f7597, $f75bf - $f7597
-
-_Music_RocketTheme_sub_0xf75bf: ; 0xf75bf
-; subroutine
-	octave3
-	note $60
-	note $00
-	note $90
-	note $00
-	octave4
-	note $10
-	note $00
-	note $30
-	note $02
-	octave3
-	note $35
-	endchannel ; end
-; 0xf75cc
-
-_Music_RocketTheme_sub_0xf75cc: ; 0xf75cc
-; subroutine
-	octave2
-	note $90
-	note $00
-	octave3
-	note $90
-	note $00
-	octave2
-	note $90
-	note $00
-	note $90
-	note $00
-	note $a0
-	note $00
-	octave3
-	note $a0
-	note $00
-	note $10
-	note $00
-	note $70
-	note $00
-	endchannel ; end
-; 0xf75e1
-
-_Music_RocketTheme_sub_0xf75e1: ; 0xf75e1
-; subroutine
-	intensity $24
-	octave2
-	note $90
-	note $00
-	octave3
-	note $60
-	note $00
-	octave2
-	note $a0
-	note $00
-	octave3
-	note $70
-	note $00
-	intensity $14
-	octave2
-	note $b0
-	note $00
-	octave3
-	note $80
-	note $00
-	octave2
-	note $c0
-	note $00
-	octave3
-	note $90
-	note $00
-	endchannel ; end
-; 0xf75fe
-
-_Music_RocketTheme_sub_0xf75fe: ; 0xf75fe
-; subroutine
-	note $10
-	note $00
-	octave4
-	note $10
-	note $00
-	octave3
-	note $10
-	note $00
-	note $10
-	note $00
-	octave4
-	note $10
-	note $00
-	octave3
-	note $10
-	note $00
-	note $40
-	note $00
-	note $80
-	note $00
-	note $10
-	note $00
-	note $10
-	note $00
-	note $10
-	note $00
-	note $10
-	note $00
-	note $10
-	note $00
-	note $10
-	note $00
-	note $70
-	note $00
-	note $a0
-	note $00
-	endchannel ; end
-; 0xf7623
-
-_Music_RocketTheme_sub_0xf7623: ; 0xf7623
-; subroutine
-	octave2
-	note $90
-	note $00
-	octave3
-	note $90
-	note $00
-	octave2
-	note $90
-	note $00
-	note $90
-	note $00
-	note $a0
-	note $00
-	octave3
-	note $a0
-	note $00
-	note $90
-	note $70
-	note $40
-	note $10
-	endchannel ; end
-; 0xf7638
-
-INCBIN "baserom.gbc", $f7638, $f765c - $f7638
-
-
-_Music_RocketTheme_sub_0xf765c: ; 0xf765c
-; subroutine
-	note $17
-	note $31
-	note $41
-	note $20
-	note $20
-	note $30
-	note $30
-	endchannel ; end
-; 0xf7664
-
-_Music_RocketTheme_sub_0xf7664: ; 0xf7664
-; subroutine
-	note $41
-	note $71
-	note $31
-	note $71
-	note $41
-	note $71
-	note $31
-	note $71
-	endchannel ; end
-; 0xf766d