From 6bf6cc2d6a7f4753ea2559cc6d6b8d1dd146ba44 Mon Sep 17 00:00:00 2001
From: Ibot02 <jtp.jtp@gmx.de>
Date: Sat, 8 Aug 2020 02:57:52 +0200
Subject: [PATCH] Added manager.h

Moved the unknown struct from manager6.c to new header manager.h
---
 include/manager.h      | 23 +++++++++++++++++++++++
 src/manager/manager6.c | 22 +++-------------------
 2 files changed, 26 insertions(+), 19 deletions(-)
 create mode 100644 include/manager.h

diff --git a/include/manager.h b/include/manager.h
new file mode 100644
index 00000000..66b1c363
--- /dev/null
+++ b/include/manager.h
@@ -0,0 +1,23 @@
+#ifndef MANAGER_H
+#define MANAGER_H
+
+#include "global.h"
+
+typedef struct {
+    u16 field_0x00;
+    u16 field_0x02;
+    u8 field_0x04;
+    u8 field_0x05;
+    u8 field_0x06;
+    union {
+        u8 all;
+        struct {
+            u8 layer : 2;
+            u8 unk1 : 2;
+            u8 unk2 : 1;
+            u8 unk3 : 3;
+        } PACKED b;
+    } PACKED field_0x07;
+} UnkManagerHelperStruct;
+
+#endif
diff --git a/src/manager/manager6.c b/src/manager/manager6.c
index 4532cce1..deb44026 100644
--- a/src/manager/manager6.c
+++ b/src/manager/manager6.c
@@ -1,32 +1,16 @@
 #include "global.h"
 #include "entity.h"
 #include "link.h"
+#include "manager.h"
 
 extern void* GetCurrentRoomProperty(u8);
 extern u32 CheckPlayerInRegion(u16, u16, u8, u8);
 extern void DoExitTransition(void*);
 extern void sub_0805E900(Entity*);
 
-typedef struct {
-    u16 field_0x00;
-    u16 field_0x02;
-    u8 field_0x04;
-    u8 field_0x05;
-    u8 field_0x06;
-    union {
-        u8 all;
-        struct {
-            u8 layer : 2;
-            u8 unk1 : 2;
-            u8 unk2 : 1;
-            u8 unk3 : 3;
-        } PACKED b;
-    } PACKED field_0x07;
-} unknownStruct;
-
 void sub_08057CB4(Entity * this) {
     u32 tmp;
-    unknownStruct* i;
+    UnkManagerHelperStruct* i;
     if (this->action == 0){
         this->action = 1;
         this->field_0x20 = (s32) GetCurrentRoomProperty(this->entityType.form);
@@ -36,7 +20,7 @@ void sub_08057CB4(Entity * this) {
         }
     }
     if (this->actionDelay == 0 || gLinkState.field_0x10[2] == 0x1e) {
-        for (i = ((unknownStruct*) this->field_0x20);i->field_0x00 != 0xFFFF; i++) {
+        for (i = ((UnkManagerHelperStruct*) this->field_0x20);i->field_0x00 != 0xFFFF; i++) {
             tmp = (i->field_0x07.all & 0x3);
             if (((tmp & (gLinkEntity.collisionLayer)) != 0) &&
                 (((gLinkState.flags.all & 0x80) != 0) || ((i->field_0x07.b.unk2) != 0)) &&