ref: 6a85dc48e1ef04b23a72694ed1d0271a44aa22c3
parent: 1014adc83cbd6df9bf91a92e5d23d48c601abe07
author: KuroiIeWa5Da <tyuki@adu.me>
date: Sun Jan 22 23:33:56 EST 2012
Completed Routes3 music data channel 2 hg-commit-id: ef99ba55bb1b
--- a/music.asm
+++ b/music.asm
@@ -1255,7 +1255,128 @@
;No end byte until indigo plateu channel 1
Routes3_md_2: ;A009 - A07E
-INCBIN "baserom.gbc",$a009,$a07f - $a009
+ ; A009
+ mus_mod 8, 2, 3
+ mus_duty duty50
+ mus_vel 12, 7
+
+ mus_octave oct2
+ mus_note noteG, note16
+ mus_note noteA#, note16
+ mus_note noteB, note4_8
+ mus_note noteA, note16
+ mus_note noteB, note16
+
+ mus_octave oct3
+ mus_note noteC, note16
+ mus_note noteRst, note2_4_8_16
+ mus_note noteRst, note1
+ mus_vel 12, 7
+ mus_duty duty50
+
+ mus_octave oct3
+ mus_note noteC, note4_8
+
+ mus_octave oct2
+ mus_note noteG, note16
+
+ mus_octave oct3
+ mus_note noteC, note16
+ mus_note noteE, note2_8
+
+ mus_octave oct2
+ mus_note noteG, note8
+
+ mus_octave oct3
+ mus_note noteC, note8
+ mus_note noteG, note8
+ mus_note noteF, note8
+ mus_note noteE, note8
+ mus_note noteD, note8
+ mus_note noteC, note8
+ mus_note noteD, note2
+ mus_note noteF, note2
+ mus_vel 12, 5
+ mus_duty duty75
+
+ mus_octave oct2
+ mus_note noteA#, note2
+ mus_note noteA, note2
+ mus_vel 12, 7
+ mus_duty duty50
+
+ mus_octave oct3
+ mus_note noteC, note4_8
+
+ mus_octave oct2
+ mus_note noteG, note16
+
+ mus_octave oct3
+ mus_note noteC, note16
+ mus_note noteE, note2_8
+
+ mus_octave oct2
+ mus_note noteG, note8
+
+ mus_octave oct3
+ mus_note noteC, note8
+ mus_note noteG, note8
+ mus_note noteF, note8
+ mus_note noteE, note8
+ mus_note noteD, note8
+ mus_note noteC, note8
+ mus_note noteD, note2
+ mus_note noteF, note2
+ mus_vel 12, 5
+ mus_duty duty75
+
+ mus_octave oct2
+ mus_note noteA#, note2
+
+ mus_octave oct3
+ mus_note noteD, note4_8
+ mus_vel 12, 7
+ mus_duty duty50
+ mus_note noteC, note16
+ mus_note noteD, note16
+ mus_note noteE, note8
+ mus_note noteD, note8
+ mus_note noteE, note8
+ mus_note noteC, note2
+
+ mus_octave oct2
+ mus_note noteB, note16
+
+ mus_octave oct3
+ mus_note noteC, note16
+ mus_note noteD, note8
+
+ mus_octave oct2
+ mus_note noteG, note4
+
+ mus_octave oct3
+ mus_note noteG, note2
+ mus_note noteF, note16
+ mus_note noteE, note16
+ db $D8
+ db $D3
+ mus_note noteF, note4
+ mus_note noteE, note4
+ db $D8
+ mus_note noteRst, note4_16
+ mus_note noteC, note4
+ db $D8
+ mus_note noteRst, note4_8
+ mus_note noteC, note2_4
+ mus_vel 10, 0
+ mus_duty duty75
+
+ mus_octave oct2
+ mus_note noteA, note2
+ mus_note noteB, note2
+ mus_jump 0, $601A
+ ; A07E
+ ;No end byte until indigo plateu channel 1
Routes3_md_3: ;A07F - 6130
INCBIN "baserom.gbc",$a07f,$a131 - $a07f
--- a/music/pokeredmusicdisasm/Parser.cpp
+++ b/music/pokeredmusicdisasm/Parser.cpp
@@ -114,7 +114,6 @@
for(unsigned int i = filePos; (i <= fileLength) && (stop == false); i++)
{
// There's a way to make this block shorter but for now it does it's job
- filePos = i;
// Check to see if it's the correct data type and if so then use it
if(tmpCall.IsValid(&rawBytesFixed[i])) // Should have made IsValid static
@@ -203,6 +202,8 @@
unkCode << "db $" << hex << uppercase << (short)rawBytesFixed[i];
parsedString.push_back(unkCode.str());
}
+
+ filePos = i;
// If the stop address parameter is set, break when we get there
if( (stopAddress != 0) && (i >= stopAddress) ) break;