thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-07 16:15:23 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updated program to support the -fo option - forces continuation of parsing past mus_end

Browse source 
hg-commit-id: 595e13f32986
This commit is contained in:
KuroiIeWa5Da 2012-01-28 08:16:42 -06:00
parent 436c486d95
commit 1e6b99faa2
3 changed files with 44 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

28
music/pokeredmusicdisasm/Parser.cpp
View file

@ -10,6 +10,7 @@ Parser::Parser()
filePos = 0;
stop = false;
stopAddress = 0;
force = false;
}
Parser::Parser(std::string filename)
@ -19,6 +20,7 @@ Parser::Parser(std::string filename)
filePos = 0;
stop = false;
stopAddress = 0;
force = false;
SetFilename(filename);
}
@ -58,6 +60,16 @@ void Parser::SetStopAddress(unsigned int value)
stopAddress = value;
}
bool Parser::GetForce()
{
return force;
}
void Parser::SetForce(bool value)
{
force = value;
}
string Parser::GetParsedAsm()
{
string tmpStr;
@ -139,14 +151,27 @@ void Parser::ParseNext() // Parses the block immidiately following
bool firstNonNote = false; // (unused so far)First byte wasn't a note or octacve switch, add ";Setup" comment
bool firstNote = false; // (unused so far) First note or octave
unsigned char lDataType = DATA_NA;
bool newBranch = false; // Create a new branch
stringstream pos;
pos << "; " << hex << uppercase << (unsigned int)filePos;
parsedString.push_back(pos.str());
unsigned int count = 1; // Counter for processed instructions
newBranch = true;
for(unsigned int i = filePos; (i <= fileLength) && (stop == false); i++)
{
if(newBranch)
{
stringstream _tmpBr;
_tmpBr << "\n";
_tmpBr << "UnknSong_md_" << hex << i << ":";
parsedString.push_back(_tmpBr.str());
_tmpBr.str("");
newBranch = false;
}
// First peek to see what kind of data it is, then perform any pre and post setup
if(ParseData<Call>(i, true))
{
@ -236,7 +261,8 @@ void Parser::ParseNext() // Parses the block immidiately following
if(lDataType == DATA_NOTE) parsedString.push_back("\n"); // Insert a newline after notes
ParseData<Stop>(i);
stop = true; // Raise the stop flag informing the parser to stop
if(!force) stop = true; // Raise the stop flag informing the parser to stop
newBranch = true;
lDataType = DATA_STOP;
}
else