2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-08 22:27:43 +00:00

Submodule updates

This commit is contained in:
Jack Andersen
2015-11-09 16:07:15 -10:00
parent 9cb8b10fda
commit b94e14cd55
17 changed files with 146 additions and 42 deletions

View File

@@ -2,7 +2,7 @@
#define _DNAMP1_PARAMETERS_HPP_
#include "../../DNACommon/DNACommon.hpp"
#include "../ANCS.hpp"
#include "../DNAMP1.hpp"
namespace Retro
{
@@ -94,19 +94,7 @@ struct AnimationParameters : BigYAML
Value<atUint32> character;
Value<atUint32> defaultAnimation;
UniqueID32 getCINF(PAKRouter<PAKBridge>& pakRouter) const
{
if (!animationCharacterSet)
return UniqueID32();
const NOD::Node* node;
const PAK::Entry* ancsEnt = pakRouter.lookupEntry(animationCharacterSet, &node);
ANCS ancs;
{
PAKEntryReadStream rs = ancsEnt->beginReadStream(*node);
ancs.read(rs);
}
return ancs.characterSet.characters.at(character).cinf;
}
UniqueID32 getCINF(PAKRouter<PAKBridge>& pakRouter) const;
void nameANCS(PAKRouter<PAKBridge>& pakRouter, const std::string& name) const
{