mirror of
https://github.com/AxioDL/metaforce.git
synced 2025-12-09 12:27:43 +00:00
Add FRME
Various fixes
This commit is contained in:
@@ -13,17 +13,17 @@ void EVNT::read(Athena::io::IStreamReader& reader)
|
||||
reader.enumerate(loopEvents, loopCount);
|
||||
|
||||
uevtEvents.clear();
|
||||
if (version == 2)
|
||||
{
|
||||
atUint32 uevtCount = reader.readUint32Big();
|
||||
reader.enumerate(uevtEvents, uevtCount);
|
||||
}
|
||||
atUint32 uevtCount = reader.readUint32Big();
|
||||
reader.enumerate(uevtEvents, uevtCount);
|
||||
|
||||
atUint32 effectCount = reader.readUint32Big();
|
||||
reader.enumerate(effectEvents, effectCount);
|
||||
|
||||
atUint32 sfxCount = reader.readUint32Big();
|
||||
reader.enumerate(sfxEvents, sfxCount);
|
||||
if (version == 2)
|
||||
{
|
||||
atUint32 sfxCount = reader.readUint32Big();
|
||||
reader.enumerate(sfxEvents, sfxCount);
|
||||
}
|
||||
}
|
||||
|
||||
void EVNT::write(Athena::io::IStreamWriter& writer) const
|
||||
@@ -33,17 +33,17 @@ void EVNT::write(Athena::io::IStreamWriter& writer) const
|
||||
writer.writeUint32Big(loopEvents.size());
|
||||
writer.enumerate(loopEvents);
|
||||
|
||||
if (version == 2)
|
||||
{
|
||||
writer.writeUint32Big(uevtEvents.size());
|
||||
writer.enumerate(uevtEvents);
|
||||
}
|
||||
writer.writeUint32Big(uevtEvents.size());
|
||||
writer.enumerate(uevtEvents);
|
||||
|
||||
writer.writeUint32Big(effectEvents.size());
|
||||
writer.enumerate(effectEvents);
|
||||
|
||||
writer.writeUint32Big(sfxEvents.size());
|
||||
writer.enumerate(sfxEvents);
|
||||
if (version == 2)
|
||||
{
|
||||
writer.writeUint32Big(sfxEvents.size());
|
||||
writer.enumerate(sfxEvents);
|
||||
}
|
||||
}
|
||||
|
||||
void EVNT::read(Athena::io::YAMLDocReader& reader)
|
||||
@@ -54,17 +54,17 @@ void EVNT::read(Athena::io::YAMLDocReader& reader)
|
||||
reader.enumerate("loopEvents", loopEvents, loopCount);
|
||||
|
||||
uevtEvents.clear();
|
||||
if (version == 2)
|
||||
{
|
||||
atUint32 uevtCount = reader.readUint32("uevtCount");
|
||||
reader.enumerate("uevtEvents", uevtEvents, uevtCount);
|
||||
}
|
||||
atUint32 uevtCount = reader.readUint32("uevtCount");
|
||||
reader.enumerate("uevtEvents", uevtEvents, uevtCount);
|
||||
|
||||
atUint32 effectCount = reader.readUint32("effectCount");
|
||||
reader.enumerate("effectEvents", effectEvents, effectCount);
|
||||
|
||||
atUint32 sfxCount = reader.readUint32("sfxCount");
|
||||
reader.enumerate("sfxEvents", sfxEvents, sfxCount);
|
||||
if (version == 2)
|
||||
{
|
||||
atUint32 sfxCount = reader.readUint32("sfxCount");
|
||||
reader.enumerate("sfxEvents", sfxEvents, sfxCount);
|
||||
}
|
||||
}
|
||||
|
||||
void EVNT::write(Athena::io::YAMLDocWriter& writer) const
|
||||
@@ -74,17 +74,33 @@ void EVNT::write(Athena::io::YAMLDocWriter& writer) const
|
||||
writer.writeUint32("loopCount", loopEvents.size());
|
||||
writer.enumerate("loopEvents", loopEvents);
|
||||
|
||||
if (version == 2)
|
||||
{
|
||||
writer.writeUint32("uevtCount", uevtEvents.size());
|
||||
writer.enumerate("uevtEvents", uevtEvents);
|
||||
}
|
||||
writer.writeUint32("uevtCount", uevtEvents.size());
|
||||
writer.enumerate("uevtEvents", uevtEvents);
|
||||
|
||||
writer.writeUint32("effectCount", effectEvents.size());
|
||||
writer.enumerate("effectEvents", effectEvents);
|
||||
|
||||
writer.writeUint32("sfxCount", sfxEvents.size());
|
||||
writer.enumerate("sfxEvents", sfxEvents);
|
||||
if (version == 2)
|
||||
{
|
||||
writer.writeUint32("sfxCount", sfxEvents.size());
|
||||
writer.enumerate("sfxEvents", sfxEvents);
|
||||
}
|
||||
}
|
||||
|
||||
const char* EVNT::DNAType()
|
||||
{
|
||||
return "Retro::DNAMP1::EVNT";
|
||||
}
|
||||
|
||||
size_t EVNT::binarySize(size_t __isz) const
|
||||
{
|
||||
__isz = __EnumerateSize(__isz, loopEvents);
|
||||
__isz = __EnumerateSize(__isz, uevtEvents);
|
||||
__isz = __EnumerateSize(__isz, effectEvents);
|
||||
if (version == 2)
|
||||
__isz = __EnumerateSize(__isz, sfxEvents);
|
||||
|
||||
return __isz + (version == 2 ? 20 : 16);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user