merge entity.c

asm/code_08000108.s

@@ -82,7 +82,7 @@ _08000144EU:
 	thumb_func_start sub_08000108
 sub_08000108: @ 0x08000108
 	push {r4, lr}
-	ldr r0, _080001E8 @ =gUnk_02000070
+	ldr r0, _080001E8 @ =gUpdateVisibleTiles
 	ldrb r1, [r0]
 	lsls r1, r1, #2
 	beq _08000136
@@ -195,7 +195,7 @@ sub_080001DA: @ 0x080001DA
 	ldrh r0, [r1, r0]
 	bx lr
 	.align 2, 0
-_080001E8: .4byte gUnk_02000070
+_080001E8: .4byte gUpdateVisibleTiles
 _080001EC: .4byte gUnk_02025EB0
 _080001F0: .4byte gUnk_02019EE0
 _080001F4: .4byte gUnk_02021F70

asm/code_0801967C.s

@@ -47,7 +47,7 @@ sub_08019698: @ 0x08019698
 	ldrh r2, [r5, #0xc]
 	adds r0, r0, r2
 	strh r0, [r5, #0xc]
-	ldr r1, _08019730 @ =gUnk_02000070
+	ldr r1, _08019730 @ =gUpdateVisibleTiles
 	movs r0, #1
 	strb r0, [r1]
 	bl sub_08000108
@@ -89,7 +89,7 @@ _08019700:
 _08019724: .4byte gUnk_02032EC0
 _08019728: .4byte gUnk_080B4410
 _0801972C: .4byte gRoomControls
-_08019730: .4byte gUnk_02000070
+_08019730: .4byte gUpdateVisibleTiles
 _08019734: .4byte gScreen
 _08019738: .4byte 0x0000FEFF
 _0801973C: .4byte gUnk_02018EB0
@@ -118,7 +118,7 @@ _08019760: .4byte gUnk_02018EB0
 sub_08019764: @ 0x08019764
 	push {lr}
 	bl FlushSprites
-	bl sub_0805E5C0
+	bl UpdateEntities
 	bl sub_080AD9B0
 	bl sub_080AD918
 	ldr r2, _08019798 @ =gUnk_02018EB0

asm/code_0804AA84.s

@@ -81,7 +81,7 @@ _0804AC18: .4byte gUnk_080D4110
 	thumb_func_start sub_0804AC1C
 sub_0804AC1C: @ 0x0804AC1C
 	push {r4, lr}
-	bl sub_0805E5C0
+	bl UpdateEntities
 	ldr r0, _0804AC98 @ =gUnk_02018EB0
 	ldr r2, [r0, #0x14]
 	cmp r2, #0

asm/code_080526F8.s

@@ -1992,7 +1992,7 @@ sub_080535AC: @ 0x080535AC
 	strh r0, [r2, #8]
 	ldr r0, _080535E0 @ =gUnk_02032EC0
 	strb r1, [r0, #6]
-	ldr r0, _080535E4 @ =gUnk_02000070
+	ldr r0, _080535E4 @ =gUpdateVisibleTiles
 	strb r1, [r0]
 	ldr r2, _080535E8 @ =gScreen
 	ldrh r1, [r2]
@@ -2008,7 +2008,7 @@ sub_080535AC: @ 0x080535AC
 	.align 2, 0
 _080535DC: .4byte gMenu
 _080535E0: .4byte gUnk_02032EC0
-_080535E4: .4byte gUnk_02000070
+_080535E4: .4byte gUpdateVisibleTiles
 _080535E8: .4byte gScreen
 _080535EC: .4byte 0x0000FEFF
 _080535F0: .4byte gUnk_080FCB94
@@ -2177,7 +2177,7 @@ sub_0805370C: @ 0x0805370C
 	ldrb r0, [r1, #6]
 	adds r0, #1
 	strb r0, [r1, #6]
-	ldr r1, _08053734 @ =gUnk_02000070
+	ldr r1, _08053734 @ =gUpdateVisibleTiles
 	movs r0, #1
 	strb r0, [r1]
 	bl sub_08051FF0
@@ -2189,7 +2189,7 @@ sub_0805370C: @ 0x0805370C
 	pop {pc}
 	.align 2, 0
 _08053730: .4byte gMenu
-_08053734: .4byte gUnk_02000070
+_08053734: .4byte gUpdateVisibleTiles
 _08053738: .4byte gUnk_080FCC54
 
 	thumb_func_start sub_0805373C
@@ -2642,7 +2642,7 @@ sub_08053ACC: @ 0x08053ACC
 	ldrb r0, [r1, #6]
 	adds r0, #1
 	strb r0, [r1, #6]
-	ldr r1, _08053AF8 @ =gUnk_02000070
+	ldr r1, _08053AF8 @ =gUpdateVisibleTiles
 	movs r0, #1
 	strb r0, [r1]
 	bl sub_08051FF0
@@ -2655,7 +2655,7 @@ sub_08053ACC: @ 0x08053ACC
 	pop {pc}
 	.align 2, 0
 _08053AF4: .4byte gMenu
-_08053AF8: .4byte gUnk_02000070
+_08053AF8: .4byte gUpdateVisibleTiles
 _08053AFC: .4byte gUnk_080FCD84
 
 	thumb_func_start sub_08053B00
@@ -2727,7 +2727,7 @@ sub_08053B74: @ 0x08053B74
 	ldrb r0, [r1, #6]
 	adds r0, #1
 	strb r0, [r1, #6]
-	ldr r1, _08053BA4 @ =gUnk_02000070
+	ldr r1, _08053BA4 @ =gUpdateVisibleTiles
 	movs r0, #1
 	strb r0, [r1]
 	ldr r0, _08053BA8 @ =gUnk_080FCDE0
@@ -2741,7 +2741,7 @@ sub_08053B74: @ 0x08053B74
 	pop {pc}
 	.align 2, 0
 _08053BA0: .4byte gMenu
-_08053BA4: .4byte gUnk_02000070
+_08053BA4: .4byte gUpdateVisibleTiles
 _08053BA8: .4byte gUnk_080FCDE0
 
 	thumb_func_start sub_08053BAC
@@ -2814,7 +2814,7 @@ sub_08053C20: @ 0x08053C20
 	strb r2, [r1, #6]
 	movs r0, #0x78
 	strh r0, [r1, #8]
-	ldr r0, _08053C54 @ =gUnk_02000070
+	ldr r0, _08053C54 @ =gUpdateVisibleTiles
 	strb r2, [r0]
 	bl sub_08051FF0
 	movs r0, #4
@@ -2829,7 +2829,7 @@ sub_08053C20: @ 0x08053C20
 	pop {pc}
 	.align 2, 0
 _08053C50: .4byte gMenu
-_08053C54: .4byte gUnk_02000070
+_08053C54: .4byte gUpdateVisibleTiles
 _08053C58: .4byte gUnk_080FCEBC
 
 	thumb_func_start nullsub_483
@@ -2922,7 +2922,7 @@ sub_08053CC8: @ 0x08053CC8
 	ldr r0, _08053D2C @ =0x0000FEFF
 	ands r0, r1
 	strh r0, [r2]
-	ldr r0, _08053D30 @ =gUnk_02000070
+	ldr r0, _08053D30 @ =gUpdateVisibleTiles
 	strb r5, [r0]
 	movs r0, #4
 	movs r1, #0x10
@@ -2938,7 +2938,7 @@ _08053D20: .4byte gMenu
 _08053D24: .4byte gUnk_080FCF04
 _08053D28: .4byte gScreen
 _08053D2C: .4byte 0x0000FEFF
-_08053D30: .4byte gUnk_02000070
+_08053D30: .4byte gUpdateVisibleTiles
 
 	thumb_func_start sub_08053D34
 sub_08053D34: @ 0x08053D34
@@ -3020,7 +3020,7 @@ sub_08053DB4: @ 0x08053DB4
 	ldrb r1, [r4, #5]
 	bl sub_08052FF4
 	bl sub_0807C740
-	ldr r1, _08053E28 @ =gUnk_02000070
+	ldr r1, _08053E28 @ =gUpdateVisibleTiles
 	movs r0, #1
 	strb r0, [r1]
 	ldr r1, _08053E2C @ =gRoomControls
@@ -3058,7 +3058,7 @@ _08053E1C:
 	.align 2, 0
 _08053E20: .4byte gFadeControl
 _08053E24: .4byte gMenu
-_08053E28: .4byte gUnk_02000070
+_08053E28: .4byte gUpdateVisibleTiles
 _08053E2C: .4byte gRoomControls
 
 	thumb_func_start sub_08053E30
@@ -3119,7 +3119,7 @@ sub_08053E74: @ 0x08053E74
 	ldr r0, _08053EBC @ =0x0000FEFF
 	ands r0, r1
 	strh r0, [r2]
-	ldr r1, _08053EC0 @ =gUnk_02000070
+	ldr r1, _08053EC0 @ =gUpdateVisibleTiles
 	movs r0, #1
 	strb r0, [r1]
 	movs r0, #1
@@ -3133,7 +3133,7 @@ _08053EB0: .4byte gUnk_080FCFB8
 _08053EB4: .4byte gMenu
 _08053EB8: .4byte gScreen
 _08053EBC: .4byte 0x0000FEFF
-_08053EC0: .4byte gUnk_02000070
+_08053EC0: .4byte gUpdateVisibleTiles
 
 	thumb_func_start sub_08053EC4
 sub_08053EC4: @ 0x08053EC4
@@ -3198,7 +3198,7 @@ sub_08053F20: @ 0x08053F20
 	ldrb r1, [r4, #9]
 	bl sub_08052FF4
 	bl sub_0807C740
-	ldr r1, _08053F80 @ =gUnk_02000070
+	ldr r1, _08053F80 @ =gUpdateVisibleTiles
 	movs r0, #1
 	strb r0, [r1]
 	ldr r1, _08053F84 @ =gRoomControls
@@ -3228,7 +3228,7 @@ _08053F74:
 	.align 2, 0
 _08053F78: .4byte gFadeControl
 _08053F7C: .4byte gMenu
-_08053F80: .4byte gUnk_02000070
+_08053F80: .4byte gUpdateVisibleTiles
 _08053F84: .4byte gRoomControls
 
 	thumb_func_start sub_08053F88

asm/code_0805436C.s

@@ -58,7 +58,7 @@ sub_080548E8: @ 0x080548E8
 	ldr r0, [r0]
 	bl _call_via_r0
 	bl FlushSprites
-	bl sub_0805E5C0
+	bl UpdateEntities
 	bl sub_080AD9B0
 	bl sub_080AD918
 	bl UpdateScroll
@@ -149,7 +149,7 @@ _080549BC:
 	ldrb r1, [r6, #3]
 	bl sub_08052FF4
 	bl sub_0807C740
-	ldr r1, _08054A00 @ =gUnk_02000070
+	ldr r1, _08054A00 @ =gUpdateVisibleTiles
 	movs r0, #1
 	strb r0, [r1]
 _080549CE:
@@ -177,7 +177,7 @@ _080549F4:
 	bl sub_08018710
 	pop {r4, r5, r6, pc}
 	.align 2, 0
-_08054A00: .4byte gUnk_02000070
+_08054A00: .4byte gUpdateVisibleTiles
 _08054A04: .4byte gScreen
 _08054A08: .4byte 0x00001FFF
 _08054A0C: .4byte gRoomControls

asm/code_08054C04.s

@@ -36,7 +36,7 @@ sub_08054C20: @ 0x08054C20
 	ldrb r0, [r4, #6]
 	adds r0, #1
 	strb r0, [r4, #6]
-	ldr r1, _08054C54 @ =gUnk_02000070
+	ldr r1, _08054C54 @ =gUpdateVisibleTiles
 	movs r0, #1
 	strb r0, [r1]
 	movs r0, #4
@@ -45,7 +45,7 @@ sub_08054C20: @ 0x08054C20
 	pop {r4, pc}
 	.align 2, 0
 _08054C50: .4byte gMenu
-_08054C54: .4byte gUnk_02000070
+_08054C54: .4byte gUpdateVisibleTiles
 
 	thumb_func_start sub_08054C58
 sub_08054C58: @ 0x08054C58
@@ -152,7 +152,7 @@ sub_08054D04: @ 0x08054D04
 	ldrb r0, [r4, #6]
 	adds r0, #1
 	strb r0, [r4, #6]
-	ldr r1, _08054D38 @ =gUnk_02000070
+	ldr r1, _08054D38 @ =gUpdateVisibleTiles
 	movs r0, #1
 	strb r0, [r1]
 	movs r0, #4
@@ -161,7 +161,7 @@ sub_08054D04: @ 0x08054D04
 	pop {r4, pc}
 	.align 2, 0
 _08054D34: .4byte gMenu
-_08054D38: .4byte gUnk_02000070
+_08054D38: .4byte gUpdateVisibleTiles
 
 	thumb_func_start sub_08054D3C
 sub_08054D3C: @ 0x08054D3C
@@ -246,7 +246,7 @@ sub_08054DAC: @ 0x08054DAC
 	ldrb r0, [r4, #6]
 	adds r0, #1
 	strb r0, [r4, #6]
-	ldr r1, _08054DF8 @ =gUnk_02000070
+	ldr r1, _08054DF8 @ =gUpdateVisibleTiles
 	movs r0, #1
 	strb r0, [r1]
 	movs r0, #4
@@ -256,7 +256,7 @@ sub_08054DAC: @ 0x08054DAC
 	.align 2, 0
 _08054DF0: .4byte gMenu
 _08054DF4: .4byte gUnk_080FEED4
-_08054DF8: .4byte gUnk_02000070
+_08054DF8: .4byte gUpdateVisibleTiles
 
 	thumb_func_start nullsub_484
 nullsub_484: @ 0x08054DFC
@@ -297,7 +297,7 @@ sub_08054E1C: @ 0x08054E1C
 	ldrb r0, [r5, #6]
 	adds r0, #1
 	strb r0, [r5, #6]
-	ldr r1, _08054E58 @ =gUnk_02000070
+	ldr r1, _08054E58 @ =gUpdateVisibleTiles
 	movs r0, #1
 	strb r0, [r1]
 	movs r0, #4
@@ -306,7 +306,7 @@ sub_08054E1C: @ 0x08054E1C
 	pop {r4, r5, pc}
 	.align 2, 0
 _08054E54: .4byte gMenu
-_08054E58: .4byte gUnk_02000070
+_08054E58: .4byte gUpdateVisibleTiles
 
 	thumb_func_start sub_08054E5C
 sub_08054E5C: @ 0x08054E5C
@@ -521,7 +521,7 @@ _08054FCA:
 	adds r0, #1
 	movs r4, #0
 	strb r0, [r6, #6]
-	ldr r1, _08055010 @ =gUnk_02000070
+	ldr r1, _08055010 @ =gUpdateVisibleTiles
 	movs r0, #1
 	strb r0, [r1]
 	movs r0, #4
@@ -544,7 +544,7 @@ _08055004:
 	.align 2, 0
 _08055008: .4byte gMenu
 _0805500C: .4byte gUnk_080FF108
-_08055010: .4byte gUnk_02000070
+_08055010: .4byte gUpdateVisibleTiles
 
 	thumb_func_start sub_08055014
 sub_08055014: @ 0x08055014
@@ -594,7 +594,7 @@ sub_08055054: @ 0x08055054
 	ldrb r0, [r4, #6]
 	adds r0, #1
 	strb r0, [r4, #6]
-	ldr r1, _08055088 @ =gUnk_02000070
+	ldr r1, _08055088 @ =gUpdateVisibleTiles
 	movs r0, #1
 	strb r0, [r1]
 	movs r0, #4
@@ -604,7 +604,7 @@ sub_08055054: @ 0x08055054
 	.align 2, 0
 _08055080: .4byte gUnk_080FF128
 _08055084: .4byte gMenu
-_08055088: .4byte gUnk_02000070
+_08055088: .4byte gUpdateVisibleTiles
 
 	thumb_func_start sub_0805508C
 sub_0805508C: @ 0x0805508C
@@ -649,7 +649,7 @@ sub_080550B0: @ 0x080550B0
 	ldrb r0, [r4, #6]
 	adds r0, #1
 	strb r0, [r4, #6]
-	ldr r1, _080550F0 @ =gUnk_02000070
+	ldr r1, _080550F0 @ =gUpdateVisibleTiles
 	movs r0, #1
 	strb r0, [r1]
 	movs r0, #4
@@ -659,7 +659,7 @@ sub_080550B0: @ 0x080550B0
 	.align 2, 0
 _080550E8: .4byte gMenu
 _080550EC: .4byte gUnk_080FF154
-_080550F0: .4byte gUnk_02000070
+_080550F0: .4byte gUpdateVisibleTiles
 
 	thumb_func_start nullsub_487
 nullsub_487: @ 0x080550F4
@@ -702,7 +702,7 @@ _0805512A:
 	ldrb r0, [r4, #6]
 	adds r0, #1
 	strb r0, [r4, #6]
-	ldr r1, _08055160 @ =gUnk_02000070
+	ldr r1, _08055160 @ =gUpdateVisibleTiles
 	movs r0, #1
 	strb r0, [r1]
 	movs r0, #4
@@ -714,7 +714,7 @@ _08055150: .4byte gUnk_080FF17C
 _08055154: .4byte gSave
 _08055158: .4byte 0x00000DB4
 _0805515C: .4byte gMenu
-_08055160: .4byte gUnk_02000070
+_08055160: .4byte gUpdateVisibleTiles
 
 	thumb_func_start nullsub_488
 nullsub_488: @ 0x08055164
@@ -793,7 +793,7 @@ sub_08055184: @ 0x08055184
 	strh r0, [r5, #8]
 	mov r0, r8
 	strh r0, [r5, #0xa]
-	ldr r1, _08055220 @ =gUnk_02000070
+	ldr r1, _08055220 @ =gUpdateVisibleTiles
 	movs r0, #1
 	strb r0, [r1]
 	movs r0, #4
@@ -808,7 +808,7 @@ _08055210: .4byte gUnk_080FF1D4
 _08055214: .4byte gScreen
 _08055218: .4byte 0x00001E05
 _0805521C: .4byte 0x00003648
-_08055220: .4byte gUnk_02000070
+_08055220: .4byte gUpdateVisibleTiles
 
 	thumb_func_start sub_08055224
 sub_08055224: @ 0x08055224
@@ -954,7 +954,7 @@ sub_08055318: @ 0x08055318
 	ldrb r0, [r4, #6]
 	adds r0, #1
 	strb r0, [r4, #6]
-	ldr r1, _0805534C @ =gUnk_02000070
+	ldr r1, _0805534C @ =gUpdateVisibleTiles
 	movs r0, #1
 	strb r0, [r1]
 	movs r0, #4
@@ -963,7 +963,7 @@ sub_08055318: @ 0x08055318
 	pop {r4, pc}
 	.align 2, 0
 _08055348: .4byte gMenu
-_0805534C: .4byte gUnk_02000070
+_0805534C: .4byte gUpdateVisibleTiles
 
 	thumb_func_start sub_08055350
 sub_08055350: @ 0x08055350
@@ -1097,7 +1097,7 @@ sub_08055430: @ 0x08055430
 	ldrb r0, [r4, #6]
 	adds r0, #1
 	strb r0, [r4, #6]
-	ldr r1, _08055464 @ =gUnk_02000070
+	ldr r1, _08055464 @ =gUpdateVisibleTiles
 	movs r0, #1
 	strb r0, [r1]
 	movs r0, #4
@@ -1106,7 +1106,7 @@ sub_08055430: @ 0x08055430
 	pop {r4, pc}
 	.align 2, 0
 _08055460: .4byte gMenu
-_08055464: .4byte gUnk_02000070
+_08055464: .4byte gUpdateVisibleTiles
 
 	thumb_func_start sub_08055468
 sub_08055468: @ 0x08055468
@@ -1211,7 +1211,7 @@ sub_08055518: @ 0x08055518
 	ldrb r0, [r4, #6]
 	adds r0, #1
 	strb r0, [r4, #6]
-	ldr r1, _08055544 @ =gUnk_02000070
+	ldr r1, _08055544 @ =gUpdateVisibleTiles
 	movs r0, #1
 	strb r0, [r1]
 	movs r0, #4
@@ -1220,7 +1220,7 @@ sub_08055518: @ 0x08055518
 	pop {r4, pc}
 	.align 2, 0
 _08055540: .4byte gMenu
-_08055544: .4byte gUnk_02000070
+_08055544: .4byte gUpdateVisibleTiles
 
 	thumb_func_start sub_08055548
 sub_08055548: @ 0x08055548
@@ -1308,7 +1308,7 @@ sub_080555B8: @ 0x080555B8
 	ldrb r0, [r5, #6]
 	adds r0, #1
 	strb r0, [r5, #6]
-	ldr r1, _08055608 @ =gUnk_02000070
+	ldr r1, _08055608 @ =gUpdateVisibleTiles
 	movs r0, #1
 	strb r0, [r1]
 	movs r0, #4
@@ -1318,7 +1318,7 @@ sub_080555B8: @ 0x080555B8
 	.align 2, 0
 _08055600: .4byte gMenu
 _08055604: .4byte gUnk_0811E454
-_08055608: .4byte gUnk_02000070
+_08055608: .4byte gUpdateVisibleTiles
 
 	thumb_func_start sub_0805560C
 sub_0805560C: @ 0x0805560C
@@ -1414,7 +1414,7 @@ sub_080556AC: @ 0x080556AC
 	ldrb r0, [r4, #6]
 	adds r0, #1
 	strb r0, [r4, #6]
-	ldr r1, _080556E8 @ =gUnk_02000070
+	ldr r1, _080556E8 @ =gUpdateVisibleTiles
 	movs r0, #1
 	strb r0, [r1]
 	ldr r1, [r4, #0xc]
@@ -1434,7 +1434,7 @@ sub_080556AC: @ 0x080556AC
 	pop {r4, pc}
 	.align 2, 0
 _080556E4: .4byte gMenu
-_080556E8: .4byte gUnk_02000070
+_080556E8: .4byte gUpdateVisibleTiles
 _080556EC: .4byte gUnk_080FF264
 
 	thumb_func_start nullsub_489
@@ -1486,7 +1486,7 @@ _08055734:
 	ldrb r0, [r4, #6]
 	adds r0, #1
 	strb r0, [r4, #6]
-	ldr r1, _08055768 @ =gUnk_02000070
+	ldr r1, _08055768 @ =gUpdateVisibleTiles
 	movs r0, #1
 	strb r0, [r1]
 	movs r0, #4
@@ -1497,7 +1497,7 @@ _08055734:
 _0805575C: .4byte gMenu
 _08055760: .4byte gUnk_080FEE48
 _08055764: .4byte 0x000080FF
-_08055768: .4byte gUnk_02000070
+_08055768: .4byte gUpdateVisibleTiles
 
 	thumb_func_start sub_0805576C
 sub_0805576C: @ 0x0805576C
@@ -1562,7 +1562,7 @@ sub_080557D0: @ 0x080557D0
 	ldrb r0, [r4, #6]
 	adds r0, #1
 	strb r0, [r4, #6]
-	ldr r1, _0805580C @ =gUnk_02000070
+	ldr r1, _0805580C @ =gUpdateVisibleTiles
 	movs r0, #1
 	strb r0, [r1]
 	ldr r1, [r4, #0xc]
@@ -1582,7 +1582,7 @@ sub_080557D0: @ 0x080557D0
 	pop {r4, pc}
 	.align 2, 0
 _08055808: .4byte gMenu
-_0805580C: .4byte gUnk_02000070
+_0805580C: .4byte gUpdateVisibleTiles
 _08055810: .4byte gUnk_080FF298
 
 	thumb_func_start nullsub_490
@@ -1626,7 +1626,7 @@ _0805584A:
 	ldrb r0, [r4, #6]
 	adds r0, #1
 	strb r0, [r4, #6]
-	ldr r1, _08055880 @ =gUnk_02000070
+	ldr r1, _08055880 @ =gUpdateVisibleTiles
 	movs r0, #1
 	strb r0, [r1]
 	movs r0, #4
@@ -1638,7 +1638,7 @@ _08055870: .4byte gUnk_080FF2C0
 _08055874: .4byte gSave
 _08055878: .4byte 0x00000DB4
 _0805587C: .4byte gMenu
-_08055880: .4byte gUnk_02000070
+_08055880: .4byte gUpdateVisibleTiles
 
 	thumb_func_start nullsub_491
 nullsub_491: @ 0x08055884
@@ -1678,7 +1678,7 @@ sub_080558A4: @ 0x080558A4
 	ldrb r0, [r4, #6]
 	adds r0, #1
 	strb r0, [r4, #6]
-	ldr r1, _080558E4 @ =gUnk_02000070
+	ldr r1, _080558E4 @ =gUpdateVisibleTiles
 	movs r0, #1
 	strb r0, [r1]
 	movs r0, #4
@@ -1688,7 +1688,7 @@ sub_080558A4: @ 0x080558A4
 	.align 2, 0
 _080558DC: .4byte gMenu
 _080558E0: .4byte gUnk_080FF308
-_080558E4: .4byte gUnk_02000070
+_080558E4: .4byte gUpdateVisibleTiles
 
 	thumb_func_start nullsub_492
 nullsub_492: @ 0x080558E8
@@ -1729,7 +1729,7 @@ sub_08055908: @ 0x08055908
 	ldrb r0, [r5, #6]
 	adds r0, #1
 	strb r0, [r5, #6]
-	ldr r1, _08055944 @ =gUnk_02000070
+	ldr r1, _08055944 @ =gUpdateVisibleTiles
 	movs r0, #1
 	strb r0, [r1]
 	movs r0, #4
@@ -1738,7 +1738,7 @@ sub_08055908: @ 0x08055908
 	pop {r4, r5, pc}
 	.align 2, 0
 _08055940: .4byte gMenu
-_08055944: .4byte gUnk_02000070
+_08055944: .4byte gUpdateVisibleTiles
 
 	thumb_func_start sub_08055948
 sub_08055948: @ 0x08055948
@@ -1854,7 +1854,7 @@ _08055A0E:
 	ldrb r0, [r4, #6]
 	adds r0, #1
 	strb r0, [r4, #6]
-	ldr r1, _08055A38 @ =gUnk_02000070
+	ldr r1, _08055A38 @ =gUpdateVisibleTiles
 	movs r0, #1
 	strb r0, [r1]
 	movs r0, #4
@@ -1864,7 +1864,7 @@ _08055A0E:
 	.align 2, 0
 _08055A30: .4byte gMenu
 _08055A34: .4byte gUnk_080FF33C
-_08055A38: .4byte gUnk_02000070
+_08055A38: .4byte gUpdateVisibleTiles
 
 	thumb_func_start sub_08055A3C
 sub_08055A3C: @ 0x08055A3C
@@ -1981,7 +1981,7 @@ _08055B14:
 	ldrb r0, [r4, #6]
 	adds r0, #1
 	strb r0, [r4, #6]
-	ldr r1, _08055B34 @ =gUnk_02000070
+	ldr r1, _08055B34 @ =gUpdateVisibleTiles
 	movs r0, #1
 	strb r0, [r1]
 	movs r0, #4
@@ -1991,7 +1991,7 @@ _08055B14:
 	.align 2, 0
 _08055B2C: .4byte gMenu
 _08055B30: .4byte gUnk_080FED18
-_08055B34: .4byte gUnk_02000070
+_08055B34: .4byte gUpdateVisibleTiles
 
 	thumb_func_start sub_08055B38
 sub_08055B38: @ 0x08055B38
@@ -2090,7 +2090,7 @@ sub_08055BCC: @ 0x08055BCC
 	ldrb r0, [r4, #6]
 	adds r0, #1
 	strb r0, [r4, #6]
-	ldr r1, _08055C00 @ =gUnk_02000070
+	ldr r1, _08055C00 @ =gUpdateVisibleTiles
 	movs r0, #1
 	strb r0, [r1]
 	movs r0, #4
@@ -2099,7 +2099,7 @@ sub_08055BCC: @ 0x08055BCC
 	pop {r4, pc}
 	.align 2, 0
 _08055BFC: .4byte gMenu
-_08055C00: .4byte gUnk_02000070
+_08055C00: .4byte gUpdateVisibleTiles
 
 	thumb_func_start sub_08055C04
 sub_08055C04: @ 0x08055C04
@@ -2237,7 +2237,7 @@ sub_08055CF4: @ 0x08055CF4
 	ldrb r0, [r4, #6]
 	adds r0, #1
 	strb r0, [r4, #6]
-	ldr r1, _08055D28 @ =gUnk_02000070
+	ldr r1, _08055D28 @ =gUpdateVisibleTiles
 	movs r0, #1
 	strb r0, [r1]
 	movs r0, #4
@@ -2246,7 +2246,7 @@ sub_08055CF4: @ 0x08055CF4
 	pop {r4, pc}
 	.align 2, 0
 _08055D24: .4byte gMenu
-_08055D28: .4byte gUnk_02000070
+_08055D28: .4byte gUpdateVisibleTiles
 
 	thumb_func_start sub_08055D2C
 sub_08055D2C: @ 0x08055D2C
@@ -2316,7 +2316,7 @@ sub_08055D9C: @ 0x08055D9C
 	ldrb r0, [r1, #6]
 	adds r0, #1
 	strb r0, [r1, #6]
-	ldr r1, _08055DBC @ =gUnk_02000070
+	ldr r1, _08055DBC @ =gUpdateVisibleTiles
 	movs r0, #1
 	strb r0, [r1]
 	movs r0, #4
@@ -2325,7 +2325,7 @@ sub_08055D9C: @ 0x08055D9C
 	pop {pc}
 	.align 2, 0
 _08055DB8: .4byte gMenu
-_08055DBC: .4byte gUnk_02000070
+_08055DBC: .4byte gUpdateVisibleTiles
 
 	thumb_func_start sub_08055DC0
 sub_08055DC0: @ 0x08055DC0

asm/code_0805E3B0.s

@@ -1,399 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-	
-	thumb_func_start sub_0805E3B0
-sub_0805E3B0: @ 0x0805E3B0
-	push {lr}
-	adds r3, r0, #0
-	ldrb r1, [r3, #0x10]
-	movs r0, #0x10
-	ands r0, r1
-	cmp r0, #0
-	beq _0805E3C2
-	movs r0, #1
-	b _0805E404
-_0805E3C2:
-	ldrb r0, [r3, #0xc]
-	cmp r0, #0
-	bne _0805E3CC
-	movs r0, #0
-	b _0805E404
-_0805E3CC:
-	ldr r1, _0805E3DC @ =gUnk_03003DC0
-	ldrb r0, [r1]
-	ldrb r2, [r1, #1]
-	cmp r0, r2
-	bls _0805E3E0
-	adds r2, r0, #0
-	b _0805E3E2
-	.align 2, 0
-_0805E3DC: .4byte gUnk_03003DC0
-_0805E3E0:
-	ldrb r2, [r1, #1]
-_0805E3E2:
-	ldr r0, _0805E408 @ =gMessage
-	ldrb r1, [r0]
-	movs r0, #0x7f
-	ands r0, r1
-	cmp r0, #0
-	beq _0805E3F4
-	cmp r2, #2
-	bhs _0805E3F4
-	movs r2, #2
-_0805E3F4:
-	movs r1, #0
-	ldrb r0, [r3, #0x11]
-	lsls r0, r0, #0x1c
-	lsrs r0, r0, #0x1c
-	cmp r2, r0
-	bls _0805E402
-	movs r1, #1
-_0805E402:
-	adds r0, r1, #0
-_0805E404:
-	pop {pc}
-	.align 2, 0
-_0805E408: .4byte gMessage
-
-	thumb_func_start sub_0805E40C
-sub_0805E40C: @ 0x0805E40C
-	push {lr}
-	ldr r1, _0805E424 @ =gUnk_03003DC0
-	ldrb r0, [r1]
-	ldrb r2, [r1, #1]
-	cmp r0, r2
-	bhi _0805E41A
-	ldrb r0, [r1, #1]
-_0805E41A:
-	cmp r0, #0
-	beq _0805E420
-	movs r0, #1
-_0805E420:
-	pop {pc}
-	.align 2, 0
-_0805E424: .4byte gUnk_03003DC0
-
-	thumb_func_start sub_0805E428
-sub_0805E428: @ 0x0805E428
-	push {lr}
-	bl sub_0805E524
-	ldr r2, _0805E440 @ =gUnk_03003DC0
-	ldrb r3, [r2, #2]
-	adds r1, r3, #0
-	cmp r1, #0
-	beq _0805E444
-	movs r0, #0
-	strb r3, [r2, #1]
-	strb r0, [r2, #2]
-	b _0805E44E
-	.align 2, 0
-_0805E440: .4byte gUnk_03003DC0
-_0805E444:
-	ldrb r0, [r2, #3]
-	cmp r0, #0
-	beq _0805E44E
-	strb r1, [r2, #3]
-	strb r1, [r2, #1]
-_0805E44E:
-	pop {pc}
-
-	thumb_func_start sub_0805E450
-sub_0805E450: @ 0x0805E450
-	push {lr}
-	ldr r1, _0805E464 @ =gUnk_03003DC0
-	ldrb r2, [r1, #2]
-	cmp r0, r2
-	blo _0805E460
-	ldrb r2, [r1, #1]
-	cmp r0, r2
-	bhs _0805E468
-_0805E460:
-	movs r0, #0
-	b _0805E46C
-	.align 2, 0
-_0805E464: .4byte gUnk_03003DC0
-_0805E468:
-	strb r0, [r1, #2]
-	movs r0, #1
-_0805E46C:
-	pop {pc}
-	.align 2, 0
-
-	thumb_func_start sub_0805E470
-sub_0805E470: @ 0x0805E470
-	ldr r1, _0805E478 @ =gUnk_03003DC0
-	movs r0, #1
-	strb r0, [r1, #3]
-	bx lr
-	.align 2, 0
-_0805E478: .4byte gUnk_03003DC0
-
-	thumb_func_start sub_0805E47C
-sub_0805E47C: @ 0x0805E47C
-	push {r4, lr}
-	adds r4, r0, #0
-	ldrb r0, [r4, #0x11]
-	lsls r0, r0, #0x1c
-	lsrs r0, r0, #0x18
-	movs r1, #2
-	orrs r0, r1
-	strb r0, [r4, #0x11]
-	movs r0, #2
-	bl sub_0805E450
-	cmp r0, #0
-	beq _0805E49A
-	ldr r0, _0805E49C @ =gUnk_03003DC0
-	str r4, [r0, #4]
-_0805E49A:
-	pop {r4, pc}
-	.align 2, 0
-_0805E49C: .4byte gUnk_03003DC0
-
-	thumb_func_start sub_0805E4A0
-sub_0805E4A0: @ 0x0805E4A0
-	push {r4, lr}
-	adds r4, r0, #0
-	movs r0, #1
-	bl sub_08078A90
-	ldrb r0, [r4, #0x11]
-	lsls r0, r0, #0x1c
-	lsrs r0, r0, #0x18
-	movs r1, #3
-	orrs r0, r1
-	strb r0, [r4, #0x11]
-	movs r0, #1
-	bl sub_0805E450
-	cmp r0, #0
-	beq _0805E4C4
-	ldr r0, _0805E4C8 @ =gUnk_03003DC0
-	str r4, [r0, #4]
-_0805E4C4:
-	pop {r4, pc}
-	.align 2, 0
-_0805E4C8: .4byte gUnk_03003DC0
-
-	thumb_func_start sub_0805E4CC
-sub_0805E4CC: @ 0x0805E4CC
-	push {r4, lr}
-	adds r4, r0, #0
-	movs r0, #0
-	bl sub_08078A90
-	adds r0, r4, #0
-	bl sub_0805E584
-	pop {r4, pc}
-	.align 2, 0
-
-	thumb_func_start sub_0805E4E0
-sub_0805E4E0: @ 0x0805E4E0
-	push {r4, r5, lr}
-	adds r4, r0, #0
-	adds r5, r1, #0
-	cmp r4, #0
-	beq _0805E4F6
-	ldrb r0, [r4, #0x11]
-	lsls r0, r0, #0x1c
-	lsrs r0, r0, #0x18
-	movs r1, #3
-	orrs r0, r1
-	strb r0, [r4, #0x11]
-_0805E4F6:
-	movs r0, #1
-	bl sub_0805E450
-	cmp r0, #0
-	beq _0805E504
-	ldr r0, _0805E50C @ =gUnk_03003DC0
-	str r4, [r0, #4]
-_0805E504:
-	adds r0, r5, #0
-	bl sub_0805E510
-	pop {r4, r5, pc}
-	.align 2, 0
-_0805E50C: .4byte gUnk_03003DC0
-
-	thumb_func_start sub_0805E510
-sub_0805E510: @ 0x0805E510
-	push {lr}
-	adds r1, r0, #0
-	ldr r2, _0805E520 @ =gUnk_03003DC0
-	ldrh r0, [r2, #8]
-	cmp r0, r1
-	bhs _0805E51E
-	strh r1, [r2, #8]
-_0805E51E:
-	pop {pc}
-	.align 2, 0
-_0805E520: .4byte gUnk_03003DC0
-
-	thumb_func_start sub_0805E524
-sub_0805E524: @ 0x0805E524
-	push {lr}
-	ldr r1, _0805E540 @ =gUnk_03003DC0
-	ldrh r0, [r1, #8]
-	cmp r0, #0
-	beq _0805E53C
-	subs r0, #1
-	strh r0, [r1, #8]
-	lsls r0, r0, #0x10
-	cmp r0, #0
-	bne _0805E53C
-	bl sub_0805E470
-_0805E53C:
-	pop {pc}
-	.align 2, 0
-_0805E540: .4byte gUnk_03003DC0
-
-	thumb_func_start sub_0805E544
-sub_0805E544: @ 0x0805E544
-	ldr r1, _0805E55C @ =gUnk_03003DC0
-	movs r3, #6
-	movs r0, #6
-	strb r0, [r1]
-	ldr r2, _0805E560 @ =gPlayerEntity
-	ldrb r1, [r2, #0x11]
-	subs r0, #0x16
-	ands r0, r1
-	orrs r0, r3
-	strb r0, [r2, #0x11]
-	bx lr
-	.align 2, 0
-_0805E55C: .4byte gUnk_03003DC0
-_0805E560: .4byte gPlayerEntity
-
-	thumb_func_start UnfreezeTime
-UnfreezeTime: @ 0x0805E564
-	ldr r1, _0805E57C @ =gUnk_03003DC0
-	movs r0, #0
-	strb r0, [r1]
-	ldr r2, _0805E580 @ =gPlayerEntity
-	ldrb r1, [r2, #0x11]
-	subs r0, #0x10
-	ands r0, r1
-	movs r1, #1
-	orrs r0, r1
-	strb r0, [r2, #0x11]
-	bx lr
-	.align 2, 0
-_0805E57C: .4byte gUnk_03003DC0
-_0805E580: .4byte gPlayerEntity
-
-	thumb_func_start sub_0805E584
-sub_0805E584: @ 0x0805E584
-	push {lr}
-	ldrb r2, [r0, #0x11]
-	lsrs r3, r2, #4
-	movs r1, #0x10
-	rsbs r1, r1, #0
-	ands r1, r2
-	orrs r1, r3
-	strb r1, [r0, #0x11]
-	bl sub_0805E470
-	pop {pc}
-	.align 2, 0
-
-	thumb_func_start sub_0805E59C
-sub_0805E59C: @ 0x0805E59C
-	ldr r1, _0805E5A4 @ =gUnk_03003DC0
-	movs r0, #6
-	strb r0, [r1]
-	bx lr
-	.align 2, 0
-_0805E5A4: .4byte gUnk_03003DC0
-
-	thumb_func_start sub_0805E5A8
-sub_0805E5A8: @ 0x0805E5A8
-	ldr r1, _0805E5B0 @ =gUnk_03003DC0
-	movs r0, #7
-	strb r0, [r1]
-	bx lr
-	.align 2, 0
-_0805E5B0: .4byte gUnk_03003DC0
-
-	thumb_func_start sub_0805E5B4
-sub_0805E5B4: @ 0x0805E5B4
-	ldr r1, _0805E5BC @ =gUnk_03003DC0
-	movs r0, #0
-	strb r0, [r1]
-	bx lr
-	.align 2, 0
-_0805E5BC: .4byte gUnk_03003DC0
-
-	thumb_func_start sub_0805E5C0
-sub_0805E5C0: @ 0x0805E5C0
-	push {lr}
-	ldr r0, _0805E5F0 @ =gRoomVars
-	ldrb r1, [r0, #4]
-	movs r2, #0
-	strb r1, [r0, #5]
-	strb r2, [r0, #4]
-	bl sub_0805ED30
-	bl sub_0805E428
-	bl ClearHitboxList
-	bl sub_0806F0A4
-	ldr r1, _0805E5F4 @ =_UpdateEntities
-	movs r0, #0
-	bl _call_via_r1
-	bl ClearAllDeletedEntities
-	bl sub_0805EE88
-	pop {pc}
-	.align 2, 0
-_0805E5F0: .4byte gRoomVars
-_0805E5F4: .4byte _UpdateEntities
-
-	thumb_func_start sub_0805E5F8
-sub_0805E5F8: @ 0x0805E5F8
-	push {lr}
-	ldr r1, _0805E608 @ =_UpdateEntities
-	movs r0, #1
-	bl _call_via_r1
-	bl ClearAllDeletedEntities
-	pop {pc}
-	.align 2, 0
-_0805E608: .4byte _UpdateEntities
-
-	thumb_func_start EraseAllEntities
-EraseAllEntities: @ 0x0805E60C
-	push {lr}
-	bl DeleteAllEntities
-	ldr r0, _0805E654 @ =gUnk_03003DC0
-	movs r1, #0xc
-	bl MemClear
-	ldr r0, _0805E658 @ =gPlayerEntity
-	movs r1, #0xaa
-	lsls r1, r1, #6
-	bl MemClear
-	ldr r0, _0805E65C @ =gUnk_02033290
-	movs r1, #0x80
-	lsls r1, r1, #4
-	bl MemClear
-	bl sub_0805E98C
-	ldr r0, _0805E660 @ =gEntCount
-	movs r1, #0
-	strb r1, [r0]
-	ldr r0, _0805E664 @ =gManagerCount
-	strb r1, [r0]
-	ldr r1, _0805E668 @ =gUnk_03000000
-	ldr r2, _0805E66C @ =0x00000427
-	adds r0, r1, r2
-	movs r2, #1
-	strb r2, [r0]
-	ldr r3, _0805E670 @ =0x00000426
-	adds r0, r1, r3
-	strb r2, [r0]
-	ldr r0, _0805E674 @ =0x0000042E
-	adds r1, r1, r0
-	strb r2, [r1]
-	pop {pc}
-	.align 2, 0
-_0805E654: .4byte gUnk_03003DC0
-_0805E658: .4byte gPlayerEntity
-_0805E65C: .4byte gUnk_02033290
-_0805E660: .4byte gEntCount
-_0805E664: .4byte gManagerCount
-_0805E668: .4byte gUnk_03000000
-_0805E66C: .4byte 0x00000427
-_0805E670: .4byte 0x00000426
-_0805E674: .4byte 0x0000042E

asm/code_08078778.s

@@ -5810,7 +5810,7 @@ _0807B3C8:
 	ldrh r0, [r0]
 	cmp r0, #1
 	beq _0807B430
-	ldr r1, _0807B40C @ =gUnk_02000070
+	ldr r1, _0807B40C @ =gUpdateVisibleTiles
 	movs r0, #1
 	strb r0, [r1]
 	b _0807B430
@@ -5818,7 +5818,7 @@ _0807B3C8:
 _0807B400: .4byte gMapDataTopSpecial
 _0807B404: .4byte 0x00007004
 _0807B408: .4byte gRoomControls
-_0807B40C: .4byte gUnk_02000070
+_0807B40C: .4byte gUpdateVisibleTiles
 _0807B410:
 	ldr r0, _0807B424 @ =0x00003FFF
 	cmp r5, r0

asm/code_0807B9B8.s

@@ -95,7 +95,7 @@ _0807BA44:
 	ldrh r0, [r0]
 	cmp r0, #1
 	beq _0807BA78
-	ldr r1, _0807BA88 @ =gUnk_02000070
+	ldr r1, _0807BA88 @ =gUpdateVisibleTiles
 	movs r0, #1
 	strb r0, [r1]
 _0807BA78:
@@ -104,7 +104,7 @@ _0807BA78:
 _0807BA7C: .4byte gMapDataTopSpecial
 _0807BA80: .4byte 0x00007004
 _0807BA84: .4byte gRoomControls
-_0807BA88: .4byte gUnk_02000070
+_0807BA88: .4byte gUpdateVisibleTiles
 
 	thumb_func_start sub_0807BA8C
 sub_0807BA8C: @ 0x0807BA8C
@@ -197,7 +197,7 @@ _0807BB20:
 	ldrh r0, [r0]
 	cmp r0, #1
 	beq _0807BB54
-	ldr r1, _0807BB64 @ =gUnk_02000070
+	ldr r1, _0807BB64 @ =gUpdateVisibleTiles
 	movs r0, #1
 	strb r0, [r1]
 _0807BB54:
@@ -206,7 +206,7 @@ _0807BB54:
 _0807BB58: .4byte gMapDataTopSpecial
 _0807BB5C: .4byte 0x00007004
 _0807BB60: .4byte gRoomControls
-_0807BB64: .4byte gUnk_02000070
+_0807BB64: .4byte gUpdateVisibleTiles
 
 	thumb_func_start sub_0807BB68
 sub_0807BB68: @ 0x0807BB68
@@ -1847,14 +1847,14 @@ sub_0807C810: @ 0x0807C810
 	adds r1, r1, r0
 	strh r1, [r6, #0x32]
 	bl sub_080809D4
-	ldr r0, _0807C85C @ =gUnk_02000070
+	ldr r0, _0807C85C @ =gUpdateVisibleTiles
 	strb r5, [r0]
 	pop {r4, r5, r6, pc}
 	.align 2, 0
 _0807C850: .4byte gUnk_03004030
 _0807C854: .4byte gPlayerEntity
 _0807C858: .4byte gRoomControls
-_0807C85C: .4byte gUnk_02000070
+_0807C85C: .4byte gUpdateVisibleTiles
 
 	thumb_func_start sub_0807C860
 sub_0807C860: @ 0x0807C860

asm/code_0807F0D8.s

@@ -79,7 +79,7 @@ _0807FCBC:
 	subs r0, r7, r3
 	cmp r0, #0
 	bgt _0807FCCE
-	ldr r1, _0807FCD8 @ =gUnk_02000070
+	ldr r1, _0807FCD8 @ =gUpdateVisibleTiles
 	movs r0, #1
 	strb r0, [r1]
 _0807FCCE:
@@ -89,7 +89,7 @@ _0807FCCE:
 	blt _0807FD16
 	b _0807FD14
 	.align 2, 0
-_0807FCD8: .4byte gUnk_02000070
+_0807FCD8: .4byte gUpdateVisibleTiles
 _0807FCDC:
 	ldrh r0, [r2, #6]
 	ldrh r1, [r2, #0x1e]
@@ -113,7 +113,7 @@ _0807FCFC:
 	subs r0, r7, r3
 	cmp r0, #7
 	ble _0807FD0C
-	ldr r1, _0807FD68 @ =gUnk_02000070
+	ldr r1, _0807FD68 @ =gUpdateVisibleTiles
 	movs r0, #1
 	strb r0, [r1]
 _0807FD0C:
@@ -158,7 +158,7 @@ _0807FD4C:
 	subs r0, r7, r3
 	cmp r0, #0
 	bgt _0807FD5E
-	ldr r1, _0807FD68 @ =gUnk_02000070
+	ldr r1, _0807FD68 @ =gUpdateVisibleTiles
 	movs r0, #1
 	strb r0, [r1]
 _0807FD5E:
@@ -168,7 +168,7 @@ _0807FD5E:
 	blt _0807FDA6
 	b _0807FDA4
 	.align 2, 0
-_0807FD68: .4byte gUnk_02000070
+_0807FD68: .4byte gUpdateVisibleTiles
 _0807FD6C:
 	ldrh r0, [r2, #8]
 	ldrh r1, [r2, #0x20]
@@ -192,7 +192,7 @@ _0807FD8C:
 	subs r0, r7, r3
 	cmp r0, #7
 	ble _0807FD9C
-	ldr r1, _0807FDAC @ =gUnk_02000070
+	ldr r1, _0807FDAC @ =gUpdateVisibleTiles
 	movs r0, #1
 	strb r0, [r1]
 _0807FD9C:
@@ -206,7 +206,7 @@ _0807FDA6:
 	bl sub_08080BC4
 	pop {r4, r5, r6, r7, pc}
 	.align 2, 0
-_0807FDAC: .4byte gUnk_02000070
+_0807FDAC: .4byte gUpdateVisibleTiles
 
 	thumb_func_start sub_0807FDB0
 sub_0807FDB0: @ 0x0807FDB0
@@ -225,7 +225,7 @@ _0807FDC4: .4byte gUnk_0811E780
 sub_0807FDC8: @ 0x0807FDC8
 	push {r4, r5, lr}
 	adds r5, r0, #0
-	ldr r4, _0807FDE0 @ =gUnk_02000070
+	ldr r4, _0807FDE0 @ =gUpdateVisibleTiles
 	movs r0, #1
 	strb r0, [r4]
 	bl sub_08000108
@@ -235,7 +235,7 @@ sub_0807FDC8: @ 0x0807FDC8
 	strb r1, [r4]
 	pop {r4, r5, pc}
 	.align 2, 0
-_0807FDE0: .4byte gUnk_02000070
+_0807FDE0: .4byte gUpdateVisibleTiles
 
 	thumb_func_start sub_0807FDE4
 sub_0807FDE4: @ 0x0807FDE4
@@ -243,17 +243,17 @@ sub_0807FDE4: @ 0x0807FDE4
 	movs r1, #2
 	strb r1, [r0, #3]
 	strh r2, [r0, #0x18]
-	ldr r0, _0807FDF4 @ =gUnk_02000070
+	ldr r0, _0807FDF4 @ =gUpdateVisibleTiles
 	strb r1, [r0]
 	bx lr
 	.align 2, 0
-_0807FDF4: .4byte gUnk_02000070
+_0807FDF4: .4byte gUpdateVisibleTiles
 
 	thumb_func_start sub_0807FDF8
 sub_0807FDF8: @ 0x0807FDF8
 	push {r4, lr}
 	adds r4, r0, #0
-	ldr r1, _0807FE18 @ =gUnk_02000070
+	ldr r1, _0807FE18 @ =gUpdateVisibleTiles
 	movs r0, #2
 	strb r0, [r1]
 	ldrh r0, [r4, #0x18]
@@ -268,7 +268,7 @@ sub_0807FDF8: @ 0x0807FDF8
 	beq _0807FE26
 	b _0807FEB6
 	.align 2, 0
-_0807FE18: .4byte gUnk_02000070
+_0807FE18: .4byte gUpdateVisibleTiles
 _0807FE1C:
 	cmp r0, #2
 	beq _0807FE68
@@ -400,12 +400,12 @@ sub_0807FF08: @ 0x0807FF08
 	movs r1, #1
 	strb r1, [r0, #3]
 	strh r2, [r0, #0x18]
-	ldr r1, _0807FF18 @ =gUnk_02000070
+	ldr r1, _0807FF18 @ =gUpdateVisibleTiles
 	movs r0, #3
 	strb r0, [r1]
 	bx lr
 	.align 2, 0
-_0807FF18: .4byte gUnk_02000070
+_0807FF18: .4byte gUpdateVisibleTiles
 
 	thumb_func_start sub_0807FF1C
 sub_0807FF1C: @ 0x0807FF1C
@@ -417,7 +417,7 @@ sub_0807FF1C: @ 0x0807FF1C
 	ands r0, r1
 	cmp r0, #0
 	bne _0807FF48
-	ldr r1, _0807FF50 @ =gUnk_02000070
+	ldr r1, _0807FF50 @ =gUpdateVisibleTiles
 	movs r0, #3
 	strb r0, [r1]
 	ldrh r0, [r2, #0x18]
@@ -434,7 +434,7 @@ _0807FF48:
 	pop {pc}
 	.align 2, 0
 _0807FF4C: .4byte gScreenTransition
-_0807FF50: .4byte gUnk_02000070
+_0807FF50: .4byte gUpdateVisibleTiles
 
 	thumb_func_start sub_0807FF54
 sub_0807FF54: @ 0x0807FF54
@@ -642,13 +642,13 @@ _080800F0: .4byte gScreen
 _080800F4: .4byte gUnk_08109194
 _080800F8: .4byte gUnk_03004030
 _080800FC:
-	ldr r1, _08080104 @ =gUnk_02000070
+	ldr r1, _08080104 @ =gUpdateVisibleTiles
 	movs r0, #4
 	strb r0, [r1]
 _08080102:
 	pop {r4, r5, r6, r7, pc}
 	.align 2, 0
-_08080104: .4byte gUnk_02000070
+_08080104: .4byte gUpdateVisibleTiles
 
 	thumb_func_start sub_08080108
 sub_08080108: @ 0x08080108
@@ -717,12 +717,12 @@ sub_08080198: @ 0x08080198
 	strh r1, [r0, #0x1c]
 	bl LoadRoom
 	bl sub_0804AFF4
-	ldr r0, _080801B8 @ =gUnk_02000070
+	ldr r0, _080801B8 @ =gUpdateVisibleTiles
 	strb r4, [r0]
 	bl sub_080805F8
 	pop {r4, pc}
 	.align 2, 0
-_080801B8: .4byte gUnk_02000070
+_080801B8: .4byte gUpdateVisibleTiles
 
 	thumb_func_start sub_080801BC
 sub_080801BC: @ 0x080801BC
@@ -815,7 +815,7 @@ _08080232:
 _08080260: .4byte gScreen
 _08080264: .4byte 0x0000BFFF
 _08080268:
-	ldr r0, _08080274 @ =gUnk_02000070
+	ldr r0, _08080274 @ =gUpdateVisibleTiles
 	movs r1, #4
 	strb r1, [r0]
 	movs r0, #0
@@ -823,7 +823,7 @@ _08080268:
 _08080272:
 	pop {r4, r5, r6, r7, pc}
 	.align 2, 0
-_08080274: .4byte gUnk_02000070
+_08080274: .4byte gUpdateVisibleTiles
 
 	thumb_func_start sub_08080278
 sub_08080278: @ 0x08080278
@@ -987,7 +987,7 @@ _080803A2:
 	cmp r4, r6
 	blo _080803A2
 _080803B8:
-	ldr r1, _080803CC @ =gUnk_02000070
+	ldr r1, _080803CC @ =gUpdateVisibleTiles
 	movs r0, #0
 	strb r0, [r1]
 _080803BE:
@@ -996,7 +996,7 @@ _080803BE:
 _080803C0: .4byte gUnk_020246B0
 _080803C4: .4byte gUnk_02034480
 _080803C8: .4byte 0x00000FFF
-_080803CC: .4byte gUnk_02000070
+_080803CC: .4byte gUpdateVisibleTiles
 
 	thumb_func_start sub_080803D0
 sub_080803D0: @ 0x080803D0

asm/code_080A3BD0.s

@@ -1337,7 +1337,7 @@ _080A45D0:
 	ldr r0, [r0]
 	bl _call_via_r0
 _080A45E0:
-	bl sub_0805E5C0
+	bl UpdateEntities
 	bl sub_0801C1D4
 	bl sub_0801C208
 	bl sub_080AD9B0

asm/code_080A5574.s

@@ -5120,8 +5120,8 @@ sub_080A74F4: @ 0x080A74F4
 	movs r0, #0
 	strb r0, [r1, #0xb]
 	bl FlushSprites
-	bl sub_0805E5C0
-	bl sub_0805E5F8
+	bl UpdateEntities
+	bl UpdateManagers
 	bl sub_0801C344
 	bl sub_0801C208
 	bl sub_08078CB4

asm/fileScreen.s

@@ -202,7 +202,7 @@ _08051AEC: .4byte gScreenTransition
 sub_08051AF0: @ 0x08051AF0
 .ifdef EU
 	push {r4, lr}
-	bl sub_0805E5C0
+	bl UpdateEntities
 	bl sub_0805BBBC
 	cmp r0, #0
 	bne _0805173E
@@ -211,7 +211,7 @@ _0805173E:
 	bl UpdateBgAnim
 	bl sub_08000108
 	bl sub_0801C344
-	bl sub_0805E5F8
+	bl UpdateManagers
 	bl FlushSprites
 	bl sub_0801C208
 	bl sub_08078CB4
@@ -280,7 +280,7 @@ _080517F8: .4byte gRoomVars
 
 .else
 	push {r4, r5, lr}
-	bl sub_0805E5C0
+	bl UpdateEntities
 	bl sub_0805BBBC
 	cmp r0, #0
 	bne _08051B02
@@ -289,7 +289,7 @@ _08051B02:
 	bl UpdateBgAnim
 	bl sub_08000108
 	bl sub_0801C344
-	bl sub_0805E5F8
+	bl UpdateManagers
 	bl FlushSprites
 	bl sub_0801C208
 	bl sub_08078CB4
@@ -441,7 +441,7 @@ _08051C02:
 	bl sub_08078B48
 _08051C06:
 	bl FlushSprites
-	bl sub_0805E5C0
+	bl UpdateEntities
 	bl sub_08080A40
 	bl CollisionMain
 	bl UpdateScroll
@@ -449,7 +449,7 @@ _08051C06:
 	bl sub_08000108
 	bl sub_08052C3C
 	bl sub_0801C344
-	bl sub_0805E5F8
+	bl UpdateManagers
 	bl sub_0801C208
 	bl sub_08078CB4
 	bl sub_080AD9B0
@@ -503,10 +503,10 @@ sub_08051CA8: @ 0x08051CA8
 	bl sub_080705AC
 	cmp r0, #0
 	bne _08051CEA
-	bl sub_0805E5C0
+	bl UpdateEntities
 	bl CollisionMain
 	bl sub_0801C344
-	bl sub_0805E5F8
+	bl UpdateManagers
 	bl FlushSprites
 	bl sub_0801C208
 	bl sub_08078CB4
@@ -586,7 +586,7 @@ InitializeEntities: @ 0x08051D40
 	movs r0, #0
 	str r0, [r1]
 	bl sub_0807C740
-	ldr r1, _08051D94 @ =gUnk_02000070
+	ldr r1, _08051D94 @ =gUpdateVisibleTiles
 	movs r0, #1
 	strb r0, [r1]
 	bl sub_0805283C
@@ -605,7 +605,7 @@ InitializeEntities: @ 0x08051D40
 	pop {pc}
 	.align 2, 0
 _08051D90: .4byte gUnk_03004030
-_08051D94: .4byte gUnk_02000070
+_08051D94: .4byte gUpdateVisibleTiles
 
 	thumb_func_start sub_08051D98
 sub_08051D98: @ 0x08051D98
@@ -788,12 +788,12 @@ sub_08051F04: @ 0x08051F04
 	ldr r0, [r0]
 	bl _call_via_r0
 	bl FlushSprites
-	bl sub_0805E5C0
+	bl UpdateEntities
 	bl sub_080AD9B0
 	bl sub_080AD918
 	bl UpdateScroll
 	bl UpdateBgAnim
-	bl sub_0805E5F8
+	bl UpdateManagers
 	bl sub_08000108
 	pop {pc}
 	.align 2, 0
@@ -869,7 +869,7 @@ sub_08051F9C: @ 0x08051F9C
 	add r0, r8
 	strh r0, [r1, #0xc]
 	bl sub_0807C740
-	ldr r1, _08051FE8 @ =gUnk_02000070
+	ldr r1, _08051FE8 @ =gUpdateVisibleTiles
 	movs r0, #1
 	strb r0, [r1]
 	ldr r0, _08051FEC @ =gUsedPalettes
@@ -883,7 +883,7 @@ sub_08051F9C: @ 0x08051F9C
 	.align 2, 0
 _08051FE0: .4byte gScreen
 _08051FE4: .4byte gRoomControls
-_08051FE8: .4byte gUnk_02000070
+_08051FE8: .4byte gUpdateVisibleTiles
 _08051FEC: .4byte gUsedPalettes
 
 	thumb_func_start sub_08051FF0

asm/getEmptyEntity.s

@@ -1,12 +1,5 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
 
 	.syntax unified
-
-	.text
-	
-	thumb_func_start GetEmptyEntity
-GetEmptyEntity: @ 0x0805E678
 	push {r4, r5, r6, r7, lr}
 	mov r7, r8
 	push {r7}
@@ -111,3 +104,4 @@ _0805E730:
 _0805E738: .4byte gUnk_03003BE0
 _0805E73C: .4byte gEntityLists
 _0805E740: .4byte gUnk_03003DD0
+	.syntax divided

asm/gyorgFemale.s

@@ -524,7 +524,7 @@ _080464DE:
 	movs r1, #0x80
 	lsls r1, r1, #4
 	bl MemClear
-	ldr r1, _08046514 @ =gUnk_02000070
+	ldr r1, _08046514 @ =gUpdateVisibleTiles
 	movs r0, #1
 	strb r0, [r1]
 	pop {r4, r5, r6, pc}
@@ -532,7 +532,7 @@ _080464DE:
 _08046508: .4byte gUnk_080D1A74
 _0804650C: .4byte gUnk_02019EE0
 _08046510: .4byte 0x00003260
-_08046514: .4byte gUnk_02000070
+_08046514: .4byte gUpdateVisibleTiles
 
 	thumb_func_start sub_08046518
 sub_08046518: @ 0x08046518

asm/intr.s

@@ -655,8 +655,6 @@ _080B21A4: .4byte 0x01010101
 _080B21A8: .4byte gUnk_02000006
 _080B21AC: .4byte gUnk_08000F54
 
-	arm_func_start UpdateEntities
-UpdateEntities: @ 0x080B21B0
 	ldr r11, _080B2270 @ =gUnk_03003DD0
 	ldr r1, [r11]
 	ldm r1, {r7, r8, r9, r10}
@@ -672,6 +670,8 @@ UpdateEntities: @ 0x080B21B0
 @	void* restore_sp;
 @ }
 
+	arm_func_start UpdateEntities_arm
+UpdateEntities_arm: @ 0x080B21B0
 @ UpdateEntities starts here
     @ arg0 (r0) : 0 = entities, 1 = managers
 	ldr r1, _080B2274 @ =gUnk_080026A4

asm/sub_0805E248.s

@@ -1,131 +0,0 @@
-	.include "asm/macros.inc"
-
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start sub_0805E248
-sub_0805E248: @ 0x0805E248
-	push {r4, r5, lr}
-	ldr r0, _0805E2C8 @ =gUnk_03004030
-	ldr r0, [r0]
-	ldrh r5, [r0, #6]
-	ldr r0, _0805E2CC @ =gRoomControls
-	ldrb r0, [r0, #4]
-	cmp r0, #0xa
-	beq _0805E25C
-	cmp r0, #0x16
-	bne _0805E2E8
-_0805E25C:
-	movs r0, #0x9f
-	lsls r0, r0, #2
-	adds r4, r5, #0
-	subs r4, #0x41
-	adds r1, r4, #0
-	movs r2, #1
-	bl SetTileType
-	ldr r0, _0805E2D0 @ =0x00000283
-	adds r1, r4, #0
-	movs r2, #2
-	bl SetTileType
-	ldr r0, _0805E2D4 @ =0x0000027D
-	adds r4, #1
-	adds r1, r4, #0
-	movs r2, #1
-	bl SetTileType
-	movs r0, #0xa1
-	lsls r0, r0, #2
-	adds r1, r4, #0
-	movs r2, #2
-	bl SetTileType
-	ldr r0, _0805E2D8 @ =0x0000027E
-	adds r4, #1
-	adds r1, r4, #0
-	movs r2, #1
-	bl SetTileType
-	ldr r0, _0805E2DC @ =0x00000285
-	adds r1, r4, #0
-	movs r2, #2
-	bl SetTileType
-	ldr r0, _0805E2E0 @ =0x0000027F
-	subs r1, r5, #1
-	movs r2, #1
-	bl SetTileType
-	movs r0, #0xa0
-	lsls r0, r0, #2
-	adds r1, r5, #0
-	movs r2, #1
-	bl SetTileType
-	ldr r0, _0805E2E4 @ =0x00000282
-	adds r1, r5, #1
-	movs r2, #1
-	bl SetTileType
-	b _0805E350
-	.align 2, 0
-_0805E2C8: .4byte gUnk_03004030
-_0805E2CC: .4byte gRoomControls
-_0805E2D0: .4byte 0x00000283
-_0805E2D4: .4byte 0x0000027D
-_0805E2D8: .4byte 0x0000027E
-_0805E2DC: .4byte 0x00000285
-_0805E2E0: .4byte 0x0000027F
-_0805E2E4: .4byte 0x00000282
-_0805E2E8:
-	movs r0, #0x9b
-	lsls r0, r0, #2
-	adds r4, r5, #0
-	subs r4, #0x41
-	adds r1, r4, #0
-	movs r2, #1
-	bl SetTileType
-	ldr r0, _0805E358 @ =0x00000273
-	adds r1, r4, #0
-	movs r2, #2
-	bl SetTileType
-	ldr r0, _0805E35C @ =0x0000026D
-	adds r4, #1
-	adds r1, r4, #0
-	movs r2, #1
-	bl SetTileType
-	movs r0, #0x9d
-	lsls r0, r0, #2
-	adds r1, r4, #0
-	movs r2, #2
-	bl SetTileType
-	ldr r0, _0805E360 @ =0x0000026E
-	adds r4, #1
-	adds r1, r4, #0
-	movs r2, #1
-	bl SetTileType
-	ldr r0, _0805E364 @ =0x00000275
-	adds r1, r4, #0
-	movs r2, #2
-	bl SetTileType
-	ldr r0, _0805E368 @ =0x0000026F
-	subs r1, r5, #1
-	movs r2, #1
-	bl SetTileType
-	movs r0, #0x9c
-	lsls r0, r0, #2
-	adds r1, r5, #0
-	movs r2, #1
-	bl SetTileType
-	ldr r0, _0805E36C @ =0x00000272
-	adds r1, r5, #1
-	movs r2, #1
-	bl SetTileType
-_0805E350:
-	ldr r1, _0805E370 @ =gUnk_02000070
-	movs r0, #0
-	strb r0, [r1]
-	pop {r4, r5, pc}
-	.align 2, 0
-_0805E358: .4byte 0x00000273
-_0805E35C: .4byte 0x0000026D
-_0805E360: .4byte 0x0000026E
-_0805E364: .4byte 0x00000275
-_0805E368: .4byte 0x0000026F
-_0805E36C: .4byte 0x00000272
-_0805E370: .4byte gUnk_02000070