summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorTakaRikka <38417346+TakaRikka@users.noreply.github.com>2022-03-15 02:35:30 -0700
committerTakaRikka <38417346+TakaRikka@users.noreply.github.com>2022-03-15 02:35:30 -0700
commit9b81bd3fc3594033d60dec2337f286a2ffab7414 (patch)
tree53452744d9d1ed8b893a742ef83c2eb485a2397e /include
parent985d47a5c87d070682b0212dffe346132158b7b4 (diff)
format / asm
Diffstat (limited to 'include')
-rw-r--r--include/JSystem/JMessage/control.h22
-rw-r--r--include/JSystem/JMessage/data.h6
-rw-r--r--include/JSystem/JMessage/locale.h12
-rw-r--r--include/JSystem/JMessage/processor.h154
-rw-r--r--include/JSystem/JMessage/resource.h44
-rw-r--r--include/d/a/d_a_alink.h2
-rw-r--r--include/d/a/d_a_npc.h6
-rw-r--r--include/d/a/d_a_shop_item_static.h2
-rw-r--r--include/d/msg/d_msg_flow.h4
-rw-r--r--include/d/msg/d_msg_object.h6
-rw-r--r--include/d/shop/d_shop_item_ctrl.h2
-rw-r--r--include/d/shop/d_shop_system.h8
-rw-r--r--include/f_op/f_op_msg_mng.h2
-rw-r--r--include/m_Do/m_Do_audio.h2
-rw-r--r--include/rel/d/a/tag/d_a_tag_telop/d_a_tag_telop.h6
15 files changed, 137 insertions, 141 deletions
diff --git a/include/JSystem/JMessage/control.h b/include/JSystem/JMessage/control.h
index e1a49e2fa4..71d29d7268 100644
--- a/include/JSystem/JMessage/control.h
+++ b/include/JSystem/JMessage/control.h
@@ -4,19 +4,19 @@
#include "dolphin/types.h"
namespace JMessage {
- struct TProcessor;
+struct TProcessor;
- struct TControl {
- /* 802A7548 */ TControl();
- /* 802A758C */ ~TControl();
- /* 802A75D4 */ void reset();
- /* 802A7634 */ void update();
- /* 802A76BC */ void render();
- /* 802A77E8 */ void setMessageCode(u16, u16);
- /* 802A78F4 */ void setMessageID(u32, u32, bool*);
- /* 802A7A20 */ void setMessageCode_inSequence_(JMessage::TProcessor const*, u16, u16);
- };
+struct TControl {
+ /* 802A7548 */ TControl();
+ /* 802A758C */ ~TControl();
+ /* 802A75D4 */ void reset();
+ /* 802A7634 */ void update();
+ /* 802A76BC */ void render();
+ /* 802A77E8 */ void setMessageCode(u16, u16);
+ /* 802A78F4 */ void setMessageID(u32, u32, bool*);
+ /* 802A7A20 */ void setMessageCode_inSequence_(JMessage::TProcessor const*, u16, u16);
};
+}; // namespace JMessage
struct jmessage_tControl {};
diff --git a/include/JSystem/JMessage/data.h b/include/JSystem/JMessage/data.h
index 1281f2419b..ef1791c89e 100644
--- a/include/JSystem/JMessage/data.h
+++ b/include/JSystem/JMessage/data.h
@@ -4,9 +4,9 @@
#include "dolphin/types.h"
namespace JMessage {
- struct data {
- static f32 ga4cSignature[1 + 1 /* padding */];
- };
+struct data {
+ static f32 ga4cSignature[1 + 1 /* padding */];
};
+}; // namespace JMessage
#endif /* DATA_H */
diff --git a/include/JSystem/JMessage/locale.h b/include/JSystem/JMessage/locale.h
index 321a3bda58..eebedb6fd4 100644
--- a/include/JSystem/JMessage/locale.h
+++ b/include/JSystem/JMessage/locale.h
@@ -4,12 +4,12 @@
#include "dolphin/types.h"
namespace JMessage {
- struct locale {
- /* 802A9490 */ void parseCharacter_1Byte(char const**);
- /* 802A94A8 */ void parseCharacter_2Byte(char const**);
- /* 802A9528 */ void parseCharacter_ShiftJIS(char const**);
- /* 802A958C */ void parseCharacter_UTF8(char const**);
- };
+struct locale {
+ /* 802A9490 */ void parseCharacter_1Byte(char const**);
+ /* 802A94A8 */ void parseCharacter_2Byte(char const**);
+ /* 802A9528 */ void parseCharacter_ShiftJIS(char const**);
+ /* 802A958C */ void parseCharacter_UTF8(char const**);
};
+}; // namespace JMessage
#endif /* LOCALE_H */
diff --git a/include/JSystem/JMessage/processor.h b/include/JSystem/JMessage/processor.h
index 90e8aee8af..53281106f7 100644
--- a/include/JSystem/JMessage/processor.h
+++ b/include/JSystem/JMessage/processor.h
@@ -1,92 +1,90 @@
#ifndef PROCESSOR_H
#define PROCESSOR_H
-#include "dolphin/types.h"
#include "SSystem/SComponent/c_xyz.h"
+#include "dolphin/types.h"
namespace JMessage {
- struct TProcessor {
- /* 802A7B48 */ ~TProcessor();
- /* 802A7B90 */ void reset();
- /* 802A7BF8 */ void stack_pushCurrent(char const*);
- /* 802A7C30 */ void stack_popCurrent();
- /* 802A7C54 */ void getResource_groupID(u16) const;
- /* 802A7CD4 */ void toMessageCode_messageID(u32, u32, bool*) const;
- /* 802A7E38 */ void on_select_begin(char const* (*)(JMessage::TProcessor*), void const*,
- char const*, u32);
- /* 802A7EDC */ void on_select_end();
- /* 802A7F34 */ void on_select_separate();
- /* 802A7FC0 */ void do_reset();
- /* 802A7FC4 */ void do_begin(void const*, char const*);
- /* 802A7FC8 */ void do_end();
- /* 802A7FCC */ void do_character(int);
- /* 802A7FD0 */ bool do_tag(u32, void const*, u32);
- /* 802A7FD8 */ void do_select_begin(u32);
- /* 802A7FDC */ void do_select_end();
- /* 802A7FE0 */ void do_select_separate();
- /* 802A7FE4 */ void on_tag_();
- /* 802A8084 */ void do_resetStatus_(char const*);
- /* 802A8088 */ bool do_setBegin_isReady_() const;
- /* 802A8090 */ void do_tag_(u32, void const*, u32);
- /* 802A81EC */ void process_character_();
- /* 802A828C */ void process_onCharacterEnd_normal_(JMessage::TProcessor*);
- /* 802A82F4 */ void process_onCharacterEnd_select_(JMessage::TProcessor*);
- /* 802A833C */ void process_onSelect_limited_(JMessage::TProcessor*);
- /* 802A8358 */ void process_onSelect_(JMessage::TProcessor*);
- /* 802A8C24 */ void on_message(u32) const;
- /* 802A8C44 */ void getMessageText_messageCode(u32) const;
- };
+struct TProcessor {
+ /* 802A7B48 */ ~TProcessor();
+ /* 802A7B90 */ void reset();
+ /* 802A7BF8 */ void stack_pushCurrent(char const*);
+ /* 802A7C30 */ void stack_popCurrent();
+ /* 802A7C54 */ void getResource_groupID(u16) const;
+ /* 802A7CD4 */ void toMessageCode_messageID(u32, u32, bool*) const;
+ /* 802A7E38 */ void on_select_begin(char const* (*)(JMessage::TProcessor*), void const*,
+ char const*, u32);
+ /* 802A7EDC */ void on_select_end();
+ /* 802A7F34 */ void on_select_separate();
+ /* 802A7FC0 */ void do_reset();
+ /* 802A7FC4 */ void do_begin(void const*, char const*);
+ /* 802A7FC8 */ void do_end();
+ /* 802A7FCC */ void do_character(int);
+ /* 802A7FD0 */ bool do_tag(u32, void const*, u32);
+ /* 802A7FD8 */ void do_select_begin(u32);
+ /* 802A7FDC */ void do_select_end();
+ /* 802A7FE0 */ void do_select_separate();
+ /* 802A7FE4 */ void on_tag_();
+ /* 802A8084 */ void do_resetStatus_(char const*);
+ /* 802A8088 */ bool do_setBegin_isReady_() const;
+ /* 802A8090 */ void do_tag_(u32, void const*, u32);
+ /* 802A81EC */ void process_character_();
+ /* 802A828C */ void process_onCharacterEnd_normal_(JMessage::TProcessor*);
+ /* 802A82F4 */ void process_onCharacterEnd_select_(JMessage::TProcessor*);
+ /* 802A833C */ void process_onSelect_limited_(JMessage::TProcessor*);
+ /* 802A8358 */ void process_onSelect_(JMessage::TProcessor*);
+ /* 802A8C24 */ void on_message(u32) const;
+ /* 802A8C44 */ void getMessageText_messageCode(u32) const;
+};
- struct TReference {
- /* 802A7AF8 */ ~TReference();
- /* 802A7B40 */ bool do_word(u32) const;
- };
+struct TReference {
+ /* 802A7AF8 */ ~TReference();
+ /* 802A7B40 */ bool do_word(u32) const;
+};
- struct TControl;
+struct TControl;
- struct TSequenceProcessor {
- /* 802A8374 */ TSequenceProcessor(JMessage::TReference const*, JMessage::TControl*);
- /* 802A83B8 */ ~TSequenceProcessor();
- /* 802A8418 */ void process(char const*);
- /* 802A85A4 */ void on_isReady();
- /* 802A85D0 */ void on_jump_register(void const* (*)(JMessage::TSequenceProcessor const*),
- u32);
- /* 802A85E4 */ void on_jump_isReady();
- /* 802A8610 */ void on_jump(void const*, char const*);
- /* 802A8690 */ void on_branch_register(void const* (*)(JMessage::TSequenceProcessor const*,
- u32),
- void const*, u32);
- /* 802A86A0 */ void on_branch_query(u32);
- /* 802A86D4 */ void on_branch_queryResult();
- /* 802A8700 */ void on_branch(void const*, char const*);
- /* 802A8780 */ bool do_isReady();
- /* 802A8788 */ bool do_jump_isReady();
- /* 802A8790 */ void do_jump(void const*, char const*);
- /* 802A8794 */ void do_branch_query(u32);
- /* 802A8798 */ s32 do_branch_queryResult();
- /* 802A87A0 */ void do_branch(void const*, char const*);
- /* 802A87A4 */ void do_resetStatus_(char const*);
- /* 802A87C0 */ void do_setBegin_isReady_() const;
- /* 802A87D0 */ void do_begin_(void const*, char const*);
- /* 802A87D4 */ void do_end_();
- /* 802A87E0 */ void do_tag_(u32, void const*, u32);
- /* 802A892C */ void process_setMessageIndex_reserved_(u16);
- /* 802A8944 */ void process_setMessageCode_(JMessage::TSequenceProcessor const*, u16, u16);
- /* 802A89B8 */ void process_onJump_limited_(JMessage::TSequenceProcessor const*);
- /* 802A89EC */ void process_onJump_(JMessage::TSequenceProcessor const*);
- /* 802A8A18 */ void process_onBranch_limited_(JMessage::TSequenceProcessor const*, u32);
- /* 802A8A50 */ void process_onBranch_(JMessage::TSequenceProcessor const*, u32);
- };
+struct TSequenceProcessor {
+ /* 802A8374 */ TSequenceProcessor(JMessage::TReference const*, JMessage::TControl*);
+ /* 802A83B8 */ ~TSequenceProcessor();
+ /* 802A8418 */ void process(char const*);
+ /* 802A85A4 */ void on_isReady();
+ /* 802A85D0 */ void on_jump_register(void const* (*)(JMessage::TSequenceProcessor const*), u32);
+ /* 802A85E4 */ void on_jump_isReady();
+ /* 802A8610 */ void on_jump(void const*, char const*);
+ /* 802A8690 */ void
+ on_branch_register(void const* (*)(JMessage::TSequenceProcessor const*, u32), void const*, u32);
+ /* 802A86A0 */ void on_branch_query(u32);
+ /* 802A86D4 */ void on_branch_queryResult();
+ /* 802A8700 */ void on_branch(void const*, char const*);
+ /* 802A8780 */ bool do_isReady();
+ /* 802A8788 */ bool do_jump_isReady();
+ /* 802A8790 */ void do_jump(void const*, char const*);
+ /* 802A8794 */ void do_branch_query(u32);
+ /* 802A8798 */ s32 do_branch_queryResult();
+ /* 802A87A0 */ void do_branch(void const*, char const*);
+ /* 802A87A4 */ void do_resetStatus_(char const*);
+ /* 802A87C0 */ void do_setBegin_isReady_() const;
+ /* 802A87D0 */ void do_begin_(void const*, char const*);
+ /* 802A87D4 */ void do_end_();
+ /* 802A87E0 */ void do_tag_(u32, void const*, u32);
+ /* 802A892C */ void process_setMessageIndex_reserved_(u16);
+ /* 802A8944 */ void process_setMessageCode_(JMessage::TSequenceProcessor const*, u16, u16);
+ /* 802A89B8 */ void process_onJump_limited_(JMessage::TSequenceProcessor const*);
+ /* 802A89EC */ void process_onJump_(JMessage::TSequenceProcessor const*);
+ /* 802A8A18 */ void process_onBranch_limited_(JMessage::TSequenceProcessor const*, u32);
+ /* 802A8A50 */ void process_onBranch_(JMessage::TSequenceProcessor const*, u32);
+};
- struct TRenderingProcessor {
- /* 802A8A84 */ TRenderingProcessor(JMessage::TReference const*);
- /* 802A8AC0 */ ~TRenderingProcessor();
- /* 802A8B20 */ void process(char const*);
- /* 802A8BA4 */ void do_begin_(void const*, char const*);
- /* 802A8BA8 */ void do_end_();
- /* 802A8BAC */ void do_tag_(u32, void const*, u32);
- };
+struct TRenderingProcessor {
+ /* 802A8A84 */ TRenderingProcessor(JMessage::TReference const*);
+ /* 802A8AC0 */ ~TRenderingProcessor();
+ /* 802A8B20 */ void process(char const*);
+ /* 802A8BA4 */ void do_begin_(void const*, char const*);
+ /* 802A8BA8 */ void do_end_();
+ /* 802A8BAC */ void do_tag_(u32, void const*, u32);
};
+}; // namespace JMessage
struct jmessage_tReference {
/* 80228B04 */ jmessage_tReference();
diff --git a/include/JSystem/JMessage/resource.h b/include/JSystem/JMessage/resource.h
index 820b824194..b1fc2b3a60 100644
--- a/include/JSystem/JMessage/resource.h
+++ b/include/JSystem/JMessage/resource.h
@@ -4,32 +4,32 @@
#include "dolphin/types.h"
namespace JMessage {
- struct TResource {
- /* 802A8CDC */ void toMessageIndex_messageID(u32, u32, bool*) const;
- };
+struct TResource {
+ /* 802A8CDC */ void toMessageIndex_messageID(u32, u32, bool*) const;
+};
- struct TResourceContainer {
- struct TCResource {
- /* 802A8EC0 */ TCResource();
- /* 802A8EF8 */ ~TCResource();
- /* 802A8F6C */ void Get_groupID(u16);
- /* 802A8FFC */ void Do_create();
- /* 802A9048 */ void Do_destroy(JMessage::TResource*);
- };
+struct TResourceContainer {
+ struct TCResource {
+ /* 802A8EC0 */ TCResource();
+ /* 802A8EF8 */ ~TCResource();
+ /* 802A8F6C */ void Get_groupID(u16);
+ /* 802A8FFC */ void Do_create();
+ /* 802A9048 */ void Do_destroy(JMessage::TResource*);
+ };
- /* 802A906C */ TResourceContainer();
- /* 802A90B8 */ void setEncoding(u8);
- /* 802A90F0 */ void setEncoding_(u8);
+ /* 802A906C */ TResourceContainer();
+ /* 802A90B8 */ void setEncoding(u8);
+ /* 802A90F0 */ void setEncoding_(u8);
- static void* sapfnParseCharacter_[5];
- };
+ static void* sapfnParseCharacter_[5];
+};
- struct TParse {
- /* 802A9130 */ TParse(JMessage::TResourceContainer*);
- /* 802A9158 */ ~TParse();
- /* 802A91B8 */ void parseHeader_next(void const**, u32*, u32);
- /* 802A92F4 */ void parseBlock_next(void const**, u32*, u32);
- };
+struct TParse {
+ /* 802A9130 */ TParse(JMessage::TResourceContainer*);
+ /* 802A9158 */ ~TParse();
+ /* 802A91B8 */ void parseHeader_next(void const**, u32*, u32);
+ /* 802A92F4 */ void parseBlock_next(void const**, u32*, u32);
};
+}; // namespace JMessage
#endif /* RESOURCE_H */
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;
diff --git a/include/f_op/f_op_msg_mng.h b/include/f_op/f_op_msg_mng.h
index 6818b77d6b..3493e0f590 100644
--- a/include/f_op/f_op_msg_mng.h
+++ b/include/f_op/f_op_msg_mng.h
@@ -1,9 +1,9 @@
#ifndef F_F_OP_MSG_MNG_H_
#define F_F_OP_MSG_MNG_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"
typedef int (*fopMsgCreateFunc)(void*);
diff --git a/include/m_Do/m_Do_audio.h b/include/m_Do/m_Do_audio.h
index 8416fc3703..5095b82aa4 100644
--- a/include/m_Do/m_Do_audio.h
+++ b/include/m_Do/m_Do_audio.h
@@ -66,7 +66,7 @@ inline void mDoAud_seStart(u32 sfx_id, const Vec* param_1, u32 param_2, s8 param
inline void mDoAud_messageSePlay(u16 param_0, Vec* position, s8 param_2) {
Z2AudioMgr::getInterface()->mSeMgr.messageSePlay(param_0, position, param_2);
-}
+}
inline void mDoAud_sceneBgmStart() {
Z2AudioMgr::getInterface()->mSceneMgr.sceneBgmStart();
diff --git a/include/rel/d/a/tag/d_a_tag_telop/d_a_tag_telop.h b/include/rel/d/a/tag/d_a_tag_telop/d_a_tag_telop.h
index 02b8a8eaa9..cba8bd7a2b 100644
--- a/include/rel/d/a/tag/d_a_tag_telop/d_a_tag_telop.h
+++ b/include/rel/d/a/tag/d_a_tag_telop/d_a_tag_telop.h
@@ -1,8 +1,8 @@
#ifndef D_A_TAG_TELOP_H
#define D_A_TAG_TELOP_H
-#include "dolphin/types.h"
#include "d/com/d_com_inf_game.h"
+#include "dolphin/types.h"
class daTag_Telop_c : public fopAc_ac_c {
public:
@@ -12,9 +12,7 @@ public:
int create();
void execute();
- u16 getMessageNo() {
- return mOrig.mAngle.z;
- }
+ u16 getMessageNo() { return mOrig.mAngle.z; }
private:
/* 0x568 */ u16 mMessageNo;