summaryrefslogtreecommitdiff
path: root/ZAPD/ZFile.cpp
diff options
context:
space:
mode:
authorfig02 <fig02srl@gmail.com>2021-01-01 21:10:28 -0500
committerGitHub <noreply@github.com>2021-01-01 21:10:28 -0500
commitcd4a8760b64474a2603c2d164ab7fb7bcd88385c (patch)
treecb510f6c63ad183df25083c658788e4e2407c7df /ZAPD/ZFile.cpp
parenta29291d139764b251536282b3fd716ffa877e3d7 (diff)
Misc changes (#41)
* fixes * changes * progress * Vertices -> Vtx * done i think
Diffstat (limited to 'ZAPD/ZFile.cpp')
-rw-r--r--ZAPD/ZFile.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/ZAPD/ZFile.cpp b/ZAPD/ZFile.cpp
index fa4f081..b2de4a8 100644
--- a/ZAPD/ZFile.cpp
+++ b/ZAPD/ZFile.cpp
@@ -723,21 +723,22 @@ string ZFile::ProcessDeclarations()
{
int diff = item.first - (lastAddr + declarations[lastAddr]->size);
- string src = "\t";
+ string src = " ";
+
for (int i = 0; i < diff; i++)
{
src += StringHelper::Sprintf("0x%02X, ", rawDataArr[lastAddr + declarations[lastAddr]->size + i]);
- if (i % 16 == 15)
- src += "\n\t";
+ if ((i % 16 == 15) && (i != (diff - 1)))
+ src += "\n ";
}
if (declarations.find(lastAddr + declarations[lastAddr]->size) == declarations.end())
{
if (diff > 0)
{
- AddDeclarationArray(lastAddr + declarations[lastAddr]->size, DeclarationAlignment::None, diff, "static u8", StringHelper::Sprintf("unaccounted_%04X", lastAddr + declarations[lastAddr]->size),
+ AddDeclarationArray(lastAddr + declarations[lastAddr]->size, DeclarationAlignment::None, diff, "static u8", StringHelper::Sprintf("unaccounted_%06X", lastAddr + declarations[lastAddr]->size),
diff, src);
}
}
@@ -766,7 +767,7 @@ string ZFile::ProcessDeclarations()
{
if (diff > 0)
{
- AddDeclarationArray(lastAddr + declarations[lastAddr]->size, DeclarationAlignment::None, diff, "static u8", StringHelper::Sprintf("unaccounted_%04X", lastAddr + declarations[lastAddr]->size),
+ AddDeclarationArray(lastAddr + declarations[lastAddr]->size, DeclarationAlignment::None, diff, "static u8", StringHelper::Sprintf("unaccounted_%06X", lastAddr + declarations[lastAddr]->size),
diff, src);
}
}