AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Standalone MP3 CHAR fix

This commit is contained in:
Jack Andersen 2015-09-26 17:48:53 -10:00
parent 262f9ccf9f
commit 525c8a0254
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
DataSpec/DNAMP3/CHAR.cpp
View File

@ -12,6 +12,7 @@ void CHAR::AnimationInfo::EVNT::SFXEvent::read(Athena::io::IStreamReader& reader
unk1 = reader.readUint32Big(); unk1 = reader.readUint32Big();
unk2 = reader.readUint32Big(); unk2 = reader.readUint32Big();
unk3 = reader.readUint32Big(); unk3 = reader.readUint32Big();
reader.enumerateBig(unk3Vals, unk3);
extraType = reader.readUint32Big(); extraType = reader.readUint32Big();
if (extraType == 1) if (extraType == 1)
extraFloat = reader.readFloatBig(); extraFloat = reader.readFloatBig();
@ -26,6 +27,7 @@ void CHAR::AnimationInfo::EVNT::SFXEvent::write(Athena::io::IStreamWriter& write
writer.writeUint32Big(unk1); writer.writeUint32Big(unk1);
writer.writeUint32Big(unk2); writer.writeUint32Big(unk2);
writer.writeUint32Big(unk3); writer.writeUint32Big(unk3);
writer.enumerateBig(unk3Vals);
writer.writeUint32Big(extraType); writer.writeUint32Big(extraType);
if (extraType == 1) if (extraType == 1)
writer.writeFloatBig(extraFloat); writer.writeFloatBig(extraFloat);
@ -40,6 +42,7 @@ void CHAR::AnimationInfo::EVNT::SFXEvent::fromYAML(Athena::io::YAMLDocReader& re
unk1 = reader.readUint32("unk1"); unk1 = reader.readUint32("unk1");
unk2 = reader.readUint32("unk2"); unk2 = reader.readUint32("unk2");
unk3 = reader.readUint32("unk3"); unk3 = reader.readUint32("unk3");
reader.enumerate("unk3Vals", unk3Vals, unk3);
extraType = reader.readUint32("extraType"); extraType = reader.readUint32("extraType");
if (extraType == 1) if (extraType == 1)
extraFloat = reader.readFloat("extraFloat"); extraFloat = reader.readFloat("extraFloat");
@ -52,6 +55,7 @@ void CHAR::AnimationInfo::EVNT::SFXEvent::toYAML(Athena::io::YAMLDocWriter& writ
writer.writeUint32("unk1", unk1); writer.writeUint32("unk1", unk1);
writer.writeUint32("unk2", unk2); writer.writeUint32("unk2", unk2);
writer.writeUint32("unk3", unk3); writer.writeUint32("unk3", unk3);
writer.enumerate("unk3Vals", unk3Vals);
writer.writeUint32("extraType", extraType); writer.writeUint32("extraType", extraType);
if (extraType == 1) if (extraType == 1)
writer.writeFloat("extraFloat", extraFloat); writer.writeFloat("extraFloat", extraFloat);

3
DataSpec/DNAMP3/CHAR.hpp
View File

@ -72,7 +72,7 @@ struct CHAR : BigYAML
struct EVNT : BigYAML struct EVNT : BigYAML
{ {
DECL_YAML DECL_YAML
Value<atUint32> eventBinding; Value<atUint32> eventIdx;
String<-1> eventName; String<-1> eventName;
struct EventBase : BigYAML struct EventBase : BigYAML
@ -117,6 +117,7 @@ struct CHAR : BigYAML
Value<atUint32> unk1; Value<atUint32> unk1;
Value<atUint32> unk2; Value<atUint32> unk2;
Value<atUint32> unk3; Value<atUint32> unk3;
std::vector<float> unk3Vals;
Value<atUint32> extraType; Value<atUint32> extraType;
Value<float> extraFloat; Value<float> extraFloat;
}; };