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

MP2 ANIM signing fix

This commit is contained in:
Jack Andersen 2017-02-01 15:54:38 -10:00
parent 802cf9d811
commit 6bdcf93c83
2 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
DataSpec/DNAMP2/ANIM.hpp
View File

@ -77,25 +77,25 @@ struct ANIM : BigDNA
Delete expl; Delete expl;
Value<atUint8> id = 0; Value<atUint8> id = 0;
Value<atUint16> keyCount1 = 0; Value<atUint16> keyCount1 = 0;
Value<atUint16> initRX = 0; Value<atInt16> initRX = 0;
Value<atUint8> qRX = 0; Value<atUint8> qRX = 0;
Value<atUint16> initRY = 0; Value<atInt16> initRY = 0;
Value<atUint8> qRY = 0; Value<atUint8> qRY = 0;
Value<atUint16> initRZ = 0; Value<atInt16> initRZ = 0;
Value<atUint8> qRZ = 0; Value<atUint8> qRZ = 0;
Value<atUint16> keyCount2 = 0; Value<atUint16> keyCount2 = 0;
Value<atUint16> initTX = 0; Value<atInt16> initTX = 0;
Value<atUint8> qTX = 0; Value<atUint8> qTX = 0;
Value<atUint16> initTY = 0; Value<atInt16> initTY = 0;
Value<atUint8> qTY = 0; Value<atUint8> qTY = 0;
Value<atUint16> initTZ = 0; Value<atInt16> initTZ = 0;
Value<atUint8> qTZ = 0; Value<atUint8> qTZ = 0;
Value<atUint16> keyCount3 = 0; Value<atUint16> keyCount3 = 0;
Value<atUint16> initSX = 0; Value<atInt16> initSX = 0;
Value<atUint8> qSX = 0; Value<atUint8> qSX = 0;
Value<atUint16> initSY = 0; Value<atInt16> initSY = 0;
Value<atUint8> qSY = 0; Value<atUint8> qSY = 0;
Value<atUint16> initSZ = 0; Value<atInt16> initSZ = 0;
Value<atUint8> qSZ = 0; Value<atUint8> qSZ = 0;
void read(athena::io::IStreamReader& reader) void read(athena::io::IStreamReader& reader)
@ -104,31 +104,31 @@ struct ANIM : BigDNA
keyCount1 = reader.readUint16Big(); keyCount1 = reader.readUint16Big();
if (keyCount1) if (keyCount1)
{ {
initRX = reader.readUint16Big(); initRX = reader.readInt16Big();
qRX = reader.readUByte(); qRX = reader.readUByte();
initRY = reader.readUint16Big(); initRY = reader.readInt16Big();
qRY = reader.readUByte(); qRY = reader.readUByte();
initRZ = reader.readUint16Big(); initRZ = reader.readInt16Big();
qRZ = reader.readUByte(); qRZ = reader.readUByte();
} }
keyCount2 = reader.readUint16Big(); keyCount2 = reader.readUint16Big();
if (keyCount2) if (keyCount2)
{ {
initTX = reader.readUint16Big(); initTX = reader.readInt16Big();
qTX = reader.readUByte(); qTX = reader.readUByte();
initTY = reader.readUint16Big(); initTY = reader.readInt16Big();
qTY = reader.readUByte(); qTY = reader.readUByte();
initTZ = reader.readUint16Big(); initTZ = reader.readInt16Big();
qTZ = reader.readUByte(); qTZ = reader.readUByte();
} }
keyCount3 = reader.readUint16Big(); keyCount3 = reader.readUint16Big();
if (keyCount3) if (keyCount3)
{ {
initSX = reader.readUint16Big(); initSX = reader.readInt16Big();
qSX = reader.readUByte(); qSX = reader.readUByte();
initSY = reader.readUint16Big(); initSY = reader.readInt16Big();
qSY = reader.readUByte(); qSY = reader.readUByte();
initSZ = reader.readUint16Big(); initSZ = reader.readInt16Big();
qSZ = reader.readUByte(); qSZ = reader.readUByte();
} }
} }
@ -138,31 +138,31 @@ struct ANIM : BigDNA
writer.writeUint16Big(keyCount1); writer.writeUint16Big(keyCount1);
if (keyCount1) if (keyCount1)
{ {
writer.writeUint16Big(initRX); writer.writeInt16Big(initRX);
writer.writeUByte(qRX); writer.writeUByte(qRX);
writer.writeUint16Big(initRY); writer.writeInt16Big(initRY);
writer.writeUByte(qRY); writer.writeUByte(qRY);
writer.writeUint16Big(initRZ); writer.writeInt16Big(initRZ);
writer.writeUByte(qRZ); writer.writeUByte(qRZ);
} }
writer.writeUint16Big(keyCount2); writer.writeUint16Big(keyCount2);
if (keyCount2) if (keyCount2)
{ {
writer.writeUint16Big(initTX); writer.writeInt16Big(initTX);
writer.writeUByte(qTX); writer.writeUByte(qTX);
writer.writeUint16Big(initTY); writer.writeInt16Big(initTY);
writer.writeUByte(qTY); writer.writeUByte(qTY);
writer.writeUint16Big(initTZ); writer.writeInt16Big(initTZ);
writer.writeUByte(qTZ); writer.writeUByte(qTZ);
} }
writer.writeUint16Big(keyCount3); writer.writeUint16Big(keyCount3);
if (keyCount3) if (keyCount3)
{ {
writer.writeUint16Big(initSX); writer.writeInt16Big(initSX);
writer.writeUByte(qSX); writer.writeUByte(qSX);
writer.writeUint16Big(initSY); writer.writeInt16Big(initSY);
writer.writeUByte(qSY); writer.writeUByte(qSY);
writer.writeUint16Big(initSZ); writer.writeInt16Big(initSZ);
writer.writeUByte(qSZ); writer.writeUByte(qSZ);
} }
} }

2
hecl

@ -1 +1 @@
Subproject commit 98d5b4f35c8784ce00ab50dace48620dd65e0261 Subproject commit 62bfcf745950bc694c2145dd1a5d165112799f0c