RemoveFieldObjectsOutsideView

asm/field_control_avatar.s

@@ -567,7 +567,7 @@ _0809C32E:
 	.pool
 _0809C33C:
 	movs r4, 0
-	ldr r1, =gUnknown_02032308
+	ldr r1, =gLinkPlayerMapObjects
 _0809C340:
 	ldrb r0, [r1]
 	cmp r0, 0x1

asm/field_map_obj.s

@@ -5,57 +5,6 @@
 
 	.text
 
-	thumb_func_start RemoveFieldObjectsOutsideView
-@ void RemoveFieldObjectsOutsideView()
-RemoveFieldObjectsOutsideView: @ 808E08C
-	push {r4-r6,lr}
-	movs r3, 0
-	ldr r6, =gUnknown_02032308
-_0808E092:
-	movs r2, 0
-	movs r4, 0
-	adds r5, r3, 0x1
-_0808E098:
-	lsls r0, r2, 2
-	adds r1, r0, r6
-	ldrb r0, [r1]
-	cmp r0, 0
-	beq _0808E0AA
-	ldrb r1, [r1, 0x2]
-	cmp r3, r1
-	bne _0808E0AA
-	movs r4, 0x1
-_0808E0AA:
-	adds r0, r2, 0x1
-	lsls r0, 24
-	lsrs r2, r0, 24
-	cmp r2, 0x3
-	bls _0808E098
-	cmp r4, 0
-	bne _0808E0D2
-	lsls r0, r3, 3
-	adds r0, r3
-	lsls r0, 2
-	ldr r1, =gMapObjects
-	adds r2, r0, r1
-	ldr r0, [r2]
-	ldr r1, =0x00010001
-	ands r0, r1
-	cmp r0, 0x1
-	bne _0808E0D2
-	adds r0, r2, 0
-	bl RemoveFieldObjectIfOutsideView
-_0808E0D2:
-	lsls r0, r5, 24
-	lsrs r3, r0, 24
-	cmp r3, 0xF
-	bls _0808E092
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end RemoveFieldObjectsOutsideView
-
 	thumb_func_start RemoveFieldObjectIfOutsideView
 @ void RemoveFieldObjectIfOutsideView(npc_state *fieldObject)
 RemoveFieldObjectIfOutsideView: @ 808E0EC
@@ -183,7 +132,7 @@ sub_808E1B8: @ 808E1B8
 	lsrs r2, 16
 	str r2, [sp, 0x24]
 	movs r7, 0
-	ldr r2, =gUnknown_02032308
+	ldr r2, =gLinkPlayerMapObjects
 _0808E1DA:
 	lsls r0, r7, 2
 	adds r1, r0, r2

asm/rom4.s

@@ -5480,7 +5480,7 @@ sub_80872D8: @ 80872D8
 	movs r0, 0x1
 _080872EA:
 	strb r0, [r6, 0x1]
-	ldr r1, =gUnknown_02032308
+	ldr r1, =gLinkPlayerMapObjects
 	lsls r0, r4, 2
 	adds r0, r1
 	ldrb r0, [r0, 0x3]
@@ -5977,7 +5977,7 @@ sub_80876C4: @ 80876C4
 	thumb_func_start strange_npc_table_clear
 strange_npc_table_clear: @ 80876CC
 	push {lr}
-	ldr r0, =gUnknown_02032308
+	ldr r0, =gLinkPlayerMapObjects
 	movs r1, 0
 	movs r2, 0x10
 	bl memset
@@ -6025,7 +6025,7 @@ sub_80876F0: @ 80876F0
 	lsls r6, 24
 	lsrs r6, 24
 	lsls r4, r7, 2
-	ldr r0, =gUnknown_02032308
+	ldr r0, =gLinkPlayerMapObjects
 	adds r4, r0
 	lsls r5, r6, 3
 	adds r5, r6
@@ -6118,7 +6118,7 @@ sub_80877DC: @ 80877DC
 	lsls r0, 24
 	lsls r1, 24
 	lsrs r2, r1, 24
-	ldr r1, =gUnknown_02032308
+	ldr r1, =gLinkPlayerMapObjects
 	lsrs r0, 22
 	adds r1, r0, r1
 	ldrb r0, [r1]
@@ -6142,7 +6142,7 @@ sub_808780C: @ 808780C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 22
-	ldr r1, =gUnknown_02032308
+	ldr r1, =gLinkPlayerMapObjects
 	adds r5, r0, r1
 	ldrb r1, [r5, 0x2]
 	lsls r0, r1, 3
@@ -6176,7 +6176,7 @@ _08087838:
 	thumb_func_start sub_8087858
 sub_8087858: @ 8087858
 	lsls r0, 24
-	ldr r1, =gUnknown_02032308
+	ldr r1, =gLinkPlayerMapObjects
 	lsrs r0, 22
 	adds r0, r1
 	ldrb r1, [r0, 0x2]
@@ -6193,7 +6193,7 @@ sub_8087858: @ 8087858
 	thumb_func_start sub_8087878
 sub_8087878: @ 8087878
 	lsls r0, 24
-	ldr r3, =gUnknown_02032308
+	ldr r3, =gLinkPlayerMapObjects
 	lsrs r0, 22
 	adds r0, r3
 	ldrb r3, [r0, 0x2]
@@ -6213,7 +6213,7 @@ sub_8087878: @ 8087878
 	thumb_func_start sub_80878A0
 sub_80878A0: @ 80878A0
 	lsls r0, 24
-	ldr r1, =gUnknown_02032308
+	ldr r1, =gLinkPlayerMapObjects
 	lsrs r0, 22
 	adds r0, r1
 	ldrb r1, [r0, 0x2]
@@ -6230,7 +6230,7 @@ sub_80878A0: @ 80878A0
 	thumb_func_start sub_80878C0
 sub_80878C0: @ 80878C0
 	lsls r0, 24
-	ldr r1, =gUnknown_02032308
+	ldr r1, =gLinkPlayerMapObjects
 	lsrs r0, 22
 	adds r0, r1
 	ldrb r1, [r0, 0x2]
@@ -6249,7 +6249,7 @@ sub_80878C0: @ 80878C0
 	thumb_func_start sub_80878E4
 sub_80878E4: @ 80878E4
 	lsls r0, 24
-	ldr r1, =gUnknown_02032308
+	ldr r1, =gLinkPlayerMapObjects
 	lsrs r0, 22
 	adds r0, r1
 	ldrb r1, [r0, 0x2]
@@ -6271,7 +6271,7 @@ sub_80878E4: @ 80878E4
 sub_808790C: @ 808790C
 	push {r4-r6,lr}
 	movs r2, 0
-	ldr r5, =gUnknown_02032308
+	ldr r5, =gLinkPlayerMapObjects
 	lsls r0, 16
 	asrs r4, r0, 16
 	lsls r1, 16
@@ -6326,7 +6326,7 @@ sub_808796C: @ 808796C
 	lsrs r3, r1, 24
 	adds r2, r3, 0
 	lsrs r0, 22
-	ldr r1, =gUnknown_02032308
+	ldr r1, =gLinkPlayerMapObjects
 	adds r5, r0, r1
 	ldrb r1, [r5, 0x2]
 	lsls r0, r1, 3
@@ -6654,7 +6654,7 @@ sub_8087BCC: @ 8087BCC
 	lsls r1, 24
 	lsrs r3, r1, 24
 	lsls r2, r5, 2
-	ldr r0, =gUnknown_02032308
+	ldr r0, =gLinkPlayerMapObjects
 	adds r2, r0
 	ldrb r1, [r2, 0x2]
 	lsls r0, r1, 3
@@ -6742,7 +6742,7 @@ sub_8087C8C: @ 8087C8C
 	movs r0, 0x2E
 	ldrsh r4, [r5, r0]
 	lsls r4, 2
-	ldr r0, =gUnknown_02032308
+	ldr r0, =gLinkPlayerMapObjects
 	adds r4, r0
 	ldrb r1, [r4, 0x2]
 	lsls r0, r1, 3