auto decompile more functions

rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key.cpp

@@ -28,10 +28,10 @@ struct mDoMtx_stack_c {
     static u8 now[48];
 };
 
-struct J3DModelData {};
-
 struct J3DAnmTransform {};
 
+struct J3DModelData {};
+
 struct mDoExt_bckAnm {
     /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool);
     /* 8000D9CC */ void entry(J3DModelData*, f32);

rel/d/a/obj/d_a_obj_ari/d_a_obj_ari.cpp

@@ -49,19 +49,19 @@ struct mDoExt_baseAnm {
     /* 8000D428 */ void play();
 };
 
+struct J3DAnmTransform {};
+
+struct mDoExt_McaMorfCallBack1_c {};
+
 struct J3DModelData {};
 
 struct mDoExt_McaMorfCallBack2_c {};
 
-struct mDoExt_McaMorfCallBack1_c {};
-
 struct Z2Creature {
     /* 802C03C8 */ Z2Creature();
     /* 802C0530 */ void init(Vec*, Vec*, u8, u8);
 };
 
-struct J3DAnmTransform {};
-
 struct mDoExt_McaMorfSO {
     /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*,
                                     mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int,
@@ -85,10 +85,10 @@ struct daObj_AriHIO_c {
     /* 80BA5360 */ ~daObj_AriHIO_c();
 };
 
-struct J3DJoint {};
-
 struct J3DModel {};
 
+struct J3DJoint {};
+
 struct daObjARI_c {
     /* 80BA26BC */ void InitCcSph();
     /* 80BA2728 */ void SetCcSph();

rel/d/a/obj/d_a_obj_automata/d_a_obj_automata.cpp

@@ -39,12 +39,14 @@ struct mDoExt_baseAnm {
     /* 8000D428 */ void play();
 };
 
+struct J3DAnmTransform {};
+
+struct mDoExt_McaMorfCallBack1_c {};
+
 struct J3DModelData {};
 
 struct mDoExt_McaMorfCallBack2_c {};
 
-struct mDoExt_McaMorfCallBack1_c {};
-
 struct Vec {};
 
 struct Z2Creature {
@@ -53,8 +55,6 @@ struct Z2Creature {
     /* 802C0530 */ void init(Vec*, Vec*, u8, u8);
 };
 
-struct J3DAnmTransform {};
-
 struct mDoExt_McaMorfSO {
     /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*,
                                     mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int,

rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche.cpp

@@ -17,10 +17,10 @@ struct mDoMtx_stack_c {
     static u8 now[48];
 };
 
-struct J3DModelData {};
-
 struct J3DAnmTransform {};
 
+struct J3DModelData {};
+
 struct mDoExt_bckAnm {
     /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool);
     /* 8000D9CC */ void entry(J3DModelData*, f32);

rel/d/a/obj/d_a_obj_batta/d_a_obj_batta.cpp

@@ -44,12 +44,14 @@ struct mDoExt_baseAnm {
     /* 8000D428 */ void play();
 };
 
+struct J3DAnmTransform {};
+
+struct mDoExt_McaMorfCallBack1_c {};
+
 struct J3DModelData {};
 
 struct mDoExt_McaMorfCallBack2_c {};
 
-struct mDoExt_McaMorfCallBack1_c {};
-
 struct Vec {};
 
 struct Z2Creature {
@@ -57,8 +59,6 @@ struct Z2Creature {
     /* 802C0530 */ void init(Vec*, Vec*, u8, u8);
 };
 
-struct J3DAnmTransform {};
-
 struct mDoExt_McaMorfSO {
     /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*,
                                     mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int,

rel/d/a/obj/d_a_obj_bemos/d_a_obj_bemos.cpp

@@ -58,10 +58,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);

rel/d/a/obj/d_a_obj_bk_leaf/d_a_obj_bk_leaf.cpp

@@ -21,10 +21,10 @@ struct mDoMtx_stack_c {
     static u8 now[48];
 };
 
-struct J3DModelData {};
-
 struct J3DAnmTransform {};
 
+struct J3DModelData {};
+
 struct mDoExt_bckAnm {
     /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool);
     /* 8000D9CC */ void entry(J3DModelData*, f32);

rel/d/a/obj/d_a_obj_brakeeff/d_a_obj_brakeeff.cpp

@@ -19,10 +19,10 @@ struct mDoMtx_stack_c {
     static u8 now[48];
 };
 
-struct J3DMaterialTable {};
-
 struct J3DAnmTevRegKey {};
 
+struct J3DMaterialTable {};
+
 struct mDoExt_brkAnm {
     /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16);
     /* 8000D7A8 */ void entry(J3DMaterialTable*, f32);

rel/d/a/obj/d_a_obj_brg/d_a_obj_brg.cpp

@@ -27,10 +27,10 @@ struct mDoExt_3DlineMatSortPacket {
 
 struct dKy_tevstr_c {};
 
-struct _GXColor {};
-
 struct ResTIMG {};
 
+struct _GXColor {};
+
 struct mDoExt_3DlineMat1_c {
     /* 80013360 */ void init(u16, u16, ResTIMG*, int);
     /* 8001373C */ void update(int, f32, _GXColor&, u16, dKy_tevstr_c*);

rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.cpp

@@ -13,12 +13,12 @@
 
 struct request_of_phase_process_class {};
 
-struct Quaternion {};
-
 struct csXyz {
     /* 802673F4 */ csXyz(s16, s16, s16);
 };
 
+struct Quaternion {};
+
 struct mDoMtx_stack_c {
     /* 8000CD9C */ void transM(f32, f32, f32);
     /* 8000CF44 */ void ZXYrotM(csXyz const&);

rel/d/a/obj/d_a_obj_cdoor/d_a_obj_cdoor.cpp

@@ -17,10 +17,10 @@ struct mDoMtx_stack_c {
     static u8 now[48];
 };
 
-struct J3DModelData {};
-
 struct J3DAnmTransform {};
 
+struct J3DModelData {};
+
 struct mDoExt_bckAnm {
     /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool);
     /* 8000D9CC */ void entry(J3DModelData*, f32);

rel/d/a/obj/d_a_obj_cho/d_a_obj_cho.cpp

@@ -49,19 +49,19 @@ struct mDoExt_baseAnm {
     /* 8000D428 */ void play();
 };
 
+struct J3DAnmTransform {};
+
+struct mDoExt_McaMorfCallBack1_c {};
+
 struct J3DModelData {};
 
 struct mDoExt_McaMorfCallBack2_c {};
 
-struct mDoExt_McaMorfCallBack1_c {};
-
 struct Z2Creature {
     /* 802C03C8 */ Z2Creature();
     /* 802C0530 */ void init(Vec*, Vec*, u8, u8);
 };
 
-struct J3DAnmTransform {};
-
 struct mDoExt_McaMorfSO {
     /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*,
                                     mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int,

rel/d/a/obj/d_a_obj_crope/d_a_obj_crope.cpp

@@ -21,10 +21,10 @@ struct mDoExt_3DlineMatSortPacket {
 
 struct dKy_tevstr_c {};
 
-struct _GXColor {};
-
 struct ResTIMG {};
 
+struct _GXColor {};
+
 struct mDoExt_3DlineMat1_c {
     /* 80013360 */ void init(u16, u16, ResTIMG*, int);
     /* 8001373C */ void update(int, f32, _GXColor&, u16, dKy_tevstr_c*);

rel/d/a/obj/d_a_obj_dan/d_a_obj_dan.cpp

@@ -49,19 +49,19 @@ struct mDoExt_baseAnm {
     /* 8000D428 */ void play();
 };
 
+struct J3DAnmTransform {};
+
+struct mDoExt_McaMorfCallBack1_c {};
+
 struct J3DModelData {};
 
 struct mDoExt_McaMorfCallBack2_c {};
 
-struct mDoExt_McaMorfCallBack1_c {};
-
 struct Z2Creature {
     /* 802C03C8 */ Z2Creature();
     /* 802C0530 */ void init(Vec*, Vec*, u8, u8);
 };
 
-struct J3DAnmTransform {};
-
 struct mDoExt_McaMorfSO {
     /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*,
                                     mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int,

rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl.cpp

@@ -34,10 +34,10 @@ struct dSv_info_c {
     /* 80035360 */ void isSwitch(int, int) const;
 };
 
-struct dKy_tevstr_c {};
-
 struct _GXColor {};
 
+struct dKy_tevstr_c {};
+
 struct dPa_control_c {
     /* 8004D1B8 */ void setSimple(u16, cXyz const*, dKy_tevstr_c const*, u8, _GXColor const&,
                                   _GXColor const&, int, f32);

rel/d/a/obj/d_a_obj_digplace/d_a_obj_digplace.cpp

@@ -37,10 +37,10 @@ struct dSv_info_c {
     /* 80035360 */ void isSwitch(int, int) const;
 };
 
-struct dKy_tevstr_c {};
-
 struct _GXColor {};
 
+struct dKy_tevstr_c {};
+
 struct dPa_control_c {
     /* 8004D1B8 */ void setSimple(u16, cXyz const*, dKy_tevstr_c const*, u8, _GXColor const&,
                                   _GXColor const&, int, f32);

rel/d/a/obj/d_a_obj_drop/d_a_obj_drop.cpp

@@ -97,8 +97,6 @@ struct cXyz {
     static f32 Zero[3];
 };
 
-struct dKy_tevstr_c {};
-
 struct csXyz {
     /* 80BE02D8 */ ~csXyz();
     /* 80BE0314 */ csXyz();
@@ -106,6 +104,8 @@ struct csXyz {
     static u8 Zero[4];
 };
 
+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*,

rel/d/a/obj/d_a_obj_eff/d_a_obj_eff.cpp

@@ -32,14 +32,14 @@ struct daObj {
 
 struct dPa_levelEcallBack {};
 
-struct cXyz {};
-
-struct dKy_tevstr_c {};
-
 struct _GXColor {};
 
+struct cXyz {};
+
 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*,

rel/d/a/obj/d_a_obj_fireWood/d_a_obj_fireWood.cpp

@@ -48,14 +48,14 @@ struct dSv_info_c {
 
 struct dPa_levelEcallBack {};
 
-struct cXyz {};
-
-struct dKy_tevstr_c {};
-
 struct _GXColor {};
 
+struct cXyz {};
+
 struct csXyz {};
 
+struct dKy_tevstr_c {};
+
 struct dPa_control_c {
     /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*,
                             cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*,

rel/d/a/obj/d_a_obj_fireWood2/d_a_obj_fireWood2.cpp

@@ -51,14 +51,14 @@ struct dSv_info_c {
 
 struct dPa_levelEcallBack {};
 
-struct cXyz {};
-
-struct dKy_tevstr_c {};
-
 struct _GXColor {};
 
+struct cXyz {};
+
 struct csXyz {};
 
+struct dKy_tevstr_c {};
+
 struct dPa_control_c {
     /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*,
                             cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*,

rel/d/a/obj/d_a_obj_firepillar2/d_a_obj_firepillar2.cpp

@@ -40,10 +40,10 @@ struct mDoExt_btkAnm {
     /* 8000D6D8 */ 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);

rel/d/a/obj/d_a_obj_gra2/d_a_obj_gra2.cpp

@@ -46,12 +46,12 @@ struct mDoExt_bckAnm {
     /* 8000D990 */ void changeBckOnly(J3DAnmTransform*);
 };
 
+struct mDoExt_McaMorfCallBack1_c {};
+
 struct J3DModelData {};
 
 struct mDoExt_McaMorfCallBack2_c {};
 
-struct mDoExt_McaMorfCallBack1_c {};
-
 struct Z2Creature {
     /* 802C0530 */ void init(Vec*, Vec*, u8, u8);
 };
@@ -78,10 +78,10 @@ struct daPy_py_c {
     /* 8015F3FC */ void getAttentionOffsetY();
 };
 
-struct J3DModel {};
-
 struct J3DJoint {};
 
+struct J3DModel {};
+
 struct dBgW {};
 
 struct daObj_GrA_c {
@@ -271,10 +271,10 @@ struct daBaseNpc_lookat_c {
     /* 8014E6AC */ void getRot(int);
 };
 
-struct J3DAnmTexPattern {};
-
 struct J3DAnmTransformKey {};
 
+struct J3DAnmTexPattern {};
+
 struct daBaseNpc_c {
     /* 8014E89C */ ~daBaseNpc_c();
     /* 8014EAD0 */ void execute();
@@ -337,10 +337,10 @@ struct dRes_control_c {
 
 struct dPa_levelEcallBack {};
 
-struct dKy_tevstr_c {};
-
 struct _GXColor {};
 
+struct dKy_tevstr_c {};
+
 struct dPa_control_c {
     struct level_c {
         /* 8004B918 */ void getEmitter(u32);
@@ -354,16 +354,16 @@ struct dPa_control_c {
                                 cXyz const*);
 };
 
-struct dBgS_AcchCir {
-    /* 80075F58 */ void SetWall(f32, f32);
-};
-
 struct dBgW_Base {};
 
 struct dBgS {
     /* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*);
 };
 
+struct dBgS_AcchCir {
+    /* 80075F58 */ void SetWall(f32, f32);
+};
+
 struct dBgS_Acch {
     /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*);
     /* 80076AAC */ void CrrPos(dBgS&);

rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone.cpp

@@ -68,10 +68,7 @@ struct dPa_control_c {
     };
 };
 
-struct dBgS_AcchCir {
-    /* 80075EAC */ dBgS_AcchCir();
-    /* 80075F58 */ void SetWall(f32, f32);
-};
+struct csXyz {};
 
 struct cBgS_PolyInfo {};
 
@@ -80,7 +77,10 @@ struct dBgS {
     /* 80075100 */ void GetRoomId(cBgS_PolyInfo const&);
 };
 
-struct csXyz {};
+struct dBgS_AcchCir {
+    /* 80075EAC */ dBgS_AcchCir();
+    /* 80075F58 */ void SetWall(f32, f32);
+};
 
 struct dBgS_Acch {
     /* 80075F94 */ ~dBgS_Acch();

rel/d/a/obj/d_a_obj_groundwater/d_a_obj_groundwater.cpp

@@ -39,12 +39,12 @@ struct mDoExt_brkAnm {
     /* 8000D7A8 */ void entry(J3DMaterialTable*, f32);
 };
 
+struct J3DAnmTransform {};
+
 struct J3DModelData {
     /* 8032600C */ void simpleCalcMaterial(u16, f32 (*)[4]);
 };
 
-struct J3DAnmTransform {};
-
 struct mDoExt_bckAnm {
     /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool);
     /* 8000D9CC */ void entry(J3DModelData*, f32);

rel/d/a/obj/d_a_obj_hakai_brl/d_a_obj_hakai_brl.cpp

@@ -67,10 +67,10 @@ struct dPa_modelEcallBack {
 
 struct dPa_levelEcallBack {};
 
-struct _GXColor {};
-
 struct csXyz {};
 
+struct _GXColor {};
+
 struct dPa_control_c {
     /* 8004C218 */ void setHitMark(u16, fopAc_ac_c*, cXyz const*, csXyz const*, cXyz const*, u32);
     /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*,

rel/d/a/obj/d_a_obj_iceleaf/d_a_obj_iceleaf.cpp

@@ -25,10 +25,10 @@ struct mDoMtx_stack_c {
     static u8 now[48];
 };
 
-struct J3DModelData {};
-
 struct J3DAnmTransform {};
 
+struct J3DModelData {};
+
 struct mDoExt_bckAnm {
     /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool);
     /* 8000D9CC */ void entry(J3DModelData*, f32);
@@ -98,12 +98,12 @@ struct dRes_control_c {
 
 struct dPa_levelEcallBack {};
 
+struct _GXColor {};
+
 struct cBgS_PolyInfo {
     /* 802680B0 */ ~cBgS_PolyInfo();
 };
 
-struct _GXColor {};
-
 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*,

rel/d/a/obj/d_a_obj_kabuto/d_a_obj_kabuto.cpp

@@ -50,19 +50,19 @@ struct mDoExt_baseAnm {
     /* 8000D428 */ void play();
 };
 
+struct J3DAnmTransform {};
+
+struct mDoExt_McaMorfCallBack1_c {};
+
 struct J3DModelData {};
 
 struct mDoExt_McaMorfCallBack2_c {};
 
-struct mDoExt_McaMorfCallBack1_c {};
-
 struct Z2Creature {
     /* 802C03C8 */ Z2Creature();
     /* 802C0530 */ void init(Vec*, Vec*, u8, u8);
 };
 
-struct J3DAnmTransform {};
-
 struct mDoExt_McaMorfSO {
     /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*,
                                     mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int,

rel/d/a/obj/d_a_obj_kag/d_a_obj_kag.cpp

@@ -45,12 +45,14 @@ struct mDoExt_baseAnm {
     /* 8000D428 */ void play();
 };
 
+struct J3DAnmTransform {};
+
+struct mDoExt_McaMorfCallBack1_c {};
+
 struct J3DModelData {};
 
 struct mDoExt_McaMorfCallBack2_c {};
 
-struct mDoExt_McaMorfCallBack1_c {};
-
 struct Vec {};
 
 struct Z2Creature {
@@ -58,8 +60,6 @@ struct Z2Creature {
     /* 802C0530 */ void init(Vec*, Vec*, u8, u8);
 };
 
-struct J3DAnmTransform {};
-
 struct mDoExt_McaMorfSO {
     /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*,
                                     mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int,

rel/d/a/obj/d_a_obj_kaisou/d_a_obj_kaisou.cpp

@@ -35,10 +35,10 @@ struct fopAcM_gc_c {
     static f32 mGroundY;
 };
 
-struct J3DJoint {};
-
 struct J3DModel {};
 
+struct J3DJoint {};
+
 struct daObjKaisou_c {
     /* 80C34058 */ void ctrlJoint(J3DJoint*, J3DModel*);
     /* 80C34390 */ void initCcCylinder();

rel/d/a/obj/d_a_obj_kamakiri/d_a_obj_kamakiri.cpp

@@ -50,19 +50,19 @@ struct mDoExt_baseAnm {
     /* 8000D428 */ void play();
 };
 
+struct J3DAnmTransform {};
+
+struct mDoExt_McaMorfCallBack1_c {};
+
 struct J3DModelData {};
 
 struct mDoExt_McaMorfCallBack2_c {};
 
-struct mDoExt_McaMorfCallBack1_c {};
-
 struct Z2Creature {
     /* 802C03C8 */ Z2Creature();
     /* 802C0530 */ void init(Vec*, Vec*, u8, u8);
 };
 
-struct J3DAnmTransform {};
-
 struct mDoExt_McaMorfSO {
     /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*,
                                     mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int,

rel/d/a/obj/d_a_obj_kantera/d_a_obj_kantera.cpp

@@ -107,12 +107,12 @@ struct dBgS_AcchCir {
     /* 80C38E98 */ ~dBgS_AcchCir();
 };
 
+struct dBgS {};
+
 struct cXyz {
     /* 80266B84 */ void operator*(f32) const;
 };
 
-struct dBgS {};
-
 struct csXyz {};
 
 struct dBgS_Acch {

rel/d/a/obj/d_a_obj_katatsumuri/d_a_obj_katatsumuri.cpp

@@ -49,19 +49,19 @@ struct mDoExt_baseAnm {
     /* 8000D428 */ void play();
 };
 
+struct J3DAnmTransform {};
+
+struct mDoExt_McaMorfCallBack1_c {};
+
 struct J3DModelData {};
 
 struct mDoExt_McaMorfCallBack2_c {};
 
-struct mDoExt_McaMorfCallBack1_c {};
-
 struct Z2Creature {
     /* 802C03C8 */ Z2Creature();
     /* 802C0530 */ void init(Vec*, Vec*, u8, u8);
 };
 
-struct J3DAnmTransform {};
-
 struct mDoExt_McaMorfSO {
     /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*,
                                     mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int,
@@ -85,10 +85,10 @@ struct daObj_KatHIO_c {
     /* 80C3C5CC */ ~daObj_KatHIO_c();
 };
 
-struct J3DJoint {};
-
 struct J3DModel {};
 
+struct J3DJoint {};
+
 struct daObjKAT_c {
     /* 80C39994 */ void InitCcSph();
     /* 80C39A00 */ void SetCcSph();

rel/d/a/obj/d_a_obj_keyhole/d_a_obj_keyhole.cpp

@@ -26,11 +26,11 @@ struct mDoExt_McaMorfCallBack2_c {};
 
 struct mDoExt_McaMorfCallBack1_c {};
 
-struct Vec {};
+struct J3DAnmTransform {};
 
 struct J3DModelData {};
 
-struct J3DAnmTransform {};
+struct Vec {};
 
 struct mDoExt_McaMorf {
     /* 8000FC4C */ mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*,

rel/d/a/obj/d_a_obj_ki/d_a_obj_ki.cpp

@@ -30,10 +30,10 @@ struct mDoExt_McaMorfCallBack2_c {};
 
 struct mDoExt_McaMorfCallBack1_c {};
 
-struct J3DModelData {};
-
 struct J3DAnmTransform {};
 
+struct J3DModelData {};
+
 struct mDoExt_McaMorf {
     /* 8000FC4C */ mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*,
                                   mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, int,

rel/d/a/obj/d_a_obj_knBullet/d_a_obj_knBullet.cpp

@@ -36,6 +36,8 @@ struct daObjKnBullet_c {
 
 struct dPa_levelEcallBack {};
 
+struct _GXColor {};
+
 struct Vec {};
 
 struct cXyz {
@@ -45,8 +47,6 @@ struct cXyz {
 
 struct dKy_tevstr_c {};
 
-struct _GXColor {};
-
 struct dPa_control_c {
     struct level_c {
         /* 8004B918 */ void getEmitter(u32);

rel/d/a/obj/d_a_obj_kshutter/d_a_obj_kshutter.cpp

@@ -26,10 +26,10 @@ struct mDoMtx_stack_c {
     static u8 now[48];
 };
 
-struct J3DModelData {};
-
 struct J3DAnmTransform {};
 
+struct J3DModelData {};
+
 struct mDoExt_bckAnm {
     /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool);
     /* 8000D9CC */ void entry(J3DModelData*, f32);

rel/d/a/obj/d_a_obj_ktonfire/d_a_obj_ktOnFire.cpp

@@ -50,14 +50,14 @@ struct dSv_info_c {
 
 struct dPa_levelEcallBack {};
 
-struct cXyz {};
-
-struct dKy_tevstr_c {};
-
 struct _GXColor {};
 
+struct cXyz {};
+
 struct csXyz {};
 
+struct dKy_tevstr_c {};
+
 struct dPa_control_c {
     /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*,
                             cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*,

rel/d/a/obj/d_a_obj_kuwagata/d_a_obj_kuwagata.cpp

@@ -50,19 +50,19 @@ struct mDoExt_baseAnm {
     /* 8000D428 */ void play();
 };
 
+struct J3DAnmTransform {};
+
+struct mDoExt_McaMorfCallBack1_c {};
+
 struct J3DModelData {};
 
 struct mDoExt_McaMorfCallBack2_c {};
 
-struct mDoExt_McaMorfCallBack1_c {};
-
 struct Z2Creature {
     /* 802C03C8 */ Z2Creature();
     /* 802C0530 */ void init(Vec*, Vec*, u8, u8);
 };
 
-struct J3DAnmTransform {};
-
 struct mDoExt_McaMorfSO {
     /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*,
                                     mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int,

rel/d/a/obj/d_a_obj_laundry_rope/d_a_obj_laundry_rope.cpp

@@ -21,10 +21,10 @@ struct mDoExt_3DlineMatSortPacket {
 
 struct dKy_tevstr_c {};
 
-struct _GXColor {};
-
 struct ResTIMG {};
 
+struct _GXColor {};
+
 struct mDoExt_3DlineMat1_c {
     /* 80013360 */ void init(u16, u16, ResTIMG*, int);
     /* 80013FB0 */ void update(int, _GXColor&, dKy_tevstr_c*);

rel/d/a/obj/d_a_obj_life_container/d_a_obj_life_container.cpp

@@ -103,10 +103,10 @@ struct dPa_followEcallBack {
     /* 80049580 */ dPa_followEcallBack(u8, u8);
 };
 
-struct dKy_tevstr_c {};
-
 struct _GXColor {};
 
+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*,

rel/d/a/obj/d_a_obj_lp/d_a_obj_lp.cpp

@@ -52,10 +52,10 @@ struct dRes_control_c {
     /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int);
 };
 
-struct J3DModelData {};
-
 struct J3DModel {};
 
+struct J3DModelData {};
+
 struct dComIfG_play_c {
     /* 8002CAF0 */ void addSimpleModel(J3DModelData*, int, u8);
     /* 8002CB30 */ void removeSimpleModel(J3DModelData*, int);

rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff.cpp

@@ -24,17 +24,17 @@ struct daObjWaterEff_c {
 
 struct dPa_levelEcallBack {};
 
+struct _GXColor {};
+
 struct cXyz {
     /* 80C5C670 */ ~cXyz();
     /* 80C5C6AC */ cXyz();
 };
 
-struct dKy_tevstr_c {};
-
-struct _GXColor {};
-
 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*,

rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray.cpp

@@ -19,10 +19,10 @@ struct mDoMtx_stack_c {
     static u8 now[48];
 };
 
-struct J3DModelData {};
-
 struct J3DAnmTransform {};
 
+struct J3DModelData {};
+
 struct mDoExt_bckAnm {
     /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool);
     /* 8000D9CC */ void entry(J3DModelData*, f32);

rel/d/a/obj/d_a_obj_lv6bemos/d_a_obj_lv6bemos.cpp

@@ -34,10 +34,10 @@ struct mDoExt_btkAnm {
     /* 8000D6D8 */ 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);

rel/d/a/obj/d_a_obj_lv6bemos2/d_a_obj_lv6bemos2.cpp

@@ -50,10 +50,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);

rel/d/a/obj/d_a_obj_lv6egate/d_a_obj_lv6egate.cpp

@@ -40,14 +40,14 @@ struct dSv_info_c {
 
 struct dPa_levelEcallBack {};
 
-struct cXyz {};
-
-struct dKy_tevstr_c {};
-
 struct _GXColor {};
 
+struct cXyz {};
+
 struct csXyz {};
 
+struct dKy_tevstr_c {};
+
 struct dPa_control_c {
     /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*,
                             cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*,

rel/d/a/obj/d_a_obj_lv7bridge/d_a_obj_lv7bridge.cpp

@@ -22,10 +22,10 @@ struct mDoMtx_stack_c {
     static u8 now[48];
 };
 
-struct J3DModelData {};
-
 struct J3DAnmTransform {};
 
+struct J3DModelData {};
+
 struct mDoExt_bckAnm {
     /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool);
     /* 8000D9CC */ void entry(J3DModelData*, f32);

rel/d/a/obj/d_a_obj_magne_arm/d_a_obj_magne_arm.cpp

@@ -49,10 +49,10 @@ struct mDoExt_3DlineMatSortPacket {
 
 struct dKy_tevstr_c {};
 
-struct _GXColor {};
-
 struct ResTIMG {};
 
+struct _GXColor {};
+
 struct mDoExt_3DlineMat1_c {
     /* 80013360 */ void init(u16, u16, ResTIMG*, int);
     /* 8001373C */ void update(int, f32, _GXColor&, u16, dKy_tevstr_c*);

rel/d/a/obj/d_a_obj_maki/d_a_obj_maki.cpp

@@ -19,10 +19,10 @@ struct mDoMtx_stack_c {
     static u8 now[48];
 };
 
-struct J3DMaterialTable {};
-
 struct J3DAnmTevRegKey {};
 
+struct J3DMaterialTable {};
+
 struct mDoExt_brkAnm {
     /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16);
     /* 8000D7A8 */ void entry(J3DMaterialTable*, f32);

rel/d/a/obj/d_a_obj_movebox/d_a_obj_movebox.cpp

@@ -50,6 +50,8 @@ struct dBgW {
 };
 
 struct daObjMovebox {
+    struct BgcSrc_c {};
+
     struct Act_c {
         struct Prm_e {};
 
@@ -91,8 +93,6 @@ struct daObjMovebox {
         static u8 const M_attr[1280];
     };
 
-    struct BgcSrc_c {};
-
     struct Bgc_c {
         /* 8047DAEC */ Bgc_c();
         /* 8047DBF0 */ void gnd_pos(daObjMovebox::Act_c const*, daObjMovebox::BgcSrc_c const*, int,

rel/d/a/obj/d_a_obj_nagaisu/d_a_obj_nagaisu.cpp

@@ -36,16 +36,16 @@ struct daObjNagaisu_c {
     static u8 const REMOVE_ISU_IDX[28];
 };
 
-struct dCcD_Stts {
-    /* 80083860 */ void Init(int, int, fopAc_ac_c*);
-};
-
 struct dMdl_obj_c {};
 
 struct dMdl_c {
     /* 8009C668 */ void entryObj(dMdl_obj_c*);
 };
 
+struct dCcD_Stts {
+    /* 80083860 */ void Init(int, int, fopAc_ac_c*);
+};
+
 struct daObjIsuChild_c {
     /* 80C9FA90 */ daObjIsuChild_c();
     /* 80C9FCDC */ ~daObjIsuChild_c();

rel/d/a/obj/d_a_obj_nan/d_a_obj_nan.cpp

@@ -49,19 +49,19 @@ struct mDoExt_baseAnm {
     /* 8000D428 */ void play();
 };
 
+struct J3DAnmTransform {};
+
+struct mDoExt_McaMorfCallBack1_c {};
+
 struct J3DModelData {};
 
 struct mDoExt_McaMorfCallBack2_c {};
 
-struct mDoExt_McaMorfCallBack1_c {};
-
 struct Z2Creature {
     /* 802C03C8 */ Z2Creature();
     /* 802C0530 */ void init(Vec*, Vec*, u8, u8);
 };
 
-struct J3DAnmTransform {};
-
 struct mDoExt_McaMorfSO {
     /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*,
                                     mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int,

rel/d/a/obj/d_a_obj_onsenFire/d_a_obj_onsenFire.cpp

@@ -29,10 +29,10 @@ struct dSv_event_c {
     /* 800349BC */ void isEventBit(u16) const;
 };
 
-struct dKy_tevstr_c {};
-
 struct _GXColor {};
 
+struct dKy_tevstr_c {};
+
 struct cXyz {};
 
 struct dPa_control_c {

rel/d/a/obj/d_a_obj_picture/d_a_obj_picture.cpp

@@ -40,10 +40,10 @@ struct mDoExt_3DlineMatSortPacket {
 
 struct dKy_tevstr_c {};
 
-struct _GXColor {};
-
 struct ResTIMG {};
 
+struct _GXColor {};
+
 struct mDoExt_3DlineMat1_c {
     /* 80013360 */ void init(u16, u16, ResTIMG*, int);
     /* 8001373C */ void update(int, f32, _GXColor&, u16, dKy_tevstr_c*);

rel/d/a/obj/d_a_obj_poFire/d_a_obj_poFire.cpp

@@ -75,6 +75,8 @@ struct dSv_player_get_item_c {
 
 struct dPa_levelEcallBack {};
 
+struct _GXColor {};
+
 struct Vec {};
 
 struct cXyz {
@@ -83,12 +85,10 @@ struct cXyz {
     /* 80266B84 */ void operator*(f32) const;
 };
 
-struct dKy_tevstr_c {};
-
-struct _GXColor {};
-
 struct csXyz {};
 
+struct dKy_tevstr_c {};
+
 struct dPa_control_c {
     struct level_c {
         /* 8004B8B4 */ void forceOnEventMove(u32);

rel/d/a/obj/d_a_obj_poTbox/d_a_obj_poTbox.cpp

@@ -37,10 +37,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);

rel/d/a/obj/d_a_obj_rock/d_a_obj_rock.cpp

@@ -36,10 +36,10 @@ struct dRes_control_c {
     /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int);
 };
 
-struct J3DModelData {};
-
 struct J3DModel {};
 
+struct J3DModelData {};
+
 struct dComIfG_play_c {
     /* 8002CAF0 */ void addSimpleModel(J3DModelData*, int, u8);
     /* 8002CB30 */ void removeSimpleModel(J3DModelData*, int);

rel/d/a/obj/d_a_obj_rope_bridge/d_a_obj_rope_bridge.cpp

@@ -42,10 +42,10 @@ struct mDoExt_3DlineMatSortPacket {
 
 struct dKy_tevstr_c {};
 
-struct _GXColor {};
-
 struct ResTIMG {};
 
+struct _GXColor {};
+
 struct mDoExt_3DlineMat1_c {
     /* 80013360 */ void init(u16, u16, ResTIMG*, int);
     /* 8001373C */ void update(int, f32, _GXColor&, u16, dKy_tevstr_c*);

rel/d/a/obj/d_a_obj_rotBridge/d_a_obj_rotBridge.cpp

@@ -21,10 +21,10 @@ struct mDoHIO_entry_c {
     /* 80CBE9DC */ ~mDoHIO_entry_c();
 };
 
-struct J3DModelData {};
-
 struct J3DAnmTransform {};
 
+struct J3DModelData {};
+
 struct mDoExt_bckAnm {
     /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool);
     /* 8000D9CC */ void entry(J3DModelData*, f32);

rel/d/a/obj/d_a_obj_sakuita/d_a_obj_sakuita.cpp

@@ -50,10 +50,10 @@ struct dRes_control_c {
     /* 8003C37C */ void getRes(char const*, char const*, dRes_info_c*, int);
 };
 
-struct J3DModelData {};
-
 struct J3DModel {};
 
+struct J3DModelData {};
+
 struct dComIfG_play_c {
     /* 8002CAF0 */ void addSimpleModel(J3DModelData*, int, u8);
     /* 8002CB30 */ void removeSimpleModel(J3DModelData*, int);

rel/d/a/obj/d_a_obj_sakuita_rope/d_a_obj_sakuita_rope.cpp

@@ -25,10 +25,10 @@ struct mDoExt_3DlineMatSortPacket {
 
 struct dKy_tevstr_c {};
 
-struct _GXColor {};
-
 struct ResTIMG {};
 
+struct _GXColor {};
+
 struct mDoExt_3DlineMat1_c {
     /* 80013360 */ void init(u16, u16, ResTIMG*, int);
     /* 80013FB0 */ void update(int, _GXColor&, dKy_tevstr_c*);
@@ -67,10 +67,10 @@ struct dRes_control_c {
     /* 8003C37C */ void getRes(char const*, char const*, dRes_info_c*, int);
 };
 
-struct J3DModelData {};
-
 struct J3DModel {};
 
+struct J3DModelData {};
+
 struct dComIfG_play_c {
     /* 8002CAF0 */ void addSimpleModel(J3DModelData*, int, u8);
     /* 8002CB30 */ void removeSimpleModel(J3DModelData*, int);

rel/d/a/obj/d_a_obj_scannon/d_a_obj_scannon.cpp

@@ -30,10 +30,10 @@ struct mDoExt_btkAnm {
     /* 8000D6D8 */ 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);

rel/d/a/obj/d_a_obj_scannon_crs/d_a_obj_scannon_crs.cpp

@@ -39,10 +39,10 @@ struct mDoExt_btkAnm {
     /* 8000D6D8 */ 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);

rel/d/a/obj/d_a_obj_scannon_ten/d_a_obj_scannon_ten.cpp

@@ -17,10 +17,10 @@ struct mDoMtx_stack_c {
     static u8 now[48];
 };
 
-struct J3DModelData {};
-
 struct J3DAnmTransform {};
 
+struct J3DModelData {};
+
 struct mDoExt_bckAnm {
     /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool);
     /* 8000D9CC */ void entry(J3DModelData*, f32);

rel/d/a/obj/d_a_obj_sekizoa/d_a_obj_sekizoa.cpp

@@ -57,20 +57,20 @@ struct mDoExt_brkAnm {
     /* 8000D7A8 */ void entry(J3DMaterialTable*, f32);
 };
 
+struct J3DAnmTransform {};
+
+struct mDoExt_McaMorfCallBack1_c {};
+
 struct J3DModelData {};
 
 struct mDoExt_McaMorfCallBack2_c {};
 
-struct mDoExt_McaMorfCallBack1_c {};
-
 struct Z2Creature {
     /* 802C03C8 */ Z2Creature();
     /* 802C0420 */ ~Z2Creature();
     /* 802C0530 */ void init(Vec*, Vec*, u8, u8);
 };
 
-struct J3DAnmTransform {};
-
 struct mDoExt_McaMorfSO {
     /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*,
                                     mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int,
@@ -92,6 +92,12 @@ struct daTag_EvtArea_c {
     /* 8048C94C */ void chkPointInArea(cXyz, cXyz);
 };
 
+struct daNpcT_faceMotionAnmData_c {};
+
+struct daNpcT_evtData_c {};
+
+struct daNpcT_motionAnmData_c {};
+
 struct daNpcT_MotionSeqMngr_c {
     struct sequenceStepData_c {};
 
@@ -100,12 +106,6 @@ struct daNpcT_MotionSeqMngr_c {
     /* 80CD52AC */ ~daNpcT_MotionSeqMngr_c();
 };
 
-struct daNpcT_motionAnmData_c {};
-
-struct daNpcT_faceMotionAnmData_c {};
-
-struct daNpcT_evtData_c {};
-
 struct daObj_Sekizoa_c {
     /* 80CCE34C */ ~daObj_Sekizoa_c();
     /* 80CCE570 */ void create();
@@ -178,6 +178,8 @@ struct daObj_SekiDoor_c {
     /* 80CCD5DC */ void evtSkip();
 };
 
+struct J3DJoint {};
+
 struct dCcD_GObjInf {
     /* 80083A28 */ dCcD_GObjInf();
     /* 800840E4 */ ~dCcD_GObjInf();
@@ -190,8 +192,6 @@ struct dCcD_GObjInf {
 
 struct _GXColorS10 {};
 
-struct J3DJoint {};
-
 struct daNpcT_c {
     /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*);
     /* 80147FD4 */ void srchActor(void*, void*);

rel/d/a/obj/d_a_obj_smallkey/d_a_obj_smallkey.cpp

@@ -111,10 +111,10 @@ struct dPa_followEcallBack {
     /* 80CDA48C */ void __defctor();
 };
 
-struct dKy_tevstr_c {};
-
 struct _GXColor {};
 
+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*,

rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke.cpp

@@ -34,14 +34,14 @@ struct dSv_info_c {
 
 struct dPa_levelEcallBack {};
 
-struct cXyz {};
-
-struct dKy_tevstr_c {};
-
 struct _GXColor {};
 
+struct cXyz {};
+
 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*,

rel/d/a/obj/d_a_obj_snowEffTag/d_a_obj_snowEffTag.cpp

@@ -39,18 +39,18 @@ struct daSnowEffTag_HIO_c {
 
 struct dPa_levelEcallBack {};
 
+struct _GXColor {};
+
 struct Vec {};
 
 struct cXyz {
     /* 80266B34 */ void operator-(Vec const&) const;
 };
 
-struct dKy_tevstr_c {};
-
-struct _GXColor {};
-
 struct csXyz {};
 
+struct dKy_tevstr_c {};
+
 struct dPa_control_c {
     struct level_c {
         /* 8004B918 */ void getEmitter(u32);

rel/d/a/obj/d_a_obj_stairBlock/d_a_obj_stairBlock.cpp

@@ -21,10 +21,10 @@ struct mDoHIO_entry_c {
     /* 80CE81AC */ ~mDoHIO_entry_c();
 };
 
-struct J3DModelData {};
-
 struct J3DAnmTransform {};
 
+struct J3DModelData {};
+
 struct mDoExt_bckAnm {
     /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool);
     /* 8000D9CC */ void entry(J3DModelData*, f32);

rel/d/a/obj/d_a_obj_stone/d_a_obj_stone.cpp

@@ -13,12 +13,12 @@
 
 struct request_of_phase_process_class {};
 
-struct Quaternion {};
-
 struct csXyz {
     /* 802673F4 */ csXyz(s16, s16, s16);
 };
 
+struct Quaternion {};
+
 struct mDoMtx_stack_c {
     /* 8000CF44 */ void ZXYrotM(csXyz const&);
     /* 8000CF7C */ void quatM(Quaternion const*);

rel/d/a/obj/d_a_obj_sw/d_a_obj_sw.cpp

@@ -32,11 +32,11 @@ struct mDoExt_McaMorfCallBack2_c {};
 
 struct mDoExt_McaMorfCallBack1_c {};
 
-struct Vec {};
+struct J3DAnmTransform {};
 
 struct J3DModelData {};
 
-struct J3DAnmTransform {};
+struct Vec {};
 
 struct mDoExt_McaMorf {
     /* 8000FC4C */ mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*,
@@ -56,10 +56,10 @@ struct mDoExt_3DlineMatSortPacket {
 
 struct dKy_tevstr_c {};
 
-struct _GXColor {};
-
 struct ResTIMG {};
 
+struct _GXColor {};
+
 struct mDoExt_3DlineMat1_c {
     /* 80013360 */ void init(u16, u16, ResTIMG*, int);
     /* 80013FB0 */ void update(int, _GXColor&, dKy_tevstr_c*);

rel/d/a/obj/d_a_obj_swpush/d_a_obj_swpush.cpp

@@ -35,13 +35,13 @@ struct fopAc_ac_c {
     /* 80018B64 */ fopAc_ac_c();
 };
 
+struct J3DJoint {};
+
 struct dBgW {
     /* 8007B970 */ dBgW();
     /* 8007B9C0 */ void Move();
 };
 
-struct J3DJoint {};
-
 struct daObjSwpush {
     struct Act_c {
         struct Prm_e {};

rel/d/a/obj/d_a_obj_swpush2/d_a_obj_swpush2.cpp

@@ -25,11 +25,11 @@ struct mDoMtx_stack_c {
     static u8 now[48];
 };
 
-struct J3DAnmColor {};
+struct J3DAnmTextureSRTKey {};
 
 struct J3DAnmTevRegKey {};
 
-struct J3DAnmTextureSRTKey {};
+struct J3DAnmColor {};
 
 struct J3DMaterialTable {
     /* 8032F64C */ void removeMatColorAnimator(J3DAnmColor*);

rel/d/a/obj/d_a_obj_tatigi/d_a_obj_tatigi.cpp

@@ -36,10 +36,10 @@ struct dRes_control_c {
     /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int);
 };
 
-struct J3DModelData {};
-
 struct J3DModel {};
 
+struct J3DModelData {};
+
 struct dComIfG_play_c {
     /* 8002CAF0 */ void addSimpleModel(J3DModelData*, int, u8);
     /* 8002CB30 */ void removeSimpleModel(J3DModelData*, int);

rel/d/a/obj/d_a_obj_ten/d_a_obj_ten.cpp

@@ -50,19 +50,19 @@ struct mDoExt_baseAnm {
     /* 8000D428 */ void play();
 };
 
+struct J3DAnmTransform {};
+
+struct mDoExt_McaMorfCallBack1_c {};
+
 struct J3DModelData {};
 
 struct mDoExt_McaMorfCallBack2_c {};
 
-struct mDoExt_McaMorfCallBack1_c {};
-
 struct Z2Creature {
     /* 802C03C8 */ Z2Creature();
     /* 802C0530 */ void init(Vec*, Vec*, u8, u8);
 };
 
-struct J3DAnmTransform {};
-
 struct mDoExt_McaMorfSO {
     /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*,
                                     mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int,

rel/d/a/obj/d_a_obj_timeFire/d_a_obj_timeFire.cpp

@@ -46,14 +46,14 @@ struct dSv_info_c {
 
 struct dPa_levelEcallBack {};
 
-struct cXyz {};
-
-struct dKy_tevstr_c {};
-
 struct _GXColor {};
 
+struct cXyz {};
+
 struct csXyz {};
 
+struct dKy_tevstr_c {};
+
 struct dPa_control_c {
     /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*,
                             cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*,

rel/d/a/obj/d_a_obj_tks/d_a_obj_tks.cpp

@@ -41,12 +41,12 @@ struct mDoExt_bckAnm {
     /* 8000D990 */ void changeBckOnly(J3DAnmTransform*);
 };
 
+struct mDoExt_McaMorfCallBack1_c {};
+
 struct J3DModelData {};
 
 struct mDoExt_McaMorfCallBack2_c {};
 
-struct mDoExt_McaMorfCallBack1_c {};
-
 struct Z2Creature {
     /* 802C03C8 */ Z2Creature();
     /* 802C0420 */ ~Z2Creature();
@@ -66,10 +66,10 @@ struct fopAc_ac_c {
     /* 80018C8C */ ~fopAc_ac_c();
 };
 
-struct J3DJoint {};
-
 struct J3DModel {};
 
+struct J3DJoint {};
+
 struct daObjTks_c {
     /* 80D0F28C */ daObjTks_c();
     /* 80D0F480 */ ~daObjTks_c();
@@ -108,16 +108,16 @@ struct daObjTks_Param_c {
     static u8 const m[128];
 };
 
-struct J3DAnmTextureSRTKey {};
-
-struct _GXColorS10 {};
-
 struct J3DAnmTexPattern {
     /* 8032AF50 */ void getTexNo(u16, u16*) const;
 };
 
 struct J3DAnmTransformKey {};
 
+struct _GXColorS10 {};
+
+struct J3DAnmTextureSRTKey {};
+
 struct daNpcF_c {
     struct daNpcF_anmPlayData {};
 

rel/d/a/obj/d_a_obj_toby/d_a_obj_toby.cpp

@@ -95,10 +95,10 @@ struct dEvt_control_c {
     /* 80042468 */ void reset();
 };
 
-struct J3DModelData {};
-
 struct J3DModel {};
 
+struct J3DModelData {};
+
 struct dComIfG_play_c {
     /* 8002CAF0 */ void addSimpleModel(J3DModelData*, int, u8);
     /* 8002CB30 */ void removeSimpleModel(J3DModelData*, int);

rel/d/a/obj/d_a_obj_tobyhouse/d_a_obj_tobyhouse.cpp

@@ -23,10 +23,10 @@ struct mDoMtx_stack_c {
     static u8 now[48];
 };
 
-struct J3DModelData {};
-
 struct J3DAnmTransform {};
 
+struct J3DModelData {};
+
 struct mDoExt_bckAnm {
     /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool);
     /* 8000D9CC */ void entry(J3DModelData*, f32);

rel/d/a/obj/d_a_obj_tombo/d_a_obj_tombo.cpp

@@ -49,19 +49,19 @@ struct mDoExt_baseAnm {
     /* 8000D428 */ void play();
 };
 
+struct J3DAnmTransform {};
+
+struct mDoExt_McaMorfCallBack1_c {};
+
 struct J3DModelData {};
 
 struct mDoExt_McaMorfCallBack2_c {};
 
-struct mDoExt_McaMorfCallBack1_c {};
-
 struct Z2Creature {
     /* 802C03C8 */ Z2Creature();
     /* 802C0530 */ void init(Vec*, Vec*, u8, u8);
 };
 
-struct J3DAnmTransform {};
-
 struct mDoExt_McaMorfSO {
     /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*,
                                     mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int,

rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2.cpp

@@ -55,10 +55,10 @@ struct dSv_info_c {
 
 struct dPa_levelEcallBack {};
 
-struct dKy_tevstr_c {};
-
 struct _GXColor {};
 
+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*,

rel/d/a/obj/d_a_obj_tp/d_a_obj_tp.cpp

@@ -46,13 +46,13 @@ struct mDoExt_McaMorfCallBack2_c {};
 
 struct mDoExt_McaMorfCallBack1_c {};
 
-struct Vec {};
+struct J3DAnmTransform {};
 
 struct J3DModelData {
     /* 8032600C */ void simpleCalcMaterial(u16, f32 (*)[4]);
 };
 
-struct J3DAnmTransform {};
+struct Vec {};
 
 struct mDoExt_McaMorf {
     /* 8000FC4C */ mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*,

rel/d/a/obj/d_a_obj_volcbom/d_a_obj_volcbom.cpp

@@ -41,10 +41,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);

rel/d/a/obj/d_a_obj_warp_kbrg/d_a_obj_warp_kbrg.cpp

@@ -42,10 +42,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);

rel/d/a/obj/d_a_obj_warp_obrg/d_a_obj_warp_obrg.cpp

@@ -34,10 +34,10 @@ struct mDoExt_btkAnm {
     /* 8000D6D8 */ 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);

rel/d/a/obj/d_a_obj_waterPillar/d_a_obj_waterPillar.cpp

@@ -32,10 +32,10 @@ struct mDoExt_btkAnm {
     /* 8000D6D8 */ 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);

rel/d/a/obj/d_a_obj_web0/d_a_obj_web0.cpp

@@ -21,10 +21,10 @@ struct mDoMtx_stack_c {
     static u8 now[48];
 };
 
-struct J3DMaterialTable {};
-
 struct J3DAnmTevRegKey {};
 
+struct J3DMaterialTable {};
+
 struct mDoExt_brkAnm {
     /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16);
     /* 8000D7A8 */ void entry(J3DMaterialTable*, f32);

rel/d/a/obj/d_a_obj_web1/d_a_obj_web1.cpp

@@ -22,10 +22,10 @@ struct mDoMtx_stack_c {
     static u8 now[48];
 };
 
-struct J3DMaterialTable {};
-
 struct J3DAnmTevRegKey {};
 
+struct J3DMaterialTable {};
+
 struct mDoExt_brkAnm {
     /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16);
     /* 8000D7A8 */ void entry(J3DMaterialTable*, f32);

rel/d/a/obj/d_a_obj_wflag/d_a_obj_wflag.cpp

@@ -50,11 +50,11 @@ struct mDoExt_McaMorfCallBack2_c {};
 
 struct mDoExt_McaMorfCallBack1_c {};
 
-struct Vec {};
+struct J3DAnmTransform {};
 
 struct J3DModelData {};
 
-struct J3DAnmTransform {};
+struct Vec {};
 
 struct mDoExt_McaMorf {
     /* 8000FC4C */ mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*,

rel/d/a/obj/d_a_obj_window/d_a_obj_window.cpp

@@ -21,10 +21,10 @@ struct mDoMtx_stack_c {
     static u8 now[48];
 };
 
-struct J3DModelData {};
-
 struct J3DAnmTransform {};
 
+struct J3DModelData {};
+
 struct mDoExt_bckAnm {
     /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool);
     /* 8000D9CC */ void entry(J3DModelData*, f32);

rel/d/a/obj/d_a_obj_wood_statue/d_a_obj_wood_statue.cpp

@@ -92,10 +92,10 @@ struct dPa_followEcallBack {
     /* 80D3A6F4 */ void __defctor();
 };
 
-struct dKy_tevstr_c {};
-
 struct _GXColor {};
 
+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*,

rel/d/a/obj/d_a_obj_yousei/d_a_obj_yousei.cpp

@@ -27,19 +27,19 @@ struct mDoMtx_stack_c {
     static u8 now[48];
 };
 
+struct J3DAnmTransform {};
+
+struct mDoExt_McaMorfCallBack1_c {};
+
 struct J3DModelData {};
 
 struct mDoExt_McaMorfCallBack2_c {};
 
-struct mDoExt_McaMorfCallBack1_c {};
-
 struct Z2Creature {
     /* 802C03C8 */ Z2Creature();
     /* 802C0530 */ void init(Vec*, Vec*, u8, u8);
 };
 
-struct J3DAnmTransform {};
-
 struct mDoExt_McaMorfSO {
     /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*,
                                     mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int,

rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone.cpp

@@ -41,16 +41,16 @@ struct mDoExt_baseAnm {
     /* 8000D428 */ void play();
 };
 
+struct J3DAnmTransform {};
+
+struct mDoExt_McaMorfCallBack1_c {};
+
 struct J3DModelData {};
 
 struct mDoExt_McaMorfCallBack2_c {};
 
-struct mDoExt_McaMorfCallBack1_c {};
-
 struct Z2Creature {};
 
-struct J3DAnmTransform {};
-
 struct mDoExt_McaMorfSO {
     /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*,
                                     mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int,

rel/d/a/obj/mirror/d_a_obj_mirror_6pole/d_a_obj_mirror_6pole.cpp

@@ -21,10 +21,10 @@ struct mDoMtx_stack_c {
     static u8 now[48];
 };
 
-struct J3DModelData {};
-
 struct J3DAnmTransform {};
 
+struct J3DModelData {};
+
 struct mDoExt_bckAnm {
     /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool);
     /* 8000D9CC */ void entry(J3DModelData*, f32);

rel/d/a/obj/mirror/d_a_obj_mirror_chain/d_a_obj_mirror_chain.cpp

@@ -44,10 +44,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);

rel/d/a/obj/mirror/d_a_obj_mirror_sand/d_a_obj_mirror_sand.cpp

@@ -24,10 +24,10 @@ struct mDoMtx_stack_c {
     static u8 now[48];
 };
 
-struct J3DModelData {};
-
 struct J3DAnmTransform {};
 
+struct J3DModelData {};
+
 struct mDoExt_bckAnm {
     /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool);
     /* 8000D9CC */ void entry(J3DModelData*, f32);

rel/d/a/obj/mirror/d_a_obj_mirror_table/d_a_obj_mirror_table.cpp

@@ -47,10 +47,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);