manager1E.c: ok

Also split out rodata

Based on #105 rather than master as they touch the same rodata file

asm/manager1E.s

@@ -1,81 +0,0 @@
-	.include "asm/macros.inc"
-
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start sub_0805B668
-sub_0805B668: @ 0x0805B668
-	push {lr}
-	ldr r2, _0805B67C @ =gUnk_08108C8C
-	ldrb r1, [r0, #0xc]
-	lsls r1, r1, #2
-	adds r1, r1, r2
-	ldr r1, [r1]
-	bl _call_via_r1
-	pop {pc}
-	.align 2, 0
-_0805B67C: .4byte gUnk_08108C8C
-
-	thumb_func_start sub_0805B680
-sub_0805B680: @ 0x0805B680
-	push {r4, lr}
-	adds r4, r0, #0
-	movs r0, #1
-	strb r0, [r4, #0xc]
-	ldrh r1, [r4, #0x34]
-	lsrs r1, r1, #1
-	strh r1, [r4, #0x34]
-	ldrh r0, [r4, #0x38]
-	adds r0, r0, r1
-	strh r0, [r4, #0x38]
-	ldrh r1, [r4, #0x36]
-	lsrs r1, r1, #1
-	strh r1, [r4, #0x36]
-	ldrh r0, [r4, #0x3a]
-	adds r0, r0, r1
-	strh r0, [r4, #0x3a]
-	ldrb r0, [r4, #0xa]
-	cmp r0, #0
-	bne _0805B6B8
-	ldrh r0, [r4, #0x3e]
-	bl CheckFlags
-	cmp r0, #0
-	beq _0805B6B8
-	adds r0, r4, #0
-	bl DeleteManager
-	b _0805B6BE
-_0805B6B8:
-	adds r0, r4, #0
-	bl sub_0805B6C0
-_0805B6BE:
-	pop {r4, pc}
-
-	thumb_func_start sub_0805B6C0
-sub_0805B6C0: @ 0x0805B6C0
-	push {r4, lr}
-	adds r4, r0, #0
-	movs r1, #0x38
-	ldrsh r0, [r4, r1]
-	movs r2, #0x3a
-	ldrsh r1, [r4, r2]
-	ldrh r2, [r4, #0x34]
-	ldrh r3, [r4, #0x36]
-	bl CheckPlayerInRegion
-	cmp r0, #0
-	beq _0805B6EC
-	ldrh r0, [r4, #0x3e]
-	bl SetFlag
-	ldrb r0, [r4, #0xa]
-	cmp r0, #0
-	bne _0805B6F2
-	adds r0, r4, #0
-	bl DeleteManager
-	b _0805B6F2
-_0805B6EC:
-	ldrh r0, [r4, #0x3e]
-	bl ClearFlag
-_0805B6F2:
-	pop {r4, pc}

include/functions.h

@@ -288,4 +288,6 @@ extern void sub_080A1D70(Entity*, u32);
 extern void sub_0806F62C(Entity*, u32, u32);
 extern u32 sub_08079F8C(void);
 extern void sub_080A1ED0(u32, u32, u32);
+extern void DeleteManager(Manager*);
+extern bool32 CheckPlayerInRegion(u32 centerX, u32 centerY, u32 radiusX, u32 radiusY);
 #endif

linker.ld

@@ -500,7 +500,7 @@ SECTIONS {
         asm/manager1B.o(.text);
         asm/manager1C.o(.text);
         asm/manager1D.o(.text);
-        asm/manager1E.o(.text);
+        src/manager/manager1E.o(.text);
         asm/manager1F.o(.text);
         src/manager/manager20.o(.text);
         asm/manager21.o(.text);
@@ -1004,6 +1004,8 @@ SECTIONS {
         src/manager/managerB.o(.rodata);
         src/manager/managerC.o(.rodata);
         data/data_08108308.o(.rodata);
+	src/manager/manager1E.o(.rodata);
+        data/data_08108C94.o(.rodata);
         src/item.o(.rodata);
         data/data_0811BD44.o(.rodata);
         data/room_headers.o(.rodata);

src/manager/manager1E.c

@@ -0,0 +1,61 @@
+#include "global.h"
+#include "manager.h"
+#include "flags.h"
+#include "player.h"
+#include "functions.h"
+
+typedef struct {
+    Manager manager;
+    u8 unk_20[0x14];//unused
+    u16 radiusX;
+    u16 radiusY;
+    s16 posX;
+    s16 posY;
+    u8 unk_3c[2];//unused
+    u16 playerInRegionFlag;
+} Manager1E;
+
+enum Manager1E_State {
+    Init,
+    ObserveRegion
+};
+
+void Manager1E_Handler(Manager1E*);
+void Manager1E_Init(Manager1E*);
+void Manager1E_ObserveRegion(Manager1E*);
+
+void (* const Manager1E_ActionFuncs[2])(Manager1E*) = {
+    Manager1E_Init,
+    Manager1E_ObserveRegion
+};
+
+void Manager1E_Handler(Manager1E* this) {
+    Manager1E_ActionFuncs[this->manager.action](this);
+}
+
+void Manager1E_Init(Manager1E* this) {
+    this->manager.action = ObserveRegion;
+    this->radiusX >>= 1;
+    this->posX += this->radiusX;
+    this->radiusY >>= 1;
+    this->posY += this->radiusY;
+    if (!this->manager.unk_0a) {
+        if (CheckFlags(this->playerInRegionFlag)) {
+            DeleteManager(&this->manager);
+            return;
+        }
+    }
+    Manager1E_ObserveRegion(this);
+}
+
+void Manager1E_ObserveRegion(Manager1E* this) {
+    if (CheckPlayerInRegion(this->posX, this->posY, this->radiusX, this->radiusY)) {
+        SetFlag(this->playerInRegionFlag);
+        if (!this->manager.unk_0a) {
+            DeleteManager(&this->manager);
+            return;
+        }
+    } else {
+        ClearFlag(this->playerInRegionFlag);
+    }
+}