format / asm

7 files changed, 15 insertions, 15 deletions

diff --git a/include/d/a/d_a_alink.h b/include/d/a/d_a_alink.h
index 4a7927419a..f8921292ec 100644
--- a/include/d/a/d_a_alink.h
+++ b/include/d/a/d_a_alink.h
@@ -2338,7 +2338,7 @@ public:
         field_0x2844.clearData();
     }
     s32 checkPlayerDemoMode() const { return mDemo.getDemoType(); }
-    u16 getMidnaMsgNum() const { return mMidnaMsgNum; } 
+    u16 getMidnaMsgNum() const { return mMidnaMsgNum; }
 
     BOOL i_checkReinRide() const { return mRideStatus == 1 || mRideStatus == 2; }
 
diff --git a/include/d/a/d_a_npc.h b/include/d/a/d_a_npc.h
index 2c77d4d274..c27d2b5738 100644
--- a/include/d/a/d_a_npc.h
+++ b/include/d/a/d_a_npc.h
@@ -1,8 +1,8 @@
 #ifndef D_A_D_A_NPC_H
 #define D_A_D_A_NPC_H
 
-#include "dolphin/types.h"
 #include "d/com/d_com_inf_game.h"
+#include "dolphin/types.h"
 #include "global.h"
 
 class daNpcT_MotionSeqMngr_c {
@@ -253,7 +253,7 @@ public:
     /* 8014BEE4 */ void getEvtAreaTagP(int, int);
     /* 8014BFB0 */ void getShopItemTagP();
     /* 8014C030 */ void setHitodamaPrtcl();
-    
+
     /* 8014CD20 */ virtual ~daNpcT_c();
     /* 801490D4 */ virtual void ctrlBtk();
     /* 8014CC14 */ virtual void ctrlSubFaceMotion(int);
@@ -301,7 +301,7 @@ public:
     /* 8014CCA8 */ virtual void changeBtp(int*, int*);
     /* 8014CCE8 */ virtual void changeBtk(int*, int*);
     /* 8014A628 */ virtual void setMotionAnm(int, f32, int);
-    
+
     static u8 const mCcDObjData[48];
     static u8 mCcDCyl[68];
     static u8 mCcDSph[64];
diff --git a/include/d/a/d_a_shop_item_static.h b/include/d/a/d_a_shop_item_static.h
index d6bc8342df..6d17c53005 100644
--- a/include/d/a/d_a_shop_item_static.h
+++ b/include/d/a/d_a_shop_item_static.h
@@ -1,8 +1,8 @@
 #ifndef D_A_D_A_SHOP_ITEM_STATIC_H
 #define D_A_D_A_SHOP_ITEM_STATIC_H
 
-#include "dolphin/types.h"
 #include "d/a/d_a_itembase.h"
+#include "dolphin/types.h"
 
 struct ResourceData {
     char* get_arcName() const { return mArcName; }
diff --git a/include/d/msg/d_msg_flow.h b/include/d/msg/d_msg_flow.h
index e518446ba2..f57c11a677 100644
--- a/include/d/msg/d_msg_flow.h
+++ b/include/d/msg/d_msg_flow.h
@@ -1,9 +1,9 @@
 #ifndef D_MSG_D_MSG_FLOW_H
 #define D_MSG_D_MSG_FLOW_H
 
+#include "d/msg/d_msg_class.h"
 #include "dolphin/types.h"
 #include "f_op/f_op_actor.h"
-#include "d/msg/d_msg_class.h"
 
 // all mesg_flow_node structs members might be wrong
 struct mesg_flow_node {
@@ -17,7 +17,7 @@ struct mesg_flow_node_branch {
     /* 0x00 */ u8 type;
     /* 0x01 */ u8 field_0x1;
     /* 0x02 */ u16 msg_index;
-    /* 0x04 */ u16 params[2]; 
+    /* 0x04 */ u16 params[2];
 };
 
 struct mesg_flow_node_event {
diff --git a/include/d/msg/d_msg_object.h b/include/d/msg/d_msg_object.h
index bef45d2374..3ae2dacf00 100644
--- a/include/d/msg/d_msg_object.h
+++ b/include/d/msg/d_msg_object.h
@@ -2,11 +2,11 @@
 #define D_MSG_D_MSG_OBJECT_H
 
 #include "JSystem/J2DGraph/J2DTextbox.h"
-#include "d/com/d_com_inf_game.h"
-#include "d/msg/d_msg_class.h"
 #include "JSystem/JMessage/control.h"
-#include "JSystem/JMessage/resource.h"
 #include "JSystem/JMessage/processor.h"
+#include "JSystem/JMessage/resource.h"
+#include "d/com/d_com_inf_game.h"
+#include "d/msg/d_msg_class.h"
 #include "dolphin/types.h"
 
 class COutFont_c;
diff --git a/include/d/shop/d_shop_item_ctrl.h b/include/d/shop/d_shop_item_ctrl.h
index 72f6aa0174..9a3e956c22 100644
--- a/include/d/shop/d_shop_item_ctrl.h
+++ b/include/d/shop/d_shop_item_ctrl.h
@@ -1,8 +1,8 @@
 #ifndef D_SHOP_D_SHOP_ITEM_CTRL_H
 #define D_SHOP_D_SHOP_ITEM_CTRL_H
 
-#include "dolphin/types.h"
 #include "d/a/d_a_shop_item_static.h"
+#include "dolphin/types.h"
 
 class dShopItemCtrl_c {
 public:
diff --git a/include/d/shop/d_shop_system.h b/include/d/shop/d_shop_system.h
index 41ebb33d55..52f93f8594 100644
--- a/include/d/shop/d_shop_system.h
+++ b/include/d/shop/d_shop_system.h
@@ -1,9 +1,9 @@
 #ifndef D_SHOP_D_SHOP_SYSTEM_H
 #define D_SHOP_D_SHOP_SYSTEM_H
 
-#include "dolphin/types.h"
-#include "d/shop/d_shop_item_ctrl.h"
 #include "d/a/d_a_npc.h"
+#include "d/shop/d_shop_item_ctrl.h"
+#include "dolphin/types.h"
 
 typedef int (*ShopCam_actionFunc)(void);
 
@@ -124,7 +124,7 @@ public:
     /* 8019AB60 */ bool checkLeftTrigger(STControl*);
     /* 8019AB84 */ bool checkRightTrigger(STControl*);
     /* 8019ABA8 */ bool dpdMove();
-    
+
     /* 801974E4 */ virtual ~dShopSystem_c();
     /* 8019ACF0 */ virtual bool getResName2(int);
     /* 8019ACE0 */ virtual int beforeStartSeqAction(dMsgFlow_c*, int);
@@ -139,7 +139,7 @@ private:
     /* 0xE40 */ STControl* mpStick;
     /* 0xE44 */ dSelect_cursor_c* mpDrawCursor;
     /* 0xE48 */ dShopItemCtrl_c mItemCtrl;
-    /* 0xE78 */ ShopCam_action_c mShopCamAction; 
+    /* 0xE78 */ ShopCam_action_c mShopCamAction;
     /* 0xF54 */ u32 mEventParam;
     /* 0xF58 */ int field_0xf58;
     /* 0xF5C */ int field_0xf5c;