From b1f0bcd9a98f021f42bab606665425332576d9ce Mon Sep 17 00:00:00 2001
From: Anghelo Carvajal <angheloalf95@gmail.com>
Date: Wed, 23 Jun 2021 16:45:44 -0400
Subject: Add support to `LegacyLimb`s and `LegacyAnimation`, making
 `object_human` extractable  (#152)

* proof of concept

* Add hex type to ZScalar

* minor fixes

* BetaAnimation proof of concept

* FrameData and JointKey

* Fix warnings

* Rename betalimb to legacylimb and move with the rest of limbs

* Rename BetaAnimation to LegacyAnimation

* Add verboseunaccounted

* Add limb table

* Use ZLimbTable in ZSkeleton

* run format

* Update docs

* AnimationHeader2 -> LegacyAnimationHeader
---
 ZAPD/ZFile.cpp | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

(limited to 'ZAPD/ZFile.cpp')

diff --git a/ZAPD/ZFile.cpp b/ZAPD/ZFile.cpp
index 3e1559e..9502214 100644
--- a/ZAPD/ZFile.cpp
+++ b/ZAPD/ZFile.cpp
@@ -544,6 +544,7 @@ uint32_t ZFile::GetDeclarationRangedAddress(uint32_t address) const
 
 bool ZFile::HasDeclaration(uint32_t address)
 {
+	assert(GETSEGNUM(address) == 0);
 	return declarations.find(address) != declarations.end();
 }
 
@@ -908,8 +909,22 @@ std::string ZFile::ProcessDeclarations()
 					nonZeroUnaccounted = true;
 				}
 
-				if ((i % 16 == 15) && (i != (diff - 1)))
-					src += "\n    ";
+				if (Globals::Instance->verboseUnaccounted)
+				{
+					if ((i % 4 == 3))
+					{
+						src += StringHelper::Sprintf(" // 0x%06X", unaccountedAddress + i - 3);
+						if (i != (diff - 1))
+						{
+							src += "\n\t";
+						}
+					}
+				}
+				else
+				{
+					if ((i % 16 == 15) && (i != (diff - 1)))
+						src += "\n    ";
+				}
 			}
 
 			if (declarations.find(unaccountedAddress) == declarations.end())
-- 
cgit v1.2.3