From 6eb7d68b57cb678f1b2f25cc8278f34c26d79eb3 Mon Sep 17 00:00:00 2001 From: KuroiIeWa5Da Date: Mon, 23 Jan 2012 02:49:54 -0600 Subject: [PATCH 01/20] Completed Routes2 music data channel 1 hg-commit-id: 5990f73fccf8 --- music.asm | 182 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 180 insertions(+), 2 deletions(-) diff --git a/music.asm b/music.asm index 34145984..93bd370b 100644 --- a/music.asm +++ b/music.asm @@ -604,8 +604,186 @@ Routes1_md_4: ;9D24 - 9DB8 ; 9DB8 ;Routes 24 and 25 -Routes2_md_1: ;9BD9 - 9E4E -INCBIN "baserom.gbc",$9db9,$9e4f - $9db9 +Routes2_md_1: ;9DB9 - 9E4E + ; 9DB9 + mus_tempo 0, 152 + mus_volume 119 + mus_mod 9, 2, 5 + mus_duty duty25 + +branch_9DBC: + mus_vel 11, 2 + + mus_octave oct1 + mus_note noteB, note4 + + mus_octave oct2 + mus_note noteG#, note4_8 + mus_note noteF#, note8 + mus_note noteE, note8 + mus_note noteD#, note16 + mus_note noteF#, note16 + mus_note noteE, note8 + + mus_octave oct1 + mus_note noteB, note8 + + mus_octave oct2 + mus_note noteE, note8 + mus_note noteA, note8 + mus_note noteG#, note4 + mus_note noteF#, note4 + + mus_octave oct1 + mus_note noteB, note4 + + mus_octave oct2 + mus_note noteG#, note4_8 + mus_note noteF#, note8 + mus_note noteE, note8 + mus_note noteD#, note16 + mus_note noteF#, note16 + mus_note noteB, note8 + + mus_octave oct1 + mus_note noteB, note8 + + mus_octave oct2 + mus_note noteE, note8 + mus_note noteA, note8 + mus_note noteG#, note4 + mus_note noteB, note4 + db $D8 + mus_note noteB, note8_16 + + mus_octave oct3 + mus_note noteE, note8 + + mus_octave oct2 + mus_note noteA, note8 + + mus_octave oct3 + mus_note noteE, note8 + mus_note noteE, note8 + + mus_octave oct2 + mus_note noteA, note8 + + mus_octave oct3 + mus_note noteE, note8 + mus_note noteD#, note8 + + mus_octave oct2 + mus_note noteG#, note8 + + mus_octave oct3 + mus_note noteD#, note8 + mus_note noteD#, note8 + + mus_octave oct2 + mus_note noteG#, note8 + + mus_octave oct3 + mus_note noteD#, note8 + mus_note noteC#, note8 + + mus_octave oct2 + mus_note noteF#, note8 + + mus_octave oct3 + mus_note noteC#, note8 + mus_note noteC#, note8 + + mus_octave oct2 + mus_note noteF#, note8 + + mus_octave oct3 + mus_note noteC#, note8 + + mus_octave oct2 + mus_note noteB, note8 + mus_note noteE, note8 + mus_note noteB, note8 + mus_note noteB, note8 + mus_note noteE, note8 + mus_note noteG#, note8 + mus_note noteF#, note8 + mus_note noteG#, note8 + mus_note noteA, note8 + mus_note noteA, note8 + mus_note noteF#, note8 + mus_note noteA, note8 + mus_note noteF#, note8 + mus_note noteG#, note8 + mus_note noteA, note8 + mus_note noteA, note8 + mus_note noteF#, note8 + mus_note noteA, note8 + mus_note noteG#, note8 + mus_note noteE, note8 + mus_note noteB, note8 + mus_note noteB, note8 + mus_note noteE, note8 + mus_note noteB, note8 + mus_note noteB, note8 + mus_note noteE, note8 + mus_note noteB, note8 + mus_note noteB, note8 + mus_note noteE, note8 + mus_note noteB, note8 + mus_note noteA, note8 + mus_note noteB, note8 + mus_note noteA, note8 + + mus_octave oct3 + mus_note noteC#, note8 + + mus_octave oct2 + mus_note noteB, note8 + + mus_octave oct3 + mus_note noteC#, note8 + mus_note noteD, note8 + + mus_octave oct2 + mus_note noteB, note8 + + mus_octave oct3 + mus_note noteD, note8 + mus_note noteF#, note8 + mus_note noteE, note8 + mus_note noteD#, note8 + mus_note noteE, note8 + + mus_octave oct2 + mus_note noteB, note8 + + mus_octave oct3 + mus_note noteE, note8 + mus_note noteE, note8 + + mus_octave oct2 + mus_note noteB, note8 + + mus_octave oct3 + mus_note noteE, note8 + mus_note noteE, note8 + + mus_octave oct2 + mus_note noteB, note8 + + mus_octave oct3 + mus_note noteE, note8 + mus_note noteE, note8 + + mus_octave oct2 + mus_note noteB, note8 + + mus_octave oct3 + mus_note noteE, note8 + mus_jump 0, branch_9DBC + mus_end + ; 9E4E Routes2_md_2: ;9E4F - 9E9A INCBIN "baserom.gbc",$9e4f,$9e9b - $9e4f From 85cba428ce469a114c51e012f01ae88dcd1905d2 Mon Sep 17 00:00:00 2001 From: KuroiIeWa5Da Date: Mon, 23 Jan 2012 02:55:58 -0600 Subject: [PATCH 02/20] Completed Routes2 music data channel 2 and 3 hg-commit-id: 7f710c0dcf5d --- music.asm | 218 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 216 insertions(+), 2 deletions(-) diff --git a/music.asm b/music.asm index 93bd370b..8a0e49d7 100644 --- a/music.asm +++ b/music.asm @@ -786,10 +786,224 @@ branch_9DBC: ; 9E4E Routes2_md_2: ;9E4F - 9E9A -INCBIN "baserom.gbc",$9e4f,$9e9b - $9e4f + + ; 9E4F + mus_mod 8, 2, 6 + mus_duty duty75 + +branch_9E54: + mus_vel 13, 4 + + mus_octave oct3 + mus_note noteE, note4_8 + + mus_octave oct2 + mus_note noteB, note16 + + mus_octave oct3 + mus_note noteE, note16 + mus_note noteF#, note4_8 + mus_note noteA, note8 + mus_note noteG#, note8_16 + mus_note noteE, note16 + mus_note noteF#, note2 + + mus_octave oct2 + mus_note noteD#, note4 + + mus_octave oct3 + mus_note noteE, note4_8 + + mus_octave oct2 + mus_note noteB, note16 + + mus_octave oct3 + mus_note noteE, note16 + mus_note noteF#, note4_8 + mus_note noteA, note8 + mus_note noteG#, note8_16 + mus_note noteE, note16 + mus_note noteB, note2 + + mus_octave oct2 + mus_note noteG#, note4 + + mus_octave oct4 + mus_note noteC#, note4_8 + + mus_octave oct3 + mus_note noteB, note16 + mus_note noteA, note16 + mus_note noteB, note4_8 + mus_note noteA, note16 + mus_note noteG#, note16 + mus_note noteA, note4_8 + mus_note noteG#, note16 + mus_note noteF#, note16 + mus_note noteG#, note4 + mus_note noteF#, note8 + mus_note noteE, note8 + mus_note noteD, note8 + mus_note noteD, note16 + mus_note noteE, note16 + mus_note noteF#, note2 + mus_note noteA, note4 + mus_note noteG#, note8_16 + mus_note noteF#, note16 + mus_note noteE, note2 + mus_note noteF#, note8 + mus_note noteE, note8 + mus_note noteD, note8 + mus_note noteD, note16 + mus_note noteE, note16 + mus_note noteF#, note8 + mus_note noteF#, note16 + mus_note noteG#, note16 + mus_note noteA, note4 + + mus_octave oct4 + mus_note noteC#, note4 + + mus_octave oct3 + mus_note noteB, note8_16 + mus_note noteA, note16 + mus_note noteG#, note2 + mus_note noteRst, note4 + mus_jump 0, branch_9E54 + mus_end + ; 9E9A Routes2_md_3: ;9E9B - 9F07 -INCBIN "baserom.gbc",$9e9b,$9f08 - $9e9b + ; 9E9B + mus_mod 9, 2, 8 + +branch_9E9E: + mus_vel 1, 1 + + mus_octave oct2 + mus_note noteE, note8 + mus_note noteRst, note8 + + mus_octave oct1 + mus_note noteB, note4_8 + + mus_octave oct2 + mus_note noteD, note16 + mus_note noteC#, note16 + mus_note noteD, note8 + mus_note noteD#, note8 + mus_note noteE, note8 + mus_note noteRst, note8 + + mus_octave oct1 + mus_note noteB, note4_8 + + mus_octave oct2 + mus_note noteD, note16 + mus_note noteC#, note16 + + mus_octave oct1 + mus_note noteA, note8 + + mus_octave oct2 + mus_note noteC#, note8 + mus_note noteE, note8 + mus_note noteRst, note8 + + mus_octave oct1 + mus_note noteB, note4_8 + + mus_octave oct2 + mus_note noteD, note16 + mus_note noteC#, note16 + mus_note noteD, note8 + mus_note noteD#, note8 + mus_note noteE, note8 + mus_note noteRst, note8 + + mus_octave oct1 + mus_note noteB, note4 + + mus_octave oct2 + mus_note noteC#, note8 + + mus_octave oct1 + mus_note noteB, note8 + + mus_octave oct2 + mus_note noteD, note8 + mus_note noteF#, note8 + mus_note noteE, note8 + mus_note noteRst, note8 + + mus_octave oct1 + mus_note noteA, note8 + mus_note noteRst, note8 + + mus_octave oct2 + mus_note noteD#, note8 + mus_note noteRst, note8 + + mus_octave oct1 + mus_note noteG#, note8 + mus_note noteRst, note8 + + mus_octave oct2 + mus_note noteC#, note8 + mus_note noteRst, note8 + + mus_octave oct1 + mus_note noteF#, note8 + mus_note noteRst, note8 + mus_note noteB, note8 + mus_note noteRst, note8 + mus_note noteE, note8 + mus_note noteG#, note8 + mus_note noteF#, note8 + mus_note noteRst, note8 + mus_note noteA, note8 + mus_note noteRst, note8 + mus_note noteF#, note8 + mus_note noteRst, note8 + mus_note noteA, note8 + mus_note noteRst, note8 + mus_note noteG#, note8 + mus_note noteRst, note8 + mus_note noteB, note8 + mus_note noteRst, note8 + mus_note noteG#, note8 + mus_note noteRst, note8 + mus_note noteB, note8 + mus_note noteRst, note8 + mus_note noteF#, note8 + mus_note noteRst, note8 + mus_note noteA, note8 + mus_note noteRst, note8 + + mus_octave oct2 + mus_note noteC#, note8 + mus_note noteRst, note8 + + mus_octave oct1 + mus_note noteA, note8 + + mus_octave oct2 + mus_note noteC#, note8 + + mus_octave oct1 + mus_note noteB, note8 + mus_note noteRst, note8 + + mus_octave oct2 + mus_note noteE, note8 + mus_note noteRst, note8 + mus_note noteG#, note8 + mus_note noteRst, note8 + mus_note noteE, note8 + mus_note noteRst, note8 + mus_jump 0, branch_9E9E + mus_end + ; 9F07 Routes2_md_4: ;9F08 - 9FAC INCBIN "baserom.gbc",$9f08,$9fad - $9f08 From 7b5159fb06fd66f79abb62bf35306a727a269987 Mon Sep 17 00:00:00 2001 From: KuroiIeWa5Da Date: Mon, 23 Jan 2012 02:58:52 -0600 Subject: [PATCH 03/20] Completed Routes2 music data channel 4 hg-commit-id: 2cc868dbc77a --- music.asm | 160 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 159 insertions(+), 1 deletion(-) diff --git a/music.asm b/music.asm index 8a0e49d7..bb0a8d7b 100644 --- a/music.asm +++ b/music.asm @@ -1006,7 +1006,165 @@ branch_9E9E: ; 9F07 Routes2_md_4: ;9F08 - 9FAC -INCBIN "baserom.gbc",$9f08,$9fad - $9f08 + ; 9F08 + mus_vel 11, 1 + mus_note noteC, note4 + mus_note noteRst, note8 + mus_note noteB, note16 + mus_note noteC, note4 + mus_note noteRst, note4_16 + mus_note noteB, note16 + mus_note noteC, note4 + mus_note noteB, note16 + mus_note noteC, note4 + mus_note noteB, note8 + mus_note noteC, note4 + mus_note noteB, note8 + mus_note noteC, note4 + mus_note noteB, note8 + mus_note noteC, note4 + mus_note noteRst, note8 + db $D8 + mus_note noteB, note8 + mus_note noteC, note4 + mus_note noteB, note8 + mus_note noteC, note4 + mus_note noteB, note8 + mus_note noteC, note4 + mus_note noteB, note8_16 + mus_note noteC, note4 + mus_note noteB, note8_16 + mus_note noteC, note4 + mus_vel 11, 0 + mus_note noteC, note4 + mus_note noteRst, note8_16 + mus_note noteB, note8 + mus_note noteC, note4 + mus_note noteRst, note8 + mus_note noteB, note8 + mus_note noteC, note4 + mus_note noteRst, note4 + mus_note noteB, note16 + mus_note noteC, note4 + mus_note noteB, note16 + mus_note noteC, note4 + mus_note noteB, note8 + mus_note noteC, note4 + mus_note noteRst, note8 + mus_note noteB, note8 + mus_note noteC, note4 + mus_note noteRst, note8 + db $D8 + mus_note noteB, note8 + mus_note noteC, note4 + mus_note noteB, note8 + mus_note noteC, note4 + mus_note noteB, note8 + mus_note noteC, note4 + mus_note noteB, note8_16 + mus_note noteC, note4 + mus_note noteB, note8_16 + mus_note noteC, note4 + mus_note noteB, note8 + mus_note noteC, note4 + mus_note noteB, note8 + mus_note noteC, note4 + mus_note noteB, note8 + mus_note noteC, note4 + mus_note noteB, note8_16 + mus_note noteC, note4 + mus_note noteRst, note8_16 + mus_vel 11, 0 + mus_note noteC, note4 + mus_note noteRst, note4_16 + mus_note noteB, note16 + mus_note noteC, note4 + mus_note noteB, note16 + mus_note noteC, note4 + mus_note noteB, note8 + mus_note noteC, note4 + mus_note noteB, note8 + mus_note noteC, note4 + mus_note noteB, note8 + mus_note noteC, note4 + mus_note noteRst, note8 + db $D8 + mus_note noteB, note8 + mus_note noteC, note4 + mus_note noteB, note8 + mus_note noteC, note4 + mus_note noteB, note8 + mus_note noteC, note4 + mus_note noteB, note8_16 + mus_note noteC, note4 + mus_note noteRst, note8_16 + mus_vel 11, 0 + mus_note noteC, note4 + mus_note noteRst, note8_16 + mus_note noteB, note8 + mus_note noteC, note4 + mus_note noteRst, note8 + mus_note noteB, note8 + mus_note noteC, note4 + mus_note noteRst, note4 + mus_note noteB, note16 + mus_note noteC, note4 + mus_note noteB, note16 + mus_note noteC, note4 + mus_note noteB, note8 + mus_note noteC, note4 + mus_note noteB, note8 + mus_note noteC, note4 + mus_note noteB, note8 + mus_note noteC, note4 + mus_note noteRst, note8 + db $D8 + mus_note noteB, note8 + mus_note noteC, note4 + mus_note noteB, note8 + mus_note noteC, note4 + mus_note noteB, note8 + mus_note noteC, note4 + mus_note noteB, note8_16 + mus_note noteC, note4 + mus_note noteRst, note8_16 + mus_note noteB, note8_16 + mus_note noteC, note4 + mus_note noteB, note8_16 + mus_note noteC, note4 + mus_note noteB, note8_16 + mus_note noteC, note4 + mus_note noteRst, note8_16 + mus_vel 11, 0 + mus_note noteC, note4 + mus_note noteRst, note4_16 + mus_note noteB, note16 + mus_note noteC, note4 + mus_note noteB, note16 + mus_note noteC, note4 + mus_note noteB, note8 + mus_note noteC, note4 + mus_note noteB, note8 + mus_note noteC, note4 + mus_note noteB, note8 + mus_note noteC, note4 + mus_note noteRst, note8 + db $D8 + mus_note noteB, note8 + mus_note noteC, note4 + mus_note noteB, note8 + mus_note noteC, note4 + mus_note noteB, note8 + mus_note noteC, note4 + mus_note noteB, note8_16 + mus_note noteC, note4 + mus_note noteRst, note8_16 + mus_note noteB, note8_16 + mus_note noteC, note4 + mus_note noteRst, note8_16 + mus_jump 0, Routes2_md_4 + mus_end + ; 9FAC ;Routes 3, 4, 5, 6, 7, 8, 9, 10, 16, 17, 18, 19, 20, 21, 22 Routes3_md_1: ;9FAD - A008 From a297c105b5269f51d85b07308aa1c0c87eb9daca Mon Sep 17 00:00:00 2001 From: KuroiIeWa5Da Date: Mon, 23 Jan 2012 03:59:25 -0600 Subject: [PATCH 04/20] updated disassembly program to support a custom stop address hg-commit-id: a2bee0bdb345 --- music/pokeredmusicdisasm/Parser.cpp | 14 +++++++++++ music/pokeredmusicdisasm/Parser.h | 6 +++++ music/pokeredmusicdisasm/main.cpp | 38 +++++++++++++++++++++++++---- 3 files changed, 53 insertions(+), 5 deletions(-) diff --git a/music/pokeredmusicdisasm/Parser.cpp b/music/pokeredmusicdisasm/Parser.cpp index a548b015..f11d57b6 100644 --- a/music/pokeredmusicdisasm/Parser.cpp +++ b/music/pokeredmusicdisasm/Parser.cpp @@ -9,6 +9,7 @@ Parser::Parser() fileLength = 0; filePos = 0; stop = false; + stopAddress = 0; } Parser::Parser(std::string filename) @@ -46,6 +47,16 @@ void Parser::SetFilename(std::string value) Read(); } +unsigned int Parser::GetStopAddress() +{ + return stopAddress; +} + +void Parser::SetStopAddress(unsigned int value) +{ + stopAddress = value; +} + string Parser::GetParsedAsm() { string tmpStr; @@ -192,6 +203,9 @@ void Parser::ParseNext() // Parses the block immidiately following unkCode << "db $" << hex << uppercase << (short)rawBytesFixed[i]; parsedString.push_back(unkCode.str()); } + + // If the stop address parameter is set, break when we get there + if( (stopAddress != 0) && (i >= stopAddress) ) break; } // Now record the postion we left off diff --git a/music/pokeredmusicdisasm/Parser.h b/music/pokeredmusicdisasm/Parser.h index 9f7550c0..515d07ad 100644 --- a/music/pokeredmusicdisasm/Parser.h +++ b/music/pokeredmusicdisasm/Parser.h @@ -37,6 +37,9 @@ public: std::string GetFilename(); void SetFilename(std::string value); + unsigned int GetStopAddress(); + void SetStopAddress(unsigned int value); + std::string GetParsedAsm(); // File Operations @@ -56,6 +59,9 @@ private: unsigned int filePos; bool stop; + // Optional Settings + unsigned int stopAddress; + // A lot of tmp classes Call tmpCall; Duty tmpDuty; diff --git a/music/pokeredmusicdisasm/main.cpp b/music/pokeredmusicdisasm/main.cpp index 919fd719..40fca2ae 100644 --- a/music/pokeredmusicdisasm/main.cpp +++ b/music/pokeredmusicdisasm/main.cpp @@ -7,31 +7,59 @@ using namespace std; int main(int argc, char** argv) { - string arg1; // Offset - string arg2; // File + const unsigned char parameters = 2; + const unsigned char self = 1; + const unsigned char _max_argc = parameters + self; - if(argc >= 3) + string arg1; // Offset + string arg2; // File or "--" (if "--" then the file is assumed) + + string paramStopAddr; + + if(argc >= _max_argc) { arg1 = argv[1]; arg2 = argv[2]; } - else if(argc == 2) + else if(argc == (_max_argc - 1)) { arg1 = argv[1]; arg2 = "../baserom.gbc"; } + // Process any parameters + if(argc > _max_argc) + { + for(int i = _max_argc; i < argc; i++) + { + string tmpArgv = argv[i]; + if(tmpArgv.substr(0, 7) == "--stop=") paramStopAddr = tmpArgv.substr(7); + } + } + if(arg1 == "") Console::Ask("What offset in the file in hex (0x----): ", arg1); if(arg2 == "") Console::Ask("What file: ", arg2); // Weird way of converting arg1 to an unsigned integer + Parser p(arg2); + stringstream arg1Conv; unsigned int arg1ConvNum; arg1Conv << arg1; arg1Conv << hex; arg1Conv >> arg1ConvNum; - Parser p(arg2); + if(paramStopAddr != "") + { + stringstream paramStopAddrConv; + unsigned int paramStopAddrNum = 0; + paramStopAddrConv.str(""); + paramStopAddrConv << paramStopAddr; + paramStopAddrConv << hex; + paramStopAddrConv >> paramStopAddrNum; + p.SetStopAddress(paramStopAddrNum); + } + p.Parse(arg1ConvNum); Console::PrintLn(p.GetParsedAsm().c_str()); From 1014adc83cbd6df9bf91a92e5d23d48c601abe07 Mon Sep 17 00:00:00 2001 From: KuroiIeWa5Da Date: Mon, 23 Jan 2012 04:25:21 -0600 Subject: [PATCH 05/20] Completed Routes3 music data channel 1 hg-commit-id: be5b52f43ccc --- music.asm | 86 ++++++++++++++++++++++++++++++- music/pokeredmusicdisasm/main.cpp | 4 +- 2 files changed, 88 insertions(+), 2 deletions(-) diff --git a/music.asm b/music.asm index bb0a8d7b..62ca5846 100644 --- a/music.asm +++ b/music.asm @@ -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); From 6a85dc48e1ef04b23a72694ed1d0271a44aa22c3 Mon Sep 17 00:00:00 2001 From: KuroiIeWa5Da Date: Mon, 23 Jan 2012 04:33:56 -0600 Subject: [PATCH 06/20] Completed Routes3 music data channel 2 hg-commit-id: ef99ba55bb1b --- music.asm | 123 +++++++++++++++++++++++++++- music/pokeredmusicdisasm/Parser.cpp | 3 +- 2 files changed, 124 insertions(+), 2 deletions(-) diff --git a/music.asm b/music.asm index 62ca5846..4d0ce3a6 100644 --- a/music.asm +++ b/music.asm @@ -1255,7 +1255,128 @@ branch_9FC3: ;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 diff --git a/music/pokeredmusicdisasm/Parser.cpp b/music/pokeredmusicdisasm/Parser.cpp index f11d57b6..9fa0af7f 100644 --- a/music/pokeredmusicdisasm/Parser.cpp +++ b/music/pokeredmusicdisasm/Parser.cpp @@ -114,7 +114,6 @@ void Parser::ParseNext() // Parses the block immidiately following 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 @@ -204,6 +203,8 @@ void Parser::ParseNext() // Parses the block immidiately following 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; } From eebf7023a3c56d2fb0edb39bc815488aefbca1cc Mon Sep 17 00:00:00 2001 From: KuroiIeWa5Da Date: Mon, 23 Jan 2012 04:42:24 -0600 Subject: [PATCH 07/20] labeled branch A01A for routes3_md_2 hg-commit-id: 543dc45a5488 --- music.asm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/music.asm b/music.asm index 4d0ce3a6..b5c399c5 100644 --- a/music.asm +++ b/music.asm @@ -1271,6 +1271,8 @@ Routes3_md_2: ;A009 - A07E mus_note noteC, note16 mus_note noteRst, note2_4_8_16 mus_note noteRst, note1 + +branch_A01A: mus_vel 12, 7 mus_duty duty50 @@ -1374,7 +1376,7 @@ Routes3_md_2: ;A009 - A07E mus_octave oct2 mus_note noteA, note2 mus_note noteB, note2 - mus_jump 0, $601A + mus_jump 0, branch_A01A ; A07E ;No end byte until indigo plateu channel 1 From 93f5296a23f34731cfd3431a7ba5285f729a4a8a Mon Sep 17 00:00:00 2001 From: KuroiIeWa5Da Date: Mon, 23 Jan 2012 04:46:55 -0600 Subject: [PATCH 08/20] Completed Routes3 music data channel 3 hg-commit-id: e2fe888f94fd --- music.asm | 193 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 191 insertions(+), 2 deletions(-) diff --git a/music.asm b/music.asm index b5c399c5..a89aa8d4 100644 --- a/music.asm +++ b/music.asm @@ -1380,8 +1380,197 @@ branch_A01A: ; A07E ;No end byte until indigo plateu channel 1 -Routes3_md_3: ;A07F - 6130 -INCBIN "baserom.gbc",$a07f,$a131 - $a07f +Routes3_md_3: ;A07F - A130 + ; A07F + mus_mod 4, 1, 0 + db $D6 + mus_note noteC#, note8_16 + + mus_octave oct3 + mus_note noteG, note8 + mus_note noteA#, note8 + mus_note noteB, note2 + mus_note noteA, note2 + mus_note noteG, note8 + mus_note noteRst, note8 + mus_note noteG, note4_8_16 + mus_note noteRst, note16 + mus_note noteG, note16 + mus_note noteRst, note16 + mus_note noteG, note16 + mus_note noteRst, note16 + mus_note noteG, note8 + mus_note noteRst, note8 + mus_note noteG, note8 + mus_note noteRst, note8 + mus_note noteG, note2 + mus_note noteG, note8 + mus_note noteRst, note8 + mus_note noteG, note4_8_16 + mus_note noteRst, note16 + mus_note noteG, note16 + mus_note noteRst, note16 + mus_note noteG, note16 + mus_note noteRst, note16 + mus_note noteG, note8 + mus_note noteRst, note8 + mus_note noteG, note8 + mus_note noteRst, note8 + mus_note noteG, note2 + +branch_A0A3: + mus_vel 1, 2 + mus_note noteE, note16 + mus_note noteRst, note16 + mus_note noteG, note4 + mus_note noteE, note16 + mus_note noteE, note16 + mus_note noteE, note16 + mus_note noteRst, note16 + mus_note noteE, note16 + mus_note noteRst, note16 + mus_note noteG, note4 + mus_note noteE, note16 + mus_note noteRst, note16 + mus_note noteG, note4 + mus_note noteE, note16 + mus_note noteE, note16 + mus_note noteE, note16 + mus_note noteRst, note16 + mus_note noteE, note16 + mus_note noteRst, note16 + mus_note noteG, note8 + mus_note noteA, note8 + mus_note noteF, note16 + mus_note noteRst, note16 + mus_note noteA#, note4 + mus_note noteF, note16 + mus_note noteF, note16 + mus_note noteF, note16 + mus_note noteRst, note16 + mus_note noteF, note16 + mus_note noteRst, note16 + mus_note noteA#, note4 + mus_note noteF, note16 + mus_note noteRst, note16 + mus_note noteA#, note4 + mus_note noteF, note16 + mus_note noteF, note16 + mus_note noteF, note16 + mus_note noteRst, note16 + mus_note noteF, note16 + mus_note noteRst, note16 + mus_note noteA#, note8 + mus_note noteF, note8 + mus_note noteE, note16 + mus_note noteRst, note16 + mus_note noteG, note4 + mus_note noteE, note16 + mus_note noteE, note16 + mus_note noteE, note16 + mus_note noteRst, note16 + mus_note noteE, note16 + mus_note noteRst, note16 + mus_note noteG, note4 + mus_note noteE, note16 + mus_note noteRst, note16 + mus_note noteG, note4 + mus_note noteE, note16 + mus_note noteE, note16 + mus_note noteE, note16 + mus_note noteRst, note16 + mus_note noteE, note16 + mus_note noteRst, note16 + mus_note noteG, note8 + mus_note noteA, note8 + mus_note noteF, note16 + mus_note noteRst, note16 + mus_note noteA#, note4 + mus_note noteF, note16 + mus_note noteF, note16 + mus_note noteF, note16 + mus_note noteRst, note16 + mus_note noteF, note16 + mus_note noteRst, note16 + mus_note noteA#, note4 + mus_note noteF, note16 + mus_note noteRst, note16 + mus_note noteA#, note4 + mus_note noteF, note16 + mus_note noteF, note16 + mus_note noteF, note16 + mus_note noteRst, note16 + mus_note noteF, note16 + mus_note noteRst, note16 + mus_note noteA#, note8 + mus_note noteA, note8 + mus_note noteG, note16 + mus_note noteRst, note16 + + mus_octave oct4 + mus_note noteC, note4 + + mus_octave oct3 + mus_note noteG, note16 + mus_note noteG, note16 + mus_note noteG, note16 + mus_note noteRst, note16 + mus_note noteG, note16 + mus_note noteRst, note16 + + mus_octave oct4 + mus_note noteC, note4 + + mus_octave oct3 + mus_note noteG, note16 + mus_note noteRst, note16 + + mus_octave oct4 + mus_note noteD, note4 + + mus_octave oct3 + mus_note noteG, note16 + mus_note noteG, note16 + mus_note noteG, note16 + mus_note noteRst, note16 + mus_note noteG, note16 + mus_note noteRst, note16 + + mus_octave oct4 + mus_note noteD, note4 + + mus_octave oct3 + mus_note noteF, note16 + mus_note noteRst, note16 + + mus_octave oct4 + mus_note noteC, note4 + + mus_octave oct3 + mus_note noteF, note16 + mus_note noteF, note16 + mus_note noteF, note16 + mus_note noteRst, note16 + mus_note noteF, note16 + mus_note noteRst, note16 + + mus_octave oct4 + mus_note noteC, note4 + + mus_octave oct3 + mus_note noteF, note16 + mus_note noteRst, note16 + mus_note noteA, note4 + mus_note noteF, note16 + mus_note noteF, note16 + mus_note noteF, note16 + mus_note noteRst, note16 + mus_note noteF, note16 + mus_note noteRst, note16 + mus_note noteA, note4 + mus_jump 0, branch_A0A3 + ; A130 + ;No end byte until indigo plateu channel 1 Routes3_md_4: ;A131 -A26A INCBIN "baserom.gbc",$a131,$a26a - $a131 From 053990927ef1968677064f76009dc5bea517c814 Mon Sep 17 00:00:00 2001 From: KuroiIeWa5Da Date: Mon, 23 Jan 2012 04:59:31 -0600 Subject: [PATCH 09/20] Completed Routes3 music data channel 4 hg-commit-id: 247aa97881d2 --- music.asm | 317 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 315 insertions(+), 2 deletions(-) diff --git a/music.asm b/music.asm index a89aa8d4..177896d3 100644 --- a/music.asm +++ b/music.asm @@ -1572,8 +1572,321 @@ branch_A0A3: ; A130 ;No end byte until indigo plateu channel 1 -Routes3_md_4: ;A131 -A26A -INCBIN "baserom.gbc",$a131,$a26a - $a131 +Routes3_md_4: ;A131 -A269 + ; A131 + db $D6 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note2 + mus_note noteC#, note8 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note2_4 + mus_note noteC#, note8 + mus_note noteB, note8 + mus_note noteC#, note8 + mus_note noteB, note8 + mus_note noteC#, note8_16 + mus_note noteB, note4 + mus_note noteC#, note8 + mus_note noteB, note4 + mus_note noteC#, note8 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note2_4 + mus_note noteC#, note8 + mus_note noteB, note8 + mus_note noteC#, note8 + mus_note noteB, note8 + mus_note noteC#, note8_16 + mus_note noteB, note4 + mus_note noteC#, note8 + mus_note noteB, note4 + mus_note noteC#, note8_16 + mus_note noteB, note4 + mus_note noteC#, note8 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note16 + mus_note noteC#, note8_16 + +branch_A17A: + mus_note noteB, note2_4 + mus_note noteC#, note8 + mus_note noteB, note8 + mus_note noteC#, note8 + mus_note noteB, note8 + mus_note noteC#, note8_16 + mus_note noteB, note4 + mus_note noteC#, note8 + mus_note noteB, note4 + mus_note noteC#, note8 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note2_4 + mus_note noteC#, note8 + mus_note noteB, note8 + mus_note noteC#, note8 + mus_note noteB, note8 + mus_note noteC#, note8 + mus_note noteB, note4 + mus_note noteC#, note8 + mus_note noteB, note2 + mus_note noteC#, note8 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note2_4 + mus_note noteC#, note8 + mus_note noteB, note8 + mus_note noteC#, note8 + mus_note noteB, note8 + mus_note noteC#, note8_16 + mus_note noteB, note4 + mus_note noteC#, note8 + mus_note noteB, note2_8 + mus_note noteC#, note8 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note2_4 + mus_note noteC#, note8 + mus_note noteB, note8 + mus_note noteC#, note8 + mus_note noteB, note8 + mus_note noteC#, note4 + mus_note noteB, note4 + mus_note noteC#, note8 + mus_note noteB, note4 + mus_note noteC#, note8 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note2_4 + mus_note noteC#, note8 + mus_note noteB, note8 + mus_note noteC#, note8 + mus_note noteB, note8 + mus_note noteC#, note8 + mus_note noteB, note4 + mus_note noteC#, note8 + mus_note noteB, note2 + mus_note noteC#, note8 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note2_4 + mus_note noteC#, note8 + mus_note noteB, note8 + mus_note noteC#, note8 + mus_note noteB, note8 + mus_note noteC#, note8 + mus_note noteB, note4 + mus_note noteC#, note8 + mus_note noteB, note2_8 + mus_note noteC#, note8 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note2_4 + mus_note noteC#, note8 + mus_note noteB, note8 + mus_note noteC#, note8 + mus_note noteB, note8 + mus_note noteC#, note8 + mus_note noteB, note4 + mus_note noteC#, note8 + mus_note noteB, note2 + mus_note noteC#, note8 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note2_4 + mus_note noteC#, note8 + mus_note noteB, note8 + mus_note noteC#, note8 + mus_note noteB, note8 + mus_note noteC#, note8 + mus_note noteB, note4 + mus_note noteC#, note8 + mus_note noteB, note4 + mus_note noteC#, note8 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note2_4 + mus_note noteC#, note8 + mus_note noteB, note8 + mus_note noteC#, note8 + mus_note noteB, note8 + mus_note noteC#, note8 + mus_note noteB, note4 + mus_note noteC#, note8 + mus_note noteB, note2_8 + mus_note noteC#, note8 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note2_4 + mus_note noteC#, note8 + mus_note noteB, note8 + mus_note noteC#, note8 + mus_note noteB, note8 + mus_note noteC#, note8 + mus_note noteB, note4 + mus_note noteC#, note8 + mus_note noteB, note2 + mus_note noteC#, note8 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note2_4 + mus_note noteC#, note8 + mus_note noteB, note8 + mus_note noteC#, note8 + mus_note noteB, note8 + mus_note noteC#, note8 + mus_note noteB, note4 + mus_note noteC#, note8 + mus_note noteB, note2 + mus_note noteC#, note8 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note2_4 + mus_note noteC#, note8 + mus_note noteB, note8 + mus_note noteC#, note8 + mus_note noteB, note8 + mus_note noteC#, note8 + mus_note noteB, note4 + mus_note noteC#, note8 + mus_note noteB, note4 + mus_note noteC#, note8 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_jump 0, branch_A17A + ; A269 ;Routes 11, 12, 13, 14, 15 Routes4_md_1: ;a26a - a303 From 0ea0ae063f862809d7c2c715c520b836cd4f34db Mon Sep 17 00:00:00 2001 From: KuroiIeWa5Da Date: Mon, 23 Jan 2012 05:07:16 -0600 Subject: [PATCH 10/20] Completed Routes4 music data channel 1 and fixed minor program bug hg-commit-id: ce15c0659a12 --- music.asm | 162 +++++++++++++++++++++++- music/pokeredmusicdisasm/Modulation.cpp | 2 +- 2 files changed, 162 insertions(+), 2 deletions(-) diff --git a/music.asm b/music.asm index 177896d3..a833b434 100644 --- a/music.asm +++ b/music.asm @@ -1887,10 +1887,170 @@ branch_A17A: mus_note noteC#, note8_16 mus_jump 0, branch_A17A ; A269 + ;No end byte until indigo plateu channel 1 ;Routes 11, 12, 13, 14, 15 Routes4_md_1: ;a26a - a303 -INCBIN "baserom.gbc",$a26a,$a304 - $a26a + ; A26A + mus_tempo 0, 148 + mus_volume 119 + mus_duty duty75 + mus_mod 10, 3, 4 + db $E8 + mus_vel 10, 2 + + mus_octave oct1 + mus_note noteG#, note4 + mus_note noteG#, note4 + mus_note noteG#, note4 + mus_vel 7, 15 + mus_note noteG#, note4 + mus_vel 10, 2 + mus_note noteG#, note4 + mus_note noteG#, note4 + mus_note noteG#, note4 + mus_vel 11, 7 + mus_note noteB, note16 + + mus_octave oct2 + mus_note noteE, note16 + mus_note noteF#, note16 + mus_note noteB, note16 + +branch_A28A: + mus_vel 11, 7 + mus_note noteB, note4_8 + mus_note noteE, note8 + mus_note noteE, note4 + + mus_octave oct3 + mus_note noteE, note4 + mus_note noteD, note4 + mus_note noteC#, note4 + + mus_octave oct2 + mus_note noteB, note4 + mus_note noteA, note4 + mus_vel 11, 1 + mus_note noteG#, note8_16 + mus_vel 11, 7 + mus_note noteE, note16 + mus_note noteF#, note2_4 + mus_note noteE, note2 + mus_note noteD#, note4 + mus_note noteF#, note4 + mus_note noteB, note4_8 + mus_note noteE, note8 + mus_note noteE, note4 + + mus_octave oct3 + mus_note noteE, note4 + mus_note noteD, note4 + mus_note noteC#, note4 + + mus_octave oct2 + mus_note noteB, note4 + + mus_octave oct3 + mus_note noteC#, note4 + mus_vel 11, 1 + mus_note noteE, note8_16 + mus_vel 11, 7 + mus_note noteD#, note16 + mus_note noteE, note2_4 + + mus_octave oct2 + mus_note noteB, note8_16 + mus_note noteA, note16 + mus_note noteG#, note2 + + mus_octave oct3 + mus_note noteE, note4 + + mus_octave oct2 + mus_note noteD, note8 + mus_note noteE, note8 + mus_note noteF#, note8 + mus_note noteG#, note8 + mus_note noteA, note8 + mus_note noteB, note8 + + mus_octave oct3 + mus_note noteC#, note8 + mus_note noteD, note8 + mus_note noteD, note8 + + mus_octave oct2 + mus_note noteA, note8 + mus_note noteF#, note8 + mus_note noteE, note8 + mus_note noteD, note8 + mus_note noteE, note8 + mus_note noteF#, note8 + mus_note noteA, note8 + mus_note noteG#, note8 + mus_note noteF#, note8 + mus_note noteE, note8 + mus_note noteF#, note8 + mus_note noteG#, note8 + mus_note noteA, note8 + mus_note noteB, note8 + + mus_octave oct3 + mus_note noteD#, note8 + mus_note noteE, note8 + + mus_octave oct2 + mus_note noteB, note8 + mus_note noteG#, note8 + mus_note noteF#, note8 + mus_note noteE, note8 + mus_note noteF#, note8 + mus_note noteG#, note8 + mus_note noteB, note8 + db $D8 + mus_note noteB, note4_8 + mus_note noteA, note4 + mus_note noteG#, note4 + mus_note noteF#, note4 + + mus_octave oct3 + mus_note noteE, note4 + mus_note noteD#, note4 + mus_note noteC#, note4 + mus_note noteC#, note4 + + mus_octave oct2 + mus_note noteB, note4 + mus_note noteA, note4 + mus_note noteB, note4 + + mus_octave oct3 + mus_note noteC#, note4 + mus_note noteD#, note4 + + mus_octave oct2 + mus_note noteE, note8_16 + mus_note noteF#, note8_16 + mus_note noteG#, note8_16 + mus_note noteA, note8_16 + mus_note noteB, note4 + + mus_octave oct3 + mus_note noteC#, note4 + mus_note noteD#, note4 + mus_note noteE, note8_16 + + mus_octave oct2 + mus_note noteB, note8_16 + mus_note noteG#, note8_16 + mus_note noteF#, note8_16 + mus_note noteE, note8_16 + mus_note noteF#, note8_16 + mus_note noteG#, note8_16 + mus_note noteA, note8_16 + mus_jump 0, branch_A28A + ; A303 Routes4_md_2: ;a304 - a3c3 INCBIN "baserom.gbc",$a304,$a3c4 - $a304 diff --git a/music/pokeredmusicdisasm/Modulation.cpp b/music/pokeredmusicdisasm/Modulation.cpp index 61ccbf82..eed78183 100644 --- a/music/pokeredmusicdisasm/Modulation.cpp +++ b/music/pokeredmusicdisasm/Modulation.cpp @@ -72,7 +72,7 @@ string Modulation::GenAsm() if(tmpRet != "") return tmpRet; stringstream tmpAsmOut; - tmpAsmOut << "mus_mod " << hex << (short)delay << ", " << (short)depth << ", " << (short)rate; + tmpAsmOut << "mus_mod " << (short)delay << ", " << (short)depth << ", " << (short)rate; return tmpAsmOut.str(); } From f4787b201a911d9087e3ccf3f54e4955dd80d825 Mon Sep 17 00:00:00 2001 From: KuroiIeWa5Da Date: Mon, 23 Jan 2012 05:12:25 -0600 Subject: [PATCH 11/20] Completed Routes4 music data channel 2 hg-commit-id: 87ee047102bf --- music.asm | 187 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 186 insertions(+), 1 deletion(-) diff --git a/music.asm b/music.asm index a833b434..cd8215ed 100644 --- a/music.asm +++ b/music.asm @@ -2053,7 +2053,192 @@ branch_A28A: ; A303 Routes4_md_2: ;a304 - a3c3 -INCBIN "baserom.gbc",$a304,$a3c4 - $a304 + ; a304 + mus_mod 12, 2, 4 + mus_duty duty25 + mus_vel 9, 2 + + mus_octave oct2 + mus_note noteE, note8_16 + mus_note noteF#, note16 + mus_vel 9, 0 + mus_note noteE, note2_4 + mus_vel 9, 2 + + mus_octave oct1 + mus_note noteB, note8_16 + + mus_octave oct2 + mus_note noteC, note16 + mus_vel 9, 0 + + mus_octave oct1 + mus_note noteB, note2 + mus_duty duty75 + mus_vel 12, 7 + + mus_octave oct2 + mus_note noteE, note16 + mus_note noteF#, note16 + mus_note noteB, note16 + + mus_octave oct3 + mus_note noteD#, note16 + +branch_A325: + mus_vel 12, 7 + mus_note noteE, note4_8 + + mus_octave oct2 + mus_note noteB, note8 + mus_note noteB, note4 + + mus_octave oct3 + mus_note noteB, note4 + mus_note noteA, note4 + mus_note noteG#, note4 + mus_note noteF#, note4 + mus_note noteF#, note16 + mus_note noteA, note16 + mus_note noteG#, note16 + mus_note noteF#, note16 + mus_vel 12, 2 + mus_note noteG#, note8_16 + mus_note noteE, note16 + mus_vel 10, 0 + + mus_octave oct2 + mus_note noteB, note2_4 + mus_duty duty12_5 + mus_vel 12, 2 + + mus_octave oct1 + mus_note noteB, note8_16 + mus_vel 12, 7 + + mus_octave oct2 + mus_note noteC, note16 + + mus_octave oct1 + mus_note noteB, note2 + + mus_octave oct2 + mus_note noteD#, note4 + mus_duty duty75 + + mus_octave oct3 + mus_note noteE, note4_8 + + mus_octave oct2 + mus_note noteB, note8 + mus_note noteB, note4 + + mus_octave oct3 + mus_note noteB, note4 + mus_note noteA, note4 + mus_note noteG#, note4 + mus_note noteF#, note4 + mus_note noteA, note16 + + mus_octave oct4 + mus_note noteC#, note16 + + mus_octave oct3 + mus_note noteB, note16 + mus_note noteA, note16 + mus_vel 12, 2 + mus_note noteB, note8_16 + mus_vel 12, 7 + mus_note noteA, note16 + mus_vel 11, 0 + mus_note noteG#, note4_8 + mus_vel 9, 0 + mus_note noteG#, note4_8 + mus_vel 7, 0 + mus_note noteG#, note4_8 + mus_vel 6, 15 + mus_note noteG#, note4_8 + mus_vel 12, 7 + mus_note noteG#, note4 + db $D8 + mus_note noteRst, note4 + mus_note noteA, note4 + mus_note noteG#, note4 + mus_note noteF#, note4 + db $D8 + mus_note noteA, note16 + mus_note noteF#, note4_8 + db $D8 + mus_note noteG, note1 + mus_note noteF#, note4_8 + mus_duty duty12_5 + db $D8 + mus_note noteA, note16 + + mus_octave oct2 + mus_note noteF#, note4 + mus_note noteE, note4 + mus_note noteF#, note4 + mus_note noteA, note4_8 + mus_duty duty75 + db $D8 + mus_note noteRst, note2 + + mus_octave oct3 + mus_note noteF#, note4_8 + mus_note noteG#, note4 + mus_note noteF#, note4 + db $D8 + mus_note noteRst, note4_16 + mus_note noteE, note4 + db $D8 + mus_note noteA#, note16 + mus_note noteE, note2_4 + mus_duty duty12_5 + db $D8 + mus_note noteA, note16 + + mus_octave oct2 + mus_note noteE, note4 + mus_note noteD#, note4 + mus_note noteE, note4 + mus_note noteG#, note4_8 + mus_duty duty75 + db $D8 + mus_note noteRst, note2 + + mus_octave oct3 + mus_note noteE, note4_8 + mus_note noteF#, note4 + mus_note noteD#, note4 + + mus_octave oct2 + mus_note noteB, note4 + db $D8 + mus_note noteA#, note16 + + mus_octave oct3 + mus_note noteB, note1 + db $D8 + mus_note noteA#, note2 + mus_note noteB, note2 + db $D8 + mus_note noteB, note16 + mus_note noteA, note4_8 + db $D8 + mus_note noteB, note2 + mus_note noteA, note4_8 + mus_vel 10, 7 + mus_note noteG#, note16 + mus_note noteF#, note16 + mus_vel 11, 0 + mus_note noteE, note2_4 + mus_vel 10, 0 + mus_note noteE, note2 + mus_vel 10, 7 + mus_note noteE, note2_8 + mus_jump 0, branch_A325 + ; A3C3 Routes4_md_3: ;a3c4 - a49c INCBIN "baserom.gbc",$a3c4,$a49d - $a3c4 From 205c0b4ea5501988b477263118db682680de3939 Mon Sep 17 00:00:00 2001 From: KuroiIeWa5Da Date: Mon, 23 Jan 2012 05:30:17 -0600 Subject: [PATCH 12/20] Completed Routes4 music data channel 3 hg-commit-id: 4aff88c3813d --- music.asm | 221 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 220 insertions(+), 1 deletion(-) diff --git a/music.asm b/music.asm index cd8215ed..4422a90c 100644 --- a/music.asm +++ b/music.asm @@ -2051,6 +2051,7 @@ branch_A28A: mus_note noteA, note8_16 mus_jump 0, branch_A28A ; A303 + ;No end byte until indigo plateu channel 1 Routes4_md_2: ;a304 - a3c3 ; a304 @@ -2239,9 +2240,227 @@ branch_A325: mus_note noteE, note2_8 mus_jump 0, branch_A325 ; A3C3 + ;No end byte until indigo plateu channel 1 Routes4_md_3: ;a3c4 - a49c -INCBIN "baserom.gbc",$a3c4,$a49d - $a3c4 +; A3C4 + mus_vel 1, 0 + + mus_octave oct3 + mus_note noteE, note16 + mus_note noteRst, note8_16 + mus_note noteE, note16 + mus_note noteRst, note8_16 + mus_note noteE, note16 + mus_note noteRst, note8_16 + mus_note noteE, note16 + mus_note noteRst, note8_16 + mus_note noteE, note16 + mus_note noteRst, note8_16 + mus_note noteE, note16 + mus_note noteRst, note8_16 + mus_note noteE, note16 + mus_note noteRst, note8_16 + mus_note noteD#, note16 + mus_note noteRst, note8_16 + +branch_A3D7: + mus_note noteE, note16 + mus_note noteRst, note8_16 + mus_note noteE, note16 + mus_note noteE, note16 + mus_note noteE, note16 + mus_note noteE, note16 + mus_note noteE, note16 + mus_note noteRst, note16 + mus_note noteE, note16 + mus_note noteRst, note8_16 + mus_note noteE, note16 + mus_note noteRst, note16 + mus_note noteF#, note16 + mus_note noteRst, note8_16 + mus_note noteF#, note16 + mus_note noteF#, note16 + mus_note noteF#, note16 + mus_note noteF#, note16 + mus_note noteF#, note16 + mus_note noteRst, note16 + mus_note noteF#, note16 + mus_note noteRst, note8_16 + mus_note noteA, note16 + mus_note noteRst, note16 + mus_note noteG#, note16 + mus_note noteRst, note8_16 + mus_note noteG#, note16 + mus_note noteG#, note16 + mus_note noteG#, note16 + mus_note noteG#, note16 + mus_note noteG#, note16 + mus_note noteRst, note16 + mus_note noteG#, note16 + mus_note noteRst, note8_16 + mus_note noteG#, note16 + mus_note noteRst, note16 + mus_note noteG#, note16 + mus_note noteRst, note8_16 + mus_note noteG#, note16 + mus_note noteG#, note16 + mus_note noteG#, note16 + mus_note noteG#, note16 + mus_note noteG#, note16 + mus_note noteRst, note16 + mus_note noteG#, note16 + mus_note noteRst, note8_16 + mus_note noteG#, note16 + mus_note noteRst, note16 + mus_note noteE, note16 + mus_note noteRst, note8_16 + mus_note noteE, note16 + mus_note noteE, note16 + mus_note noteE, note16 + mus_note noteE, note16 + mus_note noteE, note16 + mus_note noteRst, note16 + mus_note noteE, note16 + mus_note noteRst, note8_16 + mus_note noteE, note16 + mus_note noteRst, note16 + mus_note noteF#, note16 + mus_note noteRst, note8_16 + mus_note noteF#, note16 + mus_note noteF#, note16 + mus_note noteF#, note16 + mus_note noteF#, note16 + mus_note noteF#, note16 + mus_note noteRst, note16 + mus_note noteF#, note16 + mus_note noteRst, note8_16 + mus_note noteA, note16 + mus_note noteRst, note16 + mus_note noteB, note16 + mus_note noteRst, note8_16 + mus_note noteB, note16 + mus_note noteB, note16 + mus_note noteB, note16 + mus_note noteB, note16 + mus_note noteB, note16 + mus_note noteRst, note16 + mus_note noteB, note16 + mus_note noteRst, note8_16 + mus_note noteB, note16 + mus_note noteRst, note16 + mus_note noteE, note16 + mus_note noteRst, note8_16 + mus_note noteE, note16 + mus_note noteE, note16 + mus_note noteE, note16 + mus_note noteE, note16 + mus_note noteE, note16 + mus_note noteRst, note16 + mus_note noteE, note16 + mus_note noteRst, note16 + mus_note noteE, note16 + mus_note noteRst, note16 + mus_note noteA, note16 + mus_note noteRst, note16 + mus_note noteF#, note16 + mus_note noteRst, note8_16 + mus_note noteF#, note16 + mus_note noteF#, note16 + mus_note noteF#, note16 + mus_note noteF#, note16 + mus_note noteF#, note16 + mus_note noteRst, note16 + mus_note noteF#, note16 + mus_note noteRst, note8_16 + mus_note noteF#, note16 + mus_note noteRst, note16 + mus_note noteD, note16 + mus_note noteRst, note8_16 + mus_note noteD, note16 + mus_note noteD, note16 + mus_note noteD, note16 + mus_note noteD, note16 + mus_note noteD, note16 + mus_note noteRst, note16 + mus_note noteD, note16 + mus_note noteRst, note8_16 + mus_note noteD, note16 + mus_note noteRst, note16 + mus_note noteE, note16 + mus_note noteRst, note8_16 + mus_note noteE, note16 + mus_note noteE, note16 + mus_note noteE, note16 + mus_note noteE, note16 + mus_note noteE, note16 + mus_note noteRst, note16 + mus_note noteE, note16 + mus_note noteRst, note8_16 + mus_note noteE, note16 + mus_note noteRst, note16 + mus_note noteG#, note16 + mus_note noteRst, note8_16 + mus_note noteG#, note16 + mus_note noteG#, note16 + mus_note noteG#, note16 + mus_note noteG#, note16 + mus_note noteG#, note16 + mus_note noteRst, note16 + mus_note noteG#, note16 + mus_note noteRst, note8_16 + mus_note noteG#, note16 + mus_note noteRst, note16 + mus_note noteF#, note16 + mus_note noteRst, note8_16 + mus_note noteF#, note16 + mus_note noteF#, note16 + mus_note noteF#, note16 + mus_note noteF#, note16 + mus_note noteF#, note16 + mus_note noteRst, note16 + mus_note noteF#, note16 + mus_note noteRst, note8_16 + mus_note noteF#, note16 + mus_note noteRst, note16 + mus_note noteB, note16 + mus_note noteRst, note8_16 + mus_note noteB, note16 + mus_note noteB, note16 + mus_note noteB, note16 + mus_note noteB, note16 + mus_note noteB, note16 + mus_note noteRst, note16 + mus_note noteB, note16 + mus_note noteRst, note8_16 + mus_note noteB, note16 + mus_note noteRst, note16 + mus_note noteG#, note16 + mus_note noteRst, note8_16 + mus_note noteG#, note16 + mus_note noteG#, note16 + mus_note noteG#, note16 + mus_note noteG#, note16 + mus_note noteG#, note16 + mus_note noteRst, note16 + mus_note noteG#, note16 + mus_note noteRst, note8_16 + mus_note noteG#, note16 + mus_note noteRst, note16 + mus_note noteE, note16 + mus_note noteRst, note8_16 + mus_note noteE, note16 + mus_note noteE, note16 + mus_note noteE, note16 + mus_note noteE, note16 + mus_note noteE, note16 + mus_note noteRst, note16 + mus_note noteE, note16 + mus_note noteRst, note8_16 + mus_note noteD#, note16 + mus_note noteRst, note16 + mus_jump 0, branch_A3D7 + ; A49C Routes4_md_4: ;a49d - a5ef INCBIN "baserom.gbc",$a49d,$a5f0 - $a49d From 1b37c6a5239261beb1ab675eaeea43f8b07876af Mon Sep 17 00:00:00 2001 From: KuroiIeWa5Da Date: Mon, 23 Jan 2012 05:37:10 -0600 Subject: [PATCH 13/20] Completed Routes4 music data channel 4 hg-commit-id: ab6a2625691b --- music.asm | 342 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 341 insertions(+), 1 deletion(-) diff --git a/music.asm b/music.asm index 4422a90c..b188cbdb 100644 --- a/music.asm +++ b/music.asm @@ -2461,9 +2461,349 @@ branch_A3D7: mus_note noteRst, note16 mus_jump 0, branch_A3D7 ; A49C + ;No end byte until indigo plateu channel 1 Routes4_md_4: ;a49d - a5ef -INCBIN "baserom.gbc",$a49d,$a5f0 - $a49d + ; A49D + mus_vel 12, 15 + mus_note noteRst, note2_4 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note16 + mus_note noteC#, note8_16 + +branch_A4A8: + mus_note noteB, note4 + mus_note noteC#, note8 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note8 + mus_note noteC#, note8 + mus_note noteB, note8 + mus_note noteC#, note8_16 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note4 + mus_note noteC#, note8 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note4 + mus_note noteC#, note8 + mus_note noteB, note8 + mus_note noteC#, note8 + mus_note noteB, note4 + mus_note noteC#, note8 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note8 + mus_note noteC#, note8 + mus_note noteB, note8 + mus_note noteC#, note8 + mus_note noteB, note8 + mus_note noteC#, note8 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note4 + mus_note noteC#, note8 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note8 + mus_note noteC#, note8 + mus_note noteB, note8 + mus_note noteC#, note8 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note4 + mus_note noteC#, note8 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note8 + mus_note noteC#, note8 + mus_note noteB, note8 + mus_note noteC#, note8 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note4 + mus_note noteC#, note8 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note4 + mus_note noteC#, note8 + mus_note noteB, note8 + mus_note noteC#, note8 + mus_note noteB, note4 + mus_note noteC#, note8 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note8 + mus_note noteC#, note8 + mus_note noteB, note8 + mus_note noteC#, note8 + mus_note noteB, note8 + mus_note noteC#, note8 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note4 + mus_note noteC#, note8 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note8 + mus_note noteC#, note8 + mus_note noteB, note8 + mus_note noteC#, note8 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note4 + mus_note noteC#, note8 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note8 + mus_note noteC#, note8 + mus_note noteB, note8 + mus_note noteC#, note8 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note4 + mus_note noteC#, note8 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note4 + mus_note noteC#, note8 + mus_note noteB, note8 + mus_note noteC#, note8 + mus_note noteB, note4 + mus_note noteC#, note8 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note8 + mus_note noteC#, note8 + mus_note noteB, note8 + mus_note noteC#, note8 + mus_note noteB, note8 + mus_note noteC#, note8 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note4 + mus_note noteC#, note8 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note8 + mus_note noteC#, note8 + mus_note noteB, note8 + mus_note noteC#, note8 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note4 + mus_note noteC#, note8 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note8 + mus_note noteC#, note8 + mus_note noteB, note8 + mus_note noteC#, note8 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note4 + mus_note noteC#, note8 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note4 + mus_note noteC#, note8 + mus_note noteB, note8 + mus_note noteC#, note8 + mus_note noteB, note4 + mus_note noteC#, note8 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note8 + mus_note noteC#, note8 + mus_note noteB, note8 + mus_note noteC#, note8 + mus_note noteB, note8 + mus_note noteC#, note8 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note4 + mus_note noteC#, note8 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note8 + mus_note noteC#, note8 + mus_note noteB, note8 + mus_note noteC#, note8 + mus_note noteB, note8 + mus_note noteC#, note8 + mus_note noteB, note8 + mus_note noteC#, note8 + mus_jump 0, $64A8 + ; A5EF + ;No end byte until indigo plateu channel 1 ;Indigo Plateau IndigoPlateau_md_1: ;a5f0 - a663 From 6be5bd7e8f155904fb38e8a2a38346f2d485707a Mon Sep 17 00:00:00 2001 From: KuroiIeWa5Da Date: Mon, 23 Jan 2012 09:07:19 -0600 Subject: [PATCH 14/20] Finished Indigo Plateu Music Data Channel 1 hg-commit-id: d109d3215bce --- music.asm | 102 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 101 insertions(+), 1 deletion(-) diff --git a/music.asm b/music.asm index b188cbdb..80b50536 100644 --- a/music.asm +++ b/music.asm @@ -2807,7 +2807,107 @@ branch_A4A8: ;Indigo Plateau IndigoPlateau_md_1: ;a5f0 - a663 -INCBIN "baserom.gbc",$a5f0,$a664 - $a5f0 + mus_tempo 0, 132 + mus_volume 119 + mus_duty duty75 + mus_mod 6, 3, 4 + db $E8 + mus_vel 11, 2 + + mus_octave oct1 + mus_note noteA, note2 + mus_note noteA, note2 + mus_note noteA, note2 + mus_note noteA, note4 + mus_vel 10, 4 + mus_note noteA#, note4 + +branch_a605: + mus_call branch_a659 + mus_vel 11, 4 + + mus_octave oct2 + mus_note noteD, note4 + mus_call branch_a659 + mus_vel 11, 4 + + mus_octave oct2 + mus_note noteD#, note4 + mus_call branch_a659 + mus_vel 11, 4 + + mus_octave oct2 + mus_note noteD, note4 + mus_call branch_a659 + mus_vel 10, 0 + + mus_octave oct1 + mus_note noteA#, note4 + mus_call branch_a659 + mus_vel 11, 4 + + mus_octave oct2 + mus_note noteD, note4 + mus_vel 13, 4 + + mus_octave oct2 + mus_note noteA, note4 + mus_note noteA, note4 + mus_note noteA, note4 + mus_note noteA, note4 + mus_note noteA, note4 + mus_note noteA, note4 + mus_note noteA, note4 + mus_vel 11, 4 + + mus_octave oct2 + mus_note noteD#, note4 + mus_vel 13, 4 + + mus_octave oct2 + mus_note noteA#, note4 + mus_note noteA#, note4 + mus_note noteA#, note4 + mus_note noteA#, note4 + mus_note noteA#, note4 + mus_note noteA#, note4 + mus_note noteA#, note4 + mus_vel 11, 4 + + mus_octave oct2 + mus_note noteF, note8 + mus_vel 11, 4 + + mus_octave oct2 + mus_note noteG, note8 + mus_vel 11, 0 + mus_note noteA, note2 + + mus_octave oct1 + mus_note noteA, note2 + mus_vel 11, 7 + + mus_octave oct2 + mus_note noteF, note2 + mus_vel 4, 14 + + mus_octave oct1 + mus_note noteA#, note2 + mus_jump 0, branch_a605 + +branch_a659: + mus_vel 11, 2 + + mus_octave oct1 + mus_note noteA, note4 + mus_note noteA, note4 + mus_note noteA, note4 + mus_note noteA, note4 + mus_note noteA, note4 + mus_note noteA, note4 + mus_note noteA, note4 + mus_end + ; A663 IndigoPlateau_md_2: ;a664 - a6b9 INCBIN "baserom.gbc",$a664,$a6ba - $a664 From 212fb466d8c2cebe219fd001530075484c765cb8 Mon Sep 17 00:00:00 2001 From: KuroiIeWa5Da Date: Mon, 23 Jan 2012 09:13:24 -0600 Subject: [PATCH 15/20] Finished Indigo Plateu Music Data Channel 2 hg-commit-id: 997a88c37722 --- music.asm | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 67 insertions(+), 1 deletion(-) diff --git a/music.asm b/music.asm index 80b50536..ab3f4f13 100644 --- a/music.asm +++ b/music.asm @@ -2910,7 +2910,73 @@ branch_a659: ; A663 IndigoPlateau_md_2: ;a664 - a6b9 -INCBIN "baserom.gbc",$a664,$a6ba - $a664 +; A664 + mus_duty duty75 + mus_mod 8, 2, 5 + mus_vel 12, 2 + + mus_octave oct2 + mus_note noteD, note2 + mus_note noteD, note2 + mus_note noteD, note2 + mus_note noteD, note4 + mus_vel 5, 10 + mus_note noteD#, note4 + +branch_a673: + mus_call branch_a6af + mus_vel 12, 5 + mus_note noteA, note4 + mus_call branch_a6af + mus_vel 12, 5 + mus_note noteA#, note4 + mus_call branch_a6af + mus_vel 12, 5 + mus_note noteA, note4 + mus_call branch_a6af + mus_vel 12, 7 + mus_note noteC#, note4 + mus_call branch_a6af + mus_vel 12, 5 + mus_note noteA, note4 + mus_call branch_a6af + mus_vel 12, 5 + mus_note noteA#, note4 + mus_call branch_a6af + mus_vel 12, 5 + + mus_octave oct3 + mus_note noteC, note8 + mus_vel 12, 7 + + mus_octave oct3 + mus_note noteC#, note8 + mus_note noteD, note2 + + mus_octave oct2 + mus_note noteD, note2 + + mus_octave oct3 + mus_note noteC, note2 + mus_vel 4, 13 + + mus_octave oct3 + mus_note noteD#, note2 + mus_jump 0, branch_a673 + +branch_a6af: + mus_vel 12, 2 + + mus_octave oct2 + mus_note noteD, note4 + mus_note noteD, note4 + mus_note noteD, note4 + mus_note noteD, note4 + mus_note noteD, note4 + mus_note noteD, note4 + mus_note noteD, note4 + mus_end + ; A6B9 IndigoPlateau_md_3: ;a6ba - a70e INCBIN "baserom.gbc",$a6ba,$a70f - $a6ba From 2d724d079be64f7910c0b88eea86460c222e1b74 Mon Sep 17 00:00:00 2001 From: KuroiIeWa5Da Date: Mon, 23 Jan 2012 09:19:30 -0600 Subject: [PATCH 16/20] Finished Indigo Plateu Music Data Channel 3 hg-commit-id: 142112eb8d0f --- music.asm | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 79 insertions(+), 1 deletion(-) diff --git a/music.asm b/music.asm index ab3f4f13..bf05faa9 100644 --- a/music.asm +++ b/music.asm @@ -2979,7 +2979,85 @@ branch_a6af: ; A6B9 IndigoPlateau_md_3: ;a6ba - a70e -INCBIN "baserom.gbc",$a6ba,$a70f - $a6ba + ; A6BA + mus_vel 1, 0 + + mus_octave oct3 + mus_note noteD, note8 + mus_note noteRst, note4_8 + mus_note noteD, note8 + mus_note noteRst, note4_8 + mus_note noteD, note8 + mus_note noteRst, note4_8 + mus_note noteD, note8 + mus_note noteRst, note8 + mus_note noteD#, note4 + +branch_a6c6: + mus_call branch_a6fe + mus_call branch_a6fe + mus_call branch_a6fe + mus_note noteD, note8 + mus_note noteRst, note8 + mus_note noteD, note8 + mus_note noteRst, note8 + mus_note noteD, note8 + mus_note noteRst, note8 + mus_note noteD, note8 + mus_note noteRst, note8 + mus_note noteD, note8 + mus_note noteRst, note8 + mus_note noteD, note8 + mus_note noteRst, note8 + mus_note noteD, note8 + mus_note noteRst, note8 + mus_note noteF#, note4 + mus_call branch_a6fe + mus_call branch_a6fe + mus_note noteD, note8 + mus_note noteRst, note8 + mus_note noteD, note8 + mus_note noteRst, note8 + mus_note noteD, note8 + mus_note noteRst, note8 + mus_note noteD, note8 + mus_note noteRst, note8 + mus_note noteD, note8 + mus_note noteRst, note8 + mus_note noteD, note8 + mus_note noteRst, note8 + mus_note noteD, note8 + mus_note noteRst, note8 + mus_note noteA#, note16 + mus_note noteRst, note16 + mus_note noteA#, note16 + mus_note noteRst, note16 + mus_note noteA, note2 + mus_note noteD, note2 + mus_note noteA#, note2 + mus_note noteD#, note2 + mus_jump 0, branch_a6c6 + + +branch_a6fe: + mus_octave oct3 + mus_note noteD, note8 + mus_note noteRst, note8 + mus_note noteD, note8 + mus_note noteRst, note8 + mus_note noteD, note8 + mus_note noteRst, note8 + mus_note noteD, note8 + mus_note noteRst, note8 + mus_note noteD, note8 + mus_note noteRst, note8 + mus_note noteD, note8 + mus_note noteRst, note8 + mus_note noteD, note8 + mus_note noteRst, note8 + mus_note noteA, note4 + mus_end + ; A70E IndigoPlateau_md_4: ;a70f - a7c4 INCBIN "baserom.gbc",$a70f,$a7c5 - $a70f From 1f87393305129179acd3f6b801b76af1787dbeaa Mon Sep 17 00:00:00 2001 From: KuroiIeWa5Da Date: Mon, 23 Jan 2012 09:44:09 -0600 Subject: [PATCH 17/20] Finished Indigo Plateu Music Data Channel 4 hg-commit-id: 3a15a4086cdb --- music.asm | 168 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 167 insertions(+), 1 deletion(-) diff --git a/music.asm b/music.asm index bf05faa9..647f7b4c 100644 --- a/music.asm +++ b/music.asm @@ -3060,7 +3060,173 @@ branch_a6fe: ; A70E IndigoPlateau_md_4: ;a70f - a7c4 -INCBIN "baserom.gbc",$a70f,$a7c5 - $a70f + ; A70F + +;piece 1 + db $D6 + mus_note noteB, note1 + mus_note noteC#, note8 + mus_note noteB, note1 + mus_note noteC#, note8 + mus_note noteB, note1 + mus_note noteC#, note8 + mus_note noteB, note2 + mus_note noteC#, note8 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note16 + mus_note noteC#, note8_16 + +branch_a728: + mus_call branch_a791 + mus_call branch_a77e + mus_call branch_a791 + mus_call branch_a7a8 + mus_call branch_a791 + mus_call branch_a77e + mus_call branch_a791 + mus_call branch_a7a8 + mus_call branch_a791 + mus_call branch_a77e + mus_call branch_a791 + mus_call branch_a7a8 + mus_call branch_a77e + mus_call branch_a7a8 + mus_note noteB, note1 + mus_note noteC#, note8 + mus_note noteB, note2 + mus_note noteC#, note8 + mus_note noteB, note2 + mus_note noteC#, note8_16 + mus_note noteB, note1 + mus_note noteC#, note8 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note16 + mus_note noteC#, note8 + mus_note noteB, note16 + mus_note noteC#, note8 + mus_note noteB, note16 + mus_note noteC#, note8 + mus_note noteB, note16 + mus_note noteC#, note8 + mus_jump 0, branch_a728 + +branch_a77e: + mus_note noteB, note4 + mus_note noteC#, note8 + mus_note noteB, note4 + mus_note noteC#, note8_16 + mus_note noteB, note4 + mus_note noteC#, note4 + mus_note noteB, note4 + mus_note noteC#, note8_16 + mus_note noteB, note4 + mus_note noteC#, note8 + mus_note noteB, note4 + mus_note noteC#, note8_16 + mus_note noteB, note4 + mus_note noteC#, note4 + mus_note noteB, note8 + mus_note noteC#, note4 + mus_note noteB, note8 + mus_note noteC#, note8_16 + mus_end + ; A790 + +;piece 2 +branch_a791: + mus_note noteB, note4 + mus_note noteC#, note8 + mus_note noteB, note4 + mus_note noteC#, note8_16 + mus_note noteB, note4 + mus_note noteC#, note4 + mus_note noteB, note4 + mus_note noteC#, note8_16 + mus_note noteB, note4 + mus_note noteC#, note8 + mus_note noteB, note4 + mus_note noteC#, note8_16 + mus_note noteB, note4 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_end + ; A7A7 + +;piece 3 +branch_a7a8: + mus_note noteB, note4 + mus_note noteC#, note8 + mus_note noteB, note4 + mus_note noteC#, note8_16 + mus_note noteB, note4 + mus_note noteC#, note8 + mus_note noteB, note4 + mus_note noteC#, note8_16 + mus_note noteB, note4 + mus_note noteC#, note8 + mus_note noteB, note4 + mus_note noteC#, note8 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_end + ; A7C4 ;Pallet Town PalletTown_md_1: ; a7c5 - a85e (154 bytes) From 0c15a0983793f34308f991809ce074c39d70aad6 Mon Sep 17 00:00:00 2001 From: KuroiIeWa5Da Date: Mon, 23 Jan 2012 09:53:29 -0600 Subject: [PATCH 18/20] Finished Pallet Town Music Data Channel 1 hg-commit-id: fea6decd3774 --- music.asm | 174 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 173 insertions(+), 1 deletion(-) diff --git a/music.asm b/music.asm index 647f7b4c..836f17df 100644 --- a/music.asm +++ b/music.asm @@ -3230,7 +3230,179 @@ branch_a7a8: ;Pallet Town PalletTown_md_1: ; a7c5 - a85e (154 bytes) -INCBIN "baserom.gbc",$a7c5,$a85f - $a7c5 + ; A7C5 + mus_tempo 0, 160 + mus_volume 119 + mus_duty duty50 + mus_vel 12, 3 + +branch_a7ce: + mus_octave oct2 + mus_note noteB, note4 + + mus_octave oct3 + mus_note noteC, note8 + mus_note noteD, note4 + mus_note noteG, note8 + mus_note noteD, note8 + mus_note noteC, note8 + + mus_octave oct2 + mus_note noteB, note4 + mus_note noteG, note8 + + mus_octave oct3 + mus_note noteD, note4 + mus_note noteD, note8 + mus_note noteC, note8 + + mus_octave oct2 + mus_note noteB, note8 + mus_note noteRst, note8 + mus_note noteB, note8 + + mus_octave oct3 + mus_note noteC, note8 + + mus_octave oct2 + mus_note noteB, note8 + + mus_octave oct3 + mus_note noteC, note2 + mus_note noteRst, note8 + + mus_octave oct2 + mus_note noteB, note8 + + mus_octave oct3 + mus_note noteC, note8 + + mus_octave oct2 + mus_note noteA, note8 + mus_note noteB, note8 + mus_note noteG, note8 + mus_note noteA, note8 + mus_note noteF#, note8 + mus_note noteB, note4 + + mus_octave oct3 + mus_note noteC, note8 + mus_note noteD, note4 + mus_note noteG, note8 + mus_note noteD, note8 + mus_note noteC, note8 + + mus_octave oct2 + mus_note noteB, note4 + mus_note noteG, note8 + + mus_octave oct3 + mus_note noteD, note4 + mus_note noteD, note8 + mus_note noteG, note8 + mus_note noteF#, note8 + mus_note noteE, note4 + mus_note noteD, note8 + mus_note noteC, note4 + + mus_octave oct2 + mus_note noteA, note8 + mus_note noteB, note8 + + mus_octave oct3 + mus_note noteC, note8 + mus_note noteD, note8 + mus_note noteC, note8 + + mus_octave oct2 + mus_note noteB, note8 + mus_note noteA, note8 + mus_note noteG, note4 + mus_note noteF#, note4 + + mus_octave oct3 + mus_note noteC, note8 + + mus_octave oct2 + mus_note noteG, note8 + mus_note noteE, note8 + mus_note noteG, note8 + + mus_octave oct3 + mus_note noteD, note8 + + mus_octave oct2 + mus_note noteA, note8 + mus_note noteF#, note8 + mus_note noteA, note8 + mus_vel 11, 3 + mus_note noteB, note8 + mus_note noteG, note8 + mus_note noteD, note8 + mus_note noteG, note8 + mus_note noteB, note8 + mus_note noteG, note8 + mus_note noteD, note8 + mus_note noteG, note8 + + mus_octave oct3 + mus_note noteC, note8 + + mus_octave oct2 + mus_note noteG, note8 + mus_note noteE, note8 + mus_note noteG, note8 + + mus_octave oct3 + mus_note noteD, note8 + + mus_octave oct2 + mus_note noteA, note8 + mus_note noteF#, note8 + mus_note noteA, note8 + mus_note noteB, note8 + mus_note noteG, note8 + mus_note noteD, note8 + mus_note noteG, note8 + mus_note noteB, note8 + mus_note noteG, note8 + mus_note noteD, note8 + mus_note noteG, note8 + mus_note noteA, note8 + mus_note noteE, note8 + mus_note noteC, note8 + mus_note noteE, note8 + mus_note noteA, note8 + mus_note noteE, note8 + mus_note noteC, note8 + mus_note noteE, note8 + mus_note noteA, note8 + mus_note noteE, note8 + mus_note noteC, note8 + mus_note noteE, note8 + mus_note noteA, note8 + mus_note noteE, note8 + mus_note noteC, note8 + mus_note noteE, note8 + mus_note noteF#, note8 + mus_note noteD, note8 + mus_note noteC, note8 + mus_note noteD, note8 + mus_note noteG, note8 + mus_note noteE, note8 + mus_note noteC, note8 + mus_note noteE, note8 + mus_note noteG, note8 + mus_note noteE, note8 + mus_note noteC, note8 + mus_note noteE, note8 + mus_note noteF#, note8 + mus_note noteD, note8 + mus_note noteC, note8 + mus_note noteD, note8 + mus_jump 0, branch_a7ce + mus_end + ; A85E PalletTown_md_2: ; a85f - a8dd (127 bytes) INCBIN "baserom.gbc",$a85f,$a8de - $a85f From f31781078f8e546133d238109b6b25a0706b9409 Mon Sep 17 00:00:00 2001 From: KuroiIeWa5Da Date: Mon, 23 Jan 2012 09:57:05 -0600 Subject: [PATCH 19/20] Finished Pallet Town Music Data Channel 2 hg-commit-id: 3dd5f57b1599 --- music.asm | 132 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 131 insertions(+), 1 deletion(-) diff --git a/music.asm b/music.asm index 836f17df..d928c1a6 100644 --- a/music.asm +++ b/music.asm @@ -3405,7 +3405,137 @@ branch_a7ce: ; A85E PalletTown_md_2: ; a85f - a8dd (127 bytes) -INCBIN "baserom.gbc",$a85f,$a8de - $a85f + ; A85F + mus_duty duty50 + +branch_a861: + mus_vel 13, 3 + + mus_octave oct4 + mus_note noteD, note8 + mus_vel 10, 3 + mus_note noteC, note8 + mus_vel 13, 3 + + mus_octave oct3 + mus_note noteB, note8 + mus_vel 11, 3 + mus_note noteA, note8 + mus_vel 13, 3 + + mus_octave oct4 + mus_note noteG, note8 + mus_vel 11, 3 + mus_note noteE, note8 + mus_vel 13, 3 + mus_note noteF#, note8 + mus_note noteE, note8 + mus_note noteD, note4_8 + + mus_octave oct3 + mus_note noteB, note8 + mus_note noteG, note8 + mus_note noteG, note8 + mus_note noteA, note8 + mus_note noteB, note8 + + mus_octave oct4 + mus_note noteC, note2_8 + + mus_octave oct3 + mus_note noteF#, note8 + mus_note noteG, note8 + mus_note noteA, note8 + mus_note noteB, note4_8 + + mus_octave oct4 + mus_note noteC, note16 + + mus_octave oct3 + mus_note noteB, note16 + mus_note noteA, note2 + + mus_octave oct4 + mus_note noteD, note8 + mus_vel 10, 3 + mus_note noteC, note8 + mus_vel 13, 3 + + mus_octave oct3 + mus_note noteB, note8 + mus_vel 11, 3 + + mus_octave oct4 + mus_note noteD, note8 + mus_vel 13, 3 + mus_note noteG, note8 + mus_vel 10, 3 + mus_note noteF#, note8 + mus_vel 11, 3 + mus_note noteF#, note8 + mus_vel 13, 3 + mus_note noteG, note8 + mus_note noteE, note4_8 + mus_note noteD, note8 + mus_note noteD, note2 + mus_note noteC, note8 + + mus_octave oct3 + mus_note noteB, note8 + mus_note noteA, note8 + mus_note noteG, note8 + + mus_octave oct4 + mus_note noteD, note8 + mus_note noteC, note8 + + mus_octave oct3 + mus_note noteB, note8 + mus_note noteA, note8 + mus_note noteG, note2_8 + mus_note noteG, note8 + mus_note noteA, note8 + mus_note noteB, note8 + + mus_octave oct4 + mus_note noteC, note2 + mus_note noteD, note4_8 + mus_note noteC, note8 + + mus_octave oct3 + mus_note noteB, note2 + mus_note noteRst, note8 + mus_note noteG, note8 + mus_note noteA, note8 + mus_note noteB, note8 + + mus_octave oct4 + mus_note noteC, note4 + mus_note noteC, note4 + mus_note noteD, note4_8 + mus_note noteC, note16 + mus_note noteD, note16 + + mus_octave oct3 + mus_note noteB, note2 + mus_note noteRst, note8 + mus_note noteB, note8 + mus_note noteA, note8 + mus_note noteG, note8 + mus_note noteA, note2 + mus_note noteE, note4 + mus_note noteB, note4 + mus_note noteA, note2 + mus_note noteG, note4 + mus_note noteE, note4 + mus_note noteF#, note2 + mus_note noteG, note4 + mus_note noteB, note4 + mus_note noteB, note2 + mus_note noteA, note2 + mus_jump 0, branch_a861 + mus_end + ; A8DD PalletTown_md_3: ; a8de - aa75 (408 bytes) INCBIN "baserom.gbc",$a8de,$aa76 - $a8de From d152bc24ab0fe2c5342cf6cd3118d3c188c87557 Mon Sep 17 00:00:00 2001 From: KuroiIeWa5Da Date: Mon, 23 Jan 2012 10:08:18 -0600 Subject: [PATCH 20/20] Finished Pallet Town Music Data Channel 3 hg-commit-id: 7d7684048c41 --- music.asm | 440 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 439 insertions(+), 1 deletion(-) diff --git a/music.asm b/music.asm index d928c1a6..5aa15f53 100644 --- a/music.asm +++ b/music.asm @@ -3538,8 +3538,446 @@ branch_a861: ; A8DD PalletTown_md_3: ; a8de - aa75 (408 bytes) -INCBIN "baserom.gbc",$a8de,$aa76 - $a8de +;INCBIN "baserom.gbc",$a8de,$aa76 - $a8de + ; A8DE + mus_mod 24, 2, 8 + mus_vel 1, 2 + +branch_a8e3: + mus_octave oct3 + mus_note noteG, note4_8 + mus_note noteE, note4_8 + mus_note noteF#, note4 + mus_note noteG, note4_8 + mus_note noteA, note4_8 + mus_note noteG, note4 + mus_note noteE, note4_8 + mus_note noteF#, note4_8 + mus_note noteE, note4 + mus_note noteG, note4_8 + mus_note noteE, note4_8 + mus_note noteD, note4 + mus_note noteG, note4_8 + mus_note noteE, note4_8 + mus_note noteF#, note4 + mus_note noteG, note4_8 + mus_note noteA, note4_8 + mus_note noteG, note4 + mus_note noteE, note4_8 + mus_note noteF#, note4_8 + mus_note noteA, note4 + mus_note noteG, note4_8 + mus_note noteE, note4_8 + mus_note noteD, note4 + mus_note noteC, note2 + mus_note noteD, note2 + mus_note noteG, note2 + mus_note noteE, note4 + mus_note noteD, note4 + mus_note noteC, note2 + mus_note noteD, note2 + mus_note noteG, note2 + mus_note noteA, note4 + mus_note noteG, note4 + mus_note noteE, note2 + mus_note noteA, note2 + mus_note noteE, note2 + mus_note noteG, note2 + mus_note noteF#, note2 + mus_note noteE, note2 + mus_note noteE, note2 + mus_note noteF#, note2 + mus_jump 0, branch_a8e3 + mus_end + ; A912 + + mus_tempo 0, 144 + mus_volume 119 + mus_mod 5, 1, 6 + +branch_a91b: + mus_vel 1, 0 + + mus_octave oct5 + mus_note noteE, note16 + mus_note noteRst, note16 + + mus_octave oct4 + mus_note noteB, note16 + mus_note noteRst, note16 + + mus_octave oct5 + mus_note noteC#, note16 + mus_note noteRst, note16 + + mus_octave oct4 + mus_note noteB, note16 + + mus_octave oct5 + mus_note noteE, note16 + mus_note noteRst, note4 + mus_note noteE, note8 + mus_note noteRst, note8 + mus_note noteD#, note16 + mus_note noteRst, note16 + + mus_octave oct4 + mus_note noteB, note16 + mus_note noteRst, note16 + + mus_octave oct5 + mus_note noteC#, note16 + mus_note noteRst, note16 + + mus_octave oct4 + mus_note noteB, note16 + + mus_octave oct5 + mus_note noteD#, note16 + mus_note noteRst, note2 + mus_note noteC#, note16 + mus_note noteRst, note16 + mus_note noteD#, note16 + mus_note noteRst, note16 + mus_note noteC#, note16 + + mus_octave oct4 + mus_note noteB, note16 + mus_note noteRst, note8 + + mus_octave oct5 + mus_note noteC#, note16 + mus_note noteRst, note16 + mus_note noteD#, note16 + mus_note noteRst, note16 + mus_note noteC#, note16 + + mus_octave oct4 + mus_note noteB, note16 + mus_note noteRst, note8 + + mus_octave oct5 + mus_note noteD#, note4 + mus_note noteC#, note4 + mus_note noteD#, note16 + mus_note noteE, note16 + mus_note noteRst, note16 + mus_note noteF#, note16 + mus_note noteRst, note16 + + mus_octave oct4 + mus_note noteB, note8 + mus_note noteRst, note16 + + mus_octave oct5 + mus_note noteE, note16 + mus_note noteRst, note16 + + mus_octave oct4 + mus_note noteB, note16 + mus_note noteRst, note16 + + mus_octave oct5 + mus_note noteC#, note16 + mus_note noteRst, note16 + + mus_octave oct4 + mus_note noteB, note16 + + mus_octave oct5 + mus_note noteE, note16 + mus_note noteRst, note2 + mus_note noteD#, note16 + mus_note noteRst, note16 + + mus_octave oct4 + mus_note noteB, note16 + mus_note noteRst, note16 + + mus_octave oct5 + mus_note noteC#, note16 + mus_note noteRst, note16 + + mus_octave oct4 + mus_note noteB, note16 + + mus_octave oct5 + mus_note noteD#, note16 + mus_note noteRst, note4 + + mus_octave oct4 + mus_note noteB, note8 + mus_note noteRst, note8 + + mus_octave oct5 + mus_note noteC#, note16 + mus_note noteRst, note16 + mus_note noteD#, note16 + mus_note noteRst, note16 + mus_note noteC#, note16 + + mus_octave oct4 + mus_note noteB, note16 + mus_note noteRst, note8 + + mus_octave oct5 + mus_note noteC#, note16 + mus_note noteRst, note16 + mus_note noteD#, note16 + mus_note noteRst, note16 + mus_note noteE, note16 + mus_note noteF#, note16 + mus_note noteRst, note8 + mus_note noteF#, note4 + mus_note noteE, note4 + mus_note noteF#, note16 + mus_note noteG#, note16 + mus_note noteRst, note16 + mus_note noteF#, note16 + mus_note noteRst, note16 + mus_note noteD#, note8 + mus_note noteRst, note8_16 + + mus_octave oct4 + mus_note noteA, note8 + mus_note noteRst, note8 + mus_note noteB, note8 + mus_note noteRst, note8 + + mus_octave oct5 + mus_note noteC#, note8 + mus_note noteRst, note8 + mus_note noteE, note8 + mus_note noteF#, note2 + mus_note noteRst, note8 + mus_note noteE, note8 + mus_note noteD#, note8 + mus_note noteC#, note8 + mus_note noteRst, note8 + + mus_octave oct4 + mus_note noteG#, note8 + mus_note noteRst, note8 + mus_note noteA, note8 + mus_note noteRst, note8 + mus_note noteB, note8 + mus_note noteRst, note8 + + mus_octave oct5 + mus_note noteD#, note8 + mus_note noteE, note2 + mus_note noteRst, note8 + mus_note noteD#, note8 + mus_note noteC#, note8 + mus_note noteD#, note8 + + mus_octave oct4 + mus_note noteA, note8 + mus_note noteG#, note8 + mus_note noteA, note8 + mus_note noteA#, note16 + mus_note noteB, note16 + mus_note noteRst, note4 + mus_note noteF#, note8 + mus_note noteRst, note8 + mus_note noteB, note8 + mus_note noteA#, note8 + mus_note noteB, note8 + + mus_octave oct5 + mus_note noteC, note16 + mus_note noteC#, note16 + mus_note noteRst, note2 + + mus_octave oct4 + mus_note noteF#, note8 + mus_note noteF, note8 + mus_note noteF#, note8 + mus_note noteG#, note8 + mus_note noteA, note8 + + mus_octave oct5 + mus_note noteE, note8 + mus_note noteD#, note8 + mus_note noteC#, note8 + + mus_octave oct4 + mus_note noteB, note8 + mus_note noteRst, note4_8 + mus_note noteB, note8 + mus_note noteRst, note4_8 + mus_jump 0, branch_a91b + mus_end + ; A9CE + + ; A9CF + mus_tempo 0, 144 + mus_volume 119 + db $E8 + mus_mod 6, 1, 5 + +branch_a9d8: + mus_vel 1, 0 + + mus_octave oct5 + mus_note noteE, note16 + mus_note noteRst, note16 + mus_note noteG#, note16 + mus_note noteRst, note16 + mus_note noteF#, note16 + mus_note noteRst, note16 + mus_note noteA, note16 + mus_note noteG#, note16 + mus_note noteRst, note2 + mus_note noteD#, note16 + mus_note noteRst, note16 + mus_note noteF#, note16 + mus_note noteRst, note16 + mus_note noteE, note16 + mus_note noteRst, note16 + mus_note noteG#, note16 + mus_note noteF#, note16 + mus_note noteRst, note4 + + mus_octave oct4 + mus_note noteB, note8 + mus_note noteRst, note8 + + mus_octave oct5 + mus_note noteC#, note16 + mus_note noteRst, note16 + mus_note noteD#, note16 + mus_note noteRst, note16 + mus_note noteE, note16 + mus_note noteF#, note16 + mus_note noteRst, note8 + mus_note noteC#, note16 + mus_note noteRst, note16 + mus_note noteD#, note16 + mus_note noteRst, note16 + mus_note noteE, note16 + mus_note noteF#, note16 + mus_note noteRst, note8 + mus_note noteF#, note4 + mus_note noteE, note4 + mus_note noteF#, note16 + mus_note noteG#, note16 + mus_note noteRst, note16 + mus_note noteF#, note16 + mus_note noteRst, note16 + mus_note noteD#, note8 + mus_note noteRst, note16 + mus_note noteE, note16 + mus_note noteRst, note16 + mus_note noteG#, note16 + mus_note noteRst, note16 + mus_note noteF#, note16 + mus_note noteRst, note16 + mus_note noteA, note16 + mus_note noteG#, note16 + mus_note noteRst, note4 + mus_note noteE, note8 + mus_note noteRst, note8 + mus_note noteD#, note16 + mus_note noteRst, note16 + mus_note noteF#, note16 + mus_note noteRst, note16 + mus_note noteE, note16 + mus_note noteRst, note16 + mus_note noteG#, note16 + mus_note noteF#, note16 + mus_note noteRst, note2 + mus_note noteC#, note16 + mus_note noteRst, note16 + mus_note noteD#, note16 + mus_note noteRst, note16 + mus_note noteE, note16 + mus_note noteF#, note16 + mus_note noteRst, note8 + mus_note noteC#, note16 + mus_note noteRst, note16 + mus_note noteD#, note16 + mus_note noteRst, note16 + mus_note noteE, note16 + mus_note noteF#, note16 + mus_note noteRst, note8 + mus_note noteF#, note4 + mus_note noteE, note4 + mus_note noteF#, note16 + mus_note noteG#, note16 + mus_note noteRst, note16 + mus_note noteB, note16 + mus_note noteRst, note16 + mus_note noteF#, note8 + mus_note noteRst, note16 + mus_note noteC#, note8 + mus_note noteRst, note8 + mus_note noteD#, note8 + mus_note noteRst, note8 + mus_note noteE, note8 + mus_note noteRst, note8 + mus_note noteG#, note8 + mus_note noteRst, note8 + mus_note noteD#, note2 + mus_note noteRst, note8 + mus_note noteE, note8 + mus_note noteD#, note8 + mus_note noteC#, note8 + + mus_octave oct4 + mus_note noteB, note8 + mus_note noteRst, note8 + + mus_octave oct5 + mus_note noteC#, note8 + mus_note noteRst, note8 + mus_note noteD#, note8 + mus_note noteRst, note8 + mus_note noteF#, note8 + mus_note noteRst, note8 + mus_note noteC#, note2 + mus_note noteRst, note8 + mus_note noteD#, note8 + mus_note noteC#, note8 + + mus_octave oct4 + mus_note noteB, note8 + mus_note noteA, note8 + mus_note noteG#, note8 + mus_note noteA, note8 + mus_note noteG#, note16 + mus_note noteF#, note16 + mus_note noteRst, note2 + mus_note noteB, note8 + mus_note noteA#, note8 + mus_note noteB, note8 + mus_note noteA, note16 + mus_note noteG#, note16 + mus_note noteRst, note4 + mus_note noteG#, note8 + mus_note noteRst, note8 + mus_note noteF#, note8 + mus_note noteF, note8 + mus_note noteF#, note8 + mus_note noteG#, note8 + mus_note noteA, note8 + mus_note noteE, note8 + mus_note noteC#, note8 + mus_note noteE, note8 + mus_note noteF#, note8 + mus_note noteRst, note4_8 + mus_note noteD#, note8 + mus_note noteRst, note4_8 + mus_jump 0, branch_a9d8 + mus_end + ; AA6E + + ; AA6F + mus_tempo 0, 232 + mus_jump 0, $6A79 ;;Leads into city music not dugout yet + ; AA75 + ;Viridian City, Pewter City, Saffron City Cities1_md_1: ;AA76 - AB91 INCBIN "baserom.gbc",$aa76,$ab92 - $aa76