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

Merge branch 'master' of https://github.com/AxioDL/PathShagged

This commit is contained in:
Jack Andersen 2016-02-02 13:42:38 -10:00
parent 69d85afc23 94389f5f33
commit 80b226fbfe
1 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
DataSpec/DNACommon/PART.hpp
View File

@ -14,7 +14,12 @@ struct GPSM : BigYAML
static const char* DNAType() {return "Retro::GPSM";} static const char* DNAType() {return "Retro::GPSM";}
const char* DNATypeV() const {return DNAType();} const char* DNATypeV() const {return DNAType();}
VectorElementFactory x0_PSIV;
ModVectorElementFactory x4_PSVM;
VectorElementFactory x8_PSOV;
IntElementFactory xc_PSLT;
IntElementFactory x10_PSWT;
RealElementFactory x14_PSTS;
VectorElementFactory x18_POFS; VectorElementFactory x18_POFS;
IntElementFactory x1c_PMED; IntElementFactory x1c_PMED;
RealElementFactory x20_LENG; RealElementFactory x20_LENG;
@ -47,13 +52,17 @@ struct GPSM : BigYAML
ChildGeneratorDesc<IDType> x8c_ICTS; ChildGeneratorDesc<IDType> x8c_ICTS;
IntElementFactory x9c_NCSY; IntElementFactory x9c_NCSY;
IntElementFactory xb4_NDSY; IntElementFactory xb4_NDSY;
ChildGeneratorDesc<IDType> xb8_IITS;
IntElementFactory xa0_CSSD; IntElementFactory xa0_CSSD;
ChildGeneratorDesc<IDType> xa4_IDTS; ChildGeneratorDesc<IDType> xa4_IDTS;
IntElementFactory xc8_PISY; IntElementFactory xc8_PISY;
IntElementFactory xcc_SISY; IntElementFactory xcc_SISY;
// xd0_KSSM
// xd4_SSWH Swoosh // xd4_SSWH Swoosh
IntElementFactory xe4_SSSD; IntElementFactory xe4_SSSD;
VectorElementFactory xe8_SSPO; VectorElementFactory xe8_SSPO;
IntElementFactory xf8_SESD;
VectorElementFactory xfc_SEPO;
// xec_PMLC Electric Generator // xec_PMLC Electric Generator
IntElementFactory x100_LTYP; IntElementFactory x100_LTYP;
ColorElementFactory x104_LCLR; ColorElementFactory x104_LCLR;
@ -123,6 +132,7 @@ struct GPSM : BigYAML
} }
if (r.enterSubRecord("KSSM")) if (r.enterSubRecord("KSSM"))
{ {
// xd0_KSSM.read(r);
r.leaveSubRecord(); r.leaveSubRecord();
} }
if (r.enterSubRecord("ILOC")) if (r.enterSubRecord("ILOC"))
@ -144,10 +154,6 @@ struct GPSM : BigYAML
x110_LDIR.read(r); x110_LDIR.read(r);
r.leaveSubRecord(); r.leaveSubRecord();
} }
if (r.enterSubRecord("COLR"))
{
r.leaveSubRecord();
}
if (r.enterSubRecord("LCLR")) if (r.enterSubRecord("LCLR"))
{ {
x104_LCLR.read(r); x104_LCLR.read(r);
@ -240,10 +246,17 @@ struct GPSM : BigYAML
} }
if (r.enterSubRecord("SESD")) if (r.enterSubRecord("SESD"))
{ {
xf8_SESD.read(r);
r.leaveSubRecord();
}
if (r.enterSubRecord("SEPO"))
{
xfc_SEPO.read(r);
r.leaveSubRecord(); r.leaveSubRecord();
} }
if (r.enterSubRecord("PSLT")) if (r.enterSubRecord("PSLT"))
{ {
xc_PSLT.read(r);
r.leaveSubRecord(); r.leaveSubRecord();
} }
if (r.enterSubRecord("PMSC")) if (r.enterSubRecord("PMSC"))
@ -278,6 +291,7 @@ struct GPSM : BigYAML
} }
if (r.enterSubRecord("PSIV")) if (r.enterSubRecord("PSIV"))
{ {
x0_PSIV.read(r);
r.leaveSubRecord(); r.leaveSubRecord();
} }
if (r.enterSubRecord("ROTA")) if (r.enterSubRecord("ROTA"))
@ -287,22 +301,27 @@ struct GPSM : BigYAML
} }
if (r.enterSubRecord("PSVM")) if (r.enterSubRecord("PSVM"))
{ {
x4_PSVM.read(r);
r.leaveSubRecord(); r.leaveSubRecord();
} }
if (r.enterSubRecord("PSTS")) if (r.enterSubRecord("PSTS"))
{ {
x14_PSTS.read(r);
r.leaveSubRecord(); r.leaveSubRecord();
} }
if (r.enterSubRecord("PSOV")) if (r.enterSubRecord("PSOV"))
{ {
x8_PSOV.read(r);
r.leaveSubRecord(); r.leaveSubRecord();
} }
if (r.enterSubRecord("PSWT")) if (r.enterSubRecord("PSWT"))
{ {
x10_PSWT.read(r);
r.leaveSubRecord(); r.leaveSubRecord();
} }
if (r.enterSubRecord("PMLC")) if (r.enterSubRecord("PMLC"))
{ {
// xec_PMLC.read(r);
r.leaveSubRecord(); r.leaveSubRecord();
} }
if (r.enterSubRecord("PMED")) if (r.enterSubRecord("PMED"))