auto decompile more functions

src/d/a/d_a_alink.cpp

@@ -71,10 +71,10 @@ struct mDoExt_blkAnm {
     /* 8000DA08 */ void init(J3DDeformData*, J3DAnmCluster*, int, int, f32, s16, s16);
 };
 
-struct J3DModelData {};
-
 struct J3DAnmTransform {};
 
+struct J3DModelData {};
+
 struct mDoExt_bckAnm {
     /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool);
     /* 8000D990 */ void changeBckOnly(J3DAnmTransform*);
@@ -512,11 +512,31 @@ struct daAlink_footData_c {
     /* 800CFCF4 */ daAlink_footData_c();
 };
 
+struct dCcG_At_Spl {};
+
 struct dDemo_actor_c {
     /* 8003819C */ void getPrm_Morf();
     /* 80038338 */ void getDemoIDData(int*, int*, int*, u16*, u8*);
 };
 
+struct daAlinkHIO_anm_c {};
+
+struct JKRHeap {
+    /* 802CE5CC */ void freeAll();
+};
+
+struct JKRExpHeap {
+    /* 802CEE2C */ void create(u32, JKRHeap*, bool);
+};
+
+struct J3DGXColorS10 {
+    /* 8000E460 */ J3DGXColorS10();
+};
+
+struct dBgW_Base {
+    struct PushPullLabel {};
+};
+
 struct dCcD_GObjInf {
     /* 80083A28 */ dCcD_GObjInf();
     /* 800840E4 */ ~dCcD_GObjInf();
@@ -532,22 +552,6 @@ struct dCcD_GObjInf {
     /* 800846B0 */ void ResetCoHit();
 };
 
-struct dBgS_LinChk {
-    /* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*);
-};
-
-struct dCcG_At_Spl {};
-
-struct J3DAnmBase {};
-
-struct daAlinkHIO_anm_c {};
-
-struct dAttList_c {
-    /* 80073864 */ void getActor();
-};
-
-struct JPABaseEmitter {};
-
 struct cM3dGPla {
     /* 8001DB90 */ ~cM3dGPla();
     /* 801411F0 */ cM3dGPla();
@@ -555,8 +559,12 @@ struct cM3dGPla {
     /* 8026F408 */ void crossInfLin(cXyz const&, cXyz const&, cXyz&) const;
 };
 
-struct dBgW_Base {
-    struct PushPullLabel {};
+struct dAttList_c {
+    /* 80073864 */ void getActor();
+};
+
+struct dBgS_LinChk {
+    /* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*);
 };
 
 struct _GXColorS10 {};
@@ -566,17 +574,9 @@ struct J3DAnmTevRegKey {
     /* 8032B87C */ void searchUpdateMaterialID(J3DModelData*);
 };
 
-struct J3DGXColorS10 {
-    /* 8000E460 */ J3DGXColorS10();
-};
+struct JPABaseEmitter {};
 
-struct JKRHeap {
-    /* 802CE5CC */ void freeAll();
-};
-
-struct JKRExpHeap {
-    /* 802CEE2C */ void create(u32, JKRHeap*, bool);
-};
+struct J3DAnmBase {};
 
 struct daAlink_c {
     struct daAlink_ANM {};
@@ -3074,13 +3074,6 @@ struct dPa_control_c {
     static u8 mParticleTracePCB[4 + 4 /* padding */];
 };
 
-struct dBgS_AcchCir {
-    /* 80075EAC */ dBgS_AcchCir();
-    /* 80075F40 */ void SetWallR(f32);
-    /* 80075F58 */ void SetWall(f32, f32);
-    /* 80077414 */ ~dBgS_AcchCir();
-};
-
 struct dBgS_RoofChk {
     /* 80078FF4 */ dBgS_RoofChk();
     /* 80079090 */ ~dBgS_RoofChk();
@@ -3112,6 +3105,13 @@ struct dBgS {
                                          dBgW_Base::PushPullLabel);
 };
 
+struct dBgS_AcchCir {
+    /* 80075EAC */ dBgS_AcchCir();
+    /* 80075F40 */ void SetWallR(f32);
+    /* 80075F58 */ void SetWall(f32, f32);
+    /* 80077414 */ ~dBgS_AcchCir();
+};
+
 struct dBgS_Acch {
     /* 80075F94 */ ~dBgS_Acch();
     /* 800760A0 */ dBgS_Acch();
@@ -3229,15 +3229,15 @@ struct dDlst_peekZ_c {
     /* 80056018 */ void newData(s16, s16, u32*);
 };
 
-struct J3DPacket;
-struct J3DDrawBuffer {
-    /* 8032548C */ void entryImm(J3DPacket*, u16);
-};
-
+struct J3DDrawBuffer;
 struct J3DPacket {
     /* 80312750 */ bool entry(J3DDrawBuffer*);
 };
 
+struct J3DDrawBuffer {
+    /* 8032548C */ void entryImm(J3DPacket*, u16);
+};
+
 struct dDlst_list_c {
     /* 800565EC */ void entryZSortXluDrawList(J3DDrawBuffer*, J3DPacket*, cXyz&);
 };
@@ -3626,14 +3626,14 @@ struct J3DShape {
     static u8 sOldVcdVatCmd[4];
 };
 
-struct J3DAnmTexPattern {
-    /* 8032B09C */ void searchUpdateMaterialID(J3DModelData*);
-};
-
 struct J3DAnmTextureSRTKey {
     /* 8032B1D4 */ void searchUpdateMaterialID(J3DModelData*);
 };
 
+struct J3DAnmTexPattern {
+    /* 8032B09C */ void searchUpdateMaterialID(J3DModelData*);
+};
+
 struct J3DMaterialTable {
     /* 8032F7B4 */ void removeTexMtxAnimator(J3DAnmTextureSRTKey*);
     /* 8032F880 */ void removeTevRegAnimator(J3DAnmTevRegKey*);

src/d/a/d_a_itembase.cpp

@@ -43,10 +43,10 @@ struct mDoExt_bpkAnm {
     /* 8000D518 */ void entry(J3DMaterialTable*, f32);
 };
 
-struct J3DModelData {};
-
 struct J3DAnmTransform {};
 
+struct J3DModelData {};
+
 struct mDoExt_bckAnm {
     /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool);
     /* 8000D9CC */ void entry(J3DModelData*, f32);

src/d/a/d_a_npc.cpp

@@ -48,13 +48,13 @@ struct mDoExt_morf_c {
     /* 8000FB7C */ void setMorf(f32);
 };
 
-struct J3DAnmColor {};
-
-struct J3DAnmTexPattern {};
+struct J3DAnmTextureSRTKey {};
 
 struct J3DAnmTevRegKey {};
 
-struct J3DAnmTextureSRTKey {};
+struct J3DAnmColor {};
+
+struct J3DAnmTexPattern {};
 
 struct J3DMaterialTable {
     /* 8032F64C */ void removeMatColorAnimator(J3DAnmColor*);
@@ -83,10 +83,10 @@ struct mDoExt_bpkAnm {
     /* 8000D518 */ void entry(J3DMaterialTable*, f32);
 };
 
-struct J3DModelData {};
-
 struct J3DAnmTransform {};
 
+struct J3DModelData {};
+
 struct mDoExt_bckAnm {
     /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool);
     /* 8000D990 */ void changeBckOnly(J3DAnmTransform*);
@@ -120,21 +120,21 @@ struct daNpcT_motionAnmData_c {};
 
 struct daNpcT_faceMotionAnmData_c {};
 
-struct dCcD_GObjInf {
-    /* 80084460 */ void ChkTgHit();
-};
-
-struct J3DModel {};
-
-struct _GXColorS10 {};
-
 struct J3DFrameCtrl {
     /* 803283FC */ void init(s16);
 };
 
+struct J3DAnmTransformKey {};
+
 struct J3DJoint {};
 
-struct J3DAnmTransformKey {};
+struct dCcD_GObjInf {
+    /* 80084460 */ void ChkTgHit();
+};
+
+struct _GXColorS10 {};
+
+struct J3DModel {};
 
 struct daNpcT_c {
     /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*);

src/d/a/d_a_obj.cpp

@@ -17,13 +17,13 @@ struct daPy_py_c {
     /* 8015F398 */ void checkMasterSwordEquip();
 };
 
+struct Quaternion {};
+
 struct dCcD_GObjInf {
     /* 800844F8 */ void GetTgHitObj();
     /* 8008457C */ void GetTgHitObjSe();
 };
 
-struct Quaternion {};
-
 struct Vec {};
 
 struct cXyz {
@@ -56,11 +56,11 @@ struct dRes_control_c {
     /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int);
 };
 
-struct dKy_tevstr_c {};
+struct JPABaseEmitter {};
 
 struct J3DModelData {};
 
-struct JPABaseEmitter {};
+struct dKy_tevstr_c {};
 
 struct dPa_modelEcallBack {
     /* 8004AC00 */ void setModel(JPABaseEmitter*, J3DModelData*, dKy_tevstr_c const&, u8, void*, u8,

src/d/a/d_a_player.cpp

@@ -378,7 +378,7 @@ asm void daPy_boomerangMove_c::initOffset(cXyz const* param_0) {
 #pragma pop
 
 /* ############################################################################################## */
-/* 80451018-8045101C 000518 0004+00 2/2 33/33 103/103 .sbss            m_midnaActor__9daPy_py_c */
+/* 80451018-8045101C 000518 0004+00 2/2 33/32 103/103 .sbss            m_midnaActor__9daPy_py_c */
 u8 daPy_py_c::m_midnaActor[4];
 
 /* 8045101C-80451020 -00001 0004+00 1/1 1/1 1/1 .sbss            None */

src/d/bg/d_bg_s.cpp

@@ -38,6 +38,8 @@ struct dBgS_Acch {
     /* 8007732C */ void CalcWallRR();
 };
 
+struct csXyz {};
+
 struct cXyz {};
 
 struct cBgS_PolyInfo {
@@ -48,8 +50,6 @@ struct cBgS_PolyInfo {
     /* 802681AC */ void ChkBgIndex() const;
 };
 
-struct csXyz {};
-
 struct dBgS {
     /* 80030C50 */ ~dBgS();
     /* 800748FC */ void Ct();

src/d/bg/d_bg_s_acch.cpp

@@ -60,8 +60,7 @@ struct dBgS_AcchCir {
     /* 80077414 */ ~dBgS_AcchCir();
 };
 
-struct Vec {};
-
+struct dBgS_Acch;
 struct cBgS_PolyInfo {
     /* 80268074 */ cBgS_PolyInfo();
     /* 802680B0 */ ~cBgS_PolyInfo();
@@ -70,7 +69,6 @@ struct cBgS_PolyInfo {
     /* 802681A4 */ void SetPolyIndex(int);
 };
 
-struct dBgS_Acch;
 struct csXyz {};
 
 struct dBgS {
@@ -82,6 +80,8 @@ struct dBgS {
     /* 80075B84 */ void RideCallBack(cBgS_PolyInfo const&, fopAc_ac_c*);
 };
 
+struct Vec {};
+
 struct dBgS_Acch {
     /* 80075F94 */ ~dBgS_Acch();
     /* 800760A0 */ dBgS_Acch();

src/d/bg/d_bg_w.cpp

@@ -23,21 +23,15 @@ struct dBgW_Base {
     /* 8007E6DC */ void CallArrowStickCallBack(fopAc_ac_c*, fopAc_ac_c*, cXyz&);
 };
 
-struct dBgS_SphChk {};
+struct csXyz {};
 
-struct dBgS_SplGrpChk {};
-
-struct cBgS_PolyPassChk {};
+struct cBgS_GrpPassChk {};
 
 struct dBgS_CaptPoly {};
 
-struct cM3dGPla {
-    /* 8026F57C */ void getCrossY(cXyz const&, f32*) const;
-};
+struct dBgS_RoofChk {};
 
-struct cBgS_PolyInfo {
-    /* 802681A4 */ void SetPolyIndex(int);
-};
+struct dBgS_SplGrpChk {};
 
 struct Vec {};
 
@@ -48,11 +42,17 @@ struct dBgS_Acch {
     /* 800772E8 */ void CalcMovePosWork();
 };
 
-struct cBgS_GrpPassChk {};
+struct cBgS_PolyInfo {
+    /* 802681A4 */ void SetPolyIndex(int);
+};
 
-struct dBgS_RoofChk {};
+struct cBgS_PolyPassChk {};
 
-struct csXyz {};
+struct dBgS_SphChk {};
+
+struct cM3dGPla {
+    /* 8026F57C */ void getCrossY(cXyz const&, f32*) const;
+};
 
 struct dBgW {
     /* 8007B3AC */ void GetExitId(cBgS_PolyInfo const&);
@@ -174,14 +174,14 @@ struct cBgW_GrpElm {
     /* 8007A1E4 */ cBgW_GrpElm();
 };
 
-struct cBgS_GndChk {};
-
 struct cBgD_t {};
 
 struct cBgS_ShdwDraw {};
 
 struct cBgS_LinChk {};
 
+struct cBgS_GndChk {};
+
 struct cBgW {
     /* 80079294 */ cBgW();
     /* 8007933C */ ~cBgW();

src/d/bg/d_bg_w_kcol.cpp

@@ -27,16 +27,22 @@ struct dBgW_Base {
     /* 8007E6DC */ void CallArrowStickCallBack(fopAc_ac_c*, fopAc_ac_c*, cXyz&);
 };
 
-struct dBgS_CaptPoly {};
+struct cBgS_ShdwDraw {};
 
-struct cBgS_GndChk {};
+struct cBgS_GrpPassChk {};
 
-struct Vec {};
-
-struct KC_PrismData {};
+struct cBgS_LinChk {};
 
 struct dBgS_RoofChk {};
 
+struct dBgS_SplGrpChk {};
+
+struct dBgPc {
+    /* 80074048 */ void setCode(sBgPc&);
+};
+
+struct Vec {};
+
 struct dBgS_Acch {
     /* 800771E4 */ void GetSpeedY();
     /* 80077200 */ void GetWallAddY(Vec&);
@@ -44,25 +50,19 @@ struct dBgS_Acch {
     /* 800772E8 */ void CalcMovePosWork();
 };
 
-struct csXyz {};
-
-struct dBgPc {
-    /* 80074048 */ void setCode(sBgPc&);
-};
-
-struct cBgS_PolyPassChk {};
-
-struct dBgS_SplGrpChk {};
-
 struct cBgS_PolyInfo {
     /* 802681A4 */ void SetPolyIndex(int);
 };
 
-struct cBgS_LinChk {};
+struct cBgS_PolyPassChk {};
 
-struct cBgS_ShdwDraw {};
+struct KC_PrismData {};
 
-struct cBgS_GrpPassChk {};
+struct csXyz {};
+
+struct dBgS_CaptPoly {};
+
+struct cBgS_GndChk {};
 
 struct dBgS_SphChk {};
 

src/d/bg/d_bg_w_sv.cpp

@@ -19,11 +19,11 @@ struct dBgW_Base {
 
 struct cBgS_PolyInfo {};
 
-struct cXyz {};
+struct cBgD_t {};
 
 struct csXyz {};
 
-struct cBgD_t {};
+struct cXyz {};
 
 struct dBgWSv {
     /* 80082F98 */ void Set(cBgD_t*, u32);
@@ -36,19 +36,19 @@ struct dBgWSv {
     /* 800835DC */ ~dBgWSv();
 };
 
-struct dBgS_SphChk {};
-
-struct dBgS_SplGrpChk {};
-
-struct cBgS_PolyPassChk {};
+struct cBgS_GrpPassChk {};
 
 struct dBgS_CaptPoly {};
 
+struct dBgS_RoofChk {};
+
+struct dBgS_SplGrpChk {};
+
 struct dBgS_Acch {};
 
-struct cBgS_GrpPassChk {};
+struct cBgS_PolyPassChk {};
 
-struct dBgS_RoofChk {};
+struct dBgS_SphChk {};
 
 struct dBgW {
     /* 8007B3AC */ void GetExitId(cBgS_PolyInfo const&);
@@ -98,10 +98,10 @@ struct dBgW {
 
 struct cBgS_LinChk {};
 
-struct cBgS_GndChk {};
-
 struct cBgS_ShdwDraw {};
 
+struct cBgS_GndChk {};
+
 struct cBgW {
     /* 8007933C */ ~cBgW();
     /* 80079564 */ void CalcPlane();

src/d/cc/d_cc_d.cpp

@@ -157,10 +157,7 @@ struct cM3dGCps {
     /* 8026F03C */ void Set(cM3dGCpsS const&);
 };
 
-struct cCcD_AabAttr {};
-
-struct cCcD_PntAttr {};
-
+struct cCcD_TriAttr;
 struct cCcD_ShapeAttr {
     struct Shape {};
 
@@ -171,9 +168,12 @@ struct cCcD_ShapeAttr {
     static f32 m_virtual_center[3];
 };
 
+struct cCcD_AabAttr {};
+
 struct cCcD_CpsAttr;
-struct cCcD_TriAttr;
 struct cCcD_SphAttr;
+struct cCcD_PntAttr {};
+
 struct cCcD_CylAttr {
     /* 80084CC0 */ void GetCoCP() const;
     /* 80037A4C */ void GetCoCP();

src/d/cc/d_cc_mass_s.cpp

@@ -13,10 +13,10 @@
 
 struct fopAc_ac_c {};
 
-struct cCcD_Obj {};
-
 struct cXyz {};
 
+struct cCcD_Obj {};
+
 struct dCcMassS_Obj {
     /* 800300F4 */ ~dCcMassS_Obj();
     /* 800852E0 */ void Set(cCcD_Obj*, u8, void (*)(fopAc_ac_c*, cXyz*, u32));
@@ -24,10 +24,6 @@ struct dCcMassS_Obj {
     /* 800855C8 */ dCcMassS_Obj();
 };
 
-struct dCcMassS_HitInf {
-    /* 80085334 */ void ClearPointer();
-};
-
 struct Vec {};
 
 struct cM3dGCps {
@@ -36,6 +32,10 @@ struct cM3dGCps {
     /* 8026F080 */ void SetCps(cM3dGCps const&);
 };
 
+struct dCcMassS_HitInf {
+    /* 80085334 */ void ClearPointer();
+};
+
 struct dCcMassS_Mng {
     /* 80085350 */ dCcMassS_Mng();
     /* 800855E4 */ void Ct();

src/d/cc/d_cc_s.cpp

@@ -33,19 +33,15 @@ struct dJntCol_c {
     /* 80036C44 */ void getHitmarkPosAndAngle(cXyz const*, csXyz const*, cXyz*, csXyz*, int) const;
 };
 
+struct dCcD_GStts {};
+
 struct cCcD_Stts {
     /* 80263934 */ void PlusCcMove(f32, f32, f32);
     /* 80263970 */ void PlusDmg(int);
 };
 
-struct dCcD_GObjInf {
-    /* 800843DC */ void ChkAtNoGuard();
-};
-
 struct cCcD_GStts {};
 
-struct dCcD_GStts {};
-
 struct cCcD_ShapeAttr {
     struct Shape {};
 };
@@ -56,6 +52,10 @@ struct cCcD_Obj {
 
 struct cCcD_GObjInf {};
 
+struct dCcD_GObjInf {
+    /* 800843DC */ void ChkAtNoGuard();
+};
+
 struct dCcS {
     /* 8002FF40 */ ~dCcS();
     /* 80085ED4 */ void Ct();

src/d/com/d_com_inf_game.cpp

@@ -193,10 +193,10 @@ struct dStage_nextStage_c {
     /* 80023E28 */ void set(char const*, s8, s16, s8, s8, u8);
 };
 
-struct J3DModelData {};
-
 struct J3DModel {};
 
+struct J3DModelData {};
+
 struct dSmplMdl_draw_c {
     /* 80048CB4 */ dSmplMdl_draw_c();
     /* 80048E0C */ void draw();

src/d/d_attention.cpp

@@ -38,10 +38,10 @@ struct mDoExt_bpkAnm {
     /* 8000D518 */ void entry(J3DMaterialTable*, f32);
 };
 
-struct J3DModelData {};
-
 struct J3DAnmTransform {};
 
+struct J3DModelData {};
+
 struct mDoExt_bckAnm {
     /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool);
     /* 8000D9CC */ void entry(J3DModelData*, f32);
@@ -71,6 +71,12 @@ struct dRes_control_c {
     /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int);
 };
 
+struct Vec {};
+
+struct cXyz {
+    /* 80266B34 */ void operator-(Vec const&) const;
+};
+
 struct cSAngle {
     /* 80270F68 */ cSAngle(cSAngle const&);
     /* 80270F98 */ cSAngle(s16);
@@ -78,12 +84,6 @@ struct cSAngle {
     /* 80271228 */ void operator-(s16) const;
 };
 
-struct Vec {};
-
-struct cXyz {
-    /* 80266B34 */ void operator-(Vec const&) const;
-};
-
 struct dAttention_c {
     /* 80070198 */ dAttention_c(fopAc_ac_c*, u32);
     /* 80070774 */ ~dAttention_c();

src/d/d_camera.cpp

@@ -91,7 +91,7 @@ struct daPy_py_c {
     /* 80182A10 */ void checkGoronSideMove() const;
     /* 80182AAC */ void getRightFootPosP();
     /* 80182AB4 */ void getLeftFootPosP();
-    /* 80182ABC */ void getMidnaActor();
+    /* 80182ABC */ u32 getMidnaActor();
     /* 80182AC4 */ void checkCopyRodThrowAfter() const;
     /* 80182AD8 */ void checkRide() const;
     /* 80182B9C */ void getRightHandPos() const;
@@ -208,8 +208,8 @@ struct dCcMassS_Mng {
 
 struct camera_class {};
 
-struct dCamMapToolData {
-    /* 8015FEB8 */ void Set(s32, s32, fopAc_ac_c*, u16, u8);
+struct dBgS_LinChk {
+    /* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*);
 };
 
 struct cSAngle {
@@ -249,8 +249,8 @@ struct cSAngle {
     static u8 _270[2 + 6 /* padding */];
 };
 
-struct dBgS_LinChk {
-    /* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*);
+struct dCamMapToolData {
+    /* 8015FEB8 */ void Set(s32, s32, fopAc_ac_c*, u16, u8);
 };
 
 struct dCamera_c {
@@ -852,7 +852,7 @@ extern "C" bool __lt__7cSAngleCFRC7cSAngle();
 extern "C" bool __gt__7cSAngleCFRC7cSAngle();
 extern "C" void getRightFootPosP__9daPy_py_cFv();
 extern "C" void getLeftFootPosP__9daPy_py_cFv();
-extern "C" void getMidnaActor__9daPy_py_cFv();
+extern "C" u32 getMidnaActor__9daPy_py_cFv();
 extern "C" void checkCopyRodThrowAfter__9daPy_py_cCFv();
 extern "C" void keepLock__12dAttention_cFi();
 extern "C" void checkRide__9daPy_py_cCFv();
@@ -4620,15 +4620,10 @@ asm void daPy_py_c::getLeftFootPosP() {
 }
 #pragma pop
 
-/* 80182ABC-80182AC4 17D3FC 0008+00 2/2 0/0 0/0 .text            getMidnaActor__9daPy_py_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void daPy_py_c::getMidnaActor() {
-    nofralloc
-#include "asm/d/d_camera/getMidnaActor__9daPy_py_cFv.s"
+/* 80182ABC-80182AC4 -00001 0008+00 0/0 0/0 0/0 .text            getMidnaActor__9daPy_py_cFv */
+u32 daPy_py_c::getMidnaActor() {
+    return *(u32*)(&daPy_py_c::m_midnaActor);
 }
-#pragma pop
 
 /* 80182AC4-80182AD0 17D404 000C+00 1/1 0/0 0/0 .text checkCopyRodThrowAfter__9daPy_py_cCFv */
 #pragma push

src/d/d_demo.cpp

@@ -17,10 +17,10 @@ struct mDoGph_gInf_c {
     /* 80007FD8 */ void fadeOut(f32, _GXColor&);
 };
 
-struct Vec {};
-
 struct J3DAnmTransform {};
 
+struct Vec {};
+
 struct mDoExt_McaMorf {
     /* 8001037C */ void setAnm(J3DAnmTransform*, int, f32, f32, f32, f32, void*);
     /* 800105C8 */ void play(Vec*, u32, s8);
@@ -54,10 +54,10 @@ struct cXyz {
     /* 80009184 */ ~cXyz();
 };
 
-struct dKy_tevstr_c {};
-
 struct csXyz {};
 
+struct dKy_tevstr_c {};
+
 struct dPa_control_c {
     /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*,
                             u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*,
@@ -110,10 +110,10 @@ struct JStage {
         /* 80280B88 */ void JSGGetColor() const;
     };
 
-    struct TECameraProjection {};
-
     struct TECameraView {};
 
+    struct TECameraProjection {};
+
     struct TCamera {
         /* 80280BA0 */ ~TCamera();
         /* 80280C00 */ s32 JSGFGetType() const;

src/d/d_drawlist.cpp

@@ -80,10 +80,10 @@ struct dDlst_shadowRealPoly_c {
     /* 800569A8 */ s32 getTriMax();
 };
 
-struct cBgD_Vtx_t {};
-
 struct cM3dGPla {};
 
+struct cBgD_Vtx_t {};
+
 struct dDlst_shadowPoly_c {
     /* 80054288 */ void set(cBgD_Vtx_t*, u16, u16, u16, cM3dGPla*);
     /* 800543B4 */ void draw();
@@ -109,6 +109,8 @@ struct dDlst_peekZ_c {
     /* 80056080 */ void peekData();
 };
 
+struct dDlst_base_c {};
+
 struct J3DPacket {};
 
 struct J3DDrawBuffer {
@@ -120,8 +122,6 @@ struct J3DDrawBuffer {
     /* 803254AC */ void draw() const;
 };
 
-struct dDlst_base_c {};
-
 struct _GXColor {};
 
 struct dDlst_list_c {

src/d/d_jnt_col.cpp

@@ -37,14 +37,14 @@ struct mDoMtx_stack_c {
 
 struct fopAc_ac_c {};
 
-struct J3DModel {};
+struct dJntColData_c {};
 
 struct cM3dGLin {
     /* 80036A5C */ ~cM3dGLin();
     /* 8026F2E8 */ void SetStartEnd(cXyz const&, cXyz const&);
 };
 
-struct dJntColData_c {};
+struct J3DModel {};
 
 struct dJntCol_c {
     /* 80035C8C */ dJntCol_c();

src/d/d_k_wpillar.cpp

@@ -31,10 +31,10 @@ struct mDoExt_brkAnm {
     /* 8000D7A8 */ void entry(J3DMaterialTable*, f32);
 };
 
-struct J3DModelData {};
-
 struct J3DAnmTransform {};
 
+struct J3DModelData {};
+
 struct mDoExt_bckAnm {
     /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool);
     /* 8000D9CC */ void entry(J3DModelData*, f32);