summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorU-Fish-PC\Daniel <corrnondacqb@yahoo.com>2014-04-19 08:47:37 -0400
committerU-Fish-PC\Daniel <corrnondacqb@yahoo.com>2014-04-19 08:47:37 -0400
commit561c95338ceafd6356e649a221493ee72c0b2e93 (patch)
treeea0d57af05c6b0a80029d08d1a7ab216acc9e4ce
parent1064d148d6e781cb86ac525f829fce990a79923e (diff)
Turns out noise format is the same
Diffstat
-rwxr-xr-xmacros.asm10
-rw-r--r--music/battletheme1.asm169
-rw-r--r--music/battletheme2.asm139
-rw-r--r--music/battletheme3.asm310
-rw-r--r--music/cardpop.asm34
-rw-r--r--music/challengehall.asm57
-rw-r--r--music/club1.asm50
-rw-r--r--music/club3.asm40
-rw-r--r--music/credits.asm130
-rw-r--r--music/deckmachine.asm34
-rw-r--r--music/imakuni.asm67
-rw-r--r--music/overworld.asm87
-rw-r--r--music/pausemenu.asm39
-rw-r--r--music/pcmainmenu.asm36
-rw-r--r--music/pokemondome.asm27
-rw-r--r--music/ronald.asm93
-rw-r--r--music/titlescreen.asm42
17 files changed, 1332 insertions, 32 deletions
diff --git a/macros.asm b/macros.asm
index 219cb27..d45fa47 100755
--- a/macros.asm
+++ b/macros.asm
@@ -19,6 +19,7 @@ emptybank: MACRO
endr
ENDM
+; notes
C_ EQU $1
C# EQU $2
D_ EQU $3
@@ -32,6 +33,14 @@ A_ EQU $A
A# EQU $B
B_ EQU $C
+; instruments
+noise1 EQU $1
+noise3 EQU $3
+noise5 EQU $5
+noise7 EQU $7
+noise9 EQU $9
+noisec EQU $c
+
note: MACRO
db (\1 << 4) | (\2 - 1)
ENDM
@@ -80,6 +89,7 @@ EndLoop: MACRO
db $e0
ENDM
+; unused
music_jp: MACRO
db $e1
dw \1
diff --git a/music/battletheme1.asm b/music/battletheme1.asm
index a4a98aa..f83deb1 100644
--- a/music/battletheme1.asm
+++ b/music/battletheme1.asm
@@ -1830,7 +1830,172 @@ Branch_f5c7e:
rest 2
EndLoop
music_ret
-; 0xf5c9a
+
Music_BattleTheme1_Ch4: ; f5c9a (3d:5c9a)
-INCBIN "baserom.gbc",$f5c9a,$f5d68 - $f5c9a \ No newline at end of file
+ Speed 7
+ musicdx 1
+ MainLoop
+ Loop 3
+ note noise1, 2
+ note noise7, 1
+ note noise9, 1
+ note noise7, 1
+ note noise1, 1
+ note noise5, 2
+ note noise7, 1
+ note noise1, 1
+ note noise9, 2
+ note noise3, 1
+ note noise9, 1
+ rest 1
+ note noise7, 1
+ EndLoop
+ note noise1, 2
+ note noise7, 1
+ note noise9, 1
+ note noise7, 1
+ note noise1, 1
+ note noise5, 2
+ note noise7, 1
+ note noise3, 1
+ note noise9, 1
+ Speed 1
+ note noise5, 4
+ note noise5, 3
+ Speed 7
+ note noise3, 1
+ note noise3, 1
+ note noise3, 2
+ Loop 3
+ music_call Branch_f5d39
+ EndLoop
+ music_call Branch_f5d46
+ Loop 15
+ music_call Branch_f5d39
+ EndLoop
+ music_call Branch_f5d46
+ Loop 15
+ music_call Branch_f5d39
+ EndLoop
+ note noise1, 2
+ note noise7, 1
+ note noise9, 1
+ note noise3, 2
+ note noise9, 2
+ note noise7, 1
+ note noise3, 1
+ note noise9, 1
+ Speed 1
+ note noise5, 4
+ note noise5, 3
+ Speed 7
+ Loop 4
+ note noise3, 1
+ EndLoop
+ Loop 5
+ note noise1, 1
+ note noise7, 1
+ note noise9, 1
+ note noise3, 1
+ note noise7, 1
+ note noise1, 1
+ note noise9, 2
+ note noise7, 1
+ note noise1, 1
+ note noise7, 2
+ note noise3, 2
+ note noise9, 2
+ EndLoop
+ note noise1, 2
+ note noise7, 1
+ note noise3, 1
+ note noise7, 1
+ note noise1, 1
+ note noise9, 2
+ note noise7, 1
+ note noise1, 1
+ note noise9, 1
+ Speed 1
+ note noise5, 4
+ note noise5, 3
+ Speed 7
+ Loop 4
+ note noise3, 1
+ EndLoop
+ Loop 3
+ music_call Branch_f5d39
+ EndLoop
+ music_call Branch_f5d58
+ Loop 7
+ music_call Branch_f5d39
+ EndLoop
+ music_call Branch_f5d46
+ Loop 7
+ music_call Branch_f5d39
+ EndLoop
+ music_call Branch_f5d58
+ Loop 2
+ music_call Branch_f5d39
+ EndLoop
+ note noise1, 2
+ note noise7, 1
+ note noise9, 1
+ note noise3, 2
+ note noise9, 2
+ note noise1, 1
+ note noise7, 1
+ note noise9, 2
+ note noise3, 2
+ note noisec, 14
+ note noise3, 4
+ EndMainLoop
+
+Branch_f5d39:
+ note noise1, 2
+ note noise7, 1
+ note noise9, 1
+ note noise3, 2
+ note noise9, 2
+ note noise1, 1
+ note noise7, 1
+ note noise9, 2
+ note noise3, 1
+ note noise9, 1
+ rest 1
+ note noise7, 1
+ music_ret
+
+Branch_f5d46:
+ note noise1, 2
+ note noise7, 1
+ note noise9, 1
+ note noise3, 2
+ note noise9, 2
+ note noise7, 1
+ note noise3, 1
+ note noise9, 1
+ Speed 1
+ note noise5, 4
+ note noise5, 3
+ Speed 7
+ note noise3, 1
+ note noise3, 1
+ note noise3, 2
+ music_ret
+
+Branch_f5d58:
+ note noise1, 2
+ note noise7, 1
+ note noise9, 1
+ note noise3, 2
+ note noise9, 1
+ Speed 1
+ note noise5, 4
+ note noise5, 3
+ Speed 7
+ Loop 8
+ note noise3, 1
+ EndLoop
+ music_ret
+; 0xf5d68 \ No newline at end of file
diff --git a/music/battletheme2.asm b/music/battletheme2.asm
index 02a25a0..5bdccbd 100644
--- a/music/battletheme2.asm
+++ b/music/battletheme2.asm
@@ -1097,7 +1097,142 @@ Branch_f62e5:
musicd7
note D_, 1
music_ret
-; 0xf62f3
+
Music_BattleTheme2_Ch4: ; f62f3 (3d:62f3)
-INCBIN "baserom.gbc",$f62f3,$f63a1 - $f62f3 \ No newline at end of file
+ Speed 9
+ Loop 2
+ rest 12
+ EndLoop
+ MainLoop
+ rest 12
+ rest 6
+ Loop 6
+ note noise3, 1
+ EndLoop
+ Loop 3
+ music_call Branch_f637c
+ EndLoop
+ note noise1, 1
+ note noise7, 1
+ note noise7, 1
+ note noise3, 1
+ note noise7, 1
+ note noise9, 1
+ Loop 6
+ note noise3, 1
+ EndLoop
+ Loop 15
+ music_call Branch_f637c
+ EndLoop
+ music_call Branch_f6396
+ Loop 3
+ music_call Branch_f637c
+ Loop 6
+ note noise3, 1
+ EndLoop
+ note noise3, 2
+ note noisec, 3
+ note noise3, 1
+ EndLoop
+ note noise1, 1
+ note noise7, 1
+ note noise7, 1
+ note noise3, 1
+ note noise7, 1
+ note noise7, 1
+ note noise1, 1
+ note noise7, 1
+ Speed 1
+ note noise7, 4
+ note noise5, 5
+ Speed 9
+ note noise3, 3
+ Loop 12
+ note noise3, 1
+ EndLoop
+ Loop 3
+ music_call Branch_f637c
+ music_call Branch_f6389
+ EndLoop
+ music_call Branch_f637c
+ note noise1, 1
+ note noise3, 1
+ note noise1, 1
+ note noise3, 1
+ note noise3, 1
+ note noise1, 1
+ note noise1, 1
+ note noise3, 1
+ Speed 1
+ note noise5, 4
+ note noise5, 5
+ Speed 9
+ note noise3, 1
+ note noise3, 1
+ note noise3, 1
+ Loop 4
+ music_call Branch_f637c
+ music_call Branch_f6389
+ EndLoop
+ music_call Branch_f637c
+ music_call Branch_f6396
+ Loop 3
+ music_call Branch_f637c
+ Loop 6
+ note noise3, 1
+ EndLoop
+ note noise3, 2
+ note noisec, 3
+ note noise3, 1
+ EndLoop
+ music_call Branch_f637c
+ Loop 12
+ note noise3, 1
+ EndLoop
+ note noisec, 12
+ rest 12
+ EndMainLoop
+
+Branch_f637c:
+ note noise1, 1
+ note noise7, 1
+ note noise7, 1
+ note noise3, 1
+ note noise7, 1
+ note noise7, 1
+ note noise1, 1
+ note noise7, 1
+ note noise7, 1
+ note noise3, 1
+ note noise7, 1
+ note noise9, 1
+ music_ret
+
+Branch_f6389:
+ note noise1, 1
+ note noise7, 1
+ note noise7, 1
+ note noise3, 1
+ note noise7, 1
+ note noise7, 1
+ note noise1, 1
+ note noise7, 1
+ note noise7, 1
+ note noise3, 1
+ note noise7, 1
+ note noise3, 1
+ music_ret
+
+Branch_f6396:
+ note noise1, 1
+ note noise7, 1
+ note noise7, 1
+ note noise3, 1
+ note noise7, 1
+ note noise7, 1
+ Loop 6
+ note noise3, 1
+ EndLoop
+ music_ret
+; 0xf63a1 \ No newline at end of file
diff --git a/music/battletheme3.asm b/music/battletheme3.asm
index 7889ca3..d4f7c01 100644
--- a/music/battletheme3.asm
+++ b/music/battletheme3.asm
@@ -1216,7 +1216,313 @@ Branch_f69f0:
musice8 6
note F#, 1
music_ret
-; 0xf6a3f
+
Music_BattleTheme3_Ch4: ; f6a3f (3d:6a3f)
-INCBIN "baserom.gbc",$f6a3f,$f6bb7 - $f6a3f \ No newline at end of file
+ Speed 11
+ MainLoop
+ Loop 2
+ Loop 4
+ note noise9, 1
+ note noise7, 1
+ note noise7, 1
+ EndLoop
+ note noise9, 1
+ note noise7, 1
+ note noise9, 1
+ note noise7, 1
+ EndLoop
+ Loop 4
+ note noise3, 1
+ note noise1, 1
+ note noise1, 1
+ EndLoop
+ note noise3, 1
+ note noise1, 1
+ note noise3, 1
+ note noise1, 1
+ Loop 4
+ note noise3, 1
+ note noise1, 1
+ note noise1, 1
+ EndLoop
+ note noise3, 1
+ Speed 1
+ note noise7, 5
+ note noise5, 6
+ Speed 11
+ note noise3, 1
+ note noise3, 1
+ Loop 3
+ music_call Branch_f6b40
+ EndLoop
+ note noise1, 2
+ note noise7, 1
+ note noise1, 1
+ note noise3, 2
+ note noise7, 1
+ note noise1, 1
+ note noise7, 1
+ note noise1, 1
+ note noise9, 2
+ note noise3, 1
+ Speed 1
+ note noise7, 5
+ note noise5, 6
+ Speed 11
+ note noise3, 1
+ note noise3, 1
+ Loop 7
+ music_call Branch_f6b40
+ EndLoop
+ note noise1, 2
+ note noise7, 1
+ note noise1, 1
+ note noise3, 2
+ note noise7, 1
+ note noise1, 1
+ note noise7, 1
+ note noise1, 1
+ note noise9, 2
+ note noise3, 1
+ Speed 1
+ note noise7, 5
+ note noise5, 6
+ Speed 11
+ note noise3, 1
+ note noise3, 1
+ music_call Branch_f6b7e
+ Speed 1
+ note noise7, 5
+ note noise5, 6
+ Speed 11
+ note noise3, 1
+ note noise1, 1
+ music_call Branch_f6b7e
+ Speed 1
+ note noise7, 5
+ note noise5, 6
+ Speed 11
+ note noise3, 2
+ Loop 7
+ music_call Branch_f6b40
+ EndLoop
+ note noise1, 2
+ note noise7, 1
+ note noise1, 1
+ note noise3, 2
+ note noise7, 1
+ note noise1, 1
+ note noise7, 1
+ note noise1, 1
+ note noise9, 2
+ note noise3, 1
+ Speed 1
+ note noise7, 5
+ note noise5, 6
+ note noise3, 5
+ note noise3, 6
+ note noise3, 5
+ note noise3, 6
+ Speed 11
+ music_call Branch_f6b4d
+ note noise7, 1
+ note noise3, 1
+ note noise1, 1
+ music_call Branch_f6b4d
+ Speed 1
+ note noise7, 5
+ note noise5, 6
+ Speed 11
+ note noise3, 1
+ note noise1, 1
+ music_call Branch_f6b4d
+ note noise7, 1
+ note noise3, 1
+ note noise1, 1
+ music_call Branch_f6b4d
+ Speed 1
+ note noise7, 5
+ note noise5, 6
+ Speed 11
+ note noise3, 2
+ note noisec, 8
+ rest 4
+ Speed 1
+ note noise5, 3
+ note noise5, 2
+ note noise3, 6
+ note noise3, 5
+ note noise3, 6
+ note noise3, 5
+ note noise3, 6
+ Speed 11
+ note noise3, 1
+ Loop 7
+ music_call Branch_f6b65
+ Speed 1
+ note noise1, 6
+ EndLoop
+ music_call Branch_f6b65
+ Speed 1
+ note noise3, 6
+ Loop 15
+ music_call Branch_f6b65
+ Speed 1
+ note noise1, 6
+ EndLoop
+ Speed 11
+ note noise1, 1
+ Speed 1
+ note noise7, 5
+ note noise1, 6
+ Speed 11
+ note noise3, 1
+ Speed 1
+ note noise7, 5
+ note noise9, 6
+ note noise7, 5
+ note noise5, 6
+ note noise7, 5
+ note noise1, 6
+ note noise3, 5
+ note noise3, 6
+ note noise3, 5
+ note noise3, 6
+ music_call Branch_f6b9a
+ note noise1, 1
+ Speed 1
+ note noise7, 5
+ note noise5, 6
+ note noise3, 5
+ note noise3, 6
+ note noise3, 5
+ note noise3, 6
+ music_call Branch_f6b9a
+ Speed 1
+ note noise1, 5
+ note noise5, 6
+ note noise3, 5
+ note noise3, 6
+ note noise3, 5
+ note noise3, 6
+ note noise3, 5
+ note noise3, 6
+ Speed 11
+ EndMainLoop
+
+Branch_f6b40:
+ note noise1, 2
+ note noise7, 1
+ note noise1, 1
+ note noise3, 2
+ note noise7, 1
+ note noise1, 1
+ note noise7, 1
+ note noise1, 1
+ note noise9, 2
+ note noise3, 2
+ note noise7, 1
+ note noise3, 1
+ music_ret
+
+Branch_f6b4d:
+ note noise1, 1
+ note noise3, 1
+ note noise7, 1
+ note noise1, 1
+ note noise3, 1
+ note noise9, 1
+ note noise1, 1
+ note noise3, 1
+ note noise7, 1
+ note noise1, 1
+ note noise3, 1
+ note noise9, 1
+ note noise1, 1
+ note noise3, 1
+ note noise7, 1
+ note noise1, 1
+ note noise3, 1
+ note noise9, 1
+ note noise1, 1
+ note noise3, 1
+ note noise7, 1
+ note noise1, 1
+ note noise3, 1
+ music_ret
+
+Branch_f6b65:
+ Speed 11
+ note noise1, 1
+ Speed 1
+ note noise7, 5
+ note noise1, 6
+ Speed 11
+ note noise3, 1
+ Speed 1
+ note noise7, 5
+ note noise9, 6
+ note noise7, 5
+ note noise5, 6
+ note noise7, 5
+ note noise1, 6
+ Speed 11
+ note noise3, 1
+ Speed 1
+ note noise7, 5
+ music_ret
+
+Branch_f6b7e:
+ note noise1, 2
+ note noise7, 1
+ note noise3, 1
+ note noise7, 1
+ note noise9, 1
+ note noise3, 1
+ note noise1, 1
+ note noise3, 1
+ note noise9, 1
+ note noise1, 1
+ note noise3, 1
+ note noise3, 1
+ note noise1, 1
+ note noise3, 1
+ note noise1, 1
+ note noise1, 2
+ note noise7, 1
+ note noise3, 1
+ note noise7, 1
+ note noise9, 1
+ note noise3, 1
+ note noise1, 1
+ note noise3, 1
+ note noise9, 1
+ note noise1, 1
+ note noise3, 1
+ note noise3, 1
+ music_ret
+
+Branch_f6b9a:
+ Speed 11
+ Loop 3
+ Loop 5
+ note noise1, 1
+ Speed 1
+ note noise7, 5
+ note noise5, 6
+ Speed 11
+ note noise3, 1
+ EndLoop
+ note noise1, 1
+ EndLoop
+ Loop 4
+ note noise1, 1
+ Speed 1
+ note noise7, 5
+ note noise5, 6
+ Speed 11
+ note noise3, 1
+ EndLoop
+ music_ret
+; 0xf6bb7 \ No newline at end of file
diff --git a/music/cardpop.asm b/music/cardpop.asm
index dc1c70b..4954080 100644
--- a/music/cardpop.asm
+++ b/music/cardpop.asm
@@ -263,7 +263,37 @@ Branch_f716c:
rest 2
note G_, 2
music_ret
-; 0xf717d
+
Music_CardPop_Ch4: ; f717d (3d:717d)
-INCBIN "baserom.gbc",$f717d,$f71a0 - $f717d \ No newline at end of file
+ Speed 4
+ musicdx 1
+ Loop 11
+ music_call Branch_f7196
+ note noise9, 4
+ note noise3, 2
+ note noise7, 2
+ note noise9, 2
+ note noise3, 2
+ EndLoop
+ music_call Branch_f7196
+ note noise9, 2
+ note noise5, 1
+ note noise5, 1
+ Loop 4
+ note noise3, 2
+ EndLoop
+ EndMainLoop
+
+Branch_f7196:
+ note noise1, 2
+ note noise7, 2
+ note noise9, 4
+ note noise3, 2
+ note noise7, 2
+ note noise9, 2
+ note noise3, 2
+ note noise1, 2
+ note noise3, 2
+ music_ret
+; 0xf71a0 \ No newline at end of file
diff --git a/music/challengehall.asm b/music/challengehall.asm
index e9bc618..cb141c6 100644
--- a/music/challengehall.asm
+++ b/music/challengehall.asm
@@ -1028,7 +1028,60 @@ Branch_f9b92:
rest 8
musicd8
music_ret
-; 0xf9ba9
+
Music_ChallengeHall_Ch4: ; f9ba9 (3e:5ba9)
-INCBIN "baserom.gbc",$f9ba9,$f9be5 - $f9ba9 \ No newline at end of file
+ Speed 1
+ Speed 10
+ Loop 2
+ rest 6
+ EndLoop
+ MainLoop
+ Speed 1
+ note noise3, 4
+ note noise5, 3
+ note noise5, 4
+ note noise5, 4
+ Loop 7
+ note noise5, 4
+ note noise5, 3
+ note noise5, 4
+ note noise5, 4
+ EndLoop
+ note noise3, 15
+ note noise3, 7
+ note noise3, 8
+ note noise3, 15
+ note noise3, 15
+ note noise3, 15
+ note noise3, 4
+ note noise5, 3
+ note noise5, 4
+ note noise5, 4
+ note noise3, 15
+ note noise3, 15
+ Loop 15
+ note noise1, 15
+ note noise3, 15
+ note noise1, 15
+ note noise3, 15
+ note noise1, 15
+ note noise3, 4
+ note noise5, 3
+ note noise5, 4
+ note noise5, 4
+ note noise1, 15
+ note noise3, 15
+ EndLoop
+ note noise1, 15
+ note noise3, 4
+ note noise5, 3
+ note noise5, 4
+ note noise5, 4
+ note noise3, 15
+ note noise3, 15
+ Speed 10
+ note noise3, 3
+ rest 3
+ EndMainLoop
+; 0xf9be5 \ No newline at end of file
diff --git a/music/club1.asm b/music/club1.asm
index 1fe3271..b24ce8e 100644
--- a/music/club1.asm
+++ b/music/club1.asm
@@ -868,7 +868,53 @@ Branch_fa01a:
musice8 4
note E_, 2
music_ret
-; 0xfa044
+
Music_Club1_Ch4: ; fa044 (3e:6044)
-INCBIN "baserom.gbc",$fa044,$fa077 - $fa044 \ No newline at end of file
+ Speed 5
+ musicdx 1
+ note noise1, 2
+ rest 2
+ note noise1, 2
+ note noise3, 2
+ note noise7, 2
+ note noise9, 2
+ note noise1, 2
+ rest 2
+ note noise1, 2
+ note noise3, 2
+ note noise7, 2
+ note noise9, 2
+ note noise3, 4
+ note noise5, 1
+ note noise5, 1
+ note noise3, 4
+ note noise3, 2
+ rest 4
+ note noise5, 1
+ note noise5, 1
+ note noise3, 4
+ note noise3, 2
+ MainLoop
+ music_call Branch_fa06f
+ note noise1, 4
+ Loop 4
+ note noise3, 2
+ EndLoop
+ music_call Branch_fa06f
+ note noise1, 4
+ note noise5, 1
+ note noise5, 1
+ note noise3, 4
+ note noise3, 2
+ EndMainLoop
+
+Branch_fa06f:
+ Loop 15
+ note noise1, 4
+ note noise7, 2
+ note noise3, 4
+ note noise7, 2
+ EndLoop
+ music_ret
+; 0xfa077 \ No newline at end of file
diff --git a/music/club3.asm b/music/club3.asm
index 2111abf..36d7239 100644
--- a/music/club3.asm
+++ b/music/club3.asm
@@ -1060,7 +1060,43 @@ Music_Club3_Ch3: ; fa63e (3e:663e)
note C_, 1
EndLoop
EndMainLoop
-; 0xfa772
+
Music_Club3_Ch4: ; fa772 (3e:6772)
-INCBIN "baserom.gbc",$fa772,$fa7a0 - $fa772 \ No newline at end of file
+ Speed 9
+ musicdx 1
+ MainLoop
+ Loop 3
+ music_call Branch_fa796
+ note noise3, 2
+ note noise9, 2
+ music_call Branch_fa796
+ note noise3, 2
+ note noise7, 1
+ note noise3, 1
+ EndLoop
+ music_call Branch_fa796
+ note noise3, 2
+ note noise9, 2
+ music_call Branch_fa796
+ note noise3, 1
+ Speed 1
+ note noise7, 5
+ note noise3, 4
+ Speed 9
+ note noise3, 1
+ note noise3, 1
+ EndMainLoop
+
+Branch_fa796:
+ note noise1, 2
+ note noise7, 2
+ note noise3, 2
+ note noise7, 1
+ note noise3, 1
+ note noise7, 1
+ note noise1, 1
+ note noise9, 1
+ note noise1, 1
+ music_ret
+; 0xfa7a0 \ No newline at end of file
diff --git a/music/credits.asm b/music/credits.asm
index 54d7b67..6d1aa68 100644
--- a/music/credits.asm
+++ b/music/credits.asm
@@ -2299,7 +2299,133 @@ Branch_fbe3d:
note G_, 13
note A_, 13
music_ret
-; 0xfbe51
+
Music_Credits_Ch4: ; fbe51 (3e:7e51)
-INCBIN "baserom.gbc",$fbe51,$fbef7 - $fbe51 \ No newline at end of file
+ Speed 1
+ musicdx 1
+ Loop 8
+ note noise5, 13
+ EndLoop
+ Loop 4
+ note noise3, 13
+ EndLoop
+ Loop 4
+ note noise3, 6
+ note noise3, 7
+ EndLoop
+ music_call Branch_fbe86
+ Loop 7
+ music_call Branch_fbed1
+ EndLoop
+ note noise1, 13
+ note noise7, 13
+ note noise3, 13
+ note noise7, 6
+ note noise5, 4
+ note noise5, 3
+ Loop 4
+ note noise3, 6
+ note noise3, 7
+ EndLoop
+ music_call Branch_fbe86
+ Loop 2
+ music_call Branch_fbed1
+ EndLoop
+ music_call Branch_fbeea
+ Speed 13
+ note noisec, 8
+ rest 3
+ music_end
+
+Branch_fbe86:
+ Loop 6
+ music_call Branch_fbed1
+ EndLoop
+ note noise1, 13
+ note noise7, 13
+ note noise3, 13
+ note noise7, 6
+ note noise7, 7
+ note noise1, 13
+ note noise7, 13
+ note noise3, 13
+ Speed 13
+ note noisec, 7
+ note noise3, 2
+ Speed 1
+ Loop 15
+ music_call Branch_fbed1
+ EndLoop
+ music_call Branch_fbedb
+ Loop 7
+ music_call Branch_fbed1
+ EndLoop
+ music_call Branch_fbedb
+ Loop 7
+ music_call Branch_fbed1
+ EndLoop
+ music_call Branch_fbeea
+ Loop 7
+ music_call Branch_fbed1
+ EndLoop
+ note noise1, 13
+ note noise7, 13
+ note noise3, 13
+ note noise7, 6
+ note noise7, 7
+ note noise1, 13
+ note noise7, 6
+ note noise5, 4
+ note noise5, 3
+ note noise3, 6
+ note noise3, 7
+ note noise3, 13
+ Loop 5
+ music_call Branch_fbed1
+ EndLoop
+ music_call Branch_fbeea
+ music_ret
+
+Branch_fbed1:
+ note noise1, 13
+ note noise7, 13
+ note noise3, 13
+ note noise7, 6
+ note noise7, 7
+ note noise1, 13
+ note noise7, 13
+ note noise3, 13
+ note noise9, 13
+ music_ret
+
+Branch_fbedb:
+ note noise1, 13
+ note noise7, 6
+ note noise5, 7
+ note noise3, 6
+ note noise3, 7
+ Loop 2
+ note noise3, 6
+ note noise5, 4
+ note noise5, 3
+ note noise3, 6
+ note noise3, 7
+ EndLoop
+ note noise3, 13
+ music_ret
+
+Branch_fbeea:
+ note noise1, 13
+ note noise7, 13
+ note noise3, 13
+ note noise7, 6
+ note noise5, 4
+ note noise5, 3
+ Loop 3
+ note noise3, 6
+ note noise3, 7
+ EndLoop
+ note noise3, 13
+ music_ret
+; 0xfbef7 \ No newline at end of file
diff --git a/music/deckmachine.asm b/music/deckmachine.asm
index 5eecad3..3570889 100644
--- a/music/deckmachine.asm
+++ b/music/deckmachine.asm
@@ -222,7 +222,37 @@ Music_DeckMachine_Ch3: ; f6f7b (3d:6f7b)
note B_, 7
rest 8
EndMainLoop
-; 0xf7018
+
Music_DeckMachine_Ch4: ; f7018 (3d:7018)
-INCBIN "baserom.gbc",$f7018,$f703a - $f7018 \ No newline at end of file
+ Speed 1
+ musicdx 1
+ MainLoop
+ Loop 9
+ music_call Branch_f7031
+ note noise9, 15
+ note noise3, 7
+ note noise7, 8
+ note noise9, 15
+ EndLoop
+ music_call Branch_f7031
+ note noise9, 7
+ note noise5, 4
+ note noise5, 4
+ note noise3, 7
+ note noise3, 8
+ note noise3, 7
+ note noise3, 8
+ EndMainLoop
+
+Branch_f7031:
+ note noise1, 7
+ note noise7, 8
+ note noise9, 15
+ note noise3, 7
+ note noise7, 8
+ note noise9, 15
+ note noise1, 7
+ note noise7, 8
+ music_ret
+; 0xf703a \ No newline at end of file
diff --git a/music/imakuni.asm b/music/imakuni.asm
index b3b7d0d..6511db1 100644
--- a/music/imakuni.asm
+++ b/music/imakuni.asm
@@ -470,7 +470,70 @@ Branch_faf7d:
rest 5
musicd7
music_ret
-; 0xfafa4
+
Music_Imakuni_Ch4: ; fafa4 (3e:6fa4)
-INCBIN "baserom.gbc",$fafa4,$fafea - $fafa4 \ No newline at end of file
+ Speed 1
+ musicdx 1
+ Loop 10
+ note noise1, 15
+ note noise7, 7
+ note noise1, 8
+ note noise3, 15
+ note noise1, 15
+ note noise7, 7
+ note noise7, 8
+ note noise9, 15
+ note noise7, 7
+ note noise7, 8
+ note noise9, 15
+ note noise7, 15
+ note noise1, 15
+ note noise3, 15
+ note noise9, 15
+ note noise1, 7
+ note noise7, 8
+ note noise3, 15
+ note noise3, 15
+ note noise7, 7
+ note noise3, 8
+ EndLoop
+ Loop 2
+ Speed 11
+ note noisec, 2
+ Speed 1
+ note noise3, 8
+ note noise3, 15
+ note noise3, 15
+ note noise3, 7
+ note noise3, 8
+ note noise3, 7
+ note noise3, 8
+ Speed 3
+ note noisec, 10
+ EndLoop
+ Speed 1
+ note noise3, 15
+ note noise7, 7
+ note noise3, 8
+ note noise9, 15
+ note noise3, 15
+ note noise7, 7
+ note noise3, 8
+ note noise9, 15
+ note noise3, 15
+ note noise7, 7
+ note noise3, 8
+ note noise9, 15
+ note noise3, 15
+ note noise7, 7
+ note noise3, 8
+ note noise9, 15
+ note noise3, 15
+ note noise7, 4
+ note noise7, 4
+ note noise3, 7
+ note noise3, 15
+ note noise3, 15
+ EndMainLoop
+; 0xfafea \ No newline at end of file
diff --git a/music/overworld.asm b/music/overworld.asm
index 68cd583..1154621 100644
--- a/music/overworld.asm
+++ b/music/overworld.asm
@@ -1384,7 +1384,90 @@ Branch_f7826:
musice8 3
note D_, 2
music_ret
-; 0xf78af
+
Music_Overworld_Ch4: ; f78af (3d:78af)
-INCBIN "baserom.gbc",$f78af,$f7919 - $f78af \ No newline at end of file
+ Speed 7
+ musicdx 1
+ music_call Branch_f78ee
+ music_call Branch_f78fb
+ MainLoop
+ music_call Branch_f78ee
+ note noise1, 3
+ note noise7, 2
+ note noise1, 1
+ note noise3, 3
+ note noise7, 2
+ note noise9, 1
+ note noise1, 2
+ note noise7, 1
+ note noise7, 3
+ note noise3, 1
+ note noise7, 1
+ note noise7, 1
+ note noise3, 3
+ Loop 3
+ music_call Branch_f78ee
+ music_call Branch_f78fb
+ EndLoop
+ music_call Branch_f78ee
+ music_call Branch_f790a
+ Loop 3
+ music_call Branch_f78ee
+ music_call Branch_f78fb
+ EndLoop
+ music_call Branch_f78ee
+ music_call Branch_f790a
+ music_call Branch_f78ee
+ music_call Branch_f78fb
+ EndMainLoop
+
+Branch_f78ee:
+ note noise1, 3
+ note noise7, 2
+ note noise1, 1
+ note noise3, 3
+ note noise7, 2
+ note noise9, 1
+ note noise1, 2
+ note noise7, 1
+ note noise7, 3
+ note noise3, 3
+ note noise7, 2
+ note noise9, 1
+ music_ret
+
+Branch_f78fb:
+ note noise1, 3
+ note noise7, 2
+ note noise1, 1
+ note noise3, 3
+ note noise7, 2
+ note noise9, 1
+ note noise1, 2
+ note noise7, 1
+ note noise7, 3
+ note noise3, 1
+ note noise7, 1
+ note noise7, 1
+ note noise7, 2
+ note noise9, 1
+ music_ret
+
+Branch_f790a:
+ note noise1, 3
+ note noise7, 2
+ note noise1, 1
+ note noise3, 3
+ note noise7, 2
+ note noise9, 1
+ note noise1, 2
+ note noise7, 1
+ note noise7, 3
+ note noise3, 1
+ note noise7, 1
+ note noise7, 1
+ note noise3, 2
+ note noise3, 1
+ music_ret
+; 0xf7919 \ No newline at end of file
diff --git a/music/pausemenu.asm b/music/pausemenu.asm
index 66b3917..7c76830 100644
--- a/music/pausemenu.asm
+++ b/music/pausemenu.asm
@@ -542,7 +542,42 @@ Music_PauseMenu_Ch3: ; f6e2d (3d:6e2d)
musice6 96
note D_, 3
EndMainLoop
-; 0xf6ec8
+
Music_PauseMenu_Ch4: ; f6ec8 (3d:6ec8)
-INCBIN "baserom.gbc",$f6ec8,$f6ef1 - $f6ec8 \ No newline at end of file
+ Speed 7
+ musicdx 1
+ MainLoop
+ Loop 2
+ Loop 7
+ note noise1, 1
+ note noise7, 1
+ note noise9, 2
+ note noise3, 1
+ note noise7, 1
+ note noise9, 1
+ note noise5, 1
+ note noise1, 1
+ note noise7, 1
+ note noise9, 2
+ note noise3, 1
+ note noise7, 1
+ note noise9, 1
+ note noise3, 1
+ EndLoop
+ note noise1, 1
+ note noise7, 1
+ note noise9, 2
+ note noise3, 1
+ note noise7, 1
+ note noise9, 1
+ Speed 1
+ note noise5, 4
+ note noise5, 3
+ Speed 7
+ Loop 8
+ note noise3, 1
+ EndLoop
+ EndLoop
+ EndMainLoop
+; 0xf6ef1 \ No newline at end of file
diff --git a/music/pcmainmenu.asm b/music/pcmainmenu.asm
index ed1f6a1..c210c4c 100644
--- a/music/pcmainmenu.asm
+++ b/music/pcmainmenu.asm
@@ -339,7 +339,39 @@ Music_PCMainMenu_Ch3: ; f9189 (3e:5189)
note G#, 2
Speed 7
EndMainLoop
-; 0xf922b
+
Music_PCMainMenu_Ch4: ; f922b (3e:522b)
-INCBIN "baserom.gbc",$f922b,$f9251 - $f922b \ No newline at end of file
+ Speed 7
+ musicdx 1
+ MainLoop
+ Loop 7
+ music_call Branch_f9248
+ note noise7, 1
+ note noise1, 1
+ note noise3, 2
+ note noise7, 1
+ note noise9, 1
+ EndLoop
+ music_call Branch_f9248
+ note noise9, 1
+ Speed 1
+ note noise5, 4
+ note noise5, 3
+ Speed 7
+ note noise3, 2
+ note noise3, 1
+ note noise3, 1
+ EndMainLoop
+
+Branch_f9248:
+ note noise1, 2
+ note noise7, 1
+ note noise7, 1
+ note noise3, 2
+ note noise7, 1
+ note noise9, 1
+ note noise1, 1
+ note noise5, 1
+ music_ret
+; 0xf9251 \ No newline at end of file
diff --git a/music/pokemondome.asm b/music/pokemondome.asm
index 165a4d7..f3547dd 100644
--- a/music/pokemondome.asm
+++ b/music/pokemondome.asm
@@ -770,7 +770,30 @@ Branch_f9613:
musice8 6
note G_, 2
music_ret
-; 0xf9629
+
Music_PokemonDome_Ch4: ; f9629 (3e:5629)
-INCBIN "baserom.gbc",$f9629,$f9646 - $f9629 \ No newline at end of file
+ Speed 7
+ musicdx 1
+ note noisec, 8
+ Speed 1
+ note noise3, 4
+ note noise5, 3
+ Loop 7
+ note noise5, 4
+ note noise5, 3
+ EndLoop
+ MainLoop
+ Loop 2
+ Speed 7
+ note noise3, 2
+ note noise3, 2
+ rest 2
+ Speed 1
+ note noise3, 4
+ note noise5, 3
+ note noise5, 4
+ note noise5, 3
+ EndLoop
+ EndMainLoop
+; 0xf9646 \ No newline at end of file
diff --git a/music/ronald.asm b/music/ronald.asm
index b79ac03..398d720 100644
--- a/music/ronald.asm
+++ b/music/ronald.asm
@@ -1122,7 +1122,96 @@ Branch_facc5:
note D#, 6
rest 7
music_ret
-; 0xface0
+
Music_Ronald_Ch4: ; face0 (3e:6ce0)
-INCBIN "baserom.gbc",$face0,$fad55 - $face0 \ No newline at end of file
+ Speed 1
+ musicdx 1
+ MainLoop
+ Loop 3
+ music_call Branch_fad46
+ note noise7, 13
+ music_call Branch_fad4f
+ note noise5, 7
+ note noise1, 6
+ note noise5, 7
+ note noise9, 6
+ note noise1, 7
+ note noise3, 13
+ note noise7, 6
+ note noise5, 7
+ EndLoop
+ music_call Branch_fad46
+ note noise7, 13
+ music_call Branch_fad4f
+ note noise5, 7
+ note noise1, 13
+ note noise9, 6
+ note noise5, 3
+ note noise5, 4
+ Loop 2
+ note noise3, 6
+ note noise3, 7
+ EndLoop
+ Loop 2
+ Loop 7
+ music_call Branch_fad46
+ note noise7, 13
+ music_call Branch_fad4f
+ note noise5, 7
+ note noise1, 6
+ note noise5, 7
+ note noise9, 6
+ note noise1, 7
+ note noise3, 13
+ note noise7, 6
+ note noise5, 7
+ EndLoop
+ music_call Branch_fad46
+ note noise7, 13
+ music_call Branch_fad4f
+ note noise5, 3
+ note noise5, 4
+ Loop 4
+ note noise3, 6
+ note noise3, 7
+ EndLoop
+ EndLoop
+ Loop 6
+ music_call Branch_fad46
+ note noise7, 13
+ EndLoop
+ music_call Branch_fad46
+ Speed 13
+ note noisec, 4
+ Speed 1
+ rest 6
+ note noise5, 3
+ note noise5, 4
+ note noise3, 6
+ note noise3, 7
+ Loop 2
+ note noise5, 6
+ note noise3, 7
+ EndLoop
+ note noise3, 6
+ note noise5, 7
+ EndMainLoop
+
+Branch_fad46:
+ music_call Branch_fad4f
+ note noise5, 7
+ note noise1, 13
+ note noise9, 6
+ note noise1, 7
+ note noise3, 13
+ music_ret
+
+Branch_fad4f:
+ note noise1, 13
+ note noise9, 6
+ note noise1, 7
+ note noise3, 13
+ note noise1, 6
+ music_ret
+; 0xfad55 \ No newline at end of file
diff --git a/music/titlescreen.asm b/music/titlescreen.asm
index af2870c..3ec188f 100644
--- a/music/titlescreen.asm
+++ b/music/titlescreen.asm
@@ -504,7 +504,45 @@ Branch_f52f0:
note G_, 4
note G_, 4
music_ret
-; 0xf52fa
+
Music_TitleScreen_Ch4: ; f52fa (3d:52fa)
-INCBIN "baserom.gbc",$f52fa,$f532a - $f52fa \ No newline at end of file
+ Speed 7
+ musicdx 1
+ rest 4
+ Loop 16
+ music_call Branch_f5312
+ EndLoop
+ Loop 8
+ music_call Branch_f531e
+ EndLoop
+ Loop 10
+ music_call Branch_f5312
+ EndLoop
+ note noise3, 8
+ music_end
+
+Branch_f5312:
+ Speed 7
+ note noise3, 2
+ note noise5, 2
+ note noise3, 2
+ Speed 1
+ note noise5, 4
+ note noise5, 3
+ note noise5, 4
+ note noise5, 3
+ music_ret
+
+Branch_f531e:
+ Speed 7
+ note noise3, 2
+ note noise3, 2
+ rest 2
+ Speed 1
+ note noise3, 4
+ note noise5, 3
+ note noise5, 4
+ note noise5, 3
+ music_ret
+; 0xf532a \ No newline at end of file
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-04 05:16:25 +0000