mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-13 18:30:35 +00:00
Code Issues Projects Releases Wiki Activity

Updated to use latest version of ZAPD (#777)

Browse source 
* Updated config file

* Added missing files

* Temporarily removed asm_processor changes.

* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "96ffc1e62"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "96ffc1e62"
git-subrepo:
  version:  "0.4.3"
  origin:   "???"
  commit:   "???"

* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "179af7d11"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "179af7d11"
git-subrepo:
  version:  "0.4.3"
  origin:   "???"
  commit:   "???"

* Cleanup and fixes.

* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "50ad2fe78"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "50ad2fe78"
git-subrepo:
  version:  "0.4.3"
  origin:   "???"
  commit:   "???"

* Makefile fix

* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "b9120803e"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "b9120803e"
git-subrepo:
  version:  "0.4.3"
  origin:   "???"
  commit:   "???"

Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
This commit is contained in:
Nicholas Estelami 2021-04-30 17:23:22 -04:00 • committed by GitHub
parent 6e58354c71
commit 0432011bd9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
141 changed files with 7843 additions and 4338 deletions
Download patch file Download diff file Expand all files Collapse all files

44
tools/ZAPD/ZAPD/ZSymbol.cpp
View file

@ -1,30 +1,17 @@
#include "ZSymbol.h"
#include "StringHelper.h"
#include "ZFile.h"
ZSymbol::ZSymbol(const std::string& nName, int nRawDataIndex, const std::string& nType,
uint32_t nTypeSize, bool nIsArray, uint32_t nCount)
: type(nType), typeSize(nTypeSize), isArray(nIsArray), count(nCount)
REGISTER_ZFILENODE(Symbol, ZSymbol);
ZSymbol::ZSymbol(ZFile* nParent) : ZResource(nParent)
{
name = nName;
rawDataIndex = nRawDataIndex;
}
ZSymbol::ZSymbol(tinyxml2::XMLElement* reader, const std::vector<uint8_t>& nRawData,
int nRawDataIndex, ZFile* nParent)
void ZSymbol::ExtractFromXML(tinyxml2::XMLElement* reader, const std::vector<uint8_t>& nRawData,
const uint32_t nRawDataIndex, const std::string& nRelPath)
{
rawData.assign(nRawData.begin(), nRawData.end());
rawDataIndex = nRawDataIndex;
parent = nParent;
ParseXML(reader);
}
ZSymbol* ZSymbol::ExtractFromXML(tinyxml2::XMLElement* reader, const std::vector<uint8_t>& nRawData,
int nRawDataIndex, ZFile* parent)
{
ZSymbol* symbol = new ZSymbol(reader, nRawData, nRawDataIndex, parent);
return symbol;
ZResource::ExtractFromXML(reader, nRawData, nRawDataIndex, nRelPath);
}
void ZSymbol::ParseXML(tinyxml2::XMLElement* reader)
@ -32,6 +19,7 @@ void ZSymbol::ParseXML(tinyxml2::XMLElement* reader)
ZResource::ParseXML(reader);
const char* typeXml = reader->Attribute("Type");
if (typeXml == nullptr)
{
fprintf(stderr,
@ -63,19 +51,17 @@ void ZSymbol::ParseXML(tinyxml2::XMLElement* reader)
if (countXml != nullptr)
{
isArray = true;
if (!std::string(countXml).empty())
{
count = std::strtoul(countXml, nullptr, 0);
}
}
}
int ZSymbol::GetRawDataSize()
size_t ZSymbol::GetRawDataSize()
{
if (isArray)
{
return count * typeSize;
}
return typeSize;
}
@ -84,13 +70,13 @@ std::string ZSymbol::GetSourceOutputHeader(const std::string& prefix)
if (isArray)
{
if (count == 0)
{
return StringHelper::Sprintf("extern %s %s%s[];\n", type.c_str(), prefix.c_str(),
name.c_str());
}
return StringHelper::Sprintf("extern %s %s%s[%i];\n", type.c_str(), prefix.c_str(),
name.c_str(), count);
else
return StringHelper::Sprintf("extern %s %s%s[%i];\n", type.c_str(), prefix.c_str(),
name.c_str(), count);
}
return StringHelper::Sprintf("extern %s %s%s;\n", type.c_str(), prefix.c_str(), name.c_str());
}