Merge pull request #517 from octorock/managers

Rename managers

asm/non_matching/playerUtils/LoadRoomGfx.inc

@@ -1,383 +0,0 @@
-	.syntax unified
-	push {r4, r5, r6, r7, lr}
-	mov r7, sb
-	mov r6, r8
-	push {r6, r7}
-	bl sub_0807BFA8
-	ldr r7, _0807C158 @ =gRoomControls
-	ldrb r1, [r7, #0xf]
-	movs r0, #0xfc
-	ands r0, r1
-	strb r0, [r7, #0xf]
-	ldr r5, _0807C15C @ =gMapDataTop
-	movs r6, #0x80
-	lsls r6, r6, #6
-	adds r0, r5, #0
-	adds r1, r6, #0
-	bl MemClear
-	adds r0, r5, r6
-	movs r1, #0x80
-	lsls r1, r1, #5
-	bl MemClear
-	ldr r0, _0807C160 @ =gMapDataBottomSpecial
-	movs r4, #0x80
-	lsls r4, r4, #8
-	adds r1, r4, #0
-	bl MemClear
-	ldr r0, _0807C164 @ =gMapDataTopSpecial
-	adds r1, r4, #0
-	bl MemClear
-	ldr r0, _0807C168 @ =gArea
-	ldr r1, _0807C16C @ =0x0000085C
-	adds r0, r0, r1
-	ldr r0, [r0]
-	ldr r0, [r0, #0xc]
-	bl sub_080197D4
-	ldr r2, _0807C170 @ =gMapBottom
-	ldrh r1, [r2, #4]
-	ldr r0, _0807C174 @ =0x0000FFFF
-	cmp r1, r0
-	beq _0807C178
-	adds r0, r2, #4
-	ldrh r1, [r7, #0x1e]
-	lsrs r1, r1, #4
-	ldrh r2, [r7, #0x20]
-	lsrs r2, r2, #4
-	bl sub_0807C8B0
-	ldrh r1, [r7, #0x1e]
-	lsrs r1, r1, #4
-	ldrh r2, [r7, #0x20]
-	lsrs r2, r2, #4
-	adds r0, r5, #0
-	bl sub_0807C8B0
-	movs r2, #0
-	mov sb, r2
-	b _0807C184
-	.align 2, 0
-_0807C158: .4byte gRoomControls
-_0807C15C: .4byte gMapDataTop
-_0807C160: .4byte gMapDataBottomSpecial
-_0807C164: .4byte gMapDataTopSpecial
-_0807C168: .4byte gArea
-_0807C16C: .4byte 0x0000085C
-_0807C170: .4byte gMapBottom
-_0807C174: .4byte 0x0000FFFF
-_0807C178:
-	adds r0, r2, #4
-	adds r1, r6, #0
-	bl MemClear
-	movs r3, #1
-	mov sb, r3
-_0807C184:
-	ldr r0, _0807C1B0 @ =gRoomTransition
-	adds r0, #0x2d
-	ldrb r0, [r0]
-	cmp r0, #0
-	bne _0807C1BC
-	ldr r0, _0807C1B4 @ =gMapDataBottom
-	movs r2, #0xc0
-	lsls r2, r2, #6
-	adds r1, r0, r2
-	movs r4, #0x80
-	lsls r4, r4, #6
-	adds r2, r4, #0
-	bl MemCopy
-	ldr r0, _0807C1B8 @ =gMapDataTop
-	movs r3, #0xc0
-	lsls r3, r3, #6
-	adds r1, r0, r3
-	adds r2, r4, #0
-	bl MemCopy
-	b _0807C26C
-	.align 2, 0
-_0807C1B0: .4byte gRoomTransition
-_0807C1B4: .4byte gMapDataBottom
-_0807C1B8: .4byte gMapDataTop
-_0807C1BC:
-	cmp r0, #2
-	bne _0807C26C
-	ldr r4, _0807C278 @ =gMapDataBottom
-	movs r0, #0xb0
-	lsls r0, r0, #8
-	adds r0, r0, r4
-	mov r8, r0
-	movs r5, #0x80
-	lsls r5, r5, #5
-	adds r0, r4, #0
-	mov r1, r8
-	adds r2, r5, #0
-	bl MemCopy
-	movs r1, #0xc0
-	lsls r1, r1, #6
-	adds r6, r4, r1
-	adds r0, r6, #0
-	adds r1, r4, #0
-	adds r2, r5, #0
-	bl MemCopy
-	mov r0, r8
-	adds r1, r6, #0
-	adds r2, r5, #0
-	bl MemCopy
-	adds r6, r4, r5
-	adds r0, r6, #0
-	mov r1, r8
-	adds r2, r5, #0
-	bl MemCopy
-	movs r2, #0x80
-	lsls r2, r2, #7
-	adds r4, r4, r2
-	adds r0, r4, #0
-	adds r1, r6, #0
-	adds r2, r5, #0
-	bl MemCopy
-	mov r0, r8
-	adds r1, r4, #0
-	adds r2, r5, #0
-	bl MemCopy
-	ldr r4, _0807C27C @ =gMapDataTop
-	movs r3, #0xb0
-	lsls r3, r3, #8
-	adds r3, r3, r4
-	mov r8, r3
-	adds r0, r4, #0
-	mov r1, r8
-	adds r2, r5, #0
-	bl MemCopy
-	movs r0, #0xc0
-	lsls r0, r0, #6
-	adds r6, r4, r0
-	adds r0, r6, #0
-	adds r1, r4, #0
-	adds r2, r5, #0
-	bl MemCopy
-	mov r0, r8
-	adds r1, r6, #0
-	adds r2, r5, #0
-	bl MemCopy
-	adds r6, r4, r5
-	adds r0, r6, #0
-	mov r1, r8
-	adds r2, r5, #0
-	bl MemCopy
-	movs r1, #0x80
-	lsls r1, r1, #7
-	adds r4, r4, r1
-	adds r0, r4, #0
-	adds r1, r6, #0
-	adds r2, r5, #0
-	bl MemCopy
-	mov r0, r8
-	adds r1, r4, #0
-	adds r2, r5, #0
-	bl MemCopy
-_0807C26C:
-	mov r2, sb
-	cmp r2, #0
-	bne _0807C280
-	bl sub_0807BBE4
-	b _0807C2A0
-	.align 2, 0
-_0807C278: .4byte gMapDataBottom
-_0807C27C: .4byte gMapDataTop
-_0807C280:
-	ldr r0, _0807C2CC @ =gUnk_02027EB4
-	ldrh r1, [r7, #0x1e]
-	lsrs r1, r1, #4
-	ldrh r2, [r7, #0x20]
-	lsrs r2, r2, #4
-	bl sub_0807C69C
-	ldr r0, _0807C2D0 @ =gUnk_0200D654
-	ldrh r1, [r7, #0x1e]
-	lsrs r1, r1, #4
-	ldrh r2, [r7, #0x20]
-	lsrs r2, r2, #4
-	bl sub_0807C69C
-	bl sub_0807C460
-_0807C2A0:
-	bl sub_0807BC84
-	ldr r4, _0807C2D4 @ =gMapBottom
-	adds r0, r4, #0
-	bl sub_08080B60
-	ldr r5, _0807C2D8 @ =gMapTop
-	adds r0, r5, #0
-	bl sub_08080B60
-	mov r3, sb
-	cmp r3, #0
-	bne _0807C2E4
-	ldr r0, _0807C2DC @ =gMapDataBottomSpecial
-	adds r1, r4, #0
-	bl sub_0801AB08
-	ldr r0, _0807C2E0 @ =gMapDataTopSpecial
-	adds r1, r5, #0
-	bl sub_0801AB08
-	b _0807C326
-	.align 2, 0
-_0807C2CC: .4byte gUnk_02027EB4
-_0807C2D0: .4byte gUnk_0200D654
-_0807C2D4: .4byte gMapBottom
-_0807C2D8: .4byte gMapTop
-_0807C2DC: .4byte gMapDataBottomSpecial
-_0807C2E0: .4byte gMapDataTopSpecial
-_0807C2E4:
-	ldr r4, _0807C34C @ =gMapDataBottomSpecial
-	movs r0, #0x80
-	lsls r0, r0, #7
-	adds r5, r4, r0
-	adds r6, r0, #0
-	adds r0, r4, #0
-	adds r1, r5, #0
-	adds r2, r6, #0
-	bl MemCopy
-	adds r0, r4, #0
-	adds r1, r5, #0
-	bl sub_0807C5F4
-	adds r0, r5, #0
-	adds r1, r6, #0
-	bl MemClear
-	ldr r4, _0807C350 @ =gMapDataTopSpecial
-	adds r5, r4, r6
-	adds r0, r4, #0
-	adds r1, r5, #0
-	adds r2, r6, #0
-	bl MemCopy
-	adds r0, r4, #0
-	adds r1, r5, #0
-	bl sub_0807C5F4
-	adds r0, r5, #0
-	adds r1, r6, #0
-	bl MemClear
-_0807C326:
-	mov r1, sb
-	cmp r1, #0
-	bne _0807C332
-	ldrb r0, [r7, #4]
-	cmp r0, #0x71
-	bne _0807C33A
-_0807C332:
-	ldrb r1, [r7, #0xf]
-	movs r0, #1
-	orrs r0, r1
-	strb r0, [r7, #0xf]
-_0807C33A:
-	ldrb r0, [r7, #4]
-	subs r0, #0x20
-	cmp r0, #0x18
-	bhi _0807C400
-	lsls r0, r0, #2
-	ldr r1, _0807C354 @ =_0807C358
-	adds r0, r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.align 2, 0
-_0807C34C: .4byte gMapDataBottomSpecial
-_0807C350: .4byte gMapDataTopSpecial
-_0807C354: .4byte _0807C358
-_0807C358: @ jump table
-	.4byte _0807C3BC @ case 0
-	.4byte _0807C3E4 @ case 1
-	.4byte _0807C3E4 @ case 2
-	.4byte _0807C3E4 @ case 3
-	.4byte _0807C3E4 @ case 4
-	.4byte _0807C3E4 @ case 5
-	.4byte _0807C400 @ case 6
-	.4byte _0807C3E4 @ case 7
-	.4byte _0807C3E4 @ case 8
-	.4byte _0807C400 @ case 9
-	.4byte _0807C400 @ case 10
-	.4byte _0807C400 @ case 11
-	.4byte _0807C400 @ case 12
-	.4byte _0807C3BC @ case 13
-	.4byte _0807C400 @ case 14
-	.4byte _0807C400 @ case 15
-	.4byte _0807C3E4 @ case 16
-	.4byte _0807C400 @ case 17
-	.4byte _0807C400 @ case 18
-	.4byte _0807C400 @ case 19
-	.4byte _0807C400 @ case 20
-	.4byte _0807C400 @ case 21
-	.4byte _0807C400 @ case 22
-	.4byte _0807C400 @ case 23
-	.4byte _0807C3E4 @ case 24
-_0807C3BC:
-	ldr r0, _0807C3D8 @ =gMapBottom
-	ldr r2, [r0]
-	cmp r2, #0
-	beq _0807C3CC
-	ldrh r1, [r2]
-	movs r0, #0x80
-	orrs r0, r1
-	strh r0, [r2]
-_0807C3CC:
-	ldr r2, _0807C3DC @ =gScreen
-	ldrh r1, [r2]
-	ldr r0, _0807C3E0 @ =0x0000FDFF
-	ands r0, r1
-	strh r0, [r2]
-	b _0807C444
-	.align 2, 0
-_0807C3D8: .4byte gMapBottom
-_0807C3DC: .4byte gScreen
-_0807C3E0: .4byte 0x0000FDFF
-_0807C3E4:
-	ldr r0, _0807C3F8 @ =gMapTop
-	ldr r1, [r0]
-	cmp r1, #0
-	beq _0807C3F2
-	ldr r0, _0807C3FC @ =gUnk_080B77C0
-	ldrh r0, [r0, #4]
-	strh r0, [r1]
-_0807C3F2:
-	bl sub_0807C5B0
-	b _0807C444
-	.align 2, 0
-_0807C3F8: .4byte gMapTop
-_0807C3FC: .4byte gUnk_080B77C0
-_0807C400:
-	ldr r0, _0807C44C @ =gMapBottom
-	ldr r1, [r0]
-	cmp r1, #0
-	beq _0807C40E
-	ldr r0, _0807C450 @ =gUnk_080B77C0
-	ldrh r0, [r0]
-	strh r0, [r1]
-_0807C40E:
-	ldr r0, _0807C454 @ =gMapTop
-	ldr r1, [r0]
-	cmp r1, #0
-	beq _0807C41C
-	ldr r0, _0807C450 @ =gUnk_080B77C0
-	ldrh r0, [r0, #2]
-	strh r0, [r1]
-_0807C41C:
-	ldr r2, _0807C458 @ =gScreen
-	ldrh r0, [r2]
-	movs r1, #0x80
-	lsls r1, r1, #4
-	ands r1, r0
-	movs r3, #0xba
-	lsls r3, r3, #5
-	adds r0, r3, #0
-	movs r3, #0
-	orrs r1, r0
-	strh r1, [r2]
-	ldr r0, _0807C45C @ =gArea
-	ldrb r0, [r0, #0xc]
-	cmp r0, #0
-	beq _0807C444
-	movs r3, #0xa0
-	lsls r3, r3, #8
-	adds r0, r3, #0
-	orrs r1, r0
-	strh r1, [r2]
-_0807C444:
-	pop {r3, r4}
-	mov r8, r3
-	mov sb, r4
-	pop {r4, r5, r6, r7, pc}
-	.align 2, 0
-_0807C44C: .4byte gMapBottom
-_0807C450: .4byte gUnk_080B77C0
-_0807C454: .4byte gMapTop
-_0807C458: .4byte gScreen
-_0807C45C: .4byte gArea
-	.syntax divided

asm/non_matching/playerUtils/sub_08079550.inc

@@ -3,7 +3,7 @@
 	mov r7, sb
 	mov r6, r8
 	push {r6, r7}
-	ldr r0, _080795A8 @ =gUnk_03004030
+	ldr r0, _080795A8 @ =gDiggingCaveEntranceTransition
 	ldrb r0, [r0, #8]
 	cmp r0, #0
 	beq _08079562
@@ -47,7 +47,7 @@ _080795A0:
 	strb r0, [r5, #0xf]
 	b _080796FE
 	.align 2, 0
-_080795A8: .4byte gUnk_03004030
+_080795A8: .4byte gDiggingCaveEntranceTransition
 _080795AC: .4byte gPlayerState
 _080795B0: .4byte gPlayerEntity
 _080795B4:

asm/non_matching/playerUtils/sub_0807BBE4.inc

@@ -1,79 +0,0 @@
-	.syntax unified
-	push {r4, r5, r6, r7, lr}
-	mov r7, sl
-	mov r6, sb
-	mov r5, r8
-	push {r5, r6, r7}
-	ldr r0, _0807BC28 @ =gMetatileTypesBottom
-	mov sl, r0
-	ldr r0, _0807BC2C @ =gMetatileTypesTop
-	mov sb, r0
-	ldr r5, _0807BC30 @ =0xFFFFB000
-	add r5, sl
-	ldr r4, _0807BC30 @ =0xFFFFB000
-	add r4, sb
-	ldr r2, _0807BC34 @ =0xFFFFD000
-	add r2, sl
-	ldr r1, _0807BC34 @ =0xFFFFD000
-	add r1, sb
-	movs r3, #0
-	ldr r0, _0807BC38 @ =0x00003FFF
-	mov r8, r0
-	ldr r0, _0807BC3C @ =gUnk_080B3E80
-	mov ip, r0
-	ldr r7, _0807BC40 @ =gUnk_080B79A7
-	ldr r6, _0807BC44 @ =0xFFFFC000
-_0807BC14:
-	ldrh r0, [r5]
-	adds r5, #2
-	cmp r0, r8
-	bhi _0807BC48
-	lsls r0, r0, #1
-	add r0, sl
-	ldrh r0, [r0]
-	add r0, ip
-	b _0807BC4C
-	.align 2, 0
-_0807BC28: .4byte gMetatileTypesBottom
-_0807BC2C: .4byte gMetatileTypesTop
-_0807BC30: .4byte 0xFFFFB000
-_0807BC34: .4byte 0xFFFFD000
-_0807BC38: .4byte 0x00003FFF
-_0807BC3C: .4byte gUnk_080B3E80
-_0807BC40: .4byte gUnk_080B79A7
-_0807BC44: .4byte 0xFFFFC000
-_0807BC48:
-	adds r0, r0, r6
-	adds r0, r0, r7
-_0807BC4C:
-	ldrb r0, [r0]
-	strb r0, [r2]
-	adds r2, #1
-	ldrh r0, [r4]
-	adds r4, #2
-	cmp r0, r8
-	bhi _0807BC64
-	lsls r0, r0, #1
-	add r0, sb
-	ldrh r0, [r0]
-	add r0, ip
-	b _0807BC68
-_0807BC64:
-	adds r0, r0, r6
-	adds r0, r0, r7
-_0807BC68:
-	ldrb r0, [r0]
-	strb r0, [r1]
-	adds r1, #1
-	adds r3, #1
-	ldr r0, _0807BC80 @ =0x00000FFF
-	cmp r3, r0
-	bls _0807BC14
-	pop {r3, r4, r5}
-	mov r8, r3
-	mov sb, r4
-	mov sl, r5
-	pop {r4, r5, r6, r7, pc}
-	.align 2, 0
-_0807BC80: .4byte 0x00000FFF
-	.syntax divided

asm/non_matching/playerUtils/sub_0807C5B0.inc

@@ -1,36 +0,0 @@
-	.syntax unified
-	push {r4, r5, r6, lr}
-	ldr r5, _0807C5E8 @ =gUnk_0200D654
-	movs r4, #0x80
-	lsls r4, r4, #5
-	movs r3, #0
-	ldr r6, _0807C5EC @ =gRoomControls
-	ldr r2, _0807C5F0 @ =gUnk_02027EB4
-_0807C5BE:
-	adds r0, r5, r3
-	ldrb r0, [r0]
-	cmp r0, #0
-	beq _0807C5D4
-	cmp r0, #0xf
-	bhi _0807C5D2
-	ldrb r1, [r2]
-	cmp r1, #0xf
-	bhi _0807C5D4
-	orrs r0, r1
-_0807C5D2:
-	strb r0, [r2]
-_0807C5D4:
-	adds r2, #1
-	adds r3, #1
-	cmp r3, r4
-	blo _0807C5BE
-	ldrb r1, [r6, #0xf]
-	movs r0, #2
-	orrs r0, r1
-	strb r0, [r6, #0xf]
-	pop {r4, r5, r6, pc}
-	.align 2, 0
-_0807C5E8: .4byte gUnk_0200D654
-_0807C5EC: .4byte gRoomControls
-_0807C5F0: .4byte gUnk_02027EB4
-	.syntax divided

asm/non_matching/scroll/sub_08080368.inc

@@ -1,6 +1,6 @@
 	.syntax unified
 	push {r4, r5, r6, r7, lr}
-	ldr r0, _08080384 @ =gUnk_03004030
+	ldr r0, _08080384 @ =gDiggingCaveEntranceTransition
 	ldr r1, _08080388 @ =gRoomControls
 	ldrb r0, [r0, #0xa]
 	ldrb r1, [r1, #4]
@@ -13,7 +13,7 @@
 	strh r0, [r1]
 	b _080803BE
 	.align 2, 0
-_08080384: .4byte gUnk_03004030
+_08080384: .4byte gDiggingCaveEntranceTransition
 _08080388: .4byte gRoomControls
 _0808038C: .4byte gUnk_02034480
 _08080390:

assets/assets.json

@@ -32284,7 +32284,7 @@
     }
   },
   {
-    "path": "manager1A/gUnk_08108670_EU.bin",
+    "path": "holeManager/gUnk_08108670_EU.bin",
     "variants": [
       "EU"
     ],
@@ -32294,7 +32294,7 @@
     "size": 12
   },
   {
-    "path": "manager1A/gUnk_08108670_1_USA-JP-DEMO_USA-DEMO_JP.bin",
+    "path": "holeManager/gUnk_08108670_1_USA-JP-DEMO_USA-DEMO_JP.bin",
     "variants": [
       "USA",
       "JP",
@@ -32305,7 +32305,7 @@
     "size": 12
   },
   {
-    "path": "manager1A/gUnk_0810867C_EU.bin",
+    "path": "holeManager/gUnk_0810867C_EU.bin",
     "variants": [
       "EU"
     ],
@@ -32315,7 +32315,7 @@
     "size": 12
   },
   {
-    "path": "manager1A/gUnk_0810867C_1_USA-JP-DEMO_USA-DEMO_JP.bin",
+    "path": "holeManager/gUnk_0810867C_1_USA-JP-DEMO_USA-DEMO_JP.bin",
     "variants": [
       "USA",
       "JP",
@@ -32326,7 +32326,7 @@
     "size": 12
   },
   {
-    "path": "manager1A/gUnk_08108688_EU.bin",
+    "path": "holeManager/gUnk_08108688_EU.bin",
     "variants": [
       "EU"
     ],
@@ -32336,7 +32336,7 @@
     "size": 12
   },
   {
-    "path": "manager1A/gUnk_08108688_1_USA-JP-DEMO_USA-DEMO_JP.bin",
+    "path": "holeManager/gUnk_08108688_1_USA-JP-DEMO_USA-DEMO_JP.bin",
     "variants": [
       "USA",
       "JP",
@@ -32347,7 +32347,7 @@
     "size": 12
   },
   {
-    "path": "manager1A/gUnk_08108694_EU.bin",
+    "path": "holeManager/gUnk_08108694_EU.bin",
     "variants": [
       "EU"
     ],
@@ -32357,7 +32357,7 @@
     "size": 12
   },
   {
-    "path": "manager1A/gUnk_08108694_1_USA-JP-DEMO_USA-DEMO_JP.bin",
+    "path": "holeManager/gUnk_08108694_1_USA-JP-DEMO_USA-DEMO_JP.bin",
     "variants": [
       "USA",
       "JP",
@@ -32368,7 +32368,7 @@
     "size": 12
   },
   {
-    "path": "manager1A/gUnk_081086A0_EU.bin",
+    "path": "holeManager/gUnk_081086A0_EU.bin",
     "variants": [
       "EU"
     ],
@@ -32378,7 +32378,7 @@
     "size": 9
   },
   {
-    "path": "manager1A/gUnk_081086A0_1_USA-JP-DEMO_USA-DEMO_JP.bin",
+    "path": "holeManager/gUnk_081086A0_1_USA-JP-DEMO_USA-DEMO_JP.bin",
     "variants": [
       "USA",
       "JP",
@@ -32389,12 +32389,12 @@
     "size": 9
   },
   {
-    "path": "manager1A/gUnk_081086A0_2.bin",
+    "path": "holeManager/gUnk_081086A0_2.bin",
     "start": 1083049,
     "size": 3
   },
   {
-    "path": "manager1A/gUnk_081086AC_EU.bin",
+    "path": "holeManager/gUnk_081086AC_EU.bin",
     "variants": [
       "EU"
     ],
@@ -32404,7 +32404,7 @@
     "size": 12
   },
   {
-    "path": "manager1A/gUnk_081086AC_1_USA-JP-DEMO_USA-DEMO_JP.bin",
+    "path": "holeManager/gUnk_081086AC_1_USA-JP-DEMO_USA-DEMO_JP.bin",
     "variants": [
       "USA",
       "JP",
@@ -32415,7 +32415,7 @@
     "size": 12
   },
   {
-    "path": "manager1A/gUnk_081086B8_EU.bin",
+    "path": "holeManager/gUnk_081086B8_EU.bin",
     "variants": [
       "EU"
     ],
@@ -32425,7 +32425,7 @@
     "size": 12
   },
   {
-    "path": "manager1A/gUnk_081086B8_1_USA-JP-DEMO_USA-DEMO_JP.bin",
+    "path": "holeManager/gUnk_081086B8_1_USA-JP-DEMO_USA-DEMO_JP.bin",
     "variants": [
       "USA",
       "JP",
@@ -32436,7 +32436,7 @@
     "size": 12
   },
   {
-    "path": "manager1A/gUnk_081086C4_EU.bin",
+    "path": "holeManager/gUnk_081086C4_EU.bin",
     "variants": [
       "EU"
     ],
@@ -32446,7 +32446,7 @@
     "size": 12
   },
   {
-    "path": "manager1A/gUnk_081086C4_1_USA-JP-DEMO_USA-DEMO_JP.bin",
+    "path": "holeManager/gUnk_081086C4_1_USA-JP-DEMO_USA-DEMO_JP.bin",
     "variants": [
       "USA",
       "JP",
@@ -32457,7 +32457,7 @@
     "size": 12
   },
   {
-    "path": "manager1A/gUnk_081086D0_EU.bin",
+    "path": "holeManager/gUnk_081086D0_EU.bin",
     "variants": [
       "EU"
     ],
@@ -32467,7 +32467,7 @@
     "size": 1
   },
   {
-    "path": "manager1A/gUnk_081086D0_1_USA-JP-DEMO_USA-DEMO_JP.bin",
+    "path": "holeManager/gUnk_081086D0_1_USA-JP-DEMO_USA-DEMO_JP.bin",
     "variants": [
       "USA",
       "JP",
@@ -32478,7 +32478,7 @@
     "size": 1
   },
   {
-    "path": "manager1A/gUnk_081086D0_2_EU.bin",
+    "path": "holeManager/gUnk_081086D0_2_EU.bin",
     "variants": [
       "EU"
     ],
@@ -32488,7 +32488,7 @@
     "size": 11
   },
   {
-    "path": "manager1A/gUnk_081086D0_3_USA-JP-DEMO_USA-DEMO_JP.bin",
+    "path": "holeManager/gUnk_081086D0_3_USA-JP-DEMO_USA-DEMO_JP.bin",
     "variants": [
       "USA",
       "JP",
@@ -32499,242 +32499,242 @@
     "size": 11
   },
   {
-    "path": "manager1A/gUnk_081086DC.bin",
+    "path": "holeManager/gUnk_081086DC.bin",
     "start": 1083100,
     "size": 8
   },
   {
-    "path": "manager1A/gUnk_081086E4.bin",
+    "path": "holeManager/gUnk_081086E4.bin",
     "start": 1083108,
     "size": 8
   },
   {
-    "path": "manager1A/gUnk_081086EC.bin",
+    "path": "holeManager/gUnk_081086EC.bin",
     "start": 1083116,
     "size": 8
   },
   {
-    "path": "manager1A/gUnk_081086F4.bin",
+    "path": "holeManager/gUnk_081086F4.bin",
     "start": 1083124,
     "size": 8
   },
   {
-    "path": "manager1A/gUnk_081086FC.bin",
+    "path": "holeManager/gUnk_081086FC.bin",
     "start": 1083132,
     "size": 8
   },
   {
-    "path": "manager1A/gUnk_08108704.bin",
+    "path": "holeManager/gUnk_08108704.bin",
     "start": 1083140,
     "size": 8
   },
   {
-    "path": "manager1A/gUnk_0810870C.bin",
+    "path": "holeManager/gUnk_0810870C.bin",
     "start": 1083148,
     "size": 8
   },
   {
-    "path": "manager1A/gUnk_08108714.bin",
+    "path": "holeManager/gUnk_08108714.bin",
     "start": 1083156,
     "size": 8
   },
   {
-    "path": "manager1A/gUnk_0810871C.bin",
+    "path": "holeManager/gUnk_0810871C.bin",
     "start": 1083164,
     "size": 8
   },
   {
-    "path": "manager1A/gUnk_08108724.bin",
+    "path": "holeManager/gUnk_08108724.bin",
     "start": 1083172,
     "size": 8
   },
   {
-    "path": "manager1A/gUnk_0810872C.bin",
+    "path": "holeManager/gUnk_0810872C.bin",
     "start": 1083180,
     "size": 8
   },
   {
-    "path": "manager1A/gUnk_08108734.bin",
+    "path": "holeManager/gUnk_08108734.bin",
     "start": 1083188,
     "size": 8
   },
   {
-    "path": "manager1A/gUnk_0810873C.bin",
+    "path": "holeManager/gUnk_0810873C.bin",
     "start": 1083196,
     "size": 8
   },
   {
-    "path": "manager1A/gUnk_08108744.bin",
+    "path": "holeManager/gUnk_08108744.bin",
     "start": 1083204,
     "size": 8
   },
   {
-    "path": "manager1A/gUnk_0810874C.bin",
+    "path": "holeManager/gUnk_0810874C.bin",
     "start": 1083212,
     "size": 8
   },
   {
-    "path": "manager1A/gUnk_08108754.bin",
+    "path": "holeManager/gUnk_08108754.bin",
     "start": 1083220,
     "size": 8
   },
   {
-    "path": "manager1A/gUnk_0810875C.bin",
+    "path": "holeManager/gUnk_0810875C.bin",
     "start": 1083228,
     "size": 8
   },
   {
-    "path": "manager1A/gUnk_08108764.bin",
+    "path": "holeManager/gUnk_08108764.bin",
     "start": 1083236,
     "size": 32
   },
   {
-    "path": "manager1A/gUnk_08108764_1.bin",
+    "path": "holeManager/gUnk_08108764_1.bin",
     "start": 1083272,
     "size": 16
   },
   {
-    "path": "manager1A/gUnk_08108764_2.bin",
+    "path": "holeManager/gUnk_08108764_2.bin",
     "start": 1083292,
     "size": 20
   },
   {
-    "path": "manager1A/gUnk_08108764_3.bin",
+    "path": "holeManager/gUnk_08108764_3.bin",
     "start": 1083316,
     "size": 12
   },
   {
-    "path": "manager1A/gUnk_08108764_4.bin",
+    "path": "holeManager/gUnk_08108764_4.bin",
     "start": 1083332,
     "size": 16
   },
   {
-    "path": "manager1A/gUnk_08108764_5.bin",
+    "path": "holeManager/gUnk_08108764_5.bin",
     "start": 1083352,
     "size": 16
   },
   {
-    "path": "manager1A/gUnk_08108764_6.bin",
+    "path": "holeManager/gUnk_08108764_6.bin",
     "start": 1083372,
     "size": 40
   },
   {
-    "path": "manager1A/gUnk_08108764_7.bin",
+    "path": "holeManager/gUnk_08108764_7.bin",
     "start": 1083416,
     "size": 16
   },
   {
-    "path": "manager1A/gUnk_08108764_8.bin",
+    "path": "holeManager/gUnk_08108764_8.bin",
     "start": 1083436,
     "size": 16
   },
   {
-    "path": "manager1A/gUnk_08108764_9.bin",
+    "path": "holeManager/gUnk_08108764_9.bin",
     "start": 1083456,
     "size": 16
   },
   {
-    "path": "manager1A/gUnk_08108764_10.bin",
+    "path": "holeManager/gUnk_08108764_10.bin",
     "start": 1083476,
     "size": 32
   },
   {
-    "path": "manager1A/gUnk_08108764_11.bin",
+    "path": "holeManager/gUnk_08108764_11.bin",
     "start": 1083512,
     "size": 440
   },
   {
-    "path": "manager1A/gUnk_08108764_12.bin",
+    "path": "holeManager/gUnk_08108764_12.bin",
     "start": 1083956,
     "size": 16
   },
   {
-    "path": "manager1A/gUnk_08108764_13.bin",
+    "path": "holeManager/gUnk_08108764_13.bin",
     "start": 1083976,
     "size": 36
   },
   {
-    "path": "manager1A/gUnk_08108764_14.bin",
+    "path": "holeManager/gUnk_08108764_14.bin",
     "start": 1084016,
     "size": 16
   },
   {
-    "path": "manager1A/gUnk_08108764_15.bin",
+    "path": "holeManager/gUnk_08108764_15.bin",
     "start": 1084036,
     "size": 16
   },
   {
-    "path": "manager1A/gUnk_08108764_16.bin",
+    "path": "holeManager/gUnk_08108764_16.bin",
     "start": 1084056,
     "size": 36
   },
   {
-    "path": "manager1A/gUnk_08108764_17.bin",
+    "path": "holeManager/gUnk_08108764_17.bin",
     "start": 1084096,
     "size": 16
   },
   {
-    "path": "manager1A/gUnk_08108764_18.bin",
+    "path": "holeManager/gUnk_08108764_18.bin",
     "start": 1084116,
     "size": 36
   },
   {
-    "path": "manager1A/gUnk_08108764_19.bin",
+    "path": "holeManager/gUnk_08108764_19.bin",
     "start": 1084156,
     "size": 36
   },
   {
-    "path": "manager1A/gUnk_08108764_20.bin",
+    "path": "holeManager/gUnk_08108764_20.bin",
     "start": 1084196,
     "size": 16
   },
   {
-    "path": "manager1A/gUnk_08108764_21.bin",
+    "path": "holeManager/gUnk_08108764_21.bin",
     "start": 1084216,
     "size": 16
   },
   {
-    "path": "manager1A/gUnk_08108764_22.bin",
+    "path": "holeManager/gUnk_08108764_22.bin",
     "start": 1084236,
     "size": 16
   },
   {
-    "path": "manager1A/gUnk_08108764_23.bin",
+    "path": "holeManager/gUnk_08108764_23.bin",
     "start": 1084256,
     "size": 32
   },
   {
-    "path": "manager1A/gUnk_08108764_24.bin",
+    "path": "holeManager/gUnk_08108764_24.bin",
     "start": 1084292,
     "size": 16
   },
   {
-    "path": "manager1A/gUnk_08108764_25.bin",
+    "path": "holeManager/gUnk_08108764_25.bin",
     "start": 1084312,
     "size": 16
   },
   {
-    "path": "manager1A/gUnk_08108764_26.bin",
+    "path": "holeManager/gUnk_08108764_26.bin",
     "start": 1084332,
     "size": 124
   },
   {
-    "path": "manager39/gUnk_08108DE8.bin",
+    "path": "enterRoomTextboxManager/gUnk_08108DE8.bin",
     "start": 1084904,
     "size": 64
   },
   {
-    "path": "manager39/gUnk_08108E30.bin",
+    "path": "enterRoomTextboxManager/gUnk_08108E30.bin",
     "start": 1084976,
     "size": 24
   },
   {
-    "path": "manager39/gUnk_08108E48.bin",
+    "path": "enterRoomTextboxManager/gUnk_08108E48.bin",
     "start": 1085000,
     "size": 24
   },
   {
-    "path": "manager39/gUnk_08108E60.bin",
+    "path": "enterRoomTextboxManager/gUnk_08108E60.bin",
     "start": 1085024,
     "size": 12
   },

data/const/manager/enterRoomTextboxManager.s

@@ -0,0 +1,21 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+    .align 2
+
+gUnk_08108DE8:: @ 08108DE8
+	.incbin "enterRoomTextboxManager/gUnk_08108DE8.bin"
+
+EnterRoomTextboxManager_Actions:: @ 08108E28 
+	.4byte sub_0805E140
+	.4byte sub_0805E18C
+
+gUnk_08108E30:: @ 08108E30
+	.incbin "enterRoomTextboxManager/gUnk_08108E30.bin"
+
+gUnk_08108E48:: @ 08108E48
+	.incbin "enterRoomTextboxManager/gUnk_08108E48.bin"
+
+gUnk_08108E60:: @ 08108E60
+	.incbin "enterRoomTextboxManager/gUnk_08108E60.bin"

data/const/manager/holeManager.s

@@ -0,0 +1,194 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+    .align 2
+
+HoleManager_Actions:: @ 08108668
+	.4byte sub_0805B048
+	.4byte sub_0805B168
+
+gUnk_08108670:: @ 08108670
+.ifdef EU
+    @ TODO only small differences
+	.incbin "holeManager/gUnk_08108670_EU.bin"
+.else
+	.incbin "holeManager/gUnk_08108670_1_USA-JP-DEMO_USA-DEMO_JP.bin"
+.endif
+
+gUnk_0810867C:: @ 0810867C
+.ifdef EU
+    @ TODO only small differences
+	.incbin "holeManager/gUnk_0810867C_EU.bin"
+.else
+	.incbin "holeManager/gUnk_0810867C_1_USA-JP-DEMO_USA-DEMO_JP.bin"
+.endif
+
+gUnk_08108688:: @ 08108688
+.ifdef EU
+    @ TODO only small differences
+	.incbin "holeManager/gUnk_08108688_EU.bin"
+.else
+	.incbin "holeManager/gUnk_08108688_1_USA-JP-DEMO_USA-DEMO_JP.bin"
+.endif
+
+gUnk_08108694:: @ 08108694
+.ifdef EU
+    @ TODO only small differences
+	.incbin "holeManager/gUnk_08108694_EU.bin"
+.else
+	.incbin "holeManager/gUnk_08108694_1_USA-JP-DEMO_USA-DEMO_JP.bin"
+.endif
+
+gUnk_081086A0:: @ 081086A0
+.ifdef EU
+    @ TODO only small differences
+	.incbin "holeManager/gUnk_081086A0_EU.bin"
+.else
+	.incbin "holeManager/gUnk_081086A0_1_USA-JP-DEMO_USA-DEMO_JP.bin"
+.endif
+	.incbin "holeManager/gUnk_081086A0_2.bin"
+
+gUnk_081086AC:: @ 081086AC
+.ifdef EU
+    @ TODO only small differences
+	.incbin "holeManager/gUnk_081086AC_EU.bin"
+.else
+	.incbin "holeManager/gUnk_081086AC_1_USA-JP-DEMO_USA-DEMO_JP.bin"
+.endif
+
+gUnk_081086B8:: @ 081086B8
+.ifdef EU
+    @ TODO only small differences
+	.incbin "holeManager/gUnk_081086B8_EU.bin"
+.else
+	.incbin "holeManager/gUnk_081086B8_1_USA-JP-DEMO_USA-DEMO_JP.bin"
+.endif
+
+gUnk_081086C4:: @ 081086C4
+.ifdef EU
+    @ TODO only small differences
+	.incbin "holeManager/gUnk_081086C4_EU.bin"
+.else
+	.incbin "holeManager/gUnk_081086C4_1_USA-JP-DEMO_USA-DEMO_JP.bin"
+.endif
+
+gUnk_081086D0:: @ 081086D0
+.ifdef EU
+    @ TODO only small differences
+	.incbin "holeManager/gUnk_081086D0_EU.bin"
+.else
+	.incbin "holeManager/gUnk_081086D0_1_USA-JP-DEMO_USA-DEMO_JP.bin"
+.endif
+.ifdef EU
+    @ TODO only small differences
+	.incbin "holeManager/gUnk_081086D0_2_EU.bin"
+.else
+	.incbin "holeManager/gUnk_081086D0_3_USA-JP-DEMO_USA-DEMO_JP.bin"
+.endif
+
+gUnk_081086DC:: @ 081086DC
+	.incbin "holeManager/gUnk_081086DC.bin"
+
+gUnk_081086E4:: @ 081086E4
+	.incbin "holeManager/gUnk_081086E4.bin"
+
+gUnk_081086EC:: @ 081086EC
+	.incbin "holeManager/gUnk_081086EC.bin"
+
+gUnk_081086F4:: @ 081086F4
+	.incbin "holeManager/gUnk_081086F4.bin"
+
+gUnk_081086FC:: @ 081086FC
+	.incbin "holeManager/gUnk_081086FC.bin"
+
+gUnk_08108704:: @ 08108704
+	.incbin "holeManager/gUnk_08108704.bin"
+
+gUnk_0810870C:: @ 0810870C
+	.incbin "holeManager/gUnk_0810870C.bin"
+
+gUnk_08108714:: @ 08108714
+	.incbin "holeManager/gUnk_08108714.bin"
+
+gUnk_0810871C:: @ 0810871C
+	.incbin "holeManager/gUnk_0810871C.bin"
+
+gUnk_08108724:: @ 08108724
+	.incbin "holeManager/gUnk_08108724.bin"
+
+gUnk_0810872C:: @ 0810872C
+	.incbin "holeManager/gUnk_0810872C.bin"
+
+gUnk_08108734:: @ 08108734
+	.incbin "holeManager/gUnk_08108734.bin"
+
+gUnk_0810873C:: @ 0810873C
+	.incbin "holeManager/gUnk_0810873C.bin"
+
+gUnk_08108744:: @ 08108744
+	.incbin "holeManager/gUnk_08108744.bin"
+
+gUnk_0810874C:: @ 0810874C
+	.incbin "holeManager/gUnk_0810874C.bin"
+
+gUnk_08108754:: @ 08108754
+	.incbin "holeManager/gUnk_08108754.bin"
+
+gUnk_0810875C:: @ 0810875C
+	.incbin "holeManager/gUnk_0810875C.bin"
+
+gUnk_08108764:: @ 08108764
+	.incbin "holeManager/gUnk_08108764.bin"
+	.4byte gUnk_08108670
+	.incbin "holeManager/gUnk_08108764_1.bin"
+	.4byte gUnk_08108688
+	.incbin "holeManager/gUnk_08108764_2.bin"
+	.4byte gUnk_0810875C
+	.incbin "holeManager/gUnk_08108764_3.bin"
+	.4byte gUnk_08108694
+	.incbin "holeManager/gUnk_08108764_4.bin"
+	.4byte gUnk_081086A0
+	.incbin "holeManager/gUnk_08108764_5.bin"
+	.4byte gUnk_081086AC
+	.incbin "holeManager/gUnk_08108764_6.bin"
+	.4byte gUnk_081086DC
+	.incbin "holeManager/gUnk_08108764_7.bin"
+	.4byte gUnk_081086E4
+	.incbin "holeManager/gUnk_08108764_8.bin"
+	.4byte gUnk_081086EC
+	.incbin "holeManager/gUnk_08108764_9.bin"
+	.4byte gUnk_081086F4
+	.incbin "holeManager/gUnk_08108764_10.bin"
+	.4byte gUnk_0810867C
+	.incbin "holeManager/gUnk_08108764_11.bin"
+	.4byte gUnk_081086FC
+	.incbin "holeManager/gUnk_08108764_12.bin"
+	.4byte gUnk_08108704
+	.incbin "holeManager/gUnk_08108764_13.bin"
+	.4byte gUnk_0810870C
+	.incbin "holeManager/gUnk_08108764_14.bin"
+	.4byte gUnk_08108714
+	.incbin "holeManager/gUnk_08108764_15.bin"
+	.4byte gUnk_0810871C
+	.incbin "holeManager/gUnk_08108764_16.bin"
+	.4byte gUnk_08108724
+	.incbin "holeManager/gUnk_08108764_17.bin"
+	.4byte gUnk_0810872C
+	.incbin "holeManager/gUnk_08108764_18.bin"
+	.4byte gUnk_08108734
+	.incbin "holeManager/gUnk_08108764_19.bin"
+	.4byte gUnk_0810873C
+	.incbin "holeManager/gUnk_08108764_20.bin"
+	.4byte gUnk_08108744
+	.incbin "holeManager/gUnk_08108764_21.bin"
+	.4byte gUnk_0810874C
+	.incbin "holeManager/gUnk_08108764_22.bin"
+	.4byte gUnk_08108754
+	.incbin "holeManager/gUnk_08108764_23.bin"
+	.4byte gUnk_081086B8
+	.incbin "holeManager/gUnk_08108764_24.bin"
+	.4byte gUnk_081086C4
+	.incbin "holeManager/gUnk_08108764_25.bin"
+	.4byte gUnk_081086D0
+	.incbin "holeManager/gUnk_08108764_26.bin"

data/const/manager/manager1A.s

@@ -1,194 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_08108668:: @ 08108668
-	.4byte sub_0805B048
-	.4byte sub_0805B168
-
-gUnk_08108670:: @ 08108670
-.ifdef EU
-    @ TODO only small differences
-	.incbin "manager1A/gUnk_08108670_EU.bin"
-.else
-	.incbin "manager1A/gUnk_08108670_1_USA-JP-DEMO_USA-DEMO_JP.bin"
-.endif
-
-gUnk_0810867C:: @ 0810867C
-.ifdef EU
-    @ TODO only small differences
-	.incbin "manager1A/gUnk_0810867C_EU.bin"
-.else
-	.incbin "manager1A/gUnk_0810867C_1_USA-JP-DEMO_USA-DEMO_JP.bin"
-.endif
-
-gUnk_08108688:: @ 08108688
-.ifdef EU
-    @ TODO only small differences
-	.incbin "manager1A/gUnk_08108688_EU.bin"
-.else
-	.incbin "manager1A/gUnk_08108688_1_USA-JP-DEMO_USA-DEMO_JP.bin"
-.endif
-
-gUnk_08108694:: @ 08108694
-.ifdef EU
-    @ TODO only small differences
-	.incbin "manager1A/gUnk_08108694_EU.bin"
-.else
-	.incbin "manager1A/gUnk_08108694_1_USA-JP-DEMO_USA-DEMO_JP.bin"
-.endif
-
-gUnk_081086A0:: @ 081086A0
-.ifdef EU
-    @ TODO only small differences
-	.incbin "manager1A/gUnk_081086A0_EU.bin"
-.else
-	.incbin "manager1A/gUnk_081086A0_1_USA-JP-DEMO_USA-DEMO_JP.bin"
-.endif
-	.incbin "manager1A/gUnk_081086A0_2.bin"
-
-gUnk_081086AC:: @ 081086AC
-.ifdef EU
-    @ TODO only small differences
-	.incbin "manager1A/gUnk_081086AC_EU.bin"
-.else
-	.incbin "manager1A/gUnk_081086AC_1_USA-JP-DEMO_USA-DEMO_JP.bin"
-.endif
-
-gUnk_081086B8:: @ 081086B8
-.ifdef EU
-    @ TODO only small differences
-	.incbin "manager1A/gUnk_081086B8_EU.bin"
-.else
-	.incbin "manager1A/gUnk_081086B8_1_USA-JP-DEMO_USA-DEMO_JP.bin"
-.endif
-
-gUnk_081086C4:: @ 081086C4
-.ifdef EU
-    @ TODO only small differences
-	.incbin "manager1A/gUnk_081086C4_EU.bin"
-.else
-	.incbin "manager1A/gUnk_081086C4_1_USA-JP-DEMO_USA-DEMO_JP.bin"
-.endif
-
-gUnk_081086D0:: @ 081086D0
-.ifdef EU
-    @ TODO only small differences
-	.incbin "manager1A/gUnk_081086D0_EU.bin"
-.else
-	.incbin "manager1A/gUnk_081086D0_1_USA-JP-DEMO_USA-DEMO_JP.bin"
-.endif
-.ifdef EU
-    @ TODO only small differences
-	.incbin "manager1A/gUnk_081086D0_2_EU.bin"
-.else
-	.incbin "manager1A/gUnk_081086D0_3_USA-JP-DEMO_USA-DEMO_JP.bin"
-.endif
-
-gUnk_081086DC:: @ 081086DC
-	.incbin "manager1A/gUnk_081086DC.bin"
-
-gUnk_081086E4:: @ 081086E4
-	.incbin "manager1A/gUnk_081086E4.bin"
-
-gUnk_081086EC:: @ 081086EC
-	.incbin "manager1A/gUnk_081086EC.bin"
-
-gUnk_081086F4:: @ 081086F4
-	.incbin "manager1A/gUnk_081086F4.bin"
-
-gUnk_081086FC:: @ 081086FC
-	.incbin "manager1A/gUnk_081086FC.bin"
-
-gUnk_08108704:: @ 08108704
-	.incbin "manager1A/gUnk_08108704.bin"
-
-gUnk_0810870C:: @ 0810870C
-	.incbin "manager1A/gUnk_0810870C.bin"
-
-gUnk_08108714:: @ 08108714
-	.incbin "manager1A/gUnk_08108714.bin"
-
-gUnk_0810871C:: @ 0810871C
-	.incbin "manager1A/gUnk_0810871C.bin"
-
-gUnk_08108724:: @ 08108724
-	.incbin "manager1A/gUnk_08108724.bin"
-
-gUnk_0810872C:: @ 0810872C
-	.incbin "manager1A/gUnk_0810872C.bin"
-
-gUnk_08108734:: @ 08108734
-	.incbin "manager1A/gUnk_08108734.bin"
-
-gUnk_0810873C:: @ 0810873C
-	.incbin "manager1A/gUnk_0810873C.bin"
-
-gUnk_08108744:: @ 08108744
-	.incbin "manager1A/gUnk_08108744.bin"
-
-gUnk_0810874C:: @ 0810874C
-	.incbin "manager1A/gUnk_0810874C.bin"
-
-gUnk_08108754:: @ 08108754
-	.incbin "manager1A/gUnk_08108754.bin"
-
-gUnk_0810875C:: @ 0810875C
-	.incbin "manager1A/gUnk_0810875C.bin"
-
-gUnk_08108764:: @ 08108764
-	.incbin "manager1A/gUnk_08108764.bin"
-	.4byte gUnk_08108670
-	.incbin "manager1A/gUnk_08108764_1.bin"
-	.4byte gUnk_08108688
-	.incbin "manager1A/gUnk_08108764_2.bin"
-	.4byte gUnk_0810875C
-	.incbin "manager1A/gUnk_08108764_3.bin"
-	.4byte gUnk_08108694
-	.incbin "manager1A/gUnk_08108764_4.bin"
-	.4byte gUnk_081086A0
-	.incbin "manager1A/gUnk_08108764_5.bin"
-	.4byte gUnk_081086AC
-	.incbin "manager1A/gUnk_08108764_6.bin"
-	.4byte gUnk_081086DC
-	.incbin "manager1A/gUnk_08108764_7.bin"
-	.4byte gUnk_081086E4
-	.incbin "manager1A/gUnk_08108764_8.bin"
-	.4byte gUnk_081086EC
-	.incbin "manager1A/gUnk_08108764_9.bin"
-	.4byte gUnk_081086F4
-	.incbin "manager1A/gUnk_08108764_10.bin"
-	.4byte gUnk_0810867C
-	.incbin "manager1A/gUnk_08108764_11.bin"
-	.4byte gUnk_081086FC
-	.incbin "manager1A/gUnk_08108764_12.bin"
-	.4byte gUnk_08108704
-	.incbin "manager1A/gUnk_08108764_13.bin"
-	.4byte gUnk_0810870C
-	.incbin "manager1A/gUnk_08108764_14.bin"
-	.4byte gUnk_08108714
-	.incbin "manager1A/gUnk_08108764_15.bin"
-	.4byte gUnk_0810871C
-	.incbin "manager1A/gUnk_08108764_16.bin"
-	.4byte gUnk_08108724
-	.incbin "manager1A/gUnk_08108764_17.bin"
-	.4byte gUnk_0810872C
-	.incbin "manager1A/gUnk_08108764_18.bin"
-	.4byte gUnk_08108734
-	.incbin "manager1A/gUnk_08108764_19.bin"
-	.4byte gUnk_0810873C
-	.incbin "manager1A/gUnk_08108764_20.bin"
-	.4byte gUnk_08108744
-	.incbin "manager1A/gUnk_08108764_21.bin"
-	.4byte gUnk_0810874C
-	.incbin "manager1A/gUnk_08108764_22.bin"
-	.4byte gUnk_08108754
-	.incbin "manager1A/gUnk_08108764_23.bin"
-	.4byte gUnk_081086B8
-	.incbin "manager1A/gUnk_08108764_24.bin"
-	.4byte gUnk_081086C4
-	.incbin "manager1A/gUnk_08108764_25.bin"
-	.4byte gUnk_081086D0
-	.incbin "manager1A/gUnk_08108764_26.bin"

data/const/manager/manager39.s

@@ -1,21 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_08108DE8:: @ 08108DE8
-	.incbin "manager39/gUnk_08108DE8.bin"
-
-gUnk_08108E28:: @ 08108E28 
-	.4byte sub_0805E140
-	.4byte sub_0805E18C
-
-gUnk_08108E30:: @ 08108E30
-	.incbin "manager39/gUnk_08108E30.bin"
-
-gUnk_08108E48:: @ 08108E48
-	.incbin "manager39/gUnk_08108E48.bin"
-
-gUnk_08108E60:: @ 08108E60
-	.incbin "manager39/gUnk_08108E60.bin"

data/scripts/cutscene/introCeremony/script_Npc4EMonsters.inc

@@ -25,7 +25,7 @@ SCRIPT_START script_Npc4EMonsters
 	SetFadeTime 0x0002
 	SetFade6
 	WaitForFadeFinish
-	CallWithArg DeleteManager36, 0x00000002
+	CallWithArg DeleteRepeatedSoundManager, 0x00000002
 	_0807F0C8 0x0000, 0x0000
 	Call NPC4E_SaveEquippedItems
 	Call SetPlayerActionNormal
@@ -52,5 +52,5 @@ SCRIPT_START script_Npc4EMonsters
 	WaitUntilTextboxCloses
 	MessageFromTargetPos TEXT_PROLOGUE, 0x46, 0x0000
 	WaitUntilTextboxCloses
-	CallWithArg CreateManager36, 0x00000002
+	CallWithArg CreateRepeatedSoundManager, 0x00000002
 	_0807F0C8 0xffff, 0x0000

data/scripts/cutscene/introCeremony/script_Npc4EVaatiAttacking.inc

@@ -23,7 +23,7 @@ SCRIPT_START script_Npc4EVaatiAttacking
 	Wait 0x000f
 	PlaySound SFX_125
 	CallWithArg sub_0807FB28, 0x00000003
-	CallWithArg DeleteManager36, 0x00000002
+	CallWithArg DeleteRepeatedSoundManager, 0x00000002
 	_0807F0C8 0x0000, 0x0000
 	SetSyncFlag 0x00000010
 	WaitForSyncFlagAndClear 0x00000020

data/scripts/cutscene/introCeremony/script_VaatiIntroCeremony.inc

@@ -77,7 +77,7 @@ SCRIPT_START script_VaatiIntroCeremony
 	Wait 0x001e
 	SetSyncFlag 0x00000200
 	WaitForSyncFlagAndClear 0x00000100
-	Call sub_08066CA4
+	Call Vaati_Evaporate
 	DoPostScriptAction 0x0008
 	Wait 0x0078
 	SetSyncFlag 0x00000200

data/scripts/cutscene/introTown/script_Npc4EIntroCastle.inc

@@ -117,5 +117,5 @@ SCRIPT_START script_Npc4EIntroCastle
 	SetSyncFlag 0x08000000
 	SetSyncFlag 0x00800000
 	WaitForSyncFlagAndClear 0x01000000
-	CallWithArg CreateManager36, 0x00000002
+	CallWithArg CreateRepeatedSoundManager, 0x00000002
 	_0807F0C8 0xffff, 0x0000

data/scripts/cutscene/originStory/script_Object69CameraTarget.inc

@@ -12,7 +12,7 @@ SCRIPT_START script_Object69CameraTarget
 	WaitForSyncFlagAndClear 0x00010000
 	SetSyncFlag 0x00048000
 	WaitForSyncFlagAndClear 0x00010000
-	CallWithArg DeleteManager36, 0x00000001
+	CallWithArg DeleteRepeatedSoundManager, 0x00000001
 	_0807F0C8 0x0000, 0x0000
 	MessageFromTargetPos TEXT_VAATI, 0x12, 0x000c
 	WaitUntilTextboxCloses

data/scripts/cutscene/originStory/script_Object69MinishVaati.inc

@@ -33,5 +33,5 @@ SCRIPT_START script_Object69MinishVaati
 	WaitUntilTextboxCloses
 	MessageFromTargetPos TEXT_VAATI, 0x10, 0x000c
 	WaitUntilTextboxCloses
-	CallWithArg CreateManager36, 0x00000001
+	CallWithArg CreateRepeatedSoundManager, 0x00000001
 	_0807F0C8 0xffff, 0x0000

data/scripts/cutscene/originStory/script_Object6AMinishCap.inc

@@ -6,13 +6,13 @@ SCRIPT_START script_Object6AMinishCap
 	Call sub_08094B80
 	EndBlock
 	WaitForSyncFlagAndClear 0x00000080
-	CallWithArg CreateManager36, 0x00000003
+	CallWithArg CreateRepeatedSoundManager, 0x00000003
 	Call sub_08094B0C
 	_0807EDD4 0x0078, 0x0068
 	SetSyncFlag 0x00000100
 	WaitForSyncFlagAndClear 0x00000080
 	_0807EF3C 0xff80, 0x0000
-	CallWithArg DeleteManager36, 0x00000003
+	CallWithArg DeleteRepeatedSoundManager, 0x00000003
 	Wait 0x003c
 	SetSyncFlag 0x00000100
 	WaitForSyncFlagAndClear 0x00000080

data/scripts/cutscene/originStory/script_Vaati.inc

@@ -39,7 +39,7 @@ SCRIPT_START script_Vaati
 	DoPostScriptAction 0x0000
 	SetSyncFlag 0x00001000
 	WaitForSyncFlagAndClear 0x00000800
-	Call sub_08066CA4
+	Call Vaati_Evaporate
 	DoPostScriptAction 0x0008
 	Wait 0x0078
 	SetSyncFlag 0x00001000

data/scripts/cutscene/originStory/script_VaatiAppearsAgain.inc

@@ -7,7 +7,7 @@ SCRIPT_START script_VaatiAppearsAgain
 	Call SetPriorityPlayerEvent
 	EndBlock
 	WaitForSyncFlagAndClear 0x00000002
-	Call sub_08066C94
+	Call Vaati_Apparate
 	Wait 0x00e9
 	DoPostScriptAction 0x0007
 	DoPostScriptAction 0x001e

data/scripts/cutscene/outro/script_Npc4EFixedEverything.inc

@@ -18,5 +18,5 @@ SCRIPT_START script_Npc4EFixedEverything
 	WaitUntilTextboxCloses
 	MessageFromTargetPos TEXT_VAATI2, 0x5e, 0x000e
 	WaitUntilTextboxCloses
-	CallWithArg CreateManager36, 0x00000001
+	CallWithArg CreateRepeatedSoundManager, 0x00000001
 	_0807F0C8 0xffff, 0x0000

data/scripts/cutscene/outro/script_Npc4EMinishPortalClosing.inc

@@ -9,7 +9,7 @@ SCRIPT_START script_Npc4EMinishPortalClosing
 	OffsetEntityPosition 0x0000, 0xffe0
 	Call WaitForCameraTouchRoomBorder
 	Wait 0x003c
-	CallWithArg DeleteManager36, 0x00000001
+	CallWithArg DeleteRepeatedSoundManager, 0x00000001
 	_0807F0C8 0x0000, 0x0000
 	Wait 0x003c
 	SetSyncFlag 0x00000002

data/scripts/cutscene/reveal/script_VaatiSanctuary.inc

@@ -8,7 +8,7 @@ SCRIPT_START script_VaatiSanctuary
 	EndBlock
 	WaitForSyncFlagAndClear 0x00000020
 	SetEntityPositionRelative 0x0098, 0x0048
-	Call sub_08066C94
+	Call Vaati_Apparate
 	Wait 0x00e9
 	DoPostScriptAction 0x0007
 	SetSyncFlag 0x00000040
@@ -26,7 +26,7 @@ SCRIPT_START script_VaatiSanctuary
 	DoPostScriptAction 0x0000
 	SetSyncFlag 0x00000040
 	WaitForSyncFlagAndClear 0x00000020
-	Call sub_08066CA4
+	Call Vaati_Evaporate
 	DoPostScriptAction 0x0008
 	Wait 0x0078
 	SetSyncFlag 0x00000040

data/scripts/cutscene/takeover/script_VaatiTakeover.inc

@@ -7,7 +7,7 @@ SCRIPT_START script_VaatiTakeover
 	DoPostScriptAction 0x001d
 	EndBlock
 	WaitForSyncFlagAndClear 0x00000010
-	Call sub_08066C94
+	Call Vaati_Apparate
 	Wait 0x00e9
 	DoPostScriptAction 0x0007
 	DoPostScriptAction 0x001e
@@ -18,13 +18,13 @@ SCRIPT_START script_VaatiTakeover
 	DoPostScriptAction 0x0000
 	SetSyncFlag 0x00000020
 	WaitForSyncFlagAndClear 0x00000010
-	Call sub_08066CA4
+	Call Vaati_Evaporate
 	DoPostScriptAction 0x0008
 	Wait 0x00bc
 	SetSyncFlag 0x00000020
 	WaitForSyncFlagAndClear 0x00000010
 	SetEntityPositionRelative 0x0088, 0x0068
-	Call sub_08066C94
+	Call Vaati_Apparate
 	Wait 0x00e8
 	DoPostScriptAction 0x0007
 	DoPostScriptAction 0x001e

data/scripts/dhc/script_Npc4EAfterDefeatingV2.inc

@@ -43,5 +43,5 @@ script_0800DBCA:
 	SetSyncFlag 0x00000001
 	StopBgm
 	Call sub_08094F98
-	CallWithArg CreateManager36, 0x00000001
+	CallWithArg CreateRepeatedSoundManager, 0x00000001
 	_0807F0C8 0xffff, 0x0000

data/scripts/dhc/script_Npc4ECastleCollapsing.inc

@@ -12,7 +12,7 @@ SCRIPT_START script_Npc4ECastleCollapsing
 	SetFadeTime 0x0004
 	_0807E80C 0x00000000
 	WaitForFadeFinish
-	CallWithArg DeleteManager36, 0x00000001
+	CallWithArg DeleteRepeatedSoundManager, 0x00000001
 	_0807F0C8 0x0000, 0x0000
 	SetLocalFlag 0x0079
 	CallWithArg sub_0806DA1C, 0x00000002

data/scripts/dhc/script_Vaati1Intro.inc

@@ -17,7 +17,7 @@ SCRIPT_START script_Vaati1Intro
 	_0807F0B4 0x0001
 	CameraTargetEntity
 	Call WaitForCameraTouchRoomBorder
-	Call sub_08066C94
+	Call Vaati_Apparate
 	Wait 0x00e9
 	DoPostScriptAction 0x0007
 	MessageFromTargetPos TEXT_VAATI2, 0x2f, 0x0002

data/scripts/sanctuary/script_Npc4EFinalSwordRumble.inc

@@ -10,7 +10,7 @@ SCRIPT_START script_Npc4EFinalSwordRumble
 .endif
 	SetSyncFlag 0x00000008
 	Wait 0x0078
-	CallWithArg DeleteManager36, 0x00000001
+	CallWithArg DeleteRepeatedSoundManager, 0x00000001
 	_0807F0C8 0x0000, 0x0000
 	Wait 0x003c
 	_0807F0B4 0x0004

data/scripts/sanctuary/script_Npc4EPedestal.inc

@@ -35,7 +35,7 @@ script_080134F8:
 	CallWithArg sub_08095D8C, script_Object6ASwordCharge6
 	EndBlock
 	Wait 0x003c
-	CallWithArg CreateManager36, 0x00000000
+	CallWithArg CreateRepeatedSoundManager, 0x00000000
 	SetSyncFlag 0x00000200
 	WaitForSyncFlagAndClear 0x00002000
 	PlaySound SFX_1D2
@@ -45,7 +45,7 @@ script_080134F8:
 	WaitForSyncFlagAndClear 0x00004000
 	Wait 0x0078
 	SetSyncFlag 0x00000060
-	CallWithArg DeleteManager36, 0x00000000
+	CallWithArg DeleteRepeatedSoundManager, 0x00000000
 	Wait 0x0078
 	SetSyncFlag 0x00000080
 	WaitForSyncFlagAndClear 0x00000100
@@ -70,5 +70,5 @@ script_080134F8:
 	MessageFromTargetPos TEXT_ITEM_GET, 0x03, 0x000c
 	WaitUntilTextboxCloses
 	SetSyncFlag 0x00040000
-	CallWithArg CreateManager36, 0x00000001
+	CallWithArg CreateRepeatedSoundManager, 0x00000001
 	_0807F0C8 0xffff, 0x0000

data/scripts/sanctuary/script_Npc4ESecondSanctuary.inc

@@ -36,7 +36,7 @@ script_0801373C:
 	CallWithArg sub_08095D8C, script_Objet6ASwordCharge7
 	EndBlock
 	Wait 0x003c
-	CallWithArg CreateManager36, 0x00000000
+	CallWithArg CreateRepeatedSoundManager, 0x00000000
 	SetSyncFlag 0x00000200
 	WaitForSyncFlagAndClear 0x00002000
 	PlaySound SFX_1D2
@@ -48,7 +48,7 @@ script_0801373C:
 	WaitForSyncFlagAndClear 0x00008000
 	Wait 0x0078
 	SetSyncFlag 0x00000060
-	CallWithArg DeleteManager36, 0x00000000
+	CallWithArg DeleteRepeatedSoundManager, 0x00000000
 	Wait 0x0078
 	SetSyncFlag 0x00000080
 	WaitForSyncFlagAndClear 0x00000100

data/scripts/sanctuary/script_Npc4ESpawnTextBoard.inc

@@ -8,7 +8,7 @@ SCRIPT_START script_Npc4ESpawnTextBoard
 	Wait 0x003c
 	SetSyncFlag 0x00000004
 	Wait 0x0078
-	CallWithArg DeleteManager36, 0x00000001
+	CallWithArg DeleteRepeatedSoundManager, 0x00000001
 	_0807F0C8 0x0000, 0x0000
 	StartPlayerScript script_PlayerTextBoardAppears
 	WaitForSyncFlagAndClear 0x00000002

data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc

@@ -38,7 +38,7 @@ script_080138D0:
 	CallWithArg sub_08095D8C, script_Object6ASwordCharge8
 	EndBlock
 	Wait 0x003c
-	CallWithArg CreateManager36, 0x00000000
+	CallWithArg CreateRepeatedSoundManager, 0x00000000
 	SetSyncFlag 0x00000200
 	WaitForSyncFlagAndClear 0x00002000
 	PlaySound SFX_1D2
@@ -52,7 +52,7 @@ script_080138D0:
 	WaitForSyncFlagAndClear 0x00010000
 	Wait 0x0078
 	SetSyncFlag 0x00000060
-	CallWithArg DeleteManager36, 0x00000000
+	CallWithArg DeleteRepeatedSoundManager, 0x00000000
 	Wait 0x0078
 	SetSyncFlag 0x00000080
 	WaitForSyncFlagAndClear 0x00000100
@@ -94,5 +94,5 @@ script_08013A8E:
 	CheckRoomFlag 0x0004
 	JumpIfNot script_08013A8E
 .endif
-	CallWithArg CreateManager36, 0x00000001
+	CallWithArg CreateRepeatedSoundManager, 0x00000001
 	_0807F0C8 0xffff, 0x0000

include/area.h

@@ -240,4 +240,4 @@ typedef enum {
     AREA_98,
 } AreaID;
 
-#endif
+#endif // AREA_H

include/beanstalkSubtask.h

@@ -1,5 +1,5 @@
-#ifndef BEANSTALK_SUBTASK_H
-#define BEANSTALK_SUBTASK_H
+#ifndef BEANSTALKSUBTASK_H
+#define BEANSTALKSUBTASK_H
 
 #include "global.h"
 
@@ -33,4 +33,4 @@ typedef struct {
 #define MAX_BG_ANIMATIONS 8
 extern BgAnimation gBgAnimations[MAX_BG_ANIMATIONS];
 
-#endif // BEANSTALK_SUBTASK_H
+#endif // BEANSTALKSUBTASK_H

include/collision.h

@@ -1,4 +1,3 @@
-
 #ifndef COLLISION_H
 #define COLLISION_H
 
@@ -32,4 +31,4 @@ bool32 IsCollidingPlayer(Entity*);
 void CalculateEntityTileCollisions(Entity*, u32, u32);
 bool32 ProcessMovementInternal(Entity*, s32, s32, u32);
 
-#endif
+#endif // COLLISION_H

include/definitions.h

@@ -1,5 +1,5 @@
-#ifndef SPRITEDATA_H
-#define SPRITEDATA_H
+#ifndef DEFINITIONS_H
+#define DEFINITIONS_H
 
 #include "gba/types.h"
 #include "entity.h"
@@ -436,7 +436,7 @@ typedef enum {
     SPRITE_FILESCREENOBJECTS,
     SPRITE_OBJECTA2,
     SPRITE_OBJECT6A_10,
-    SPRITE_VAATI_1,
-
+    SPRITE_VAATI_1
 } Sprites;
-#endif
+
+#endif // DEFINITIONS_H

include/droptables.h

@@ -1,5 +1,5 @@
-#ifndef TMC_DROPTABLES_H
-#define TMC_DROPTABLES_H
+#ifndef DROPTABLES_H
+#define DROPTABLES_H
 
 #include "global.h"
 
@@ -37,4 +37,4 @@ enum {
 };
 extern const Droptable gDroptableModifiers[];
 
-#endif // TMC_DROPTABLES_H
+#endif // DROPTABLES_H

include/effects.h

@@ -112,7 +112,7 @@ typedef enum {
     FX_69,
     FX_6A,
     FX_6B,
-    FX_6C,
+    FX_6C
 } Effect;
 
 #endif // EFFECTS_H

include/enemy.h

@@ -253,4 +253,4 @@ void Enemy66(Entity*);
 
 extern void (*const gUnk_080012C8[])(Entity*);
 
-#endif
+#endif // ENEMY_H

include/entity.h

@@ -526,6 +526,8 @@ extern u8 gManagerCount;
 /** @name Tile Macros */ /// @{
 #define TILE(x, y) (((((x)-gRoomControls.origin_x) >> 4) & 0x3F) | ((((y)-gRoomControls.origin_y) >> 4) & 0x3F) << 6)
 #define TILE_POS(x, y) (x + (y << 6))
+#define TILE_POS_X_COMPONENT 0x3f
+#define TILE_POS_Y_COMPONENT 0xfc0
 #define COORD_TO_TILE(entity) TILE((entity)->x.HALF.HI, (entity)->y.HALF.HI)
 #define COORD_TO_TILE_OFFSET(entity, xOff, yOff) TILE((entity)->x.HALF.HI - (xOff), (entity)->y.HALF.HI - (yOff))
 /// @}

include/fileselect.h

@@ -72,4 +72,4 @@ extern u32 gUsedPalettes;
 extern u8 gTextGfxBuffer[];
 extern u8 gUnk_02022030;
 
-#endif
+#endif // FILESELECT_H

include/flags.h

@@ -1741,4 +1741,4 @@ typedef enum {
     END_12,
 } LocalFlags12;
 
-#endif
+#endif // FLAGS_H

include/functions.h

@@ -1,4 +1,3 @@
-
 #ifndef FUNCTIONS_H
 #define FUNCTIONS_H
 
@@ -112,4 +111,5 @@ extern void sub_080A57F4(void);
 extern void sub_080A71C4(u32, u32, u32, u32);
 extern void sub_080ADD70(void);
 extern void sub_080AF284(void);
-#endif
+
+#endif // FUNCTIONS_H

include/gba/syscall.h

@@ -1,5 +1,5 @@
-#ifndef GUARD_GBA_SYSCALL_H
-#define GUARD_GBA_SYSCALL_H
+#ifndef SYSCALL_H
+#define SYSCALL_H
 
 #include "types.h"
 
@@ -62,4 +62,4 @@ int MultiBoot(struct MultiBootParam* mp);
 
 s32 Div(s32 num, s32 denom);
 
-#endif // GUARD_GBA_SYSCALL_H
+#endif // SYSCALL_H

include/global.h

@@ -1,12 +1,14 @@
-#ifndef GUARD_GLOBAL_H
-#define GUARD_GLOBAL_H
+#ifndef GLOBAL_H
+#define GLOBAL_H
 
 /**
  * @defgroup Tasks Tasks
  * @defgroup Subtasks Subtasks
  */
 
-/** @defgroup Entities Entities */
+/**
+ * @defgroup Entities Entities
+ */
 ///@{
 /**
  * @defgroup Player Player
@@ -16,6 +18,7 @@
  * @defgroup NPCs NPCs
  * @defgroup Items Items
  * @defgroup Managers Managers
+ * @brief Entities with a smaller footprint of 0x40 bytes
  */
 ///@}
 
@@ -122,4 +125,4 @@ union SplitHWord {
 /* forward decls */
 struct Entity_;
 
-#endif // GUARD_GLOBAL_H
+#endif // GLOBAL_H

include/hitbox.h

@@ -137,4 +137,5 @@ extern const Hitbox gUnk_080FD580;
 extern const Hitbox gUnk_080FD588;
 
 extern const Hitbox gPlayerHitbox;
-#endif
+
+#endif // HITBOX_H

include/item.h

@@ -151,4 +151,4 @@ typedef enum {
     ITEM_ENEMY_BEETLE
 } Item;
 
-#endif
+#endif // ITEM_H

include/itemMetaData.h

@@ -1,5 +1,5 @@
-#ifndef TMC_ITEMMETADATA_H
-#define TMC_ITEMMETADATA_H
+#ifndef ITEMMETADATA_H
+#define ITEMMETADATA_H
 
 #include "global.h"
 
@@ -38,4 +38,4 @@ typedef struct ItemMetaData {
 
 extern const ItemMetaData gItemMetaData[];
 
-#endif // TMC_ITEMMETADATA_H
+#endif // ITEMMETADATA_H

include/main.h

@@ -5,6 +5,7 @@
 #include "structures.h"
 #include "room.h"
 #include "script.h"
+#include "screen.h"
 
 /** File signature */
 #define SIGNATURE 'MCZ3'
@@ -86,8 +87,8 @@ typedef struct {
     /*0x00E*/ u8 unk_e;
     /*0x00F*/ u8 unk_f;
     /*0x010*/ void** currentRoomProperties;
-    /*0x014*/ u16* mapBottomBgControlPtr;
-    /*0x018*/ u16* mapTopBgControlPtr;
+    /*0x014*/ BgSettings* mapBottomBgSettings;
+    /*0x018*/ BgSettings* mapTopBgSettings;
     /*0x01C*/ RoomControls roomControls;
     /*0x054*/ GfxSlotList gfxSlotList;
     /*0x268*/ Palette palettes[0x10];
@@ -126,7 +127,7 @@ void DoSoftReset(void);
  */
 void SetSleepMode(void);
 
-extern void sub_0805622C(void* a1, u32 a2, u32 a3);
+extern void sub_0805622C(struct BgAffineDstData* a1, u32 a2, u32 a3);
 extern void sub_08056208(void);
 extern void ResetPalettes(void);
 extern void VBlankIntrWait();
@@ -151,7 +152,9 @@ extern void DemoTask(void);
 #endif
 /// @}
 
-extern u8 gUnk_03003DE4;
+extern u8 gUnk_03003DE4[0xC];
 extern u16 gPaletteBuffer[];
 
-#endif
+extern u32 CheckRegionsOnScreen(const u16* arr);
+
+#endif // MAIN_H

include/manager.h

@@ -12,224 +12,143 @@ union SplitSHWord {
 } PACKED;
 
 typedef struct Manager {
-    /*0x00*/ struct Manager* prev;
-    /*0x00*/ struct Manager* next;
-    /*0x08*/ u8 type;
-    /*0x09*/ u8 subtype;
-    /*0x0a*/ u8 unk_0a;
-    /*0x0b*/ u8 unk_0b;
-    /*0x0c*/ u8 action;
-    /*0x0d*/ u8 unk_0d;
-    /*0x0e*/ u8 unk_0e;
-    /*0x0f*/ u8 unk_0f;
-    /*0x10*/ u8 unk_10;
-    /*0x11*/ u8 unk_11[3];
-    /*0x14*/ struct Manager* parent;
-    /*0x18*/ u8 unk_18[0x8];
-    // union SplitHWord y;
-    // u16 unk_22;
-    // u16 unk_24;
-    // u16 unk_26;
-    // u8 unk_28[0x0D];
-    // u8 unk_35;
-    // u16 unk_36;
-    // union SplitSHWord unk_38;
-    // union SplitSHWord unk_3a;
-    // u16 unk_3c;
-    // u16 unk_3e;
+    /*0x00*/ struct Manager* prev; /**< previous Manager */
+    /*0x00*/ struct Manager* next; /**< next Manager */
+    /*0x08*/ u8 kind;              /**< @see EntityKind */
+    /*0x09*/ u8 id;                /**< Manager id. @see Managers */
+    /*0x0a*/ u8 type;              /**< For use internally to allow different variations. */
+    /*0x0b*/ u8 type2;             /**< For use internally. */
+    /*0x0c*/ u8 action;            /**< Current action. Usually used to index a function table. */
+    /*0x0d*/ u8 subAction;         /**< Optional sub-action. */
+    /*0x0e*/ u8 timer;             /**< General purpose timer. */
+    /*0x0f*/ u8 subtimer;          /**< General purpose timer. */
+    /*0x10*/ u8 flags;             /**< @see EntityFlags */
+    /*0x11*/ u8 unused[3];         /**< Not used by any manager. */
+    /*0x14*/ Entity* parent;       /**< Parent Entity. */
+    /*0x18*/ Entity* child;        /**< Child Entity. */
+    /*0x1c*/ u8 unused2[0x4];      /**< Not used by any manager. */
 } Manager;
 
-typedef struct {
-    u16 posX;
-    u16 posY;
-    u8 width;
-    u8 height;
-    u8 unk_06;
-    union {
-        u8 all;
-        struct {
-            u8 layer : 2;
-            u8 unk1 : 2;
-            u8 unk2 : 1;
-            u8 unk3 : 3;
-        } PACKED b;
-    } PACKED unk_07;
-} Manager6WarpData;
+typedef enum {
+    MANAGER_NONE,
+    LIGHT_RAY_MANAGER,
+    VERTICAL_MINISH_PATH_BACKGROUND_MANAGER,
+    MINISH_PORTAL_MANAGER,
+    DIGGING_CAVE_ENTRANCE_MANAGER,
+    BRIDGE_MANAGER,
+    SPECIAL_WARP_MANAGER,
+    MINISH_VILLAGE_MANAGER,
+    HORIZONTAL_MINISH_PATH_BACKGROUND_MANAGER,
+    MINISH_RAFTERS_BACKGROUND_MANAGER,
+    EZLO_HINT_MANAGER,
+    FIGHT_MANAGER,
+    ROLLING_BARREL_MANAGER,
+    TILE_CHANGE_OBSERVE_MANAGER,
+    ENTITY_SPAWN_MANAGER,
+    MISC_MANAGER,
+    WEATHER_CHANGE_MANAGER,
+    FLAG_AND_OPERATOR_MANAGER,
+    HYRULE_TOWN_TILESET_MANAGER,
+    HOUSE_SIGN_MANAGER,
+    STEAM_OVERLAY_MANAGER,
+    TEMPLE_OF_DROPLETS_MANAGER,
+    DELAYED_ENTITY_LOAD_MANAGER,
+    FALLING_ITEM_MANAGER,
+    CLOUD_OVERLAY_MANAGER,
+    POW_BACKGROUND_MANAGER,
+    HOLE_MANAGER,
+    STATIC_BACKGROUND_MANAGER,
+    RAINFALL_MANAGER,
+    ANIMATED_BACKGROUND_MANAGER,
+    REGION_TRIGGER_MANAGER,
+    RAIL_INTERSECTION_MANAGER,
+    MOVEABLE_OBJECT_MANAGER,
+    MINISH_SIZED_ENTRANCE_MANAGER,
+    LIGHT_MANAGER,
+    LIGHT_LEVEL_SET_MANAGER,
+    BOMBABLE_WALL_MANAGER,
+    FLAME_MANAGER,
+    PUSHABLE_FURNITURE_MANAGER,
+    ARMOS_INTERIOR_MANAGER,
+    ENEMY_INTERACTION_MANAGER,
+    MANAGER_29,
+    DESTRUCTIBLE_TILE_OBSERVE_MANAGER,
+    ANGRY_STATUE_MANAGER,
+    CLOUD_STAIRCASE_TRANSITION_MANAGER,
+    WATERFALL_BOTTOM_MANAGER,
+    SECRET_MANAGER,
+    VAATI3_BACKGROUND_MANAGER,
+    TILE_PUZZLE_MANAGER,
+    GORON_MERCHANT_SHOP_MANAGER,
+    VAATI_APPARATE_MANAGER,
+    HYRULE_TOWN_BELL_MANAGER,
+    VAATI3_INSIDE_ARM_MANAGER,
+    CAMERA_TARGET_MANAGER,
+    REPEATED_SOUND_MANAGER,
+    VAATI3_START_MANAGER,
+    FLOATING_PLATFORM_MANAGER,
+    ENTER_ROOM_TEXTBOX_MANAGER
+} Managers;
 
-typedef struct {
-    Manager manager;
-    Manager6WarpData* warpList;
-} Manager6;
-
-typedef struct {
-    Manager manager;
-    u16 x;
-    u16 y;
-    u16 rx;
-    u16 ry;
-    u8 unk_28[13];
-    u8 msg_height;
-    u16 msg_idx;
-    u8 x_raw;
-    u8 y_raw;
-    u8 rx_raw;
-    u8 ry_raw;
-    u16 flag1;
-    u16 flag2;
-} ManagerA;
-
-typedef struct {
-    Manager manager;
-    u8 unk_20;
-    u8 unk_21[0x14];
-    u8 unk_35;
-    u8 unk_36[0x4];
-    u16 unk_3a;
-    u16 unk_3c;
-    u16 unk_3e;
-} ManagerB;
-
-typedef struct {
-    Manager manager;
-    Entity* enemies[8];
-} ManagerBHelper;
-
-typedef struct {
-    Manager manager;
-    u8 unk_20[0x18];
-    s16 unk_38;
-    s16 unk_3a;
-    u16 unk_3c;
-    u16 unk_3e;
-} ManagerE;
-
-typedef struct {
-    Manager manager;
-    u8 unk_20[0x18];
-    s16 unk_38;
-    s16 unk_3a;
-    u16 unk_3c;
-    u16 unk_3e;
-} ManagerF;
-
-typedef struct {
-    Manager manager;
-    u8 unk_20;
-    u8 unk_21;
-    u8 unk_22;
-    u8 unk_23;
-    u8 filler_0x24[0x1C];
-} Manager10;
-
-typedef struct Manager11 {
-    Manager manager;
-    u8 unk_20[0x1C];
-    u16 unk_3c;
-    u16 unk_3e;
-} Manager11;
-
-typedef struct {
-    u16 unk_00;
-    u8 source_room;
-    u8 unk_03;
-    u8 target_area;
-    u8 target_room;
-    u16 unk_06;
-} DiggingCaveEntrance;
-
-typedef struct {
-    const DiggingCaveEntrance* unk_00;
-    u16 unk_04;
-    u16 unk_06;
-    u8 isDiggingCave;
-    u8 unk_09;
-    u8 unk_0a;
-    u8 unk_0b;
-} struct_03004030;
-extern struct_03004030 gUnk_03004030;
-
-extern const DiggingCaveEntrance* const diggingCaveEntrances[];
-
-typedef struct {
-    Manager manager;
-    u8 field_0x20[0x15];
-    u8 field_0x35;
-    u8 field_0x36;
-    u8 field_0x37;
-    s16 x;
-    u16 y;
-    u16 tile;
-    u16 field_0x3e;
-} Manager24;
-
-typedef struct {
-    u8 unk_00;
-    u8 unk_01;
-    u8 unk_02;
-    u8 unk_03;
-    u16 unk_04;
-    u16 unk_06;
-} UnkManager26HelperStruct;
-
-extern void Manager1_Main();
-extern void Manager2_Main();
-extern void Manager3_Main();
-extern void Manager4_Main();
-extern void Manager5_Main();
-extern void Manager6_Main();
-extern void Manager7_Main();
-extern void Manager8_Main();
-extern void Manager9_Main();
-extern void ManagerA_Main();
-extern void ManagerB_Main();
-extern void ManagerC_Main();
-extern void ManagerD_Main();
-extern void ManagerE_Main();
-extern void sub_08058ECC(ManagerF*);
-extern void Manager10_Main(Manager10*);
-extern void Manager11_Main(Manager11*);
-extern void Manager12_Main();
-extern void Manager13_Main();
-extern void Manager14_Main();
-extern void Manager15_Main();
-extern void Manager16_Main();
-extern void Manager17_Main();
-extern void Manager18_Main();
-extern void Manager19_Main();
-extern void Manager1A_Main();
-extern void Manager1B_Main();
-extern void Manager1C_Main(Manager*);
-extern void Manager1D_Main();
-extern void Manager1E_Main();
-extern void Manager1F_Main();
-extern void Manager20_Main();
-extern void Manager21_Main();
-extern void Manager22_Main();
-extern void Manager23_Main();
-extern void Manager24_Main();
-extern void Manager25_Main();
-extern void Manager26_Main();
-extern void Manager27_Main();
-extern void Manager28_Main();
+extern void LightRayManager_Main();
+extern void VerticalMinishPathBackgroundManager_Main();
+extern void MinishPortalManager_Main();
+extern void DiggingCaveEntranceManager_Main();
+extern void BridgeManager_Main();
+extern void SpecialWarpManager_Main();
+extern void MinishVillageTilesetManager_Main();
+extern void HorizontalMinishPathBackgroundManager_Main();
+extern void MinishRaftersBackgroundManager_Main();
+extern void EzloHintManager_Main();
+extern void FightManager_Main();
+extern void RollingBarrelManager_Main();
+extern void TileChangeObserveManager_Main();
+extern void EntitySpawnManager_Main();
+extern void MiscManager_Main();
+extern void WeatherChangeManager_Main();
+extern void FlagAndOperatorManager_Main();
+extern void HyruleTownTilesetManager_Main();
+extern void HouseSignManager_Main();
+extern void SteamOverlayManager_Main();
+extern void TempleOfDropletsManager_Main();
+extern void DelayedEntityLoadManager_Main();
+extern void FallingItemManager_Main();
+extern void CloudOverlayManager_Main();
+extern void PowBackgroundManager_Main();
+extern void HoleManager_Main();
+extern void StaticBackgroundManager_Main();
+extern void RainfallManager_Main();
+extern void AnimatedBackgroundManager_Main();
+extern void RegionTriggerManager_Main();
+extern void RailIntersectionManager_Main();
+extern void MoveableObjectManager_Main();
+extern void MinishSizedEntranceManager_Main();
+extern void LightManager_Main();
+extern void LightLevelSetManager_Main();
+extern void BombableWallManager_Main();
+extern void FlameManager_Main();
+extern void PushableFurnitureManager_Main();
+extern void ArmosInteriorManager_Main();
+extern void EnemyInteractionManager_Main();
 extern void Manager29_Main();
-extern void Manager2A_Main(Manager*);
-extern void Manager2B_Main();
-extern void Manager2C_Main();
-extern void Manager2D_Main(Entity*);
-extern void Manager2E_Main();
-extern void Manager2F_Main();
-extern void Manager30_Main();
-extern void Manager31_Main();
-extern void Manager32_Main();
-extern void Manager33_Main();
-extern void Manager34_Main();
-extern void Manager35_Main();
-extern void Manager36_Main(Manager*);
-extern void Manager37_Main();
-extern void Manager38_Main(Entity*);
-extern void Manager39_Main();
+extern void DestructibleTileObserveManager_Main();
+extern void AngryStatueManager_Main();
+extern void CloudStaircaseTransitionManager_Main();
+extern void WaterfallBottomManager_Main();
+extern void SecretManager_Main();
+extern void Vaati3BackgroundManager_Main();
+extern void TilePuzzleManager_Main();
+extern void GoronMerchantShopManager_Main();
+extern void VaatiAppearingManager_Main();
+extern void HyruleTownBellManager_Main();
+extern void Vaati3InsideArmManager_Main();
+extern void CameraTargetManager_Main();
+extern void RepeatedSoundManager_Main();
+extern void Vaati3StartManager_Main();
+extern void FloatingPlatformManager_Main();
+extern void EnterRoomTextboxManager_Main();
 
-extern void (*const gManagerFunctions[58])();
+extern void (*const gMiscManagerunctions[58])();
 
 Manager* GetEmptyManager(void);
 
@@ -242,4 +161,4 @@ extern u32 sub_0805ACC0(Entity*);
 extern void sub_0801855C(void);
 extern void sub_080186C0(u32);
 
-#endif
+#endif // MANAGER_H

include/manager/angryStatueManager.h

@@ -0,0 +1,26 @@
+#ifndef ANGRYSTATUEMANAGER_H
+#define ANGRYSTATUEMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+    Entity* field_0x20[4];
+    u8 field_0x30;
+    u8 field_0x31;
+    u8 field_0x32;
+    u8 field_0x33;
+    u8 field_0x34;
+    u8 field_0x35;
+    u8 field_0x36;
+    u8 field_0x37;
+    u8 field_0x38;
+    u8 field_0x39;
+    u8 field_0x3a;
+    u8 field_0x3b;
+    u8 field_0x3c;
+    u8 field_0x3d;
+    u16 field_0x3e;
+} AngryStatueManager;
+
+#endif // ANGRYSTATUEMANAGER_H

include/manager/animatedBackgroundManager.h

@@ -0,0 +1,10 @@
+#ifndef ANIMATEDBACKGROUNDMANAGER_H
+#define ANIMATEDBACKGROUNDMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+} AnimatedBackgroundManager;
+
+#endif // ANIMATEDBACKGROUNDMANAGER_H

include/manager/armosInteriorManager.h

@@ -0,0 +1,10 @@
+#ifndef ARMOSINTERIORMANAGER_H
+#define ARMOSINTERIORMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+} ArmosInteriorManager;
+
+#endif // ARMOSINTERIORMANAGER_H

include/manager/bombableWallManager.h

@@ -0,0 +1,18 @@
+#ifndef BOMBABLEWALLMANAGER_H
+#define BOMBABLEWALLMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+    u8 field_0x20[0x15];
+    u8 field_0x35;
+    u8 field_0x36;
+    u8 field_0x37;
+    s16 x;
+    u16 y;
+    u16 tile;
+    u16 field_0x3e;
+} BombableWallManager;
+
+#endif // BOMBABLEWALLMANAGER_H

include/manager/bridgeManager.h

@@ -0,0 +1,22 @@
+#ifndef BRIDGEMANAGER_H
+#define BRIDGEMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+    u8 unk_20[0x08];
+    u16 unk_28;
+    u16 unk_2a;
+    u16 unk_2c;
+    u16 unk_2e;
+    u16 unk_30;
+    u16 unk_32;
+    u8 unk_34[0x04];
+    s16 x;
+    s16 y;
+    u16 unk_3c;
+    u16 flags;
+} BridgeManager;
+
+#endif // BRIDGEMANAGER_H

include/manager/cameraTargetManager.h

@@ -0,0 +1,18 @@
+#ifndef CAMERATARGETMANAGER_H
+#define CAMERATARGETMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+    u8 field_0x20[0x15];
+    u8 field_0x35;
+    u8 field_0x36;
+    u8 field_0x37;
+    s16 field_0x38;
+    s16 field_0x3a;
+    u16 field_0x3c;
+    u16 field_0x3e;
+} CameraTargetManager;
+
+#endif // CAMERATARGETMANAGER_H

include/manager/cloudOverlayManager.h

@@ -0,0 +1,11 @@
+#ifndef CLOUDOVERLAYMANAGER_H
+#define CLOUDOVERLAYMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+    u16 field_0x20;
+} CloudOverlayManager;
+
+#endif // CLOUDOVERLAYMANAGER_H

include/manager/cloudStaircaseTransitionManager.h

@@ -0,0 +1,17 @@
+#ifndef CLOUDSTAIRCASETRANSITIONMANAGER_H
+#define CLOUDSTAIRCASETRANSITIONMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    struct Manager base;
+    u8 field_0x20[0x16];
+    u8 field_0x36;
+    u8 field_0x37;
+    s16 x;
+    s16 y;
+    u16 field_0x3c;
+    u16 field_0x3e;
+} CloudStaircaseTransitionManager;
+
+#endif // CLOUDSTAIRCASETRANSITIONMANAGER_H

include/manager/delayedEntityLoadManager.h

@@ -0,0 +1,6 @@
+#ifndef DELAYEDENTITYLOADMANAGER_H
+#define DELAYEDENTITYLOADMANAGER_H
+
+#include "manager.h"
+
+#endif // DELAYEDENTITYLOADMANAGER_H

include/manager/destructibleTileObserveManager.h

@@ -0,0 +1,18 @@
+#ifndef DESTRUCTIBLETILEOBSERVEMANAGER_H
+#define DESTRUCTIBLETILEOBSERVEMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+} DestructibleTileObserveManager;
+
+typedef struct {
+    u8 field_0x0;
+    u8 tileLayer;
+    u16 flag;
+    u16 tilePos;
+    u16 tileType;                     // If the tile type at tilePos, tileLayer is tileType, set the local flag.
+} DestructibleTileObserveManager_unk; // TODO result of GetCurrentRoomProperty(3)?
+
+#endif // DESTRUCTIBLETILEOBSERVEMANAGER_H

include/manager/diggingCaveEntranceManager.h

@@ -0,0 +1,32 @@
+#ifndef DIGGINGCAVEENTRANCEMANAGER_H
+#define DIGGINGCAVEENTRANCEMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+} DiggingCaveEntranceManager;
+
+typedef struct {
+    u16 sourceTilePosition; /**< Tile position for the entrance in the source room. */
+    u8 sourceRoom;
+    u8 type; // TODO some sort of type that is used to index gUnk_08109194
+    u8 targetArea;
+    u8 targetRoom;
+    u16 targetTilePosition; /**< Tile position for the entrance in the target room. */
+} DiggingCaveEntrance;
+
+typedef struct {
+    const DiggingCaveEntrance* entrance;
+    u16 offsetX; /**< X offset from the player to the entrance. */
+    u16 offsetY; /**< Y offset from the player to the entrance. */
+    bool8 isDiggingCave;
+    u8 currentArea;  /**< Area the player was in before the transition. */
+    u8 previousArea; /**< Previous value of currentArea. */
+    u8 targetRoom;   /**< targetRoom | 0x80 ? */
+} DiggingCaveEntranceTransition;
+extern DiggingCaveEntranceTransition gDiggingCaveEntranceTransition;
+
+extern const DiggingCaveEntrance* const diggingCaveEntrances[];
+
+#endif // DIGGINGCAVEENTRANCEMANAGER_H

include/manager/enemyInteractionManager.h

@@ -0,0 +1,13 @@
+#ifndef ENEMYINTERACTIONMANAGER_H
+#define ENEMYINTERACTIONMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+    struct {
+        Entity* enemies[8];
+    } d;
+} EnemyInteractionManager;
+
+#endif // ENEMYINTERACTIONMANAGER_H

include/manager/enterRoomTextboxManager.h

@@ -0,0 +1,18 @@
+#ifndef ENTERROOMTEXTBOXMANAGER_H
+#define ENTERROOMTEXTBOXMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+    u8 unk_20;       // unused
+    u8 unk_21[0x13]; // unused
+    u16 unk_34;      // unused
+    u16 unk_36;      // unused
+    s16 unk_38;      // unused
+    s16 unk_3A;      // unused
+    u16 unk_3C;      // unused
+    u16 unk_3E;      // unused
+} EnterRoomTextboxManager;
+
+#endif // ENTERROOMTEXTBOXMANAGER_H

include/manager/entitySpawnManager.h

@@ -0,0 +1,15 @@
+#ifndef ENTITYSPAWNMANAGER_H
+#define ENTITYSPAWNMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+    u8 unk_20[0x18];
+    s16 sound;
+    s16 spawnTimer; /**< Timer until the entity list is loaded. */
+    u16 unk_3c;
+    u16 flag;
+} EntitySpawnManager;
+
+#endif // ENTITYSPAWNMANAGER_H

include/manager/ezloHintManager.h

@@ -0,0 +1,23 @@
+#ifndef EZLOHINTMANAGER_H
+#define EZLOHINTMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+    u16 x;
+    u16 y;
+    u16 rx;
+    u16 ry;
+    u8 unk_28[13];
+    u8 msg_height;
+    u16 msg_idx;
+    u8 x_raw;
+    u8 y_raw;
+    u8 rx_raw;
+    u8 ry_raw;
+    u16 flag1;
+    u16 flag2;
+} EzloHintManager;
+
+#endif // EZLOHINTMANAGER_H

include/manager/fallingItemManager.h

@@ -0,0 +1,18 @@
+#ifndef FALLINGITEMMANAGER_H
+#define FALLINGITEMMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+    u8 field_0x20[0x15];
+    u8 field_0x35;
+    u8 field_0x36;
+    u8 field_0x37;
+    s16 field_0x38;
+    s16 field_0x3a;
+    u16 field_0x3c;
+    u16 field_0x3e;
+} FallingItemManager;
+
+#endif // FALLINGITEMMANAGER_H

include/manager/fightManager.h

@@ -0,0 +1,22 @@
+#ifndef FIGHTMANAGER_H
+#define FIGHTMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+    u8 unk_20;
+    u8 unk_21[0x14];
+    u8 unk_35;
+    u8 unk_36[0x4];
+    u16 unk_3a;
+    u16 fightStartFlag;
+    u16 fightCompletedFlag;
+} FightManager;
+
+typedef struct {
+    Manager base;
+    Entity* enemies[8];
+} FightManagerHelper;
+
+#endif // FIGHTMANAGER_H

include/manager/flagAndOperatorManager.h

@@ -0,0 +1,13 @@
+#ifndef FLAGANDOPERATORMANAGER_H
+#define FLAGANDOPERATORMANAGER_H
+
+#include "manager.h"
+
+typedef struct FlagAndOperatorManager {
+    Manager base;
+    u8 unk_20[0x1C];
+    u16 unk_3c;
+    u16 unk_3e;
+} FlagAndOperatorManager;
+
+#endif // FLAGANDOPERATORMANAGER_H

include/manager/flameManager.h

@@ -0,0 +1,13 @@
+#ifndef FLAMEMANAGER_H
+#define FLAMEMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    struct Manager base;
+    u8 field_0x20[0x18];
+    s16 field_0x38;
+    s16 field_0x3a;
+} FlameManager;
+
+#endif // FLAMEMANAGER_H

include/manager/floatingPlatformManager.h

@@ -0,0 +1,10 @@
+#ifndef FLOATINGPLATFORMMANAGER_H
+#define FLOATINGPLATFORMMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+} FloatingPlatformManager;
+
+#endif // FLOATINGPLATFORMMANAGER_H

include/manager/goronMerchantShopManager.h

@@ -0,0 +1,11 @@
+#ifndef GORONMERCHANTSHOPMANAGER_H
+#define GORONMERCHANTSHOPMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+    u8 itemActive[3];
+} GoronMerchantShopManager;
+
+#endif // GORONMERCHANTSHOPMANAGER_H

include/manager/holeManager.h

@@ -0,0 +1,21 @@
+#ifndef HOLEMANAGER_H
+#define HOLEMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+    s16 unk_20;
+    s16 unk_22;
+    u16 unk_24;
+    u16 unk_26;
+    u8 unk_28[8];
+    u16 unk_30;
+    u16 unk_32;
+    u16 unk_34;
+    u16 unk_36;
+    u8 unk_38[7];
+    u8 unk_3f;
+} HoleManager;
+
+#endif // HOLEMANAGER_H

include/manager/horizontalMinishPathBackgroundManager.h

@@ -0,0 +1,14 @@
+#ifndef HORIZONTALMINISHPATHBACKGROUNDMANAGER_H
+#define HORIZONTALMINISHPATHBACKGROUNDMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+    u8 unk_20;
+    u8 unk_21[0x17];
+    u32 unk_38;
+    u32 unk_3c;
+} HorizontalMinishPathBackgroundManager;
+
+#endif // HORIZONTALMINISHPATHBACKGROUNDMANAGER_H

include/manager/houseSignManager.h

@@ -0,0 +1,11 @@
+#ifndef HOUSESIGNMANAGER_H
+#define HOUSESIGNMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+    u32 bitfield;
+} HouseSignManager;
+
+#endif // HOUSESIGNMANAGER_H

include/manager/hyruleTownBellManager.h

@@ -0,0 +1,10 @@
+#ifndef HYRULETOWNBELLMANAGER_H
+#define HYRULETOWNBELLMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+} HyruleTownBellManager;
+
+#endif // HYRULETOWNBELLMANAGER_H

include/manager/hyruleTownTilesetManager.h

@@ -0,0 +1,13 @@
+#ifndef HYRULETOWNTILESETMANAGER_H
+#define HYRULETOWNTILESETMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+    u8 field_0x20;
+    u8 field_0x21;
+    u8 field_0x22;
+} HyruleTownTilesetManager;
+
+#endif // HYRULETOWNTILESETMANAGER_H

include/manager/lightLevelSetManager.h

@@ -0,0 +1,19 @@
+#ifndef LIGHTLEVELSETMANAGER_H
+#define LIGHTLEVELSETMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+    u16 field_0x20;
+    u16 field_0x22;
+    u8 field_0x24[0x12];
+    u8 field_0x36;
+    u8 field_0x37;
+    u16 field_0x38;
+    u16 field_0x3a;
+    u16 field_0x3c;
+    u16 field_0x3e;
+} LightLevelSetManager;
+
+#endif // LIGHTLEVELSETMANAGER_H

include/manager/lightManager.h

@@ -0,0 +1,11 @@
+#ifndef LIGHTMANAGER_H
+#define LIGHTMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+    s32 unk20;
+} LightManager;
+
+#endif // LIGHTMANAGER_H

include/manager/lightRayManager.h

@@ -0,0 +1,17 @@
+#ifndef LIGHTRAYMANAGER_H
+#define LIGHTRAYMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+    u8 unk_20;
+    u8 unk_21;
+    u8 unk_22;
+    u8 unk_23;
+    u8 unk_24;
+    u8 unk_25[15];
+    void* unk_34;
+} LightRayManager;
+
+#endif // LIGHTRAYMANAGER_H

include/manager/manager29.h

@@ -0,0 +1,22 @@
+#ifndef MANAGER29_H
+#define MANAGER29_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+    u8 unk_20[0x8];
+    u16* unk_28;
+    u16* unk_2c;
+    u8 filler[0x4];
+    u8 unk_34;
+    u8 unk_35;
+    u8 unk_36;
+    u8 unk_37;
+    s16 unk_38;
+    u16 unk_3a;
+    u16 unk_3c;
+    u16 unk_3e;
+} Manager29;
+
+#endif // MANAGER29_H

include/manager/minishPortalManager.h

@@ -0,0 +1,20 @@
+#ifndef MINISHPORTALMANAGER_H
+#define MINISHPORTALMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+    u32 unk_20;
+    u32 unk_24;
+    u8 unk_28[0xC];
+    u8 unk_34;
+    u8 unk_35;
+    u16 unk_36;
+    u16 unk_38;
+    u16 unk_3a;
+    u16 unk_3c;
+    u16 unk_3e;
+} MinishPortalManager;
+
+#endif // MINISHPORTALMANAGER_H

include/manager/minishRaftersBackgroundManager.h

@@ -0,0 +1,12 @@
+#ifndef MINISHRAFTERSBACKGROUNDMANAGER_H
+#define MINISHRAFTERSBACKGROUNDMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+    u8 unk_00[0x1C];
+    u32 unk_3c;
+} MinishRaftersBackgroundManager;
+
+#endif // MINISHRAFTERSBACKGROUNDMANAGER_H

include/manager/minishSizedEntranceManager.h

@@ -0,0 +1,11 @@
+#ifndef MINISHSIZEDENTRANCEMANAGER_H
+#define MINISHSIZEDENTRANCEMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+    u32 field_0x20;
+} MinishSizedEntranceManager;
+
+#endif // MINISHSIZEDENTRANCEMANAGER_H

include/manager/minishVillageTilesetManager.h

@@ -0,0 +1,12 @@
+#ifndef MINISHVILLAGETILESETMANAGER_H
+#define MINISHVILLAGETILESETMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+    u8 unk_20;
+    u8 unk_21[0x1F];
+} MinishVillageTilesetManager;
+
+#endif // MINISHVILLAGETILESETMANAGER_H

include/manager/miscManager.h

@@ -0,0 +1,15 @@
+#ifndef MISCMANAGER_H
+#define MISCMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+    u8 unk_20[0x18];
+    s16 unk_38;
+    s16 unk_3a;
+    u16 unk_3c;
+    u16 unk_3e;
+} MiscManager;
+
+#endif // MISCMANAGER_H

include/manager/moveableObjectManager.h

@@ -0,0 +1,19 @@
+#ifndef MOVEABLEOBJECTMANAGER_H
+#define MOVEABLEOBJECTMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+    u8 unk_20[0x12];
+    u16 unk_32;
+    u8 unk_34[2];
+    u8 unk_36;
+    u8 unk_37;
+    u16 unk_38;
+    u16 unk_3a;
+    u16 unk_3c;
+    u16 flags;
+} MoveableObjectManager;
+
+#endif // MOVEABLEOBJECTMANAGER_H

include/manager/powBackgroundManager.h

@@ -0,0 +1,10 @@
+#ifndef POWBACKGROUNDMANAGER_H
+#define POWBACKGROUNDMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+} PowBackgroundManager;
+
+#endif // POWBACKGROUNDMANAGER_H

include/manager/pushableFurnitureManager.h

@@ -0,0 +1,23 @@
+#ifndef PUSHABLEFURNITUREMANAGER_H
+#define PUSHABLEFURNITUREMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+    u8 unk_20[0x8];
+    u8 unk_28;
+    u8 unk_29;
+    u16 unk_2a;
+} PushableFurnitureManager;
+
+typedef struct {
+    u8 unk_00;
+    u8 unk_01;
+    u8 unk_02;
+    u8 unk_03;
+    u16 unk_04;
+    u16 unk_06;
+} UnkPushableFurnitureManagerHelperStruct;
+
+#endif // PUSHABLEFURNITUREMANAGER_H

include/manager/railIntersectionManager.h

@@ -0,0 +1,18 @@
+#ifndef RAILINTERSECTIONMANAGER_H
+#define RAILINTERSECTIONMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+    u8 field_0x20[0x16];
+    u8 field_0x36;
+    u8 field_0x37;
+    s16 field_0x38;
+    u16 field_0x3a;
+    u8 field_0x3c;
+    u8 field_0x3d;
+    u16 flags;
+} RailIntersectionManager;
+
+#endif // RAILINTERSECTIONMANAGER_H

include/manager/rainfallManager.h

@@ -0,0 +1,10 @@
+#ifndef RAINFALLMANAGER_H
+#define RAINFALLMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+} RainfallManager;
+
+#endif // RAINFALLMANAGER_H

include/manager/regionTriggerManager.h

@@ -0,0 +1,17 @@
+#ifndef REGIONTRIGGERMANAGER_H
+#define REGIONTRIGGERMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+    u8 unk_20[0x14]; // unused
+    u16 radiusX;
+    u16 radiusY;
+    s16 posX;
+    s16 posY;
+    u8 unk_3c[2]; // unused
+    u16 playerInRegionFlag;
+} RegionTriggerManager;
+
+#endif // REGIONTRIGGERMANAGER_H

include/manager/repeatedSoundManager.h

@@ -0,0 +1,10 @@
+#ifndef REPEATEDSOUNDMANAGER_H
+#define REPEATEDSOUNDMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+} RepeatedSoundManager;
+
+#endif // REPEATEDSOUNDMANAGER_H

include/manager/rollingBarrelManager.h

@@ -0,0 +1,22 @@
+#ifndef ROLLINGBARRELMANAGER_H
+#define ROLLINGBARRELMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+    s32 unk_20;
+    union SplitWord unk_24;
+    u32 unk_28;
+    u32 unk_2c;
+    u8 unk_30[0x10];
+} RollingBarrelManager;
+
+typedef struct {
+    u16 unk_0;
+    u16 unk_2;
+    u16 unk_4;
+    u16 unk_6;
+} struct_08108228;
+
+#endif // ROLLINGBARRELMANAGER_H

include/manager/secretManager.h

@@ -0,0 +1,16 @@
+#ifndef SECRETMANAGER_H
+#define SECRETMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+    u8 field_0x20[0x18];
+    s16 field_0x38;
+    u8 field_0x3a;
+    u8 field_0x3b;
+    u16 field_0x3c;
+    u16 field_0x3e;
+} SecretManager;
+
+#endif // SECRETMANAGER_H

include/manager/specialWarpManager.h

@@ -0,0 +1,28 @@
+#ifndef SPECIALWARPMANAGER_H
+#define SPECIALWARPMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    u16 posX;
+    u16 posY;
+    u8 width;
+    u8 height;
+    u8 roomProperty;
+    union {
+        u8 all;
+        struct {
+            u8 layer : 2;
+            u8 unk1 : 2;
+            u8 unk2 : 1;
+            u8 unk3 : 3;
+        } PACKED b;
+    } PACKED unk_07;
+} SpecialWarpManagerWarpData;
+
+typedef struct {
+    Manager base;
+    SpecialWarpManagerWarpData* warpList;
+} SpecialWarpManager;
+
+#endif // SPECIALWARPMANAGER_H

include/manager/staticBackgroundManager.h

@@ -0,0 +1,11 @@
+#ifndef STATICBACKGROUNDMANAGER_H
+#define STATICBACKGROUNDMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+    u32 field_0x20;
+} StaticBackgroundManager;
+
+#endif // STATICBACKGROUNDMANAGER_H

include/manager/steamOverlayManager.h

@@ -0,0 +1,15 @@
+#ifndef STEAMOVERLAYMANAGER_H
+#define STEAMOVERLAYMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+    u16 unk_20;
+    u8 unk_22;
+    u8 unk_23[1];
+    u8 unk_24;
+    u8 unk_25[0x1b];
+} SteamOverlayManager;
+
+#endif // STEAMOVERLAYMANAGER_H

include/manager/templeOfDropletsManager.h

@@ -0,0 +1,25 @@
+#ifndef TEMPLEOFDROPLETSMANAGER_H
+#define TEMPLEOFDROPLETSMANAGER_H
+
+#include "manager.h"
+
+typedef struct {
+    Manager base;
+    u8 unk_20;
+    u8 unk_21;
+    u8 unk_22;
+    u8 unk_23; // used
+    u16 unk_24;
+    u16 unk_26;
+    void* unk_28;
+    u16 unk_2c;
+    u8 unk_2e[0x6];
+    s16 unk_34;
+    s16 unk_36;
+    s16 unk_38;
+    s16 unk_3a;
+    u16 unk_3c;
+    u16 unk_3e; // used
+} TempleOfDropletsManager;
+
+#endif // TEMPLEOFDROPLETSMANAGER_H