thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-11-14 09:06:41 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

Completed Routes3 music data channel 2

Browse source 
hg-commit-id: ef99ba55bb1b
This commit is contained in:
KuroiIeWa5Da 2012-01-23 04:33:56 -06:00
parent 1014adc83c
commit 6a85dc48e1
2 changed files with 124 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

123
music.asm
View file

@ -1255,7 +1255,128 @@ branch_9FC3:
;No end byte until indigo plateu channel 1 ;No end byte until indigo plateu channel 1
Routes3_md_2: ;A009 - A07E 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 Routes3_md_3: ;A07F - 6130
INCBIN "baserom.gbc",$a07f,$a131 - $a07f INCBIN "baserom.gbc",$a07f,$a131 - $a07f

3
music/pokeredmusicdisasm/Parser.cpp
View file

@ -114,7 +114,6 @@ void Parser::ParseNext() // Parses the block immidiately following
for(unsigned int i = filePos; (i <= fileLength) && (stop == false); i++) 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 // 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 // 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 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()); parsedString.push_back(unkCode.str());
} }
filePos = i;
// If the stop address parameter is set, break when we get there // If the stop address parameter is set, break when we get there
if( (stopAddress != 0) && (i >= stopAddress) ) break; if( (stopAddress != 0) && (i >= stopAddress) ) break;
} }