AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-10 00:27:43 +00:00
Code Issues Projects Releases Wiki Activity

Update submodules

Browse Source
This commit is contained in:
Jack Andersen
2018-01-09 20:20:34 -10:00
parent 92b640214a
commit 613d57299e
11 changed files with 115 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
DataSpec/DNAMP1/ANCS.hpp
View File

@@ -416,22 +416,22 @@ struct ANCS : BigYAML
MetaTransTrans()
: IMetaTrans(Type::Trans, "Trans") {}
DECL_YAML
Value<float> time;
Value<atUint32> unk1;
Value<atUint8> unk2;
Value<atUint8> unk3;
Value<atUint32> unk4;
Value<float> transDurTime;
Value<atUint32> transDurTimeMode;
Value<bool> unk2;
Value<bool> runA;
Value<atUint32> flags;
};
struct MetaTransPhaseTrans : IMetaTrans
{
MetaTransPhaseTrans()
: IMetaTrans(Type::PhaseTrans, "PhaseTrans") {}
DECL_YAML
Value<float> time;
Value<atUint32> unk1;
Value<atUint8> unk2;
Value<atUint8> unk3;
Value<atUint32> unk4;
Value<float> transDurTime;
Value<atUint32> transDurTimeMode;
Value<bool> unk2;
Value<bool> runA;
Value<atUint32> flags;
};
struct Transition : BigYAML

2
DataSpec/SpecBase.cpp
View File

@@ -494,6 +494,7 @@ void SpecBase::copyBuildListData(std::vector<std::tuple<size_t, size_t, bool>>&
{
fprintf(stderr, "\r %" PRISize " / %" PRISize " %.4s %08X", ++loadIdx, buildList.size(),
tag.type.getChars(), (unsigned int)tag.id.Value());
fflush(stderr);
fileIndex.emplace_back();
auto& thisIdx = fileIndex.back();
@@ -626,6 +627,7 @@ void SpecBase::doPackage(const hecl::ProjectPath& path, const hecl::Database::Da
{
fprintf(stderr, "\r %" PRISize " / %" PRISize " %.4s %08X", ++loadIdx, buildList.size(),
tag.type.getChars(), (unsigned int)tag.id.Value());
fflush(stderr);
if (addedTags.find(tag) != addedTags.end())
continue;
addedTags.insert(tag);