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/msg | |
| parent | 985d47a5c87d070682b0212dffe346132158b7b4 (diff) | |
format / asm
Diffstat (limited to 'include/d/msg')
| -rw-r--r-- | include/d/msg/d_msg_flow.h | 4 | ||||
| -rw-r--r-- | include/d/msg/d_msg_object.h | 6 |
2 files changed, 5 insertions, 5 deletions
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; |