diff options
| author | KuroiIeWa5Da <tyuki@adu.me> | 2012-01-23 04:25:21 -0600 |
|---|---|---|
| committer | KuroiIeWa5Da <tyuki@adu.me> | 2012-01-23 04:25:21 -0600 |
| commit | 1014adc83cbd6df9bf91a92e5d23d48c601abe07 (patch) | |
| tree | 8c32ee8a4415bf96ef8fdeb033e0b94079cfaf93 | |
| parent | a297c105b5269f51d85b07308aa1c0c87eb9daca (diff) | |
Completed Routes3 music data channel 1
hg-commit-id: be5b52f43ccc
| -rw-r--r-- | music.asm | 86 | ||||
| -rw-r--r-- | music/pokeredmusicdisasm/main.cpp | 4 |
2 files changed, 88 insertions, 2 deletions
@@ -1168,7 +1168,91 @@ Routes2_md_4: ;9F08 - 9FAC ;Routes 3, 4, 5, 6, 7, 8, 9, 10, 16, 17, 18, 19, 20, 21, 22
Routes3_md_1: ;9FAD - A008
-INCBIN "baserom.gbc",$9fad,$a009 - $9fad
+ ; 9FAD
+ mus_tempo 0, 148
+ mus_volume 119
+ mus_duty duty75
+ mus_mod 6, 3, 4
+ db $E8
+ mus_vel 11, 5
+
+ mus_octave oct2
+ mus_note noteE, note16
+ mus_note noteF#, note16
+ mus_note noteG, note4_8
+ mus_note noteF, note16
+ mus_note noteG, note16
+ mus_note noteE, note16
+ mus_note noteRst, note1
+ mus_note noteRst, note2_4_8_16
+
+branch_9FC3:
+ mus_vel 11, 5
+ mus_note noteE, note4_8
+ mus_note noteD, note16
+ mus_note noteE, note16
+ mus_note noteC, note4
+ mus_note noteE, note4
+ mus_note noteC, note4_8
+ mus_note noteD, note16
+ mus_note noteE, note16
+ mus_note noteF, note8
+ mus_note noteG, note8
+ mus_note noteG, note8
+ mus_note noteA, note8
+ mus_vel 10, 7
+ mus_note noteA#, note2
+ mus_note noteF, note2
+ mus_note noteD, note2
+ mus_note noteF, note2
+ mus_vel 11, 5
+ mus_note noteE, note4_8
+ mus_note noteD, note16
+ mus_note noteE, note16
+ mus_note noteC, note4
+ mus_note noteE, note4
+ mus_note noteC, note4_8
+ mus_note noteD, note16
+ mus_note noteE, note16
+ mus_note noteF, note8
+ mus_note noteG, note8
+ mus_note noteG, note8
+ mus_note noteA, note8
+ mus_vel 10, 7
+ mus_note noteA#, note2
+ mus_note noteA#, note2
+ mus_note noteD, note2
+ mus_note noteF, note2
+ mus_vel 11, 5
+ mus_note noteE, note4
+ mus_note noteE, note8
+ mus_note noteF, note8
+ mus_note noteG, note4
+ mus_note noteF, note8
+ mus_note noteE, note8
+ mus_note noteB, note8
+
+ mus_octave oct1
+ mus_note noteG, note4
+
+ mus_octave oct2
+ mus_note noteB, note2
+ mus_note noteA, note8
+ db $D8
+ mus_note noteRst, note4
+ mus_note noteA, note4
+ mus_note noteF, note4
+ mus_note noteA, note4
+ db $D8
+ mus_note noteE, note1
+ mus_note noteA, note2_4
+ db $D8
+ mus_note noteA, note16
+ mus_note noteF, note2_4
+ mus_note noteG, note2_4
+ mus_jump 0, branch_9FC3
+ ;A008
+ ;No end byte until indigo plateu channel 1
Routes3_md_2: ;A009 - A07E
INCBIN "baserom.gbc",$a009,$a07f - $a009
diff --git a/music/pokeredmusicdisasm/main.cpp b/music/pokeredmusicdisasm/main.cpp index 40fca2ae..d2841c6b 100644 --- a/music/pokeredmusicdisasm/main.cpp +++ b/music/pokeredmusicdisasm/main.cpp @@ -10,6 +10,7 @@ int main(int argc, char** argv) const unsigned char parameters = 2;
const unsigned char self = 1;
const unsigned char _max_argc = parameters + self;
+ const string defFileLoc = "../baserom.gbc";
string arg1; // Offset
string arg2; // File or "--" (if "--" then the file is assumed)
@@ -24,7 +25,7 @@ int main(int argc, char** argv) else if(argc == (_max_argc - 1))
{
arg1 = argv[1];
- arg2 = "../baserom.gbc";
+ arg2 = defFileLoc;
}
// Process any parameters
@@ -39,6 +40,7 @@ int main(int argc, char** argv) if(arg1 == "") Console::Ask("What offset in the file in hex (0x----): ", arg1);
if(arg2 == "") Console::Ask("What file: ", arg2);
+ if(arg2 == "--") arg2 = defFileLoc; // You can also put "--" for the default file location
// Weird way of converting arg1 to an unsigned integer
Parser p(arg2);
|