3 files changed, 52 insertions, 47 deletions

diff --git a/include/mevent_server.h b/include/mevent_server.h
index 772aae6b1..ed9812d8a 100644
--- a/include/mevent_server.h
+++ b/include/mevent_server.h
@@ -1,53 +1,7 @@
 #ifndef GUARD_MEVENT_SERVER_H
 #define GUARD_MEVENT_SERVER_H
 
-#define ME_SEND_BUF_SIZE 0x400
-
-struct mevent_srv_sub
-{
-    s32 seqno;
-    u8 sendPlayerNo;
-    u8 recvPlayerNo;
-    u16 recvIdent;
-    u16 recvCounter;
-    u16 recvCRC;
-    u16 recvSize;
-    u16 sendIdent;
-    u16 sendCounter;
-    u16 sendCRC;
-    u16 sendSize;
-    void * recvBfr;
-    const void * sendBfr;
-    u32 (*recvFunc)(struct mevent_srv_sub *);
-    u32 (*sendFunc)(struct mevent_srv_sub *);
-};
-
-struct send_recv_header
-{
-    u16 ident;
-    u16 crc;
-    u16 size;
-};
-
-struct mevent_cmd_ish
-{
-    u32 instr;
-    u32 parameter;
-};
-
-struct mevent_srv_ish
-{
-    u32 unk_00;
-    u32 param;
-    u32 mainseqno;
-    u32 flag;
-    u32 cmdidx;
-    void * sendBuffer;
-    void * recvBuffer;
-    struct mevent_cmd_ish * cmdBuffer;
-    void * buffer;
-    struct mevent_srv_sub manager;
-};
+#include "mevent_server_helpers.h"
 
 struct mevent_cmd
 {
diff --git a/include/mevent_server_helpers.h b/include/mevent_server_helpers.h
index f682e362d..e4e409862 100644
--- a/include/mevent_server_helpers.h
+++ b/include/mevent_server_helpers.h
@@ -1,6 +1,34 @@
 #ifndef GUARD_MEVENT_SERVER_HELPERS_H
 #define GUARD_MEVENT_SERVER_HELPERS_H
 
+#define ME_SEND_BUF_SIZE 0x400
+
+struct mevent_srv_sub
+{
+    s32 seqno;
+    u8 sendPlayerNo;
+    u8 recvPlayerNo;
+    u16 recvIdent;
+    u16 recvCounter;
+    u16 recvCRC;
+    u16 recvSize;
+    u16 sendIdent;
+    u16 sendCounter;
+    u16 sendCRC;
+    u16 sendSize;
+    void * recvBfr;
+    const void * sendBfr;
+    u32 (*recvFunc)(struct mevent_srv_sub *);
+    u32 (*sendFunc)(struct mevent_srv_sub *);
+};
+
+struct send_recv_header
+{
+    u16 ident;
+    u16 crc;
+    u16 size;
+};
+
 void mevent_srv_sub_init(struct mevent_srv_sub *, u32, u32);
 void mevent_srv_sub_init_send(struct mevent_srv_sub * manager, u32 ident, const void * src, u32 size);
 bool32 mevent_srv_sub_recv(struct mevent_srv_sub * manager);
diff --git a/include/mevent_server_ish.h b/include/mevent_server_ish.h
index 31f98ed52..35833ea12 100644
--- a/include/mevent_server_ish.h
+++ b/include/mevent_server_ish.h
@@ -1,6 +1,29 @@
 #ifndef GUARD_MEVENT_SERVER_ISH_H
 #define GUARD_MEVENT_SERVER_ISH_H
 
+#include "mevent_server_helpers.h"
+
+struct mevent_cmd_ish
+{
+    u32 instr;
+    u32 parameter;
+};
+
+struct mevent_srv_ish
+{
+    u32 unk_00;
+    u32 param;
+    u32 mainseqno;
+    u32 flag;
+    u32 cmdidx;
+    void * sendBuffer;
+    void * recvBuffer;
+    struct mevent_cmd_ish * cmdBuffer;
+    void * buffer;
+    struct mevent_srv_sub manager;
+    u32 unk_4C;
+};
+
 void mevent_srv_ish_do_init(u32 arg);
 u32 mevent_srv_ish_do_exec(u16 * a0);
 void mevent_srv_ish_inc_flag(void);