diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2022-03-15 02:35:30 -0700 |
|---|---|---|
| committer | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2022-03-15 02:35:30 -0700 |
| commit | 9b81bd3fc3594033d60dec2337f286a2ffab7414 (patch) | |
| tree | 53452744d9d1ed8b893a742ef83c2eb485a2397e /include/d/a | |
| parent | 985d47a5c87d070682b0212dffe346132158b7b4 (diff) | |
format / asm
Diffstat (limited to 'include/d/a')
| -rw-r--r-- | include/d/a/d_a_alink.h | 2 | ||||
| -rw-r--r-- | include/d/a/d_a_npc.h | 6 | ||||
| -rw-r--r-- | include/d/a/d_a_shop_item_static.h | 2 |
3 files changed, 5 insertions, 5 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; } |