mostly standardize to object event to prep for disassembly

238 files changed, 5708 insertions, 2145 deletions

diff --git a/asm/bike.s b/asm/bike.s
index 4d2683968..5bba18d71 100644
--- a/asm/bike.s
+++ b/asm/bike.s
@@ -77,7 +77,7 @@ sub_80BD100: @ 80BD100
 	lsls r4, r0, 3
 	adds r4, r0
 	lsls r4, 2
-	ldr r0, _080BD160 @ =gMapObjects
+	ldr r0, _080BD160 @ =gObjectEvents
 	adds r4, r0
 	bl player_get_direction_upper_nybble
 	lsls r0, 24
@@ -106,7 +106,7 @@ sub_80BD100: @ 80BD100
 	b _080BD1B6
 	.align 2, 0
 _080BD15C: .4byte gPlayerAvatar
-_080BD160: .4byte gMapObjects
+_080BD160: .4byte gObjectEvents
 _080BD164: .4byte gMain
 _080BD168:
 	ldrb r0, [r6]
@@ -204,7 +204,7 @@ sub_80BD1E8: @ 80BD1E8
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _080BD244 @ =gMapObjects
+	ldr r1, _080BD244 @ =gObjectEvents
 	adds r0, r1
 	ldrb r0, [r0, 0x1E]
 	bl MetatileBehavior_IsCyclingRoadPullDownTile
@@ -227,7 +227,7 @@ sub_80BD1E8: @ 80BD1E8
 	b _080BD270
 	.align 2, 0
 _080BD240: .4byte gPlayerAvatar
-_080BD244: .4byte gMapObjects
+_080BD244: .4byte gObjectEvents
 _080BD248:
 	movs r0, 0x2
 	strb r0, [r4, 0x2]
@@ -281,7 +281,7 @@ sub_80BD28C: @ 80BD28C
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _080BD2C4 @ =gMapObjects
+	ldr r1, _080BD2C4 @ =gObjectEvents
 	adds r5, r0, r1
 	ldrb r1, [r5, 0x1E]
 	adds r0, r4, 0
@@ -299,7 +299,7 @@ _080BD2B2:
 	bx r0
 	.align 2, 0
 _080BD2C0: .4byte gPlayerAvatar
-_080BD2C4: .4byte gMapObjects
+_080BD2C4: .4byte gObjectEvents
 	thumb_func_end sub_80BD28C
 
 	thumb_func_start sub_80BD2C8
@@ -313,7 +313,7 @@ sub_80BD2C8: @ 80BD2C8
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _080BD2FC @ =gMapObjects
+	ldr r1, _080BD2FC @ =gObjectEvents
 	adds r5, r0, r1
 	ldrb r1, [r5, 0x1E]
 	adds r0, r4, 0
@@ -327,7 +327,7 @@ sub_80BD2C8: @ 80BD2C8
 	b _080BD350
 	.align 2, 0
 _080BD2F8: .4byte gPlayerAvatar
-_080BD2FC: .4byte gMapObjects
+_080BD2FC: .4byte gObjectEvents
 _080BD300:
 	adds r0, r4, 0
 	bl sub_80BD3A0
@@ -425,7 +425,7 @@ sub_80BD3A0: @ 80BD3A0
 	lsls r4, r0, 3
 	adds r4, r0
 	lsls r4, 2
-	ldr r0, _080BD408 @ =gMapObjects
+	ldr r0, _080BD408 @ =gObjectEvents
 	adds r4, r0
 	ldrh r1, [r4, 0x10]
 	add r0, sp, 0x4
@@ -463,7 +463,7 @@ sub_80BD3A0: @ 80BD3A0
 	bx r1
 	.align 2, 0
 _080BD404: .4byte gPlayerAvatar
-_080BD408: .4byte gMapObjects
+_080BD408: .4byte gObjectEvents
 	thumb_func_end sub_80BD3A0
 
 	thumb_func_start sub_80BD40C
@@ -689,7 +689,7 @@ player_should_look_direction_be_enforced_upon_movement: @ 80BD58C
 	lsls r0, 24
 	cmp r0, 0
 	beq _080BD5C0
-	ldr r2, _080BD5B8 @ =gMapObjects
+	ldr r2, _080BD5B8 @ =gObjectEvents
 	ldr r0, _080BD5BC @ =gPlayerAvatar
 	ldrb r1, [r0, 0x5]
 	lsls r0, r1, 3
@@ -704,7 +704,7 @@ player_should_look_direction_be_enforced_upon_movement: @ 80BD58C
 	movs r0, 0
 	b _080BD5C2
 	.align 2, 0
-_080BD5B8: .4byte gMapObjects
+_080BD5B8: .4byte gObjectEvents
 _080BD5BC: .4byte gPlayerAvatar
 _080BD5C0:
 	movs r0, 0x1
diff --git a/asm/field_camera.s b/asm/field_camera.s
index 0016e6381..cf9fff21d 100644
--- a/asm/field_camera.s
+++ b/asm/field_camera.s
@@ -939,7 +939,7 @@ _0805AC54:
 	bl CameraMove
 	adds r0, r4, 0
 	adds r1, r5, 0
-	bl UpdateFieldObjectsForCameraUpdate
+	bl UpdateObjectEventsForCameraUpdate
 	ldr r6, _0805ACA8 @ =gUnknown_3000E90
 	lsls r4, 1
 	lsls r5, 1
@@ -987,7 +987,7 @@ sub_805ACB4: @ 805ACB4
 	asrs r0, 16
 	lsls r1, r5, 16
 	asrs r1, 16
-	bl UpdateFieldObjectsForCameraUpdate
+	bl UpdateObjectEventsForCameraUpdate
 	bl DrawWholeMapView
 	ldr r1, _0805ACE8 @ =gUnknown_300506C
 	lsls r4, 4
diff --git a/asm/field_control_avatar.s b/asm/field_control_avatar.s
index c0efe9975..85799d9da 100644
--- a/asm/field_control_avatar.s
+++ b/asm/field_control_avatar.s
@@ -901,12 +901,12 @@ _0806CF60:
 	lsrs r1, 16
 _0806CF7E:
 	ldrb r2, [r4, 0x4]
-	bl GetFieldObjectIdByXYZ
+	bl GetObjectEventIdByXYZ
 	lsls r0, 24
 	lsrs r3, r0, 24
 	cmp r3, 0x10
 	beq _0806CF9E
-	ldr r1, _0806CFA8 @ =gMapObjects
+	ldr r1, _0806CFA8 @ =gObjectEvents
 	lsls r2, r3, 3
 	adds r0, r2, r3
 	lsls r0, 2
@@ -920,7 +920,7 @@ _0806CF9E:
 	b _0806CFDE
 	.align 2, 0
 _0806CFA4: .4byte gDirectionToVectors
-_0806CFA8: .4byte gMapObjects
+_0806CFA8: .4byte gObjectEvents
 _0806CFAC:
 	movs r4, 0
 	ldr r1, _0806CFE4 @ =gUnknown_2031DEC
@@ -936,7 +936,7 @@ _0806CFBC:
 	adds r4, 0x1
 	cmp r4, 0x3
 	ble _0806CFB0
-	ldr r0, _0806CFE8 @ =gSelectedEventObject
+	ldr r0, _0806CFE8 @ =gSelectedObjectEvent
 	strb r3, [r0]
 	ldr r1, _0806CFEC @ =gSpecialVar_LastTalked
 	adds r0, r2, r3
@@ -947,14 +947,14 @@ _0806CFBC:
 	ldr r0, _0806CFF0 @ =gSpecialVar_Facing
 	strh r6, [r0]
 	adds r0, r3, 0
-	bl GetFieldObjectScriptPointerByFieldObjectId
+	bl GetObjectEventScriptPointerByObjectEventId
 _0806CFDE:
 	pop {r4-r6}
 	pop {r1}
 	bx r1
 	.align 2, 0
 _0806CFE4: .4byte gUnknown_2031DEC
-_0806CFE8: .4byte gSelectedEventObject
+_0806CFE8: .4byte gSelectedObjectEvent
 _0806CFEC: .4byte gSpecialVar_LastTalked
 _0806CFF0: .4byte gSpecialVar_Facing
 	thumb_func_end sub_806CF38
@@ -973,12 +973,12 @@ sub_806CFF4: @ 806CFF4
 	ldrh r0, [r4]
 	ldrh r1, [r4, 0x2]
 	ldrb r2, [r4, 0x4]
-	bl GetFieldObjectIdByXYZ
+	bl GetObjectEventIdByXYZ
 	lsls r0, 24
 	lsrs r5, r0, 24
 	cmp r5, 0x10
 	beq _0806D02A
-	ldr r2, _0806D098 @ =gMapObjects
+	ldr r2, _0806D098 @ =gObjectEvents
 	lsls r1, r5, 3
 	adds r0, r1, r5
 	lsls r0, 2
@@ -1011,12 +1011,12 @@ _0806D02A:
 	lsls r1, 16
 	lsrs r1, 16
 	ldrb r2, [r4, 0x4]
-	bl GetFieldObjectIdByXYZ
+	bl GetObjectEventIdByXYZ
 	lsls r0, 24
 	lsrs r5, r0, 24
 	cmp r5, 0x10
 	beq _0806D092
-	ldr r2, _0806D098 @ =gMapObjects
+	ldr r2, _0806D098 @ =gObjectEvents
 	lsls r1, r5, 3
 	adds r0, r1, r5
 	lsls r0, 2
@@ -1031,9 +1031,9 @@ _0806D078:
 	bne _0806D0A0
 	adds r0, r6, r5
 	lsls r0, 2
-	ldr r1, _0806D098 @ =gMapObjects
+	ldr r1, _0806D098 @ =gObjectEvents
 	adds r0, r1
-	bl FieldObjectCheckHeldMovementStatus
+	bl ObjectEventCheckHeldMovementStatus
 	lsls r0, 24
 	cmp r0, 0
 	bne _0806D0A0
@@ -1041,13 +1041,13 @@ _0806D092:
 	movs r0, 0
 	b _0806D0C8
 	.align 2, 0
-_0806D098: .4byte gMapObjects
+_0806D098: .4byte gObjectEvents
 _0806D09C: .4byte gDirectionToVectors
 _0806D0A0:
-	ldr r0, _0806D0D4 @ =gSelectedEventObject
+	ldr r0, _0806D0D4 @ =gSelectedObjectEvent
 	strb r5, [r0]
 	ldr r4, _0806D0D8 @ =gSpecialVar_LastTalked
-	ldr r1, _0806D0DC @ =gMapObjects
+	ldr r1, _0806D0DC @ =gObjectEvents
 	adds r0, r6, r5
 	lsls r0, 2
 	adds r0, r1
@@ -1057,7 +1057,7 @@ _0806D0A0:
 	mov r1, r8
 	strh r1, [r0]
 	adds r0, r5, 0
-	bl GetFieldObjectScriptPointerByFieldObjectId
+	bl GetObjectEventScriptPointerByObjectEventId
 	adds r1, r0, 0
 	ldrb r0, [r4]
 	bl GetRamScript
@@ -1069,9 +1069,9 @@ _0806D0C8:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_0806D0D4: .4byte gSelectedEventObject
+_0806D0D4: .4byte gSelectedObjectEvent
 _0806D0D8: .4byte gSpecialVar_LastTalked
-_0806D0DC: .4byte gMapObjects
+_0806D0DC: .4byte gObjectEvents
 _0806D0E0: .4byte gSpecialVar_Facing
 	thumb_func_end sub_806CFF4
 
@@ -1093,7 +1093,7 @@ sub_806D0E4: @ 806D0E4
 	lsrs r2, 16
 	ldrb r3, [r0, 0x4]
 	adds r0, r4, 0
-	bl FindInvisibleMapObjectByPosition
+	bl FindInvisibleObjectEventByPosition
 	adds r5, r0, 0
 	cmp r5, 0
 	beq _0806D164
@@ -2139,7 +2139,7 @@ sub_806D928: @ 806D928
 	lsrs r2, 16
 	ldrb r3, [r0, 0x4]
 	adds r0, r4, 0
-	bl FindInvisibleMapObjectByPosition
+	bl FindInvisibleObjectEventByPosition
 	cmp r0, 0
 	bne _0806D950
 	movs r0, 0
@@ -2809,7 +2809,7 @@ sub_806DE28: @ 806DE28
 	ldr r2, [r4]
 	ldrb r1, [r2, 0x5]
 	ldrb r2, [r2, 0x4]
-	bl RemoveFieldObjectByLocalIdAndMap
+	bl RemoveObjectEventByLocalIdAndMap
 	ldrb r0, [r5, 0x8]
 	ldr r2, [r4]
 	ldrb r1, [r2, 0x5]
@@ -2892,8 +2892,8 @@ sub_806DEC4: @ 806DEC4
 _0806DEE8: .4byte gMapHeader
 	thumb_func_end sub_806DEC4
 
-	thumb_func_start FindInvisibleMapObjectByPosition
-FindInvisibleMapObjectByPosition: @ 806DEEC
+	thumb_func_start FindInvisibleObjectEventByPosition
+FindInvisibleObjectEventByPosition: @ 806DEEC
 	push {r4-r7,lr}
 	lsls r1, 16
 	lsrs r7, r1, 16
@@ -2938,7 +2938,7 @@ _0806DF34:
 	pop {r4-r7}
 	pop {r1}
 	bx r1
-	thumb_func_end FindInvisibleMapObjectByPosition
+	thumb_func_end FindInvisibleObjectEventByPosition
 
 	thumb_func_start dive_warp
 dive_warp: @ 806DF3C
@@ -3079,8 +3079,8 @@ _0806E046:
 	bx r1
 	thumb_func_end sub_806DFB8
 
-	thumb_func_start GetFieldObjectScriptPointerForComparison
-GetFieldObjectScriptPointerForComparison: @ 806E050
+	thumb_func_start GetObjectEventScriptPointerForComparison
+GetObjectEventScriptPointerForComparison: @ 806E050
 	push {r4,r5,lr}
 	sub sp, 0x8
 	bl player_get_direction_upper_nybble
@@ -3106,7 +3106,7 @@ GetFieldObjectScriptPointerForComparison: @ 806E050
 	pop {r4,r5}
 	pop {r1}
 	bx r1
-	thumb_func_end GetFieldObjectScriptPointerForComparison
+	thumb_func_end GetObjectEventScriptPointerForComparison
 
 	thumb_func_start SetCableClubWarp
 SetCableClubWarp: @ 806E08C
diff --git a/asm/field_effect.s b/asm/field_effect.s
index 41c33c6fc..5959e076c 100644
--- a/asm/field_effect.s
+++ b/asm/field_effect.s
@@ -2067,7 +2067,7 @@ mapldr_08084390: @ 8084390
 	ldr r0, _080843E8 @ =c3_080843F8
 	movs r1, 0
 	bl CreateTask
-	ldr r4, _080843EC @ =gMapObjects
+	ldr r4, _080843EC @ =gObjectEvents
 	ldr r3, _080843F0 @ =gPlayerAvatar
 	ldrb r1, [r3, 0x5]
 	lsls r0, r1, 3
@@ -2089,7 +2089,7 @@ mapldr_08084390: @ 8084390
 	lsls r0, 2
 	adds r0, r4
 	movs r1, 0x3
-	bl FieldObjectTurn
+	bl ObjectEventTurn
 _080843D2:
 	bl ScriptContext2_Enable
 	bl FreezeEventObjects
@@ -2101,7 +2101,7 @@ _080843D2:
 	bx r0
 	.align 2, 0
 _080843E8: .4byte c3_080843F8
-_080843EC: .4byte gMapObjects
+_080843EC: .4byte gObjectEvents
 _080843F0: .4byte gPlayerAvatar
 _080843F4: .4byte gFieldCallback
 	thumb_func_end mapldr_08084390
@@ -2139,7 +2139,7 @@ _0808442A:
 	cmp r0, 0
 	bne _08084444
 	bl ScriptContext2_Disable
-	bl UnfreezeMapObjects
+	bl UnfreezeObjectEvents
 	adds r0, r5, 0
 	bl DestroyTask
 _08084444:
@@ -2214,7 +2214,7 @@ sub_80844BC: @ 80844BC
 	lsls r5, r0, 3
 	adds r5, r0
 	lsls r5, 2
-	ldr r0, _0808455C @ =gMapObjects
+	ldr r0, _0808455C @ =gObjectEvents
 	mov r8, r0
 	add r5, r8
 	ldrb r0, [r6, 0x4]
@@ -2243,7 +2243,7 @@ sub_80844BC: @ 80844BC
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r5, 0
-	bl FieldObjectSetHeldMovement
+	bl ObjectEventSetHeldMovement
 	adds r3, r4, 0
 	adds r3, 0x42
 	ldrb r0, [r3]
@@ -2279,7 +2279,7 @@ sub_80844BC: @ 80844BC
 	bx r1
 	.align 2, 0
 _08084558: .4byte gPlayerAvatar
-_0808455C: .4byte gMapObjects
+_0808455C: .4byte gObjectEvents
 _08084560: .4byte gSprites
 	thumb_func_end sub_80844BC
 
@@ -2331,7 +2331,7 @@ sub_8084580: @ 8084580
 	movs r0, 0x1
 	strh r0, [r5, 0xA]
 	strh r1, [r5, 0xC]
-	ldr r2, _080845F0 @ =gMapObjects
+	ldr r2, _080845F0 @ =gObjectEvents
 	ldrb r0, [r6, 0x5]
 	lsls r1, r0, 3
 	adds r1, r0
@@ -2355,7 +2355,7 @@ sub_8084580: @ 8084580
 _080845E4: .4byte gPlayerAvatar
 _080845E8: .4byte gSprites
 _080845EC: .4byte gSpriteCoordOffsetY
-_080845F0: .4byte gMapObjects
+_080845F0: .4byte gObjectEvents
 	thumb_func_end sub_8084580
 
 	thumb_func_start sub_80845F4
@@ -2367,7 +2367,7 @@ sub_80845F4: @ 80845F4
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _080846A4 @ =gMapObjects
+	ldr r1, _080846A4 @ =gObjectEvents
 	adds r6, r0, r1
 	ldrb r1, [r2, 0x4]
 	lsls r0, r1, 4
@@ -2450,7 +2450,7 @@ _08084698:
 	bx r1
 	.align 2, 0
 _080846A0: .4byte gPlayerAvatar
-_080846A4: .4byte gMapObjects
+_080846A4: .4byte gObjectEvents
 _080846A8: .4byte gSprites
 	thumb_func_end sub_80845F4
 
@@ -2516,7 +2516,7 @@ sub_8084708: @ 8084708
 	strb r0, [r1, 0x6]
 	bl ScriptContext2_Disable
 	bl CameraObjectReset1
-	bl UnfreezeMapObjects
+	bl UnfreezeObjectEvents
 	bl InstallCameraPanAheadCallback
 	mov r4, sp
 	adds r4, 0x2
@@ -2650,15 +2650,15 @@ sub_8084820: @ 8084820
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _0808488C @ =gMapObjects
+	ldr r1, _0808488C @ =gObjectEvents
 	adds r4, r0, r1
 	adds r0, r4, 0
-	bl FieldObjectIsMovementOverridden
+	bl ObjectEventIsMovementOverridden
 	lsls r0, 24
 	cmp r0, 0
 	beq _0808484A
 	adds r0, r4, 0
-	bl FieldObjectClearHeldMovementIfFinished
+	bl ObjectEventClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _0808487E
@@ -2671,7 +2671,7 @@ _0808484A:
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r4, 0
-	bl FieldObjectSetHeldMovement
+	bl ObjectEventSetHeldMovement
 	ldrh r0, [r5, 0x8]
 	adds r0, 0x1
 	movs r1, 0
@@ -2693,7 +2693,7 @@ _0808487E:
 	bx r1
 	.align 2, 0
 _08084888: .4byte gPlayerAvatar
-_0808488C: .4byte gMapObjects
+_0808488C: .4byte gObjectEvents
 	thumb_func_end sub_8084820
 
 	thumb_func_start sub_8084890
@@ -2944,7 +2944,7 @@ sub_8084A5C: @ 8084A5C
 	lsls r4, r0, 3
 	adds r4, r0
 	lsls r4, 2
-	ldr r0, _08084AC0 @ =gMapObjects
+	ldr r0, _08084AC0 @ =gObjectEvents
 	adds r4, r0
 	movs r0, 0x4
 	bl sub_8063EB8
@@ -2952,7 +2952,7 @@ sub_8084A5C: @ 8084A5C
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r4, 0
-	bl FieldObjectSetHeldMovement
+	bl ObjectEventSetHeldMovement
 	mov r4, sp
 	adds r4, 0x2
 	mov r0, sp
@@ -2979,7 +2979,7 @@ sub_8084A5C: @ 8084A5C
 	b _08084AC6
 	.align 2, 0
 _08084ABC: .4byte gPlayerAvatar
-_08084AC0: .4byte gMapObjects
+_08084AC0: .4byte gObjectEvents
 _08084AC4:
 	movs r1, 0
 _08084AC6:
@@ -3189,23 +3189,23 @@ sub_8084C3C: @ 8084C3C
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _08084C98 @ =gMapObjects
+	ldr r1, _08084C98 @ =gObjectEvents
 	adds r4, r0, r1
 	adds r0, r4, 0
-	bl FieldObjectClearHeldMovementIfFinished
+	bl ObjectEventClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _08084C8A
 	bl CameraObjectReset1
 	bl ScriptContext2_Disable
-	bl UnfreezeMapObjects
+	bl UnfreezeObjectEvents
 	movs r0, 0x4
 	bl sub_8063F84
 	adds r1, r0, 0
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r4, 0
-	bl FieldObjectSetHeldMovement
+	bl ObjectEventSetHeldMovement
 	ldr r0, _08084C9C @ =sub_8084A24
 	bl FindTaskIdByFunc
 	lsls r0, 24
@@ -3220,7 +3220,7 @@ _08084C8A:
 	bx r1
 	.align 2, 0
 _08084C94: .4byte gPlayerAvatar
-_08084C98: .4byte gMapObjects
+_08084C98: .4byte gObjectEvents
 _08084C9C: .4byte sub_8084A24
 	thumb_func_end sub_8084C3C
 
@@ -3273,7 +3273,7 @@ _08084CEA:
 	lsls r1, r0, 3
 	adds r1, r0
 	lsls r1, 2
-	ldr r0, _08084D20 @ =gMapObjects
+	ldr r0, _08084D20 @ =gObjectEvents
 	adds r1, r0
 	ldr r2, [r2]
 	adds r0, r4, 0
@@ -3288,7 +3288,7 @@ _08084CEA:
 _08084D14: .4byte gUnknown_83CC084
 _08084D18: .4byte gTasks
 _08084D1C: .4byte gPlayerAvatar
-_08084D20: .4byte gMapObjects
+_08084D20: .4byte gObjectEvents
 	thumb_func_end sub_8084CD8
 
 	thumb_func_start sub_8084D24
@@ -3317,12 +3317,12 @@ waterfall_1_do_anim_probably: @ 8084D44
 	adds r5, r1, 0
 	bl ScriptContext2_Enable
 	adds r0, r5, 0
-	bl FieldObjectIsMovementOverridden
+	bl ObjectEventIsMovementOverridden
 	lsls r0, 24
 	cmp r0, 0
 	bne _08084D74
 	adds r0, r5, 0
-	bl FieldObjectClearHeldMovementIfFinished
+	bl ObjectEventClearHeldMovementIfFinished
 	ldr r1, _08084D7C @ =gFieldEffectArguments
 	movs r2, 0xA
 	ldrsh r0, [r4, r2]
@@ -3374,7 +3374,7 @@ sub_8084DA4: @ 8084DA4
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r4, 0
-	bl FieldObjectSetHeldMovement
+	bl ObjectEventSetHeldMovement
 	ldrh r0, [r5, 0x8]
 	adds r0, 0x1
 	strh r0, [r5, 0x8]
@@ -3390,7 +3390,7 @@ sub_8084DCC: @ 8084DCC
 	adds r5, r0, 0
 	adds r4, r1, 0
 	adds r0, r4, 0
-	bl FieldObjectClearHeldMovementIfFinished
+	bl ObjectEventClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	bne _08084DE2
@@ -3537,7 +3537,7 @@ dive_3_unknown: @ 8084ED4
 	lsls r0, 24
 	cmp r0, 0
 	bne _08084F18
-	ldr r2, _08084F20 @ =gMapObjects
+	ldr r2, _08084F20 @ =gObjectEvents
 	ldr r0, _08084F24 @ =gPlayerAvatar
 	ldrb r1, [r0, 0x5]
 	lsls r0, r1, 3
@@ -3560,7 +3560,7 @@ _08084F18:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_08084F20: .4byte gMapObjects
+_08084F20: .4byte gObjectEvents
 _08084F24: .4byte gPlayerAvatar
 _08084F28: .4byte sub_8084E60
 	thumb_func_end dive_3_unknown
@@ -3600,7 +3600,7 @@ _08084F58:
 	lsls r1, r0, 3
 	adds r1, r0
 	lsls r1, 2
-	ldr r0, _08084F98 @ =gMapObjects
+	ldr r0, _08084F98 @ =gObjectEvents
 	adds r1, r0
 	ldrb r0, [r5, 0x4]
 	lsls r2, r0, 4
@@ -3621,7 +3621,7 @@ _08084F58:
 _08084F8C: .4byte gUnknown_83CC0A4
 _08084F90: .4byte gTasks
 _08084F94: .4byte gPlayerAvatar
-_08084F98: .4byte gMapObjects
+_08084F98: .4byte gObjectEvents
 _08084F9C: .4byte gSprites
 	thumb_func_end sub_8084F44
 
@@ -3946,7 +3946,7 @@ _080851FC:
 	lsls r1, r0, 3
 	adds r1, r0
 	lsls r1, 2
-	ldr r0, _0808523C @ =gMapObjects
+	ldr r0, _0808523C @ =gObjectEvents
 	adds r1, r0
 	ldrb r0, [r5, 0x4]
 	lsls r2, r0, 4
@@ -3967,7 +3967,7 @@ _080851FC:
 _08085230: .4byte gUnknown_83CC0BC
 _08085234: .4byte gTasks
 _08085238: .4byte gPlayerAvatar
-_0808523C: .4byte gMapObjects
+_0808523C: .4byte gObjectEvents
 _08085240: .4byte gSprites
 	thumb_func_end sub_80851E8
 
@@ -4070,7 +4070,7 @@ sub_80852C0: @ 80852C0
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r4, 0
-	bl FieldObjectSetHeldMovement
+	bl ObjectEventSetHeldMovement
 _08085308:
 	movs r0, 0
 	pop {r4}
@@ -4084,7 +4084,7 @@ _08085310: .4byte gSprites
 sub_8085314: @ 8085314
 	push {lr}
 	adds r0, r1, 0
-	bl FieldObjectClearHeldMovementIfFinished
+	bl ObjectEventClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _0808533E
@@ -4092,7 +4092,7 @@ sub_8085314: @ 8085314
 	movs r0, 0
 	strb r0, [r1, 0x6]
 	bl ScriptContext2_Disable
-	bl UnfreezeMapObjects
+	bl UnfreezeObjectEvents
 	ldr r0, _08085348 @ =sub_80851E8
 	bl FindTaskIdByFunc
 	lsls r0, 24
@@ -4209,7 +4209,7 @@ _080853F8:
 	lsls r1, r0, 3
 	adds r1, r0
 	lsls r1, 2
-	ldr r0, _08085438 @ =gMapObjects
+	ldr r0, _08085438 @ =gObjectEvents
 	adds r1, r0
 	ldrb r0, [r5, 0x4]
 	lsls r2, r0, 4
@@ -4230,7 +4230,7 @@ _080853F8:
 _0808542C: .4byte gUnknown_83CC0CC
 _08085430: .4byte gTasks
 _08085434: .4byte gPlayerAvatar
-_08085438: .4byte gMapObjects
+_08085438: .4byte gObjectEvents
 _0808543C: .4byte gSprites
 	thumb_func_end sub_80853E4
 
@@ -4266,7 +4266,7 @@ sub_8085470: @ 8085470
 	adds r4, r1, 0
 	adds r6, r2, 0
 	adds r0, r4, 0
-	bl FieldObjectClearHeldMovementIfFinished
+	bl ObjectEventClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _080854E4
@@ -4311,7 +4311,7 @@ _080854C4:
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r4, 0
-	bl FieldObjectSetHeldMovement
+	bl ObjectEventSetHeldMovement
 	movs r0, 0x21
 	bl PlaySE
 _080854E4:
@@ -4546,7 +4546,7 @@ sub_8085690: @ 8085690
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _080856D8 @ =gMapObjects
+	ldr r1, _080856D8 @ =gObjectEvents
 	adds r6, r0, r1
 	adds r4, r5, 0
 	adds r4, 0x8
@@ -4572,7 +4572,7 @@ sub_8085690: @ 8085690
 	b _08085702
 	.align 2, 0
 _080856D4: .4byte gPlayerAvatar
-_080856D8: .4byte gMapObjects
+_080856D8: .4byte gObjectEvents
 _080856DC:
 	movs r1, 0x8
 	ldrsh r0, [r4, r1]
@@ -4610,7 +4610,7 @@ _08085702:
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r6, 0
-	bl FieldObjectSetDirection
+	bl ObjectEventSetDirection
 	bl sub_80555E0
 	bl WarpIntoMap
 	ldr r1, _0808575C @ =gFieldCallback
@@ -4641,12 +4641,12 @@ sub_808576C: @ 808576C
 	adds r4, r0, 0
 	adds r6, r1, 0
 	adds r5, r2, 0
-	bl FieldObjectIsMovementOverridden
+	bl ObjectEventIsMovementOverridden
 	lsls r0, 24
 	cmp r0, 0
 	beq _0808578A
 	adds r0, r4, 0
-	bl FieldObjectClearHeldMovementIfFinished
+	bl ObjectEventClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _080857E4
@@ -4673,7 +4673,7 @@ _0808579E:
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r4, 0
-	bl FieldObjectSetHeldMovement
+	bl ObjectEventSetHeldMovement
 	ldrh r1, [r5]
 	movs r2, 0
 	ldrsh r0, [r5, r2]
@@ -4973,7 +4973,7 @@ sub_80859D4: @ 80859D4
 	ldr r1, _08085A14 @ =gFieldCallback
 	movs r0, 0
 	str r0, [r1]
-	ldr r2, _08085A18 @ =gMapObjects
+	ldr r2, _08085A18 @ =gObjectEvents
 	ldr r0, _08085A1C @ =gPlayerAvatar
 	ldrb r1, [r0, 0x5]
 	lsls r0, r1, 3
@@ -4991,7 +4991,7 @@ sub_80859D4: @ 80859D4
 	bx r0
 	.align 2, 0
 _08085A14: .4byte gFieldCallback
-_08085A18: .4byte gMapObjects
+_08085A18: .4byte gObjectEvents
 _08085A1C: .4byte gPlayerAvatar
 _08085A20: .4byte sub_8085A24
 	thumb_func_end sub_80859D4
@@ -5056,7 +5056,7 @@ sub_8085A80: @ 8085A80
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _08085AD8 @ =gMapObjects
+	ldr r1, _08085AD8 @ =gObjectEvents
 	adds r6, r0, r1
 	adds r1, r4, 0
 	adds r1, 0xA
@@ -5088,7 +5088,7 @@ sub_8085A80: @ 8085A80
 	b _08085B10
 	.align 2, 0
 _08085AD4: .4byte gPlayerAvatar
-_08085AD8: .4byte gMapObjects
+_08085AD8: .4byte gObjectEvents
 _08085ADC:
 	movs r2, 0xE
 	ldrsh r0, [r5, r2]
@@ -5125,7 +5125,7 @@ _08085B10:
 	cmp r1, r0
 	bne _08085B58
 	adds r0, r6, 0
-	bl FieldObjectCheckHeldMovementStatus
+	bl ObjectEventCheckHeldMovementStatus
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -5141,7 +5141,7 @@ _08085B10:
 	ands r0, r1
 	strb r0, [r6, 0x3]
 	bl ScriptContext2_Disable
-	bl UnfreezeMapObjects
+	bl UnfreezeObjectEvents
 	ldr r0, _08085B60 @ =sub_8085A24
 	bl FindTaskIdByFunc
 	lsls r0, 24
@@ -5226,7 +5226,7 @@ sub_8085BD0: @ 8085BD0
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _08085C5C @ =gMapObjects
+	ldr r1, _08085C5C @ =gObjectEvents
 	adds r5, r0, r1
 	ldrh r1, [r4, 0xA]
 	movs r2, 0xA
@@ -5245,7 +5245,7 @@ _08085C02:
 	add r0, sp
 	ldrb r1, [r0]
 	adds r0, r5, 0
-	bl FieldObjectTurn
+	bl ObjectEventTurn
 	movs r0, 0x8
 	strh r0, [r4, 0xA]
 	ldrh r0, [r4, 0xC]
@@ -5282,7 +5282,7 @@ _08085C4A:
 	.align 2, 0
 _08085C54: .4byte gUnknown_83CC108
 _08085C58: .4byte gPlayerAvatar
-_08085C5C: .4byte gMapObjects
+_08085C5C: .4byte gObjectEvents
 	thumb_func_end sub_8085BD0
 
 	thumb_func_start sub_8085C60
@@ -5299,7 +5299,7 @@ sub_8085C60: @ 8085C60
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _08085D2C @ =gMapObjects
+	ldr r1, _08085D2C @ =gObjectEvents
 	adds r3, r0, r1
 	ldrb r1, [r2, 0x4]
 	lsls r0, r1, 4
@@ -5321,7 +5321,7 @@ sub_8085C60: @ 8085C60
 	add r0, sp
 	ldrb r1, [r0]
 	adds r0, r3, 0
-	bl FieldObjectTurn
+	bl ObjectEventTurn
 _08085CAA:
 	ldrh r0, [r5, 0x22]
 	ldrh r1, [r4, 0xE]
@@ -5387,7 +5387,7 @@ _08085D1A:
 	.align 2, 0
 _08085D24: .4byte gUnknown_83CC108
 _08085D28: .4byte gPlayerAvatar
-_08085D2C: .4byte gMapObjects
+_08085D2C: .4byte gObjectEvents
 _08085D30: .4byte gSprites
 	thumb_func_end sub_8085C60
 
@@ -5439,7 +5439,7 @@ mapldr_08085D88: @ 8085D88
 	ldr r1, _08085DCC @ =gFieldCallback
 	movs r0, 0
 	str r0, [r1]
-	ldr r2, _08085DD0 @ =gMapObjects
+	ldr r2, _08085DD0 @ =gObjectEvents
 	ldr r0, _08085DD4 @ =gPlayerAvatar
 	ldrb r1, [r0, 0x5]
 	lsls r0, r1, 3
@@ -5458,7 +5458,7 @@ mapldr_08085D88: @ 8085D88
 	bx r0
 	.align 2, 0
 _08085DCC: .4byte gFieldCallback
-_08085DD0: .4byte gMapObjects
+_08085DD0: .4byte gObjectEvents
 _08085DD4: .4byte gPlayerAvatar
 _08085DD8: .4byte sub_8085DDC
 	thumb_func_end mapldr_08085D88
@@ -5518,7 +5518,7 @@ sub_8085E0C: @ 8085E0C
 	adds r0, r1
 	negs r0, r0
 	strh r0, [r2, 0x26]
-	ldr r3, _08085E94 @ =gMapObjects
+	ldr r3, _08085E94 @ =gObjectEvents
 	ldrb r0, [r5, 0x5]
 	lsls r1, r0, 3
 	adds r1, r0
@@ -5554,7 +5554,7 @@ _08085E82:
 _08085E88: .4byte gPlayerAvatar
 _08085E8C: .4byte gSprites
 _08085E90: .4byte gSpriteCoordOffsetY
-_08085E94: .4byte gMapObjects
+_08085E94: .4byte gObjectEvents
 	thumb_func_end sub_8085E0C
 
 	thumb_func_start sub_8085E98
@@ -5571,7 +5571,7 @@ sub_8085E98: @ 8085E98
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _08085F08 @ =gMapObjects
+	ldr r1, _08085F08 @ =gObjectEvents
 	adds r6, r0, r1
 	ldrb r1, [r2, 0x4]
 	lsls r0, r1, 4
@@ -5613,7 +5613,7 @@ sub_8085E98: @ 8085E98
 	.align 2, 0
 _08085F00: .4byte gUnknown_83CC108
 _08085F04: .4byte gPlayerAvatar
-_08085F08: .4byte gMapObjects
+_08085F08: .4byte gObjectEvents
 _08085F0C: .4byte gSprites
 _08085F10:
 	ldrb r1, [r5, 0x5]
@@ -5670,7 +5670,7 @@ _08085F5A:
 	add r0, sp
 	ldrb r1, [r0]
 	adds r0, r6, 0
-	bl FieldObjectTurn
+	bl ObjectEventTurn
 _08085F7C:
 	movs r1, 0x26
 	ldrsh r0, [r5, r1]
@@ -5704,7 +5704,7 @@ sub_8085F9C: @ 8085F9C
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _08086020 @ =gMapObjects
+	ldr r1, _08086020 @ =gObjectEvents
 	adds r5, r0, r1
 	ldrh r0, [r4, 0xA]
 	subs r0, 0x1
@@ -5718,7 +5718,7 @@ sub_8085F9C: @ 8085F9C
 	add r0, sp
 	ldrb r1, [r0]
 	adds r0, r5, 0
-	bl FieldObjectTurn
+	bl ObjectEventTurn
 	movs r0, 0x8
 	strh r0, [r4, 0xA]
 	ldrh r0, [r4, 0xC]
@@ -5737,7 +5737,7 @@ sub_8085F9C: @ 8085F9C
 	bne _08086010
 	bl ScriptContext2_Disable
 	bl CameraObjectReset1
-	bl UnfreezeMapObjects
+	bl UnfreezeObjectEvents
 	ldr r0, _08086024 @ =sub_8085DDC
 	bl FindTaskIdByFunc
 	lsls r0, 24
@@ -5751,7 +5751,7 @@ _08086010:
 	.align 2, 0
 _08086018: .4byte gUnknown_83CC108
 _0808601C: .4byte gPlayerAvatar
-_08086020: .4byte gMapObjects
+_08086020: .4byte gObjectEvents
 _08086024: .4byte sub_8085DDC
 	thumb_func_end sub_8085F9C
 
@@ -7014,7 +7014,7 @@ sub_80869C0: @ 80869C0
 	adds r0, r6, 0
 	mov r1, r8
 	bl PlayerGetDestCoords
-	ldr r2, _08086A1C @ =gMapObjects
+	ldr r2, _08086A1C @ =gObjectEvents
 	ldrb r1, [r5, 0x5]
 	lsls r0, r1, 3
 	adds r0, r1
@@ -7035,7 +7035,7 @@ sub_80869C0: @ 80869C0
 	bx r0
 	.align 2, 0
 _08086A18: .4byte gPlayerAvatar
-_08086A1C: .4byte gMapObjects
+_08086A1C: .4byte gObjectEvents
 	thumb_func_end sub_80869C0
 
 	thumb_func_start sub_8086A20
@@ -7047,15 +7047,15 @@ sub_8086A20: @ 8086A20
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _08086A68 @ =gMapObjects
+	ldr r1, _08086A68 @ =gObjectEvents
 	adds r4, r0, r1
 	adds r0, r4, 0
-	bl FieldObjectIsMovementOverridden
+	bl ObjectEventIsMovementOverridden
 	lsls r0, 24
 	cmp r0, 0
 	beq _08086A4A
 	adds r0, r4, 0
-	bl FieldObjectClearHeldMovementIfFinished
+	bl ObjectEventClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _08086A5C
@@ -7063,7 +7063,7 @@ _08086A4A:
 	bl sub_805CB70
 	adds r0, r4, 0
 	movs r1, 0x45
-	bl FieldObjectSetHeldMovement
+	bl ObjectEventSetHeldMovement
 	ldrh r0, [r5, 0x8]
 	adds r0, 0x1
 	strh r0, [r5, 0x8]
@@ -7073,7 +7073,7 @@ _08086A5C:
 	bx r0
 	.align 2, 0
 _08086A64: .4byte gPlayerAvatar
-_08086A68: .4byte gMapObjects
+_08086A68: .4byte gObjectEvents
 	thumb_func_end sub_8086A20
 
 	thumb_func_start sub_8086A6C
@@ -7085,9 +7085,9 @@ sub_8086A6C: @ 8086A6C
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _08086AAC @ =gMapObjects
+	ldr r1, _08086AAC @ =gObjectEvents
 	adds r0, r1
-	bl FieldObjectCheckHeldMovementStatus
+	bl ObjectEventCheckHeldMovementStatus
 	lsls r0, 24
 	cmp r0, 0
 	beq _08086AA2
@@ -7109,7 +7109,7 @@ _08086AA2:
 	bx r0
 	.align 2, 0
 _08086AA8: .4byte gPlayerAvatar
-_08086AAC: .4byte gMapObjects
+_08086AAC: .4byte gObjectEvents
 _08086AB0: .4byte gFieldEffectArguments
 	thumb_func_end sub_8086A6C
 
@@ -7127,7 +7127,7 @@ sub_8086AB4: @ 8086AB4
 	lsls r4, r0, 3
 	adds r4, r0
 	lsls r4, 2
-	ldr r0, _08086B28 @ =gMapObjects
+	ldr r0, _08086B28 @ =gObjectEvents
 	adds r4, r0
 	movs r0, 0x2
 	bl sub_805C808
@@ -7137,7 +7137,7 @@ sub_8086AB4: @ 8086AB4
 	adds r0, r4, 0
 	bl EventObjectSetGraphicsId
 	adds r0, r4, 0
-	bl FieldObjectClearHeldMovementIfFinished
+	bl ObjectEventClearHeldMovementIfFinished
 	ldrb r0, [r4, 0x18]
 	lsrs r0, 4
 	bl sub_80641C0
@@ -7145,7 +7145,7 @@ sub_8086AB4: @ 8086AB4
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r4, 0
-	bl FieldObjectSetHeldMovement
+	bl ObjectEventSetHeldMovement
 	ldr r1, _08086B2C @ =gFieldEffectArguments
 	movs r2, 0xA
 	ldrsh r0, [r6, r2]
@@ -7167,7 +7167,7 @@ _08086B1E:
 	bx r0
 	.align 2, 0
 _08086B24: .4byte gPlayerAvatar
-_08086B28: .4byte gMapObjects
+_08086B28: .4byte gObjectEvents
 _08086B2C: .4byte gFieldEffectArguments
 	thumb_func_end sub_8086AB4
 
@@ -7179,10 +7179,10 @@ sub_8086B30: @ 8086B30
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _08086BA0 @ =gMapObjects
+	ldr r1, _08086BA0 @ =gObjectEvents
 	adds r4, r0, r1
 	adds r0, r4, 0
-	bl FieldObjectClearHeldMovementIfFinished
+	bl ObjectEventClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _08086B96
@@ -7199,11 +7199,11 @@ sub_8086B30: @ 8086B30
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r4, 0
-	bl FieldObjectSetHeldMovement
+	bl ObjectEventSetHeldMovement
 	ldrb r0, [r4, 0x1A]
 	movs r1, 0x1
 	bl sub_80DC44C
-	bl UnfreezeMapObjects
+	bl UnfreezeObjectEvents
 	bl ScriptContext2_Disable
 	movs r0, 0x9
 	bl FieldEffectActiveListRemove
@@ -7220,7 +7220,7 @@ _08086B96:
 	bx r0
 	.align 2, 0
 _08086B9C: .4byte gPlayerAvatar
-_08086BA0: .4byte gMapObjects
+_08086BA0: .4byte gObjectEvents
 _08086BA4: .4byte sub_8086990
 	thumb_func_end sub_8086B30
 
@@ -7299,15 +7299,15 @@ sub_8086C24: @ 8086C24
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _08086C6C @ =gMapObjects
+	ldr r1, _08086C6C @ =gObjectEvents
 	adds r4, r0, r1
 	adds r0, r4, 0
-	bl FieldObjectIsMovementOverridden
+	bl ObjectEventIsMovementOverridden
 	lsls r0, 24
 	cmp r0, 0
 	beq _08086C4E
 	adds r0, r4, 0
-	bl FieldObjectClearHeldMovementIfFinished
+	bl ObjectEventClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _08086C60
@@ -7315,7 +7315,7 @@ _08086C4E:
 	bl sub_805CBE8
 	adds r0, r4, 0
 	movs r1, 0x45
-	bl FieldObjectSetHeldMovement
+	bl ObjectEventSetHeldMovement
 	ldrh r0, [r5, 0x8]
 	adds r0, 0x1
 	strh r0, [r5, 0x8]
@@ -7325,7 +7325,7 @@ _08086C60:
 	bx r0
 	.align 2, 0
 _08086C68: .4byte gPlayerAvatar
-_08086C6C: .4byte gMapObjects
+_08086C6C: .4byte gObjectEvents
 	thumb_func_end sub_8086C24
 
 	thumb_func_start sub_8086C70
@@ -7337,10 +7337,10 @@ sub_8086C70: @ 8086C70
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _08086CA0 @ =gMapObjects
+	ldr r1, _08086CA0 @ =gObjectEvents
 	adds r4, r0, r1
 	adds r0, r4, 0
-	bl FieldObjectClearHeldMovementIfFinished
+	bl ObjectEventClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _08086CEE
@@ -7353,7 +7353,7 @@ sub_8086C70: @ 8086C70
 	b _08086CAE
 	.align 2, 0
 _08086C9C: .4byte gPlayerAvatar
-_08086CA0: .4byte gMapObjects
+_08086CA0: .4byte gObjectEvents
 _08086CA4:
 	movs r0, 0x8
 	ands r0, r1
@@ -7385,7 +7385,7 @@ _08086CD2:
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r4, 0
-	bl FieldObjectForceSetSpecialAnim
+	bl ObjectEventForceSetSpecialAnim
 	ldrh r0, [r6, 0x8]
 	adds r0, 0x1
 	strh r0, [r6, 0x8]
@@ -7403,9 +7403,9 @@ sub_8086CF4: @ 8086CF4
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _08086D30 @ =gMapObjects
+	ldr r1, _08086D30 @ =gObjectEvents
 	adds r0, r1
-	bl FieldObjectClearHeldMovementIfFinished
+	bl ObjectEventClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _08086D26
@@ -7424,7 +7424,7 @@ _08086D26:
 	bx r0
 	.align 2, 0
 _08086D2C: .4byte gPlayerAvatar
-_08086D30: .4byte gMapObjects
+_08086D30: .4byte gObjectEvents
 _08086D34: .4byte sub_8086BD0
 	thumb_func_end sub_8086CF4
 
@@ -7596,15 +7596,15 @@ sub_8086E70: @ 8086E70
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _08086EC4 @ =gMapObjects
+	ldr r1, _08086EC4 @ =gObjectEvents
 	adds r4, r0, r1
 	adds r0, r4, 0
-	bl FieldObjectIsMovementOverridden
+	bl ObjectEventIsMovementOverridden
 	lsls r0, 24
 	cmp r0, 0
 	beq _08086E9A
 	adds r0, r4, 0
-	bl FieldObjectClearHeldMovementIfFinished
+	bl ObjectEventClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _08086EB8
@@ -7617,7 +7617,7 @@ _08086E9A:
 	bl sub_805CB70
 	adds r0, r4, 0
 	movs r1, 0x45
-	bl FieldObjectSetHeldMovement
+	bl ObjectEventSetHeldMovement
 	ldrh r0, [r5, 0x8]
 	adds r0, 0x1
 	strh r0, [r5, 0x8]
@@ -7627,7 +7627,7 @@ _08086EB8:
 	bx r0
 	.align 2, 0
 _08086EC0: .4byte gPlayerAvatar
-_08086EC4: .4byte gMapObjects
+_08086EC4: .4byte gObjectEvents
 	thumb_func_end sub_8086E70
 
 	thumb_func_start sub_8086EC8
@@ -7639,9 +7639,9 @@ sub_8086EC8: @ 8086EC8
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _08086F04 @ =gMapObjects
+	ldr r1, _08086F04 @ =gObjectEvents
 	adds r0, r1
-	bl FieldObjectClearHeldMovementIfFinished
+	bl ObjectEventClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _08086EF8
@@ -7660,7 +7660,7 @@ _08086EF8:
 	bx r0
 	.align 2, 0
 _08086F00: .4byte gPlayerAvatar
-_08086F04: .4byte gMapObjects
+_08086F04: .4byte gObjectEvents
 _08086F08: .4byte gFieldEffectArguments
 	thumb_func_end sub_8086EC8
 
@@ -7678,7 +7678,7 @@ sub_8086F0C: @ 8086F0C
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _08086F60 @ =gMapObjects
+	ldr r1, _08086F60 @ =gObjectEvents
 	adds r5, r0, r1
 	ldrh r1, [r4, 0x26]
 	movs r0, 0x8
@@ -7705,7 +7705,7 @@ _08086F54:
 	bx r0
 	.align 2, 0
 _08086F5C: .4byte gPlayerAvatar
-_08086F60: .4byte gMapObjects
+_08086F60: .4byte gObjectEvents
 	thumb_func_end sub_8086F0C
 
 	thumb_func_start sub_8086F64
@@ -7729,17 +7729,17 @@ sub_8086F64: @ 8086F64
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _08086FA4 @ =gMapObjects
+	ldr r1, _08086FA4 @ =gObjectEvents
 	adds r0, r1
 	movs r1, 0x2
-	bl FieldObjectSetHeldMovement
+	bl ObjectEventSetHeldMovement
 _08086F98:
 	pop {r4}
 	pop {r0}
 	bx r0
 	.align 2, 0
 _08086FA0: .4byte gPlayerAvatar
-_08086FA4: .4byte gMapObjects
+_08086FA4: .4byte gObjectEvents
 	thumb_func_end sub_8086F64
 
 	thumb_func_start sub_8086FA8
@@ -7751,7 +7751,7 @@ sub_8086FA8: @ 8086FA8
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _08086FF8 @ =gMapObjects
+	ldr r1, _08086FF8 @ =gObjectEvents
 	adds r2, r0, r1
 	ldrh r1, [r4, 0xC]
 	movs r3, 0xC
@@ -7765,7 +7765,7 @@ sub_8086FA8: @ 8086FA8
 	bne _08086FEC
 _08086FCE:
 	adds r0, r2, 0
-	bl FieldObjectClearHeldMovementIfFinished
+	bl ObjectEventClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _08086FEC
@@ -7782,7 +7782,7 @@ _08086FEC:
 	bx r0
 	.align 2, 0
 _08086FF4: .4byte gPlayerAvatar
-_08086FF8: .4byte gMapObjects
+_08086FF8: .4byte gObjectEvents
 	thumb_func_end sub_8086FA8
 
 	thumb_func_start sub_8086FFC
@@ -7801,7 +7801,7 @@ sub_8086FFC: @ 8086FFC
 	lsls r4, r0, 3
 	adds r4, r0
 	lsls r4, 2
-	ldr r0, _08087064 @ =gMapObjects
+	ldr r0, _08087064 @ =gObjectEvents
 	adds r4, r0
 	movs r0, 0x2
 	bl sub_805C808
@@ -7824,7 +7824,7 @@ sub_8086FFC: @ 8086FFC
 	strb r0, [r4, 0x1]
 	adds r0, r4, 0
 	movs r1, 0x54
-	bl FieldObjectSetHeldMovement
+	bl ObjectEventSetHeldMovement
 	ldrh r0, [r5, 0x8]
 	adds r0, 0x1
 	strh r0, [r5, 0x8]
@@ -7836,7 +7836,7 @@ _0808705A:
 	bx r0
 	.align 2, 0
 _08087060: .4byte gPlayerAvatar
-_08087064: .4byte gMapObjects
+_08087064: .4byte gObjectEvents
 _08087068: .4byte gSprites
 	thumb_func_end sub_8086FFC
 
@@ -7856,10 +7856,10 @@ sub_808706C: @ 808706C
 	lsls r4, r0, 3
 	adds r4, r0
 	lsls r4, 2
-	ldr r0, _08087108 @ =gMapObjects
+	ldr r0, _08087108 @ =gObjectEvents
 	adds r4, r0
 	adds r0, r4, 0
-	bl FieldObjectClearAnimIfSpecialAnimActive
+	bl ObjectEventClearAnimIfSpecialAnimActive
 	ldrb r1, [r4, 0x1]
 	movs r0, 0x11
 	negs r0, r0
@@ -7915,7 +7915,7 @@ _080870FC:
 	bx r0
 	.align 2, 0
 _08087104: .4byte gPlayerAvatar
-_08087108: .4byte gMapObjects
+_08087108: .4byte gObjectEvents
 _0808710C: .4byte gSprites
 _08087110: .4byte gSaveBlock2Ptr
 _08087114: .4byte sub_8087828
@@ -8430,15 +8430,15 @@ sub_80874C8: @ 80874C8
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _080875B8 @ =gMapObjects
+	ldr r1, _080875B8 @ =gObjectEvents
 	adds r5, r0, r1
 	adds r0, r5, 0
-	bl FieldObjectIsMovementOverridden
+	bl ObjectEventIsMovementOverridden
 	lsls r0, 24
 	cmp r0, 0
 	beq _080874F2
 	adds r0, r5, 0
-	bl FieldObjectClearHeldMovementIfFinished
+	bl ObjectEventClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _080875AE
@@ -8472,7 +8472,7 @@ _0808751A:
 	bl CameraObjectReset2
 	adds r0, r5, 0
 	movs r1, 0x3
-	bl FieldObjectTurn
+	bl ObjectEventTurn
 	ldrb r1, [r5, 0x4]
 	lsls r0, r1, 4
 	adds r0, r1
@@ -8532,7 +8532,7 @@ _080875AE:
 	bx r0
 	.align 2, 0
 _080875B4: .4byte gPlayerAvatar
-_080875B8: .4byte gMapObjects
+_080875B8: .4byte gObjectEvents
 _080875BC: .4byte gSprites
 _080875C0: .4byte gSaveBlock2Ptr
 _080875C4: .4byte sub_8087828
@@ -8566,7 +8566,7 @@ _080875F2:
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _08087640 @ =gMapObjects
+	ldr r1, _08087640 @ =gObjectEvents
 	adds r0, r1
 	ldrb r0, [r0, 0x4]
 	lsls r4, r0, 4
@@ -8598,7 +8598,7 @@ _08087630:
 	.align 2, 0
 _08087638: .4byte gSprites
 _0808763C: .4byte gPlayerAvatar
-_08087640: .4byte gMapObjects
+_08087640: .4byte gObjectEvents
 	thumb_func_end sub_80875C8
 
 	thumb_func_start sub_8087644
@@ -8658,7 +8658,7 @@ sub_8087698: @ 8087698
 	lsls r5, r0, 3
 	adds r5, r0
 	lsls r5, 2
-	ldr r0, _08087708 @ =gMapObjects
+	ldr r0, _08087708 @ =gObjectEvents
 	adds r5, r0
 	ldrb r0, [r5, 0x4]
 	lsls r4, r0, 4
@@ -8688,7 +8688,7 @@ sub_8087698: @ 8087698
 	bl sub_805CB70
 	adds r0, r5, 0
 	movs r1, 0x45
-	bl FieldObjectSetHeldMovement
+	bl ObjectEventSetHeldMovement
 	ldrh r0, [r6, 0x8]
 	adds r0, 0x1
 	strh r0, [r6, 0x8]
@@ -8698,7 +8698,7 @@ _080876FC:
 	bx r0
 	.align 2, 0
 _08087704: .4byte gPlayerAvatar
-_08087708: .4byte gMapObjects
+_08087708: .4byte gObjectEvents
 _0808770C: .4byte gSprites
 	thumb_func_end sub_8087698
 
@@ -8711,9 +8711,9 @@ sub_8087710: @ 8087710
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _08087744 @ =gMapObjects
+	ldr r1, _08087744 @ =gObjectEvents
 	adds r0, r1
-	bl FieldObjectClearHeldMovementIfFinished
+	bl ObjectEventClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _08087738
@@ -8728,7 +8728,7 @@ _08087738:
 	bx r0
 	.align 2, 0
 _08087740: .4byte gPlayerAvatar
-_08087744: .4byte gMapObjects
+_08087744: .4byte gObjectEvents
 	thumb_func_end sub_8087710
 
 	thumb_func_start sub_8087748
@@ -8776,7 +8776,7 @@ fishE: @ 8087780
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _080877F4 @ =gMapObjects
+	ldr r1, _080877F4 @ =gObjectEvents
 	adds r4, r0, r1
 	movs r7, 0
 	ldrh r1, [r5, 0x26]
@@ -8798,7 +8798,7 @@ _080877B4:
 	bl EventObjectSetGraphicsId
 	adds r0, r4, 0
 	movs r1, 0x1
-	bl FieldObjectTurn
+	bl ObjectEventTurn
 	ldrh r0, [r5, 0x26]
 	strb r0, [r6]
 	movs r0, 0
@@ -8816,7 +8816,7 @@ _080877EA:
 	bx r0
 	.align 2, 0
 _080877F0: .4byte gPlayerAvatar
-_080877F4: .4byte gMapObjects
+_080877F4: .4byte gObjectEvents
 _080877F8: .4byte sub_8087498
 	thumb_func_end fishE
 
@@ -8982,7 +8982,7 @@ sub_8087924: @ 8087924
 	ldrb r1, [r7, 0x4]
 	ldrb r2, [r7, 0x8]
 	mov r3, sp
-	bl TryGetFieldObjectIdByLocalIdAndMap
+	bl TryGetObjectEventIdByLocalIdAndMap
 	lsls r0, 24
 	cmp r0, 0
 	bne _080879BA
@@ -8991,7 +8991,7 @@ sub_8087924: @ 8087924
 	lsls r4, r0, 3
 	adds r4, r0
 	lsls r4, 2
-	ldr r0, _080879C8 @ =gMapObjects
+	ldr r0, _080879C8 @ =gObjectEvents
 	adds r4, r0
 	movs r0, 0x10
 	ldrsh r5, [r4, r0]
@@ -9055,7 +9055,7 @@ _080879BA:
 	bx r1
 	.align 2, 0
 _080879C4: .4byte gFieldEffectArguments
-_080879C8: .4byte gMapObjects
+_080879C8: .4byte gObjectEvents
 _080879CC: .4byte sub_80879D8
 _080879D0: .4byte gTasks
 _080879D4: .4byte gSprites
@@ -9148,7 +9148,7 @@ _08087A78:
 	lsls r4, r0, 3
 	adds r4, r0
 	lsls r4, 2
-	ldr r0, _08087AB0 @ =gMapObjects
+	ldr r0, _08087AB0 @ =gObjectEvents
 	adds r4, r0
 	ldrh r0, [r5, 0x4]
 	strh r0, [r6, 0x20]
@@ -9169,7 +9169,7 @@ _08087AA8:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08087AB0: .4byte gMapObjects
+_08087AB0: .4byte gObjectEvents
 	thumb_func_end sub_80879D8
 
 	thumb_func_start sub_8087AB4
@@ -9181,7 +9181,7 @@ sub_8087AB4: @ 8087AB4
 	ldrb r1, [r4, 0x4]
 	ldrb r2, [r4, 0x8]
 	mov r3, sp
-	bl TryGetFieldObjectIdByLocalIdAndMap
+	bl TryGetObjectEventIdByLocalIdAndMap
 	lsls r0, 24
 	cmp r0, 0
 	bne _08087B04
@@ -9381,7 +9381,7 @@ sub_8087C2C: @ 8087C2C
 	asrs r0, 16
 	cmp r0, 0x78
 	ble _08087C9A
-	ldr r2, _08087CA4 @ =gMapObjects
+	ldr r2, _08087CA4 @ =gObjectEvents
 	movs r1, 0x4
 	ldrsh r0, [r7, r1]
 	lsls r1, r0, 3
@@ -9427,7 +9427,7 @@ _08087C9A:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08087CA4: .4byte gMapObjects
+_08087CA4: .4byte gObjectEvents
 _08087CA8: .4byte gSprites
 _08087CAC: .4byte 0x0000ffff
 _08087CB0: .4byte 0x00007fff
@@ -9454,7 +9454,7 @@ sub_8087CB4: @ 8087CB4
 	ldrb r0, [r4, 0xC]
 	ldrb r1, [r4, 0xE]
 	ldrb r2, [r4, 0x10]
-	bl RemoveFieldObjectByLocalIdAndMap
+	bl RemoveObjectEventByLocalIdAndMap
 	movs r0, 0x44
 	bl FieldEffectActiveListRemove
 	adds r0, r5, 0
diff --git a/asm/field_effect_helpers.s b/asm/field_effect_helpers.s
index 7003a10f2..735720be1 100644
--- a/asm/field_effect_helpers.s
+++ b/asm/field_effect_helpers.s
@@ -105,7 +105,7 @@ _080DAE3C: .4byte gDummySpriteAffineAnimTable
 sub_80DAE40: @ 80DAE40
 	push {lr}
 	ldrb r0, [r0, 0x5]
-	bl GetFieldObjectGraphicsInfo
+	bl GetObjectEventGraphicsInfo
 	ldrh r0, [r0, 0xA]
 	subs r0, 0x2
 	lsls r0, 16
@@ -127,7 +127,7 @@ npc_pal_op: @ 80DAE54
 	movs r0, 0
 	strh r0, [r4, 0x32]
 	ldrb r0, [r5, 0x5]
-	bl GetFieldObjectGraphicsInfo
+	bl GetObjectEventGraphicsInfo
 	ldrb r1, [r0, 0xC]
 	movs r0, 0x80
 	ands r0, r1
@@ -176,7 +176,7 @@ npc_pal_op_B: @ 80DAEC4
 	lsls r1, 24
 	lsrs r4, r1, 24
 	ldrb r0, [r0, 0x5]
-	bl GetFieldObjectGraphicsInfo
+	bl GetObjectEventGraphicsInfo
 	adds r2, r0, 0
 	ldrh r1, [r2, 0x4]
 	ldr r0, _080DAEF0 @ =0x000011ff
@@ -222,7 +222,7 @@ npc_pal_op_A: @ 80DAF20
 	lsls r1, 24
 	lsrs r4, r1, 24
 	ldrb r0, [r0, 0x5]
-	bl GetFieldObjectGraphicsInfo
+	bl GetObjectEventGraphicsInfo
 	adds r2, r0, 0
 	ldrh r1, [r2, 0x4]
 	ldr r0, _080DAF4C @ =0x000011ff
@@ -253,7 +253,7 @@ sub_80DAF50: @ 80DAF50
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _080DAF98 @ =gMapObjects
+	ldr r1, _080DAF98 @ =gObjectEvents
 	adds r7, r0, r1
 	ldrb r1, [r7, 0x4]
 	lsls r0, r1, 4
@@ -281,7 +281,7 @@ _080DAF88:
 	strb r0, [r2]
 	b _080DB0AE
 	.align 2, 0
-_080DAF98: .4byte gMapObjects
+_080DAF98: .4byte gObjectEvents
 _080DAF9C: .4byte gSprites
 _080DAFA0: .4byte 0x00020001
 _080DAFA4:
@@ -584,16 +584,16 @@ oei_shadow: @ 80DB1DC
 	ldrb r0, [r5]
 	ldrb r1, [r5, 0x4]
 	ldrb r2, [r5, 0x8]
-	bl GetFieldObjectIdByLocalIdAndMap
+	bl GetObjectEventIdByLocalIdAndMap
 	lsls r0, 24
 	lsrs r0, 24
-	ldr r2, _080DB26C @ =gMapObjects
+	ldr r2, _080DB26C @ =gObjectEvents
 	lsls r1, r0, 3
 	adds r1, r0
 	lsls r1, 2
 	adds r1, r2
 	ldrb r0, [r1, 0x5]
-	bl GetFieldObjectGraphicsInfo
+	bl GetObjectEventGraphicsInfo
 	adds r4, r0, 0
 	ldr r2, _080DB270 @ =gUnknown_83A0010
 	ldr r1, _080DB274 @ =gUnknown_83FECD2
@@ -649,7 +649,7 @@ _080DB260:
 	bx r1
 	.align 2, 0
 _080DB268: .4byte gFieldEffectArguments
-_080DB26C: .4byte gMapObjects
+_080DB26C: .4byte gObjectEvents
 _080DB270: .4byte gUnknown_83A0010
 _080DB274: .4byte gUnknown_83FECD2
 _080DB278: .4byte gSprites
@@ -671,7 +671,7 @@ oamc_shadow: @ 80DB280
 	lsls r2, 24
 	lsrs r2, 24
 	mov r3, sp
-	bl TryGetFieldObjectIdByLocalIdAndMap
+	bl TryGetObjectEventIdByLocalIdAndMap
 	lsls r0, 24
 	cmp r0, 0
 	beq _080DB2AE
@@ -685,7 +685,7 @@ _080DB2AE:
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _080DB33C @ =gMapObjects
+	ldr r1, _080DB33C @ =gObjectEvents
 	adds r4, r0, r1
 	ldrb r0, [r4, 0x4]
 	lsls r1, r0, 4
@@ -748,7 +748,7 @@ _080DB334:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_080DB33C: .4byte gMapObjects
+_080DB33C: .4byte gObjectEvents
 _080DB340: .4byte gSprites
 _080DB344: .4byte 0x00400001
 	thumb_func_end oamc_shadow
@@ -895,7 +895,7 @@ _080DB438:
 	adds r1, r4, 0
 	adds r2, r7, 0
 	mov r3, sp
-	bl TryGetFieldObjectIdByLocalIdAndMap
+	bl TryGetObjectEventIdByLocalIdAndMap
 	lsls r0, 24
 	cmp r0, 0
 	bne _080DB48C
@@ -929,7 +929,7 @@ _080DB4A0:
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _080DB4F0 @ =gMapObjects
+	ldr r1, _080DB4F0 @ =gObjectEvents
 	adds r2, r0, r1
 	ldr r0, [r2, 0x10]
 	ldr r1, [r5, 0x30]
@@ -966,7 +966,7 @@ _080DB4E4:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_080DB4F0: .4byte gMapObjects
+_080DB4F0: .4byte gObjectEvents
 	thumb_func_end unc_grass_normal
 
 	thumb_func_start FldEff_JumpTallGrass
@@ -1246,7 +1246,7 @@ _080DB6E8:
 	adds r1, r7, 0
 	adds r2, r6, 0
 	mov r3, sp
-	bl TryGetFieldObjectIdByLocalIdAndMap
+	bl TryGetObjectEventIdByLocalIdAndMap
 	lsls r0, 24
 	cmp r0, 0
 	bne _080DB73C
@@ -1280,7 +1280,7 @@ _080DB750:
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _080DB794 @ =gMapObjects
+	ldr r1, _080DB794 @ =gObjectEvents
 	adds r2, r0, r1
 	ldr r0, [r2, 0x10]
 	ldr r1, [r5, 0x30]
@@ -1309,7 +1309,7 @@ _080DB786:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_080DB794: .4byte gMapObjects
+_080DB794: .4byte gObjectEvents
 	thumb_func_end unc_grass_tall
 
 	thumb_func_start FldEff_JumpLongGrass
@@ -1376,13 +1376,13 @@ sub_80DB808: @ 80DB808
 	ldrb r0, [r6]
 	ldrb r1, [r6, 0x4]
 	ldrb r2, [r6, 0x8]
-	bl GetFieldObjectIdByLocalIdAndMap
+	bl GetObjectEventIdByLocalIdAndMap
 	lsls r0, 24
 	lsrs r0, 24
 	lsls r1, r0, 3
 	adds r1, r0
 	lsls r1, 2
-	ldr r0, _080DB8A0 @ =gMapObjects
+	ldr r0, _080DB8A0 @ =gObjectEvents
 	adds r5, r1, r0
 	ldr r0, _080DB8A4 @ =gUnknown_83A0010
 	ldr r0, [r0, 0x78]
@@ -1446,7 +1446,7 @@ _080DB894:
 	bx r1
 	.align 2, 0
 _080DB89C: .4byte gFieldEffectArguments
-_080DB8A0: .4byte gMapObjects
+_080DB8A0: .4byte gObjectEvents
 _080DB8A4: .4byte gUnknown_83A0010
 _080DB8A8: .4byte gSprites
 	thumb_func_end sub_80DB808
@@ -1468,11 +1468,11 @@ sub_80DB8AC: @ 80DB8AC
 	lsls r2, 24
 	lsrs r2, 24
 	mov r3, sp
-	bl TryGetFieldObjectIdByLocalIdAndMap
+	bl TryGetObjectEventIdByLocalIdAndMap
 	lsls r0, 24
 	cmp r0, 0
 	bne _080DB8EA
-	ldr r5, _080DB8F4 @ =gMapObjects
+	ldr r5, _080DB8F4 @ =gObjectEvents
 	mov r0, sp
 	ldrb r1, [r0]
 	lsls r0, r1, 3
@@ -1489,10 +1489,10 @@ _080DB8EA:
 	bl FieldEffectStop
 	b _080DB98E
 	.align 2, 0
-_080DB8F4: .4byte gMapObjects
+_080DB8F4: .4byte gObjectEvents
 _080DB8F8:
 	ldrb r0, [r1, 0x5]
-	bl GetFieldObjectGraphicsInfo
+	bl GetObjectEventGraphicsInfo
 	mov r8, r0
 	mov r0, sp
 	ldrb r1, [r0]
@@ -1833,13 +1833,13 @@ FldEff_Splash: @ 80DBB88
 	ldrb r0, [r6]
 	ldrb r1, [r6, 0x4]
 	ldrb r2, [r6, 0x8]
-	bl GetFieldObjectIdByLocalIdAndMap
+	bl GetObjectEventIdByLocalIdAndMap
 	lsls r0, 24
 	lsrs r0, 24
 	lsls r1, r0, 3
 	adds r1, r0
 	lsls r1, 2
-	ldr r0, _080DBC20 @ =gMapObjects
+	ldr r0, _080DBC20 @ =gObjectEvents
 	adds r5, r1, r0
 	ldr r0, _080DBC24 @ =gUnknown_83A0010
 	ldr r0, [r0, 0x34]
@@ -1852,7 +1852,7 @@ FldEff_Splash: @ 80DBB88
 	cmp r4, 0x40
 	beq _080DBC12
 	ldrb r0, [r5, 0x5]
-	bl GetFieldObjectGraphicsInfo
+	bl GetObjectEventGraphicsInfo
 	lsls r3, r4, 4
 	adds r3, r4
 	lsls r3, 2
@@ -1900,7 +1900,7 @@ _080DBC12:
 	bx r1
 	.align 2, 0
 _080DBC1C: .4byte gFieldEffectArguments
-_080DBC20: .4byte gMapObjects
+_080DBC20: .4byte gObjectEvents
 _080DBC24: .4byte gUnknown_83A0010
 _080DBC28: .4byte gSprites
 	thumb_func_end FldEff_Splash
@@ -1926,7 +1926,7 @@ sub_80DBC2C: @ 80DBC2C
 	lsls r2, 24
 	lsrs r2, 24
 	mov r3, sp
-	bl TryGetFieldObjectIdByLocalIdAndMap
+	bl TryGetObjectEventIdByLocalIdAndMap
 	lsls r0, 24
 	cmp r0, 0
 	beq _080DBC66
@@ -1937,7 +1937,7 @@ _080DBC5C:
 	b _080DBCA6
 _080DBC66:
 	ldr r3, _080DBCB0 @ =gSprites
-	ldr r2, _080DBCB4 @ =gMapObjects
+	ldr r2, _080DBCB4 @ =gObjectEvents
 	mov r0, sp
 	ldrb r1, [r0]
 	lsls r0, r1, 3
@@ -1974,7 +1974,7 @@ _080DBCA6:
 	bx r0
 	.align 2, 0
 _080DBCB0: .4byte gSprites
-_080DBCB4: .4byte gMapObjects
+_080DBCB4: .4byte gObjectEvents
 	thumb_func_end sub_80DBC2C
 
 	thumb_func_start FldEff_JumpSmallSplash
@@ -2098,13 +2098,13 @@ FldEff_FeetInFlowingWater: @ 80DBD98
 	ldrb r0, [r7]
 	ldrb r1, [r7, 0x4]
 	ldrb r2, [r7, 0x8]
-	bl GetFieldObjectIdByLocalIdAndMap
+	bl GetObjectEventIdByLocalIdAndMap
 	lsls r0, 24
 	lsrs r0, 24
 	lsls r1, r0, 3
 	adds r1, r0
 	lsls r1, 2
-	ldr r0, _080DBE3C @ =gMapObjects
+	ldr r0, _080DBE3C @ =gObjectEvents
 	adds r6, r1, r0
 	ldr r0, _080DBE40 @ =gUnknown_83A0010
 	ldr r0, [r0, 0x34]
@@ -2117,7 +2117,7 @@ FldEff_FeetInFlowingWater: @ 80DBD98
 	cmp r5, 0x40
 	beq _080DBE2E
 	ldrb r0, [r6, 0x5]
-	bl GetFieldObjectGraphicsInfo
+	bl GetObjectEventGraphicsInfo
 	adds r4, r0, 0
 	lsls r0, r5, 4
 	adds r0, r5
@@ -2171,7 +2171,7 @@ _080DBE2E:
 	bx r1
 	.align 2, 0
 _080DBE38: .4byte gFieldEffectArguments
-_080DBE3C: .4byte gMapObjects
+_080DBE3C: .4byte gObjectEvents
 _080DBE40: .4byte gUnknown_83A0010
 _080DBE44: .4byte gSprites
 _080DBE48: .4byte sub_80DBE50
@@ -2193,11 +2193,11 @@ sub_80DBE50: @ 80DBE50
 	lsls r2, 24
 	lsrs r2, 24
 	mov r3, sp
-	bl TryGetFieldObjectIdByLocalIdAndMap
+	bl TryGetObjectEventIdByLocalIdAndMap
 	lsls r0, 24
 	cmp r0, 0
 	bne _080DBE8A
-	ldr r2, _080DBE94 @ =gMapObjects
+	ldr r2, _080DBE94 @ =gObjectEvents
 	mov r0, sp
 	ldrb r1, [r0]
 	lsls r0, r1, 3
@@ -2214,7 +2214,7 @@ _080DBE8A:
 	bl FieldEffectStop
 	b _080DBEE2
 	.align 2, 0
-_080DBE94: .4byte gMapObjects
+_080DBE94: .4byte gObjectEvents
 _080DBE98:
 	ldrb r1, [r5, 0x4]
 	lsls r0, r1, 4
@@ -2317,13 +2317,13 @@ sub_80DBF50: @ 80DBF50
 	ldrb r0, [r6]
 	ldrb r1, [r6, 0x4]
 	ldrb r2, [r6, 0x8]
-	bl GetFieldObjectIdByLocalIdAndMap
+	bl GetObjectEventIdByLocalIdAndMap
 	lsls r0, 24
 	lsrs r0, 24
 	lsls r1, r0, 3
 	adds r1, r0
 	lsls r1, 2
-	ldr r0, _080DBFE8 @ =gMapObjects
+	ldr r0, _080DBFE8 @ =gObjectEvents
 	adds r5, r1, r0
 	ldr r0, _080DBFEC @ =gUnknown_83A0010
 	ldr r0, [r0, 0x7C]
@@ -2387,7 +2387,7 @@ _080DBFDC:
 	bx r1
 	.align 2, 0
 _080DBFE4: .4byte gFieldEffectArguments
-_080DBFE8: .4byte gMapObjects
+_080DBFE8: .4byte gObjectEvents
 _080DBFEC: .4byte gUnknown_83A0010
 _080DBFF0: .4byte gSprites
 	thumb_func_end sub_80DBF50
@@ -2407,11 +2407,11 @@ sub_80DBFF4: @ 80DBFF4
 	lsls r2, 24
 	lsrs r2, 24
 	mov r3, sp
-	bl TryGetFieldObjectIdByLocalIdAndMap
+	bl TryGetObjectEventIdByLocalIdAndMap
 	lsls r0, 24
 	cmp r0, 0
 	bne _080DC02E
-	ldr r5, _080DC038 @ =gMapObjects
+	ldr r5, _080DC038 @ =gObjectEvents
 	mov r0, sp
 	ldrb r1, [r0]
 	lsls r0, r1, 3
@@ -2428,10 +2428,10 @@ _080DC02E:
 	bl FieldEffectStop
 	b _080DC080
 	.align 2, 0
-_080DC038: .4byte gMapObjects
+_080DC038: .4byte gObjectEvents
 _080DC03C:
 	ldrb r0, [r1, 0x5]
-	bl GetFieldObjectGraphicsInfo
+	bl GetObjectEventGraphicsInfo
 	mov r1, sp
 	ldrb r2, [r1]
 	lsls r1, r2, 3
@@ -2863,7 +2863,7 @@ sub_80DC348: @ 80DC348
 	movs r2, 0x32
 	ldrsh r1, [r4, r2]
 	bl CurrentMapDrawMetatileAt
-	ldr r2, _080DC3A0 @ =gMapObjects
+	ldr r2, _080DC3A0 @ =gObjectEvents
 	ldr r0, _080DC3A4 @ =gPlayerAvatar
 	ldrb r1, [r0, 0x5]
 	lsls r0, r1, 3
@@ -2880,7 +2880,7 @@ sub_80DC348: @ 80DC348
 	pop {r0}
 	bx r0
 	.align 2, 0
-_080DC3A0: .4byte gMapObjects
+_080DC3A0: .4byte gObjectEvents
 _080DC3A4: .4byte gPlayerAvatar
 	thumb_func_end sub_80DC348
 
@@ -3081,7 +3081,7 @@ sub_80DC4F8: @ 80DC4F8
 	lsls r4, r0, 3
 	adds r4, r0
 	lsls r4, 2
-	ldr r0, _080DC548 @ =gMapObjects
+	ldr r0, _080DC548 @ =gObjectEvents
 	adds r4, r0
 	ldrb r0, [r4, 0x4]
 	lsls r5, r0, 4
@@ -3112,7 +3112,7 @@ sub_80DC4F8: @ 80DC4F8
 	pop {r0}
 	bx r0
 	.align 2, 0
-_080DC548: .4byte gMapObjects
+_080DC548: .4byte gObjectEvents
 _080DC54C: .4byte gSprites
 	thumb_func_end sub_80DC4F8
 
@@ -3448,13 +3448,13 @@ FldEff_SandPile: @ 80DC7B0
 	ldrb r0, [r7]
 	ldrb r1, [r7, 0x4]
 	ldrb r2, [r7, 0x8]
-	bl GetFieldObjectIdByLocalIdAndMap
+	bl GetObjectEventIdByLocalIdAndMap
 	lsls r0, 24
 	lsrs r0, 24
 	lsls r1, r0, 3
 	adds r1, r0
 	lsls r1, 2
-	ldr r0, _080DC860 @ =gMapObjects
+	ldr r0, _080DC860 @ =gObjectEvents
 	adds r6, r1, r0
 	ldr r0, _080DC864 @ =gUnknown_83A0010
 	ldr r0, [r0, 0x74]
@@ -3467,7 +3467,7 @@ FldEff_SandPile: @ 80DC7B0
 	cmp r4, 0x40
 	beq _080DC854
 	ldrb r0, [r6, 0x5]
-	bl GetFieldObjectGraphicsInfo
+	bl GetObjectEventGraphicsInfo
 	adds r5, r0, 0
 	lsls r0, r4, 4
 	adds r0, r4
@@ -3528,7 +3528,7 @@ _080DC854:
 	bx r1
 	.align 2, 0
 _080DC85C: .4byte gFieldEffectArguments
-_080DC860: .4byte gMapObjects
+_080DC860: .4byte gObjectEvents
 _080DC864: .4byte gUnknown_83A0010
 _080DC868: .4byte gSprites
 	thumb_func_end FldEff_SandPile
@@ -3548,11 +3548,11 @@ sub_80DC86C: @ 80DC86C
 	lsls r2, 24
 	lsrs r2, 24
 	mov r3, sp
-	bl TryGetFieldObjectIdByLocalIdAndMap
+	bl TryGetObjectEventIdByLocalIdAndMap
 	lsls r0, 24
 	cmp r0, 0
 	bne _080DC8A6
-	ldr r2, _080DC8B0 @ =gMapObjects
+	ldr r2, _080DC8B0 @ =gObjectEvents
 	mov r0, sp
 	ldrb r1, [r0]
 	lsls r0, r1, 3
@@ -3569,7 +3569,7 @@ _080DC8A6:
 	bl FieldEffectStop
 	b _080DC926
 	.align 2, 0
-_080DC8B0: .4byte gMapObjects
+_080DC8B0: .4byte gObjectEvents
 _080DC8B4:
 	ldr r2, _080DC930 @ =gSprites
 	ldrb r1, [r1, 0x4]
@@ -3608,7 +3608,7 @@ _080DC8F6:
 	strh r6, [r4, 0x20]
 	strh r5, [r4, 0x22]
 	ldr r3, _080DC930 @ =gSprites
-	ldr r2, _080DC934 @ =gMapObjects
+	ldr r2, _080DC934 @ =gObjectEvents
 	mov r0, sp
 	ldrb r1, [r0]
 	lsls r0, r1, 3
@@ -3635,7 +3635,7 @@ _080DC926:
 	bx r0
 	.align 2, 0
 _080DC930: .4byte gSprites
-_080DC934: .4byte gMapObjects
+_080DC934: .4byte gObjectEvents
 	thumb_func_end sub_80DC86C
 
 	thumb_func_start FldEff_Bubbles
@@ -3780,7 +3780,7 @@ ShowDisguiseFieldEffect: @ 80DCA10
 	ldrb r1, [r5, 0x4]
 	ldrb r2, [r5, 0x8]
 	mov r3, sp
-	bl TryGetFieldObjectIdByLocalIdAndMap
+	bl TryGetObjectEventIdByLocalIdAndMap
 	lsls r0, 24
 	cmp r0, 0
 	beq _080DCA48
@@ -3872,7 +3872,7 @@ sub_80DCAC8: @ 80DCAC8
 	lsls r2, 24
 	lsrs r2, 24
 	mov r3, sp
-	bl TryGetFieldObjectIdByLocalIdAndMap
+	bl TryGetObjectEventIdByLocalIdAndMap
 	lsls r0, 24
 	cmp r0, 0
 	beq _080DCAF8
@@ -3882,7 +3882,7 @@ sub_80DCAC8: @ 80DCAC8
 	adds r0, r5, 0
 	bl FieldEffectStop
 _080DCAF8:
-	ldr r4, _080DCBB0 @ =gMapObjects
+	ldr r4, _080DCBB0 @ =gObjectEvents
 	mov r0, sp
 	ldrb r1, [r0]
 	lsls r0, r1, 3
@@ -3890,7 +3890,7 @@ _080DCAF8:
 	lsls r0, 2
 	adds r0, r4
 	ldrb r0, [r0, 0x5]
-	bl GetFieldObjectGraphicsInfo
+	bl GetObjectEventGraphicsInfo
 	mov r1, sp
 	ldrb r2, [r1]
 	lsls r1, r2, 3
@@ -3975,7 +3975,7 @@ _080DCBA8:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_080DCBB0: .4byte gMapObjects
+_080DCBB0: .4byte gObjectEvents
 _080DCBB4: .4byte gSprites
 	thumb_func_end sub_80DCAC8
 
@@ -4217,14 +4217,14 @@ _080DCD5E:
 	lsls r0, r7, 3
 	adds r0, r7
 	lsls r0, 2
-	ldr r1, _080DCDF8 @ =gMapObjects
+	ldr r1, _080DCDF8 @ =gObjectEvents
 	adds r4, r0, r1
 	ldrb r0, [r4]
 	lsls r0, 31
 	cmp r0, 0
 	beq _080DCE00
 	ldrb r0, [r4, 0x5]
-	bl GetFieldObjectGraphicsInfo
+	bl GetObjectEventGraphicsInfo
 	ldrb r1, [r4, 0x4]
 	lsls r0, r1, 4
 	adds r0, r1
@@ -4291,7 +4291,7 @@ _080DCDD8:
 	strb r0, [r2]
 	b _080DCE0A
 	.align 2, 0
-_080DCDF8: .4byte gMapObjects
+_080DCDF8: .4byte gObjectEvents
 _080DCDFC: .4byte gSprites
 _080DCE00:
 	adds r0, r7, 0x1
diff --git a/asm/field_ground_effect.s b/asm/field_ground_effect.s
index b5ec3a622..b9f0c842d 100644
--- a/asm/field_ground_effect.s
+++ b/asm/field_ground_effect.s
@@ -10,7 +10,7 @@ GetAllGroundEffectFlags_OnSpawn: @ 8067B34
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
-	bl FieldObjectUpdateMetatileBehaviors
+	bl ObjectEventUpdateMetatileBehaviors
 	adds r0, r4, 0
 	adds r1, r5, 0
 	bl GetGroundEffectFlags_Reflection
@@ -42,7 +42,7 @@ GetAllGroundEffectFlags_OnBeginStep: @ 8067B7C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
-	bl FieldObjectUpdateMetatileBehaviors
+	bl ObjectEventUpdateMetatileBehaviors
 	adds r0, r4, 0
 	adds r1, r5, 0
 	bl GetGroundEffectFlags_Reflection
@@ -80,7 +80,7 @@ GetAllGroundEffectFlags_OnFinishStep: @ 8067BD4
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
-	bl FieldObjectUpdateMetatileBehaviors
+	bl ObjectEventUpdateMetatileBehaviors
 	adds r0, r4, 0
 	adds r1, r5, 0
 	bl GetGroundEffectFlags_ShallowFlowingWater
@@ -110,8 +110,8 @@ GetAllGroundEffectFlags_OnFinishStep: @ 8067BD4
 	bx r0
 	thumb_func_end GetAllGroundEffectFlags_OnFinishStep
 
-	thumb_func_start FieldObjectUpdateMetatileBehaviors
-FieldObjectUpdateMetatileBehaviors: @ 8067C24
+	thumb_func_start ObjectEventUpdateMetatileBehaviors
+ObjectEventUpdateMetatileBehaviors: @ 8067C24
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x14
@@ -129,7 +129,7 @@ FieldObjectUpdateMetatileBehaviors: @ 8067C24
 	pop {r4}
 	pop {r0}
 	bx r0
-	thumb_func_end FieldObjectUpdateMetatileBehaviors
+	thumb_func_end ObjectEventUpdateMetatileBehaviors
 
 	thumb_func_start GetGroundEffectFlags_Reflection
 GetGroundEffectFlags_Reflection: @ 8067C4C
@@ -602,7 +602,7 @@ sub_8067F88: @ 8067F88
 	push {r5-r7}
 	adds r5, r0, 0
 	ldrb r0, [r5, 0x5]
-	bl GetFieldObjectGraphicsInfo
+	bl GetObjectEventGraphicsInfo
 	movs r4, 0
 	movs r0, 0x1
 	mov r10, r0
@@ -828,8 +828,8 @@ _0806814E:
 	bx r1
 	thumb_func_end GetLedgeJumpDirection
 
-	thumb_func_start FieldObjectSetSpriteOamTableForLongGrass
-FieldObjectSetSpriteOamTableForLongGrass: @ 8068154
+	thumb_func_start ObjectEventSetSpriteOamTableForLongGrass
+ObjectEventSetSpriteOamTableForLongGrass: @ 8068154
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	adds r4, r1, 0
@@ -873,7 +873,7 @@ _080681A8:
 	pop {r4-r6}
 	pop {r0}
 	bx r0
-	thumb_func_end FieldObjectSetSpriteOamTableForLongGrass
+	thumb_func_end ObjectEventSetSpriteOamTableForLongGrass
 
 	thumb_func_start IsZCoordMismatchAt
 IsZCoordMismatchAt: @ 80681B0
@@ -910,8 +910,8 @@ _080681E4:
 	bx r1
 	thumb_func_end IsZCoordMismatchAt
 
-	thumb_func_start FieldObjectUpdateZCoordAndPriority
-FieldObjectUpdateZCoordAndPriority: @ 80681EC
+	thumb_func_start ObjectEventUpdateZCoordAndPriority
+ObjectEventUpdateZCoordAndPriority: @ 80681EC
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -920,7 +920,7 @@ FieldObjectUpdateZCoordAndPriority: @ 80681EC
 	cmp r0, 0
 	blt _0806823A
 	adds r0, r4, 0
-	bl FieldObjectUpdateZCoord
+	bl ObjectEventUpdateZCoord
 	ldr r1, _08068240 @ =gUnknown_83A708C
 	ldrb r2, [r4, 0xB]
 	lsls r2, 24
@@ -957,7 +957,7 @@ _0806823A:
 	.align 2, 0
 _08068240: .4byte gUnknown_83A708C
 _08068244: .4byte gUnknown_83A707C
-	thumb_func_end FieldObjectUpdateZCoordAndPriority
+	thumb_func_end ObjectEventUpdateZCoordAndPriority
 
 	thumb_func_start InitObjectPriorityByZCoord
 InitObjectPriorityByZCoord: @ 8068248
@@ -1012,8 +1012,8 @@ ZCoordToPriority: @ 8068294
 _080682A0: .4byte gUnknown_83A707C
 	thumb_func_end ZCoordToPriority
 
-	thumb_func_start FieldObjectUpdateZCoord
-FieldObjectUpdateZCoord: @ 80682A4
+	thumb_func_start ObjectEventUpdateZCoord
+ObjectEventUpdateZCoord: @ 80682A4
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r1, 0x10
@@ -1055,7 +1055,7 @@ _080682F2:
 	pop {r4,r5}
 	pop {r0}
 	bx r0
-	thumb_func_end FieldObjectUpdateZCoord
+	thumb_func_end ObjectEventUpdateZCoord
 
 	thumb_func_start SetObjectSubpriorityByZCoord
 SetObjectSubpriorityByZCoord: @ 80682F8
@@ -1096,8 +1096,8 @@ _08068338: .4byte gSpriteCoordOffsetY
 _0806833C: .4byte gUnknown_83A706C
 	thumb_func_end SetObjectSubpriorityByZCoord
 
-	thumb_func_start FieldObjectUpdateSubpriority
-FieldObjectUpdateSubpriority: @ 8068340
+	thumb_func_start ObjectEventUpdateSubpriority
+ObjectEventUpdateSubpriority: @ 8068340
 	push {lr}
 	adds r2, r0, 0
 	ldrb r0, [r2, 0x3]
@@ -1111,7 +1111,7 @@ FieldObjectUpdateSubpriority: @ 8068340
 _08068356:
 	pop {r0}
 	bx r0
-	thumb_func_end FieldObjectUpdateSubpriority
+	thumb_func_end ObjectEventUpdateSubpriority
 
 	thumb_func_start AreZCoordsCompatible
 AreZCoordsCompatible: @ 806835C
@@ -1330,7 +1330,7 @@ GroundEffect_SandTracks: @ 80684D4
 	adds r4, r0, 0
 	adds r5, r1, 0
 	ldrb r0, [r4, 0x5]
-	bl GetFieldObjectGraphicsInfo
+	bl GetObjectEventGraphicsInfo
 	ldr r1, _080684FC @ =gUnknown_83A709C
 	ldrb r0, [r0, 0xD]
 	lsls r0, 2
@@ -1353,7 +1353,7 @@ GroundEffect_DeepSandTracks: @ 8068500
 	adds r4, r0, 0
 	adds r5, r1, 0
 	ldrb r0, [r4, 0x5]
-	bl GetFieldObjectGraphicsInfo
+	bl GetObjectEventGraphicsInfo
 	ldr r1, _08068528 @ =gUnknown_83A709C
 	ldrb r0, [r0, 0xD]
 	lsls r0, 2
@@ -1781,13 +1781,13 @@ DoGroundEffects_OnSpawn: @ 80687F0
 	movs r0, 0
 	str r0, [sp]
 	adds r0, r4, 0
-	bl FieldObjectUpdateZCoordAndPriority
+	bl ObjectEventUpdateZCoordAndPriority
 	adds r0, r4, 0
 	mov r1, sp
 	bl GetAllGroundEffectFlags_OnSpawn
 	adds r0, r4, 0
 	adds r1, r5, 0
-	bl FieldObjectSetSpriteOamTableForLongGrass
+	bl ObjectEventSetSpriteOamTableForLongGrass
 	ldr r2, [sp]
 	adds r0, r4, 0
 	adds r1, r5, 0
@@ -1820,13 +1820,13 @@ DoGroundEffects_OnBeginStep: @ 806883C
 	movs r0, 0
 	str r0, [sp]
 	adds r0, r4, 0
-	bl FieldObjectUpdateZCoordAndPriority
+	bl ObjectEventUpdateZCoordAndPriority
 	adds r0, r4, 0
 	mov r1, sp
 	bl GetAllGroundEffectFlags_OnBeginStep
 	adds r0, r4, 0
 	adds r1, r5, 0
-	bl FieldObjectSetSpriteOamTableForLongGrass
+	bl ObjectEventSetSpriteOamTableForLongGrass
 	adds r0, r4, 0
 	mov r1, sp
 	bl filters_out_some_ground_effects
@@ -1862,13 +1862,13 @@ DoGroundEffects_OnFinishStep: @ 8068890
 	movs r0, 0
 	str r0, [sp]
 	adds r0, r4, 0
-	bl FieldObjectUpdateZCoordAndPriority
+	bl ObjectEventUpdateZCoordAndPriority
 	adds r0, r4, 0
 	mov r1, sp
 	bl GetAllGroundEffectFlags_OnFinishStep
 	adds r0, r4, 0
 	adds r1, r5, 0
-	bl FieldObjectSetSpriteOamTableForLongGrass
+	bl ObjectEventSetSpriteOamTableForLongGrass
 	adds r0, r4, 0
 	mov r1, sp
 	bl FilterOutStepOnPuddleGroundEffectIfJumping
diff --git a/asm/field_map_obj.s b/asm/field_map_obj.s
index 8c782d3dd..f380b4b53 100644
--- a/asm/field_map_obj.s
+++ b/asm/field_map_obj.s
@@ -28,7 +28,7 @@ npc_clear_ids_and_state: @ 805DE2C
 npcs_clear_ids_and_state: @ 805DE4C
 	push {r4,r5,lr}
 	movs r4, 0
-	ldr r5, _0805DE70 @ =gMapObjects
+	ldr r5, _0805DE70 @ =gObjectEvents
 _0805DE52:
 	lsls r0, r4, 3
 	adds r0, r4
@@ -44,7 +44,7 @@ _0805DE52:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_0805DE70: .4byte gMapObjects
+_0805DE70: .4byte gObjectEvents
 	thumb_func_end npcs_clear_ids_and_state
 
 	thumb_func_start sub_805DE74
@@ -141,11 +141,11 @@ _0805DF2C: .4byte gSprites
 sub_805DF30: @ 805DF30
 	push {lr}
 	movs r1, 0
-	ldr r2, _0805DF3C @ =gMapObjects
+	ldr r2, _0805DF3C @ =gObjectEvents
 	ldrb r0, [r2]
 	b _0805DF54
 	.align 2, 0
-_0805DF3C: .4byte gMapObjects
+_0805DF3C: .4byte gObjectEvents
 _0805DF40:
 	adds r0, r1, 0x1
 	lsls r0, 24
@@ -167,8 +167,8 @@ _0805DF5A:
 	bx r1
 	thumb_func_end sub_805DF30
 
-	thumb_func_start GetFieldObjectIdByLocalIdAndMap
-GetFieldObjectIdByLocalIdAndMap: @ 805DF60
+	thumb_func_start GetObjectEventIdByLocalIdAndMap
+GetObjectEventIdByLocalIdAndMap: @ 805DF60
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -178,19 +178,19 @@ GetFieldObjectIdByLocalIdAndMap: @ 805DF60
 	lsrs r2, 24
 	cmp r0, 0xFE
 	bls _0805DF78
-	bl GetFieldObjectIdByLocalId
+	bl GetObjectEventIdByLocalId
 	b _0805DF7C
 _0805DF78:
-	bl GetFieldObjectIdByLocalIdAndMapInternal
+	bl GetObjectEventIdByLocalIdAndMapInternal
 _0805DF7C:
 	lsls r0, 24
 	lsrs r0, 24
 	pop {r1}
 	bx r1
-	thumb_func_end GetFieldObjectIdByLocalIdAndMap
+	thumb_func_end GetObjectEventIdByLocalIdAndMap
 
-	thumb_func_start TryGetFieldObjectIdByLocalIdAndMap
-TryGetFieldObjectIdByLocalIdAndMap: @ 805DF84
+	thumb_func_start TryGetObjectEventIdByLocalIdAndMap
+TryGetObjectEventIdByLocalIdAndMap: @ 805DF84
 	push {r4,lr}
 	adds r4, r3, 0
 	lsls r0, 24
@@ -199,7 +199,7 @@ TryGetFieldObjectIdByLocalIdAndMap: @ 805DF84
 	lsrs r1, 24
 	lsls r2, 24
 	lsrs r2, 24
-	bl GetFieldObjectIdByLocalIdAndMap
+	bl GetObjectEventIdByLocalIdAndMap
 	strb r0, [r4]
 	lsls r0, 24
 	lsrs r0, 24
@@ -213,13 +213,13 @@ _0805DFA8:
 	pop {r4}
 	pop {r1}
 	bx r1
-	thumb_func_end TryGetFieldObjectIdByLocalIdAndMap
+	thumb_func_end TryGetObjectEventIdByLocalIdAndMap
 
-	thumb_func_start GetFieldObjectIdByXY
-GetFieldObjectIdByXY: @ 805DFB0
+	thumb_func_start GetObjectEventIdByXY
+GetObjectEventIdByXY: @ 805DFB0
 	push {r4-r6,lr}
 	movs r3, 0
-	ldr r5, _0805DFF0 @ =gMapObjects
+	ldr r5, _0805DFF0 @ =gObjectEvents
 	lsls r0, 16
 	asrs r4, r0, 16
 	lsls r1, 16
@@ -253,11 +253,11 @@ _0805DFE8:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_0805DFF0: .4byte gMapObjects
-	thumb_func_end GetFieldObjectIdByXY
+_0805DFF0: .4byte gObjectEvents
+	thumb_func_end GetObjectEventIdByXY
 
-	thumb_func_start GetFieldObjectIdByLocalIdAndMapInternal
-GetFieldObjectIdByLocalIdAndMapInternal: @ 805DFF4
+	thumb_func_start GetObjectEventIdByLocalIdAndMapInternal
+GetObjectEventIdByLocalIdAndMapInternal: @ 805DFF4
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -266,7 +266,7 @@ GetFieldObjectIdByLocalIdAndMapInternal: @ 805DFF4
 	lsls r2, 24
 	lsrs r2, 24
 	movs r1, 0
-	ldr r6, _0805E02C @ =gMapObjects
+	ldr r6, _0805E02C @ =gObjectEvents
 _0805E006:
 	lsls r0, r1, 3
 	adds r0, r1
@@ -288,7 +288,7 @@ _0805E006:
 	adds r0, r1, 0
 	b _0805E03C
 	.align 2, 0
-_0805E02C: .4byte gMapObjects
+_0805E02C: .4byte gObjectEvents
 _0805E030:
 	adds r0, r1, 0x1
 	lsls r0, 24
@@ -300,15 +300,15 @@ _0805E03C:
 	pop {r4-r6}
 	pop {r1}
 	bx r1
-	thumb_func_end GetFieldObjectIdByLocalIdAndMapInternal
+	thumb_func_end GetObjectEventIdByLocalIdAndMapInternal
 
-	thumb_func_start GetFieldObjectIdByLocalId
-GetFieldObjectIdByLocalId: @ 805E044
+	thumb_func_start GetObjectEventIdByLocalId
+GetObjectEventIdByLocalId: @ 805E044
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r3, r0, 24
 	movs r2, 0
-	ldr r4, _0805E068 @ =gMapObjects
+	ldr r4, _0805E068 @ =gObjectEvents
 _0805E04E:
 	lsls r0, r2, 3
 	adds r0, r2
@@ -324,7 +324,7 @@ _0805E04E:
 	adds r0, r2, 0
 	b _0805E078
 	.align 2, 0
-_0805E068: .4byte gMapObjects
+_0805E068: .4byte gObjectEvents
 _0805E06C:
 	adds r0, r2, 0x1
 	lsls r0, 24
@@ -336,7 +336,7 @@ _0805E078:
 	pop {r4}
 	pop {r1}
 	bx r1
-	thumb_func_end GetFieldObjectIdByLocalId
+	thumb_func_end GetObjectEventIdByLocalId
 
 	thumb_func_start sub_805E080
 sub_805E080: @ 805E080
@@ -389,7 +389,7 @@ _0805E0DA:
 	adds r1, r7, 0
 	adds r2, r6, 0
 	mov r3, sp
-	bl GetAvailableFieldObjectSlot
+	bl GetAvailableObjectEventSlot
 	lsls r0, 24
 	cmp r0, 0
 	bne _0805E106
@@ -414,7 +414,7 @@ _0805E10A:
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _0805E13C @ =gMapObjects
+	ldr r1, _0805E13C @ =gObjectEvents
 	adds r4, r0, r1
 	adds r0, r4, 0
 	bl npc_clear_ids_and_state
@@ -434,7 +434,7 @@ _0805E10A:
 	adds r0, r1
 	b _0805E14E
 	.align 2, 0
-_0805E13C: .4byte gMapObjects
+_0805E13C: .4byte gObjectEvents
 _0805E140:
 	ldrh r0, [r5, 0x4]
 	adds r0, 0x7
@@ -510,9 +510,9 @@ _0805E14E:
 	strb r1, [r0]
 	ldrb r1, [r0]
 	adds r0, r4, 0
-	bl FieldObjectSetDirection
+	bl ObjectEventSetDirection
 	adds r0, r4, 0
-	bl FieldObjectHandleDynamicGraphicsId
+	bl ObjectEventHandleDynamicGraphicsId
 	ldr r1, _0805E234 @ =gUnknown_839FD0C
 	ldrb r0, [r4, 0x6]
 	adds r0, r1
@@ -828,8 +828,8 @@ _0805E406:
 _0805E410: .4byte gSaveBlock1Ptr
 	thumb_func_end sub_805E3A0
 
-	thumb_func_start GetAvailableFieldObjectSlot
-GetAvailableFieldObjectSlot: @ 805E414
+	thumb_func_start GetAvailableObjectEventSlot
+GetAvailableObjectEventSlot: @ 805E414
 	push {r4-r7,lr}
 	mov r12, r3
 	lsls r0, 16
@@ -839,7 +839,7 @@ GetAvailableFieldObjectSlot: @ 805E414
 	lsls r2, 24
 	lsrs r4, r2, 24
 	movs r2, 0
-	ldr r1, _0805E470 @ =gMapObjects
+	ldr r1, _0805E470 @ =gObjectEvents
 	ldrb r0, [r1]
 	lsls r0, 31
 	adds r7, r1, 0
@@ -881,11 +881,11 @@ _0805E46C:
 	movs r0, 0x1
 	b _0805E4A8
 	.align 2, 0
-_0805E470: .4byte gMapObjects
+_0805E470: .4byte gObjectEvents
 _0805E474:
 	mov r0, r12
 	strb r2, [r0]
-	ldr r1, _0805E4B0 @ =gMapObjects
+	ldr r1, _0805E4B0 @ =gObjectEvents
 _0805E47A:
 	lsls r0, r2, 3
 	adds r0, r2
@@ -916,24 +916,24 @@ _0805E4A8:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_0805E4B0: .4byte gMapObjects
-	thumb_func_end GetAvailableFieldObjectSlot
+_0805E4B0: .4byte gObjectEvents
+	thumb_func_end GetAvailableObjectEventSlot
 
-	thumb_func_start RemoveFieldObject
-RemoveFieldObject: @ 805E4B4
+	thumb_func_start RemoveObjectEvent
+RemoveObjectEvent: @ 805E4B4
 	push {lr}
 	ldrb r2, [r0]
 	movs r1, 0x2
 	negs r1, r1
 	ands r1, r2
 	strb r1, [r0]
-	bl RemoveFieldObjectInternal
+	bl RemoveObjectEventInternal
 	pop {r0}
 	bx r0
-	thumb_func_end RemoveFieldObject
+	thumb_func_end RemoveObjectEvent
 
-	thumb_func_start RemoveFieldObjectByLocalIdAndMap
-RemoveFieldObjectByLocalIdAndMap: @ 805E4C8
+	thumb_func_start RemoveObjectEventByLocalIdAndMap
+RemoveObjectEventByLocalIdAndMap: @ 805E4C8
 	push {lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -943,13 +943,13 @@ RemoveFieldObjectByLocalIdAndMap: @ 805E4C8
 	lsls r2, 24
 	lsrs r2, 24
 	mov r3, sp
-	bl TryGetFieldObjectIdByLocalIdAndMap
+	bl TryGetObjectEventIdByLocalIdAndMap
 	lsls r0, 24
 	cmp r0, 0
 	bne _0805E506
 	mov r0, sp
 	ldrb r0, [r0]
-	bl GetFieldObjectFlagIdByFieldObjectId
+	bl GetObjectEventFlagIdByObjectEventId
 	lsls r0, 16
 	lsrs r0, 16
 	bl FlagSet
@@ -958,24 +958,24 @@ RemoveFieldObjectByLocalIdAndMap: @ 805E4C8
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _0805E50C @ =gMapObjects
+	ldr r1, _0805E50C @ =gObjectEvents
 	adds r0, r1
-	bl RemoveFieldObject
+	bl RemoveObjectEvent
 _0805E506:
 	add sp, 0x4
 	pop {r0}
 	bx r0
 	.align 2, 0
-_0805E50C: .4byte gMapObjects
-	thumb_func_end RemoveFieldObjectByLocalIdAndMap
+_0805E50C: .4byte gObjectEvents
+	thumb_func_end RemoveObjectEventByLocalIdAndMap
 
-	thumb_func_start RemoveFieldObjectInternal
-RemoveFieldObjectInternal: @ 805E510
+	thumb_func_start RemoveObjectEventInternal
+RemoveObjectEventInternal: @ 805E510
 	push {r4,lr}
 	sub sp, 0x8
 	adds r4, r0, 0
 	ldrb r0, [r4, 0x5]
-	bl GetFieldObjectGraphicsInfo
+	bl GetObjectEventGraphicsInfo
 	ldrh r2, [r0, 0x6]
 	ldr r1, _0805E554 @ =0xffff0000
 	ldr r0, [sp, 0x4]
@@ -1005,7 +1005,7 @@ RemoveFieldObjectInternal: @ 805E510
 	.align 2, 0
 _0805E554: .4byte 0xffff0000
 _0805E558: .4byte gSprites
-	thumb_func_end RemoveFieldObjectInternal
+	thumb_func_end RemoveObjectEventInternal
 
 	thumb_func_start unref_sub_808D958
 unref_sub_808D958: @ 805E55C
@@ -1019,9 +1019,9 @@ _0805E560:
 	lsls r0, r4, 3
 	adds r0, r4
 	lsls r0, 2
-	ldr r1, _0805E58C @ =gMapObjects
+	ldr r1, _0805E58C @ =gObjectEvents
 	adds r0, r1
-	bl RemoveFieldObject
+	bl RemoveObjectEvent
 _0805E576:
 	adds r0, r4, 0x1
 	lsls r0, 24
@@ -1033,7 +1033,7 @@ _0805E576:
 	bx r0
 	.align 2, 0
 _0805E588: .4byte gPlayerAvatar
-_0805E58C: .4byte gMapObjects
+_0805E58C: .4byte gObjectEvents
 	thumb_func_end unref_sub_808D958
 
 	thumb_func_start sub_805E590
@@ -1071,10 +1071,10 @@ _0805E5CA:
 	lsls r4, r0, 3
 	adds r0, r4, r0
 	lsls r0, 2
-	ldr r1, _0805E5F4 @ =gMapObjects
+	ldr r1, _0805E5F4 @ =gObjectEvents
 	adds r5, r0, r1
 	ldrb r0, [r5, 0x5]
-	bl GetFieldObjectGraphicsInfo
+	bl GetObjectEventGraphicsInfo
 	adds r6, r0, 0
 	ldrb r1, [r6, 0xC]
 	movs r0, 0xF
@@ -1087,7 +1087,7 @@ _0805E5CA:
 	bl npc_load_two_palettes__no_record
 	b _0805E606
 	.align 2, 0
-_0805E5F4: .4byte gMapObjects
+_0805E5F4: .4byte gObjectEvents
 _0805E5F8:
 	cmp r0, 0xA
 	bne _0805E606
@@ -1116,7 +1116,7 @@ _0805E614:
 	lsrs r7, r0, 24
 	cmp r7, 0x40
 	bne _0805E650
-	ldr r0, _0805E64C @ =gMapObjects
+	ldr r0, _0805E64C @ =gObjectEvents
 	mov r2, r8
 	adds r1, r4, r2
 	lsls r1, 2
@@ -1130,7 +1130,7 @@ _0805E614:
 	b _0805E718
 	.align 2, 0
 _0805E648: .4byte 0x0000ffff
-_0805E64C: .4byte gMapObjects
+_0805E64C: .4byte gObjectEvents
 _0805E650:
 	lsls r0, r7, 4
 	adds r0, r7
@@ -1212,7 +1212,7 @@ _0805E650:
 	ldrb r0, [r5, 0x18]
 	lsls r0, 28
 	lsrs r0, 28
-	bl FieldObjectDirectionToImageAnimId
+	bl ObjectEventDirectionToImageAnimId
 	adds r1, r0, 0
 	lsls r1, 24
 	lsrs r1, 24
@@ -1240,8 +1240,8 @@ _0805E718:
 _0805E728: .4byte gSprites
 	thumb_func_end sub_805E590
 
-	thumb_func_start SpawnFieldObject
-SpawnFieldObject: @ 805E72C
+	thumb_func_start SpawnObjectEvent
+SpawnObjectEvent: @ 805E72C
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -1266,12 +1266,12 @@ SpawnFieldObject: @ 805E72C
 	str r0, [sp, 0x20]
 	mov r1, r9
 	ldrb r0, [r1, 0x1]
-	bl GetFieldObjectGraphicsInfo
+	bl GetObjectEventGraphicsInfo
 	adds r7, r0, 0
 	add r2, sp, 0x20
 	mov r0, r9
 	add r1, sp, 0x8
-	bl MakeObjectTemplateFromFieldObjectTemplate
+	bl MakeObjectTemplateFromObjectEventTemplate
 	ldrh r3, [r7, 0x6]
 	ldr r2, _0805E7A4 @ =0xffff0000
 	add r1, sp, 0x24
@@ -1302,7 +1302,7 @@ SpawnFieldObject: @ 805E72C
 _0805E7A4: .4byte 0xffff0000
 _0805E7A8:
 	ldr r4, _0805E7EC @ =gSprites
-	ldr r1, _0805E7F0 @ =gMapObjects
+	ldr r1, _0805E7F0 @ =gObjectEvents
 	lsls r0, r2, 3
 	adds r0, r2
 	lsls r0, 2
@@ -1338,11 +1338,11 @@ _0805E7DE:
 	bx r1
 	.align 2, 0
 _0805E7EC: .4byte gSprites
-_0805E7F0: .4byte gMapObjects
-	thumb_func_end SpawnFieldObject
+_0805E7F0: .4byte gObjectEvents
+	thumb_func_end SpawnObjectEvent
 
-	thumb_func_start SpawnSpecialFieldObject
-SpawnSpecialFieldObject: @ 805E7F4
+	thumb_func_start SpawnSpecialObjectEvent
+SpawnSpecialObjectEvent: @ 805E7F4
 	push {r4-r6,lr}
 	sub sp, 0x8
 	adds r5, r0, 0
@@ -1350,7 +1350,7 @@ SpawnSpecialFieldObject: @ 805E7F4
 	adds r4, 0x6
 	add r0, sp, 0x4
 	adds r1, r4, 0
-	bl GetFieldObjectMovingCameraOffset
+	bl GetObjectEventMovingCameraOffset
 	ldr r0, _0805E82C @ =gSaveBlock1Ptr
 	ldr r0, [r0]
 	ldrb r1, [r0, 0x5]
@@ -1362,7 +1362,7 @@ SpawnSpecialFieldObject: @ 805E7F4
 	ldrsh r0, [r4, r6]
 	str r0, [sp]
 	adds r0, r5, 0
-	bl SpawnFieldObject
+	bl SpawnObjectEvent
 	lsls r0, 24
 	lsrs r0, 24
 	add sp, 0x8
@@ -1371,10 +1371,10 @@ SpawnSpecialFieldObject: @ 805E7F4
 	bx r1
 	.align 2, 0
 _0805E82C: .4byte gSaveBlock1Ptr
-	thumb_func_end SpawnSpecialFieldObject
+	thumb_func_end SpawnSpecialObjectEvent
 
-	thumb_func_start SpawnSpecialFieldObjectParameterized
-SpawnSpecialFieldObjectParameterized: @ 805E830
+	thumb_func_start SpawnSpecialObjectEventParameterized
+SpawnSpecialObjectEventParameterized: @ 805E830
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -1414,7 +1414,7 @@ SpawnSpecialFieldObjectParameterized: @ 805E830
 	strb r5, [r0, 0xA]
 	strh r6, [r0, 0xC]
 	strh r6, [r0, 0xE]
-	bl SpawnSpecialFieldObject
+	bl SpawnSpecialObjectEvent
 	lsls r0, 24
 	lsrs r0, 24
 	add sp, 0x18
@@ -1425,7 +1425,7 @@ SpawnSpecialFieldObjectParameterized: @ 805E830
 	bx r1
 	.align 2, 0
 _0805E894: .4byte 0xfff90000
-	thumb_func_end SpawnSpecialFieldObjectParameterized
+	thumb_func_end SpawnSpecialObjectEventParameterized
 
 	thumb_func_start show_sprite
 show_sprite: @ 805E898
@@ -1439,7 +1439,7 @@ show_sprite: @ 805E898
 	lsrs r6, r2, 24
 	adds r1, r7, 0
 	adds r2, r6, 0
-	bl GetFieldObjectTemplateByLocalIdAndMap
+	bl GetObjectEventTemplateByLocalIdAndMap
 	adds r5, r0, 0
 	cmp r5, 0
 	beq _0805E8DE
@@ -1447,7 +1447,7 @@ show_sprite: @ 805E898
 	adds r4, 0x6
 	add r0, sp, 0x4
 	adds r1, r4, 0
-	bl GetFieldObjectMovingCameraOffset
+	bl GetObjectEventMovingCameraOffset
 	add r0, sp, 0x4
 	movs r1, 0
 	ldrsh r3, [r0, r1]
@@ -1457,7 +1457,7 @@ show_sprite: @ 805E898
 	adds r0, r5, 0
 	adds r1, r7, 0
 	adds r2, r6, 0
-	bl SpawnFieldObject
+	bl SpawnObjectEvent
 	lsls r0, 24
 	lsrs r0, 24
 	b _0805E8E0
@@ -1478,7 +1478,7 @@ sub_805E8E8: @ 805E8E8
 	adds r7, r3, 0
 	lsls r0, 24
 	lsrs r0, 24
-	bl GetFieldObjectGraphicsInfo
+	bl GetObjectEventGraphicsInfo
 	adds r5, r0, 0
 	ldrh r0, [r5]
 	strh r0, [r4]
@@ -1517,8 +1517,8 @@ _0805E936:
 	bx r0
 	thumb_func_end sub_805E8E8
 
-	thumb_func_start MakeObjectTemplateFromFieldObjectGraphicsInfoWithCallbackIndex
-MakeObjectTemplateFromFieldObjectGraphicsInfoWithCallbackIndex: @ 805E940
+	thumb_func_start MakeObjectTemplateFromObjectEventGraphicsInfoWithCallbackIndex
+MakeObjectTemplateFromObjectEventGraphicsInfoWithCallbackIndex: @ 805E940
 	push {r4,lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -1533,10 +1533,10 @@ MakeObjectTemplateFromFieldObjectGraphicsInfoWithCallbackIndex: @ 805E940
 	bx r0
 	.align 2, 0
 _0805E95C: .4byte gUnknown_839FBC8
-	thumb_func_end MakeObjectTemplateFromFieldObjectGraphicsInfoWithCallbackIndex
+	thumb_func_end MakeObjectTemplateFromObjectEventGraphicsInfoWithCallbackIndex
 
-	thumb_func_start MakeObjectTemplateFromFieldObjectTemplate
-MakeObjectTemplateFromFieldObjectTemplate: @ 805E960
+	thumb_func_start MakeObjectTemplateFromObjectEventTemplate
+MakeObjectTemplateFromObjectEventTemplate: @ 805E960
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -1544,11 +1544,11 @@ MakeObjectTemplateFromFieldObjectTemplate: @ 805E960
 	ldrb r0, [r4, 0x1]
 	ldrb r1, [r4, 0x9]
 	adds r2, r5, 0
-	bl MakeObjectTemplateFromFieldObjectGraphicsInfoWithCallbackIndex
+	bl MakeObjectTemplateFromObjectEventGraphicsInfoWithCallbackIndex
 	pop {r4,r5}
 	pop {r0}
 	bx r0
-	thumb_func_end MakeObjectTemplateFromFieldObjectTemplate
+	thumb_func_end MakeObjectTemplateFromObjectEventTemplate
 
 	thumb_func_start AddPseudoEventObject
 AddPseudoEventObject: @ 805E978
@@ -1643,7 +1643,7 @@ sprite_new: @ 805E9F8
 	lsrs r4, 24
 	str r4, [sp, 0x20]
 	adds r0, r5, 0
-	bl GetFieldObjectGraphicsInfo
+	bl GetObjectEventGraphicsInfo
 	adds r4, r0, 0
 	ldr r1, _0805EB38 @ =sub_8068FA8
 	add r3, sp, 0x1C
@@ -1752,7 +1752,7 @@ _0805EB00:
 	movs r2, 0x1
 	bl SetObjectSubpriorityByZCoord
 	ldr r0, [sp, 0x20]
-	bl FieldObjectDirectionToImageAnimId
+	bl ObjectEventDirectionToImageAnimId
 	adds r1, r0, 0
 	lsls r1, 24
 	lsrs r1, 24
@@ -1793,7 +1793,7 @@ sub_805EB44: @ 805EB44
 	lsls r5, 16
 	lsrs r5, 16
 	adds r0, r6, 0
-	bl GetFieldObjectGraphicsInfo
+	bl GetObjectEventGraphicsInfo
 	adds r7, r0, 0
 	ldr r1, _0805EC24 @ =SpriteCallbackDummy
 	add r3, sp, 0x18
@@ -1869,7 +1869,7 @@ _0805EBE6:
 	strb r1, [r2]
 _0805EC02:
 	movs r0, 0x1
-	bl FieldObjectDirectionToImageAnimId
+	bl ObjectEventDirectionToImageAnimId
 	adds r1, r0, 0
 	lsls r1, 24
 	lsrs r1, 24
@@ -1983,7 +1983,7 @@ _0805EC86:
 	str r0, [sp]
 	adds r0, r4, 0
 	asrs r3, 16
-	bl SpawnFieldObject
+	bl SpawnObjectEvent
 _0805ECEC:
 	adds r0, r5, 0x1
 	lsls r0, 24
@@ -2005,8 +2005,8 @@ _0805ED08: .4byte gMapHeader
 _0805ED0C: .4byte gSaveBlock1Ptr
 	thumb_func_end sub_805EC30
 
-	thumb_func_start RemoveFieldObjectsOutsideView
-RemoveFieldObjectsOutsideView: @ 805ED10
+	thumb_func_start RemoveObjectEventsOutsideView
+RemoveObjectEventsOutsideView: @ 805ED10
 	push {r4-r6,lr}
 	movs r3, 0
 	ldr r6, _0805ED64 @ =gUnknown_2031DEC
@@ -2035,7 +2035,7 @@ _0805ED2E:
 	lsls r0, r3, 3
 	adds r0, r3
 	lsls r0, 2
-	ldr r1, _0805ED68 @ =gMapObjects
+	ldr r1, _0805ED68 @ =gObjectEvents
 	adds r2, r0, r1
 	ldr r0, [r2]
 	ldr r1, _0805ED6C @ =0x00010001
@@ -2043,7 +2043,7 @@ _0805ED2E:
 	cmp r0, 0x1
 	bne _0805ED56
 	adds r0, r2, 0
-	bl RemoveFieldObjectIfOutsideView
+	bl RemoveObjectEventIfOutsideView
 _0805ED56:
 	lsls r0, r5, 24
 	lsrs r3, r0, 24
@@ -2054,12 +2054,12 @@ _0805ED56:
 	bx r0
 	.align 2, 0
 _0805ED64: .4byte gUnknown_2031DEC
-_0805ED68: .4byte gMapObjects
+_0805ED68: .4byte gObjectEvents
 _0805ED6C: .4byte 0x00010001
-	thumb_func_end RemoveFieldObjectsOutsideView
+	thumb_func_end RemoveObjectEventsOutsideView
 
-	thumb_func_start RemoveFieldObjectIfOutsideView
-RemoveFieldObjectIfOutsideView: @ 805ED70
+	thumb_func_start RemoveObjectEventIfOutsideView
+RemoveObjectEventIfOutsideView: @ 805ED70
 	push {r4-r7,lr}
 	adds r3, r0, 0
 	ldr r0, _0805EDEC @ =gSaveBlock1Ptr
@@ -2118,14 +2118,14 @@ _0805EDB6:
 	ble _0805EDE4
 _0805EDDE:
 	adds r0, r3, 0
-	bl RemoveFieldObject
+	bl RemoveObjectEvent
 _0805EDE4:
 	pop {r4-r7}
 	pop {r0}
 	bx r0
 	.align 2, 0
 _0805EDEC: .4byte gSaveBlock1Ptr
-	thumb_func_end RemoveFieldObjectIfOutsideView
+	thumb_func_end RemoveObjectEventIfOutsideView
 
 	thumb_func_start sub_805EDF0
 sub_805EDF0: @ 805EDF0
@@ -2138,7 +2138,7 @@ sub_805EDF0: @ 805EDF0
 	lsrs r5, 16
 	bl ClearPlayerAvatarInfo
 	movs r6, 0
-	ldr r7, _0805EE38 @ =gMapObjects
+	ldr r7, _0805EE38 @ =gObjectEvents
 	lsls r4, 16
 	lsls r5, 16
 _0805EE0A:
@@ -2165,7 +2165,7 @@ _0805EE24:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_0805EE38: .4byte gMapObjects
+_0805EE38: .4byte gObjectEvents
 	thumb_func_end sub_805EDF0
 
 	thumb_func_start sub_805EE3C
@@ -2207,12 +2207,12 @@ _0805EE70:
 	lsls r0, r1, 3
 	add r0, r8
 	lsls r0, 2
-	ldr r1, _0805EFE4 @ =gMapObjects
+	ldr r1, _0805EFE4 @ =gObjectEvents
 	adds r6, r0, r1
 	movs r0, 0
 	str r0, [sp, 0x20]
 	ldrb r0, [r6, 0x5]
-	bl GetFieldObjectGraphicsInfo
+	bl GetObjectEventGraphicsInfo
 	adds r5, r0, 0
 	ldrh r2, [r5, 0x6]
 	ldr r1, _0805EFE8 @ =0xffff0000
@@ -2225,7 +2225,7 @@ _0805EE70:
 	ldrb r1, [r6, 0x6]
 	add r3, sp, 0x20
 	mov r2, sp
-	bl MakeObjectTemplateFromFieldObjectGraphicsInfoWithCallbackIndex
+	bl MakeObjectTemplateFromObjectEventGraphicsInfoWithCallbackIndex
 	str r4, [sp, 0xC]
 	mov r0, sp
 	ldr r2, _0805EFEC @ =0x0000ffff
@@ -2314,7 +2314,7 @@ _0805EEDC:
 	bne _0805EF6A
 	mov r0, r8
 	adds r1, r7, 0
-	bl SetPlayerAvatarFieldObjectIdAndObjectId
+	bl SetPlayerAvatarObjectEventIdAndObjectId
 	bl sub_80DB0C4
 	strb r0, [r6, 0x1B]
 _0805EF6A:
@@ -2351,7 +2351,7 @@ _0805EF76:
 	ldrb r0, [r6, 0x18]
 	lsls r0, 28
 	lsrs r0, 28
-	bl FieldObjectDirectionToImageAnimId
+	bl ObjectEventDirectionToImageAnimId
 	adds r1, r0, 0
 	lsls r1, 24
 	lsrs r1, 24
@@ -2376,7 +2376,7 @@ _0805EFCE:
 	bx r0
 	.align 2, 0
 _0805EFE0: .4byte gUnknown_2031DEC
-_0805EFE4: .4byte gMapObjects
+_0805EFE4: .4byte gObjectEvents
 _0805EFE8: .4byte 0xffff0000
 _0805EFEC: .4byte 0x0000ffff
 _0805EFF0: .4byte gSprites
@@ -2408,20 +2408,20 @@ sub_805EFF4: @ 805EFF4
 	subs r2, 0x10
 	ands r1, r2
 	strb r1, [r0, 0x2]
-	bl FieldObjectClearAnim
+	bl ObjectEventClearAnim
 	pop {r0}
 	bx r0
 	thumb_func_end sub_805EFF4
 
-	thumb_func_start SetPlayerAvatarFieldObjectIdAndObjectId
-SetPlayerAvatarFieldObjectIdAndObjectId: @ 805F02C
+	thumb_func_start SetPlayerAvatarObjectEventIdAndObjectId
+SetPlayerAvatarObjectEventIdAndObjectId: @ 805F02C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r5, _0805F058 @ =gPlayerAvatar
 	strb r0, [r5, 0x5]
 	strb r1, [r5, 0x4]
-	ldr r1, _0805F05C @ =gMapObjects
+	ldr r1, _0805F05C @ =gObjectEvents
 	lsls r4, r0, 3
 	adds r4, r0
 	lsls r4, 2
@@ -2437,8 +2437,8 @@ SetPlayerAvatarFieldObjectIdAndObjectId: @ 805F02C
 	bx r0
 	.align 2, 0
 _0805F058: .4byte gPlayerAvatar
-_0805F05C: .4byte gMapObjects
-	thumb_func_end SetPlayerAvatarFieldObjectIdAndObjectId
+_0805F05C: .4byte gObjectEvents
+	thumb_func_end SetPlayerAvatarObjectEventIdAndObjectId
 
 	thumb_func_start EventObjectSetGraphicsId
 EventObjectSetGraphicsId: @ 805F060
@@ -2453,7 +2453,7 @@ EventObjectSetGraphicsId: @ 805F060
 	lsrs r1, 24
 	str r1, [sp]
 	adds r0, r1, 0
-	bl GetFieldObjectGraphicsInfo
+	bl GetObjectEventGraphicsInfo
 	adds r5, r0, 0
 	ldrb r1, [r6, 0x4]
 	lsls r0, r1, 4
@@ -2627,8 +2627,8 @@ _0805F1D0: .4byte 0x000003ff
 _0805F1D4: .4byte 0xfffffc00
 	thumb_func_end EventObjectSetGraphicsId
 
-	thumb_func_start FieldObjectSetGraphicsIdByLocalIdAndMap
-FieldObjectSetGraphicsIdByLocalIdAndMap: @ 805F1D8
+	thumb_func_start ObjectEventSetGraphicsIdByLocalIdAndMap
+ObjectEventSetGraphicsIdByLocalIdAndMap: @ 805F1D8
 	push {r4,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -2640,7 +2640,7 @@ FieldObjectSetGraphicsIdByLocalIdAndMap: @ 805F1D8
 	lsls r3, 24
 	lsrs r4, r3, 24
 	mov r3, sp
-	bl TryGetFieldObjectIdByLocalIdAndMap
+	bl TryGetObjectEventIdByLocalIdAndMap
 	lsls r0, 24
 	cmp r0, 0
 	bne _0805F20C
@@ -2649,7 +2649,7 @@ FieldObjectSetGraphicsIdByLocalIdAndMap: @ 805F1D8
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _0805F214 @ =gMapObjects
+	ldr r1, _0805F214 @ =gObjectEvents
 	adds r0, r1
 	adds r1, r4, 0
 	bl EventObjectSetGraphicsId
@@ -2659,16 +2659,16 @@ _0805F20C:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_0805F214: .4byte gMapObjects
-	thumb_func_end FieldObjectSetGraphicsIdByLocalIdAndMap
+_0805F214: .4byte gObjectEvents
+	thumb_func_end ObjectEventSetGraphicsIdByLocalIdAndMap
 
-	thumb_func_start FieldObjectTurn
-FieldObjectTurn: @ 805F218
+	thumb_func_start ObjectEventTurn
+ObjectEventTurn: @ 805F218
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	lsls r1, 24
 	lsrs r1, 24
-	bl FieldObjectSetDirection
+	bl ObjectEventSetDirection
 	ldrb r0, [r6, 0x1]
 	lsls r0, 27
 	cmp r0, 0
@@ -2682,7 +2682,7 @@ FieldObjectTurn: @ 805F218
 	ldrb r0, [r6, 0x18]
 	lsls r0, 28
 	lsrs r0, 28
-	bl FieldObjectDirectionToImageAnimId
+	bl ObjectEventDirectionToImageAnimId
 	adds r1, r0, 0
 	lsls r1, 24
 	lsrs r1, 24
@@ -2701,10 +2701,10 @@ _0805F25E:
 	bx r0
 	.align 2, 0
 _0805F264: .4byte gSprites
-	thumb_func_end FieldObjectTurn
+	thumb_func_end ObjectEventTurn
 
-	thumb_func_start FieldObjectTurnByLocalIdAndMap
-FieldObjectTurnByLocalIdAndMap: @ 805F268
+	thumb_func_start ObjectEventTurnByLocalIdAndMap
+ObjectEventTurnByLocalIdAndMap: @ 805F268
 	push {r4,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -2716,7 +2716,7 @@ FieldObjectTurnByLocalIdAndMap: @ 805F268
 	lsls r3, 24
 	lsrs r4, r3, 24
 	mov r3, sp
-	bl TryGetFieldObjectIdByLocalIdAndMap
+	bl TryGetObjectEventIdByLocalIdAndMap
 	lsls r0, 24
 	cmp r0, 0
 	bne _0805F29C
@@ -2725,18 +2725,18 @@ FieldObjectTurnByLocalIdAndMap: @ 805F268
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _0805F2A4 @ =gMapObjects
+	ldr r1, _0805F2A4 @ =gObjectEvents
 	adds r0, r1
 	adds r1, r4, 0
-	bl FieldObjectTurn
+	bl ObjectEventTurn
 _0805F29C:
 	add sp, 0x4
 	pop {r4}
 	pop {r0}
 	bx r0
 	.align 2, 0
-_0805F2A4: .4byte gMapObjects
-	thumb_func_end FieldObjectTurnByLocalIdAndMap
+_0805F2A4: .4byte gObjectEvents
+	thumb_func_end ObjectEventTurnByLocalIdAndMap
 
 	thumb_func_start PlayerObjectTurn
 PlayerObjectTurn: @ 805F2A8
@@ -2747,17 +2747,17 @@ PlayerObjectTurn: @ 805F2A8
 	lsls r0, r2, 3
 	adds r0, r2
 	lsls r0, 2
-	ldr r2, _0805F2C4 @ =gMapObjects
+	ldr r2, _0805F2C4 @ =gObjectEvents
 	adds r0, r2
-	bl FieldObjectTurn
+	bl ObjectEventTurn
 	pop {r0}
 	bx r0
 	.align 2, 0
-_0805F2C4: .4byte gMapObjects
+_0805F2C4: .4byte gObjectEvents
 	thumb_func_end PlayerObjectTurn
 
-	thumb_func_start GetFieldObjectGraphicsInfo
-GetFieldObjectGraphicsInfo: @ 805F2C8
+	thumb_func_start GetObjectEventGraphicsInfo
+GetObjectEventGraphicsInfo: @ 805F2C8
 	push {lr}
 	lsls r0, 24
 	lsrs r1, r0, 24
@@ -2767,25 +2767,25 @@ GetFieldObjectGraphicsInfo: @ 805F2C8
 	adds r0, 0x10
 	lsls r0, 24
 	lsrs r0, 24
-	bl VarGetFieldObjectGraphicsId
+	bl VarGetObjectEventGraphicsId
 	adds r1, r0, 0
 _0805F2E0:
 	cmp r1, 0x97
 	bls _0805F2E6
 	movs r1, 0x10
 _0805F2E6:
-	ldr r0, _0805F2F4 @ =gMapObjectGraphicsInfoPointers
+	ldr r0, _0805F2F4 @ =gObjectEventGraphicsInfoPointers
 	lsls r1, 2
 	adds r1, r0
 	ldr r0, [r1]
 	pop {r1}
 	bx r1
 	.align 2, 0
-_0805F2F4: .4byte gMapObjectGraphicsInfoPointers
-	thumb_func_end GetFieldObjectGraphicsInfo
+_0805F2F4: .4byte gObjectEventGraphicsInfoPointers
+	thumb_func_end GetObjectEventGraphicsInfo
 
-	thumb_func_start FieldObjectHandleDynamicGraphicsId
-FieldObjectHandleDynamicGraphicsId: @ 805F2F8
+	thumb_func_start ObjectEventHandleDynamicGraphicsId
+ObjectEventHandleDynamicGraphicsId: @ 805F2F8
 	push {r4,lr}
 	adds r4, r0, 0
 	ldrb r0, [r4, 0x5]
@@ -2794,13 +2794,13 @@ FieldObjectHandleDynamicGraphicsId: @ 805F2F8
 	adds r0, 0x10
 	lsls r0, 24
 	lsrs r0, 24
-	bl VarGetFieldObjectGraphicsId
+	bl VarGetObjectEventGraphicsId
 	strb r0, [r4, 0x5]
 _0805F30E:
 	pop {r4}
 	pop {r0}
 	bx r0
-	thumb_func_end FieldObjectHandleDynamicGraphicsId
+	thumb_func_end ObjectEventHandleDynamicGraphicsId
 
 	thumb_func_start npc_by_local_id_and_map_set_field_1_bit_x20
 npc_by_local_id_and_map_set_field_1_bit_x20: @ 805F314
@@ -2815,11 +2815,11 @@ npc_by_local_id_and_map_set_field_1_bit_x20: @ 805F314
 	lsls r3, 24
 	lsrs r4, r3, 24
 	mov r3, sp
-	bl TryGetFieldObjectIdByLocalIdAndMap
+	bl TryGetObjectEventIdByLocalIdAndMap
 	lsls r0, 24
 	cmp r0, 0
 	bne _0805F356
-	ldr r2, _0805F360 @ =gMapObjects
+	ldr r2, _0805F360 @ =gObjectEvents
 	mov r0, sp
 	ldrb r0, [r0]
 	lsls r1, r0, 3
@@ -2842,11 +2842,11 @@ _0805F356:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_0805F360: .4byte gMapObjects
+_0805F360: .4byte gObjectEvents
 	thumb_func_end npc_by_local_id_and_map_set_field_1_bit_x20
 
-	thumb_func_start FieldObjectGetLocalIdAndMap
-FieldObjectGetLocalIdAndMap: @ 805F364
+	thumb_func_start ObjectEventGetLocalIdAndMap
+ObjectEventGetLocalIdAndMap: @ 805F364
 	push {r4,lr}
 	ldrb r4, [r0, 0x8]
 	strb r4, [r1]
@@ -2857,7 +2857,7 @@ FieldObjectGetLocalIdAndMap: @ 805F364
 	pop {r4}
 	pop {r0}
 	bx r0
-	thumb_func_end FieldObjectGetLocalIdAndMap
+	thumb_func_end ObjectEventGetLocalIdAndMap
 
 	thumb_func_start sub_805F378
 sub_805F378: @ 805F378
@@ -2866,7 +2866,7 @@ sub_805F378: @ 805F378
 	asrs r0, 16
 	lsls r1, 16
 	asrs r1, 16
-	bl GetFieldObjectIdByXY
+	bl GetObjectEventIdByXY
 	lsls r0, 24
 	lsrs r1, r0, 24
 	cmp r1, 0x10
@@ -2874,7 +2874,7 @@ sub_805F378: @ 805F378
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _0805F3A4 @ =gMapObjects
+	ldr r1, _0805F3A4 @ =gObjectEvents
 	adds r0, r1
 	ldrb r1, [r0]
 	movs r2, 0x4
@@ -2884,7 +2884,7 @@ _0805F3A0:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_0805F3A4: .4byte gMapObjects
+_0805F3A4: .4byte gObjectEvents
 	thumb_func_end sub_805F378
 
 	thumb_func_start sub_805F3A8
@@ -2900,7 +2900,7 @@ sub_805F3A8: @ 805F3A8
 	lsls r3, 24
 	lsrs r4, r3, 24
 	mov r3, sp
-	bl TryGetFieldObjectIdByLocalIdAndMap
+	bl TryGetObjectEventIdByLocalIdAndMap
 	lsls r0, 24
 	cmp r0, 0
 	bne _0805F3EE
@@ -2909,7 +2909,7 @@ sub_805F3A8: @ 805F3A8
 	lsls r2, r0, 3
 	adds r2, r0
 	lsls r2, 2
-	ldr r0, _0805F3F8 @ =gMapObjects
+	ldr r0, _0805F3F8 @ =gObjectEvents
 	adds r2, r0
 	ldrb r1, [r2, 0x4]
 	lsls r0, r1, 4
@@ -2929,7 +2929,7 @@ _0805F3EE:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_0805F3F8: .4byte gMapObjects
+_0805F3F8: .4byte gObjectEvents
 _0805F3FC: .4byte gSprites
 	thumb_func_end sub_805F3A8
 
@@ -2944,7 +2944,7 @@ sub_805F400: @ 805F400
 	lsls r2, 24
 	lsrs r2, 24
 	mov r3, sp
-	bl TryGetFieldObjectIdByLocalIdAndMap
+	bl TryGetObjectEventIdByLocalIdAndMap
 	lsls r0, 24
 	cmp r0, 0
 	bne _0805F43C
@@ -2953,7 +2953,7 @@ sub_805F400: @ 805F400
 	lsls r1, r0, 3
 	adds r1, r0
 	lsls r1, 2
-	ldr r0, _0805F444 @ =gMapObjects
+	ldr r0, _0805F444 @ =gObjectEvents
 	adds r1, r0
 	ldrb r2, [r1, 0x3]
 	movs r0, 0x5
@@ -2969,7 +2969,7 @@ _0805F43C:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_0805F444: .4byte gMapObjects
+_0805F444: .4byte gObjectEvents
 	thumb_func_end sub_805F400
 
 	thumb_func_start sub_805F448
@@ -2988,11 +2988,11 @@ sub_805F448: @ 805F448
 	lsls r4, 16
 	lsrs r4, 16
 	mov r3, sp
-	bl TryGetFieldObjectIdByLocalIdAndMap
+	bl TryGetObjectEventIdByLocalIdAndMap
 	lsls r0, 24
 	cmp r0, 0
 	bne _0805F48C
-	ldr r2, _0805F494 @ =gMapObjects
+	ldr r2, _0805F494 @ =gObjectEvents
 	mov r0, sp
 	ldrb r1, [r0]
 	lsls r0, r1, 3
@@ -3013,7 +3013,7 @@ _0805F48C:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_0805F494: .4byte gMapObjects
+_0805F494: .4byte gObjectEvents
 _0805F498: .4byte gSprites
 	thumb_func_end sub_805F448
 
@@ -3035,7 +3035,7 @@ sub_805F4B0: @ 805F4B0
 	push {lr}
 	lsls r0, 16
 	lsrs r0, 16
-	bl FindFieldObjectPaletteIndexByTag
+	bl FindObjectEventPaletteIndexByTag
 	lsls r0, 24
 	lsrs r1, r0, 24
 	ldr r0, _0805F4D4 @ =0x000011ff
@@ -3115,7 +3115,7 @@ pal_patch_for_npc: @ 805F538
 	lsrs r0, 16
 	lsls r4, 24
 	lsrs r4, 24
-	bl FindFieldObjectPaletteIndexByTag
+	bl FindObjectEventPaletteIndexByTag
 	lsls r0, 24
 	ldr r1, _0805F570 @ =gUnknown_83A5158
 	lsrs r0, 21
@@ -3163,8 +3163,8 @@ _0805F598:
 	bx r0
 	thumb_func_end pal_patch_for_npc_range
 
-	thumb_func_start FindFieldObjectPaletteIndexByTag
-FindFieldObjectPaletteIndexByTag: @ 805F5A0
+	thumb_func_start FindObjectEventPaletteIndexByTag
+FindObjectEventPaletteIndexByTag: @ 805F5A0
 	push {r4-r6,lr}
 	lsls r0, 16
 	lsrs r5, r0, 16
@@ -3203,7 +3203,7 @@ _0805F5E2:
 	pop {r4-r6}
 	pop {r1}
 	bx r1
-	thumb_func_end FindFieldObjectPaletteIndexByTag
+	thumb_func_end FindObjectEventPaletteIndexByTag
 
 	thumb_func_start npc_load_two_palettes__no_record
 npc_load_two_palettes__no_record: @ 805F5E8
@@ -3395,7 +3395,7 @@ sub_805F724: @ 805F724
 	ldr r1, _0805F7C0 @ =gSprites
 	adds r7, r0, r1
 	ldrb r0, [r6, 0x5]
-	bl GetFieldObjectGraphicsInfo
+	bl GetObjectEventGraphicsInfo
 	mov r8, r0
 	lsls r4, 16
 	asrs r4, 16
@@ -3472,7 +3472,7 @@ sub_805F7C4: @ 805F7C4
 	lsls r4, 16
 	lsrs r4, 16
 	mov r3, sp
-	bl TryGetFieldObjectIdByLocalIdAndMap
+	bl TryGetObjectEventIdByLocalIdAndMap
 	lsls r0, 24
 	cmp r0, 0
 	bne _0805F80C
@@ -3483,7 +3483,7 @@ sub_805F7C4: @ 805F7C4
 	lsls r0, r3, 3
 	adds r0, r3
 	lsls r0, 2
-	ldr r3, _0805F814 @ =gMapObjects
+	ldr r3, _0805F814 @ =gObjectEvents
 	adds r0, r3
 	movs r3, 0xE0
 	lsls r3, 11
@@ -3498,7 +3498,7 @@ _0805F80C:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_0805F814: .4byte gMapObjects
+_0805F814: .4byte gObjectEvents
 	thumb_func_end sub_805F7C4
 
 	thumb_func_start npc_coords_shift_still
@@ -3513,8 +3513,8 @@ npc_coords_shift_still: @ 805F818
 	bx r0
 	thumb_func_end npc_coords_shift_still
 
-	thumb_func_start UpdateFieldObjectCoordsForCameraUpdate
-UpdateFieldObjectCoordsForCameraUpdate: @ 805F82C
+	thumb_func_start UpdateObjectEventCoordsForCameraUpdate
+UpdateObjectEventCoordsForCameraUpdate: @ 805F82C
 	push {r4,r5,lr}
 	ldr r2, _0805F88C @ =gCamera
 	ldrb r1, [r2]
@@ -3523,7 +3523,7 @@ UpdateFieldObjectCoordsForCameraUpdate: @ 805F82C
 	cmp r0, 0
 	beq _0805F884
 	movs r3, 0
-	ldr r5, _0805F890 @ =gMapObjects
+	ldr r5, _0805F890 @ =gObjectEvents
 	movs r0, 0x4
 	ldrsh r4, [r2, r0]
 	movs r0, 0x8
@@ -3567,11 +3567,11 @@ _0805F884:
 	bx r0
 	.align 2, 0
 _0805F88C: .4byte gCamera
-_0805F890: .4byte gMapObjects
-	thumb_func_end UpdateFieldObjectCoordsForCameraUpdate
+_0805F890: .4byte gObjectEvents
+	thumb_func_end UpdateObjectEventCoordsForCameraUpdate
 
-	thumb_func_start GetFieldObjectIdByXYZ
-GetFieldObjectIdByXYZ: @ 805F894
+	thumb_func_start GetObjectEventIdByXYZ
+GetObjectEventIdByXYZ: @ 805F894
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -3582,7 +3582,7 @@ GetFieldObjectIdByXYZ: @ 805F894
 	lsls r2, 24
 	lsrs r5, r2, 24
 	movs r4, 0
-	ldr r0, _0805F8E0 @ =gMapObjects
+	ldr r0, _0805F8E0 @ =gObjectEvents
 	mov r8, r0
 _0805F8AC:
 	lsls r0, r4, 3
@@ -3604,14 +3604,14 @@ _0805F8AC:
 	bne _0805F8E4
 	adds r0, r1, 0
 	adds r1, r5, 0
-	bl FieldObjectDoesZCoordMatch
+	bl ObjectEventDoesZCoordMatch
 	lsls r0, 24
 	cmp r0, 0
 	beq _0805F8E4
 	adds r0, r4, 0
 	b _0805F8F0
 	.align 2, 0
-_0805F8E0: .4byte gMapObjects
+_0805F8E0: .4byte gObjectEvents
 _0805F8E4:
 	adds r0, r4, 0x1
 	lsls r0, 24
@@ -3625,10 +3625,10 @@ _0805F8F0:
 	pop {r4-r7}
 	pop {r1}
 	bx r1
-	thumb_func_end GetFieldObjectIdByXYZ
+	thumb_func_end GetObjectEventIdByXYZ
 
-	thumb_func_start FieldObjectDoesZCoordMatch
-FieldObjectDoesZCoordMatch: @ 805F8FC
+	thumb_func_start ObjectEventDoesZCoordMatch
+ObjectEventDoesZCoordMatch: @ 805F8FC
 	push {lr}
 	lsls r1, 24
 	lsrs r1, 24
@@ -3650,10 +3650,10 @@ _0805F91C:
 _0805F91E:
 	pop {r1}
 	bx r1
-	thumb_func_end FieldObjectDoesZCoordMatch
+	thumb_func_end ObjectEventDoesZCoordMatch
 
-	thumb_func_start UpdateFieldObjectsForCameraUpdate
-UpdateFieldObjectsForCameraUpdate: @ 805F924
+	thumb_func_start UpdateObjectEventsForCameraUpdate
+UpdateObjectEventsForCameraUpdate: @ 805F924
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -3661,7 +3661,7 @@ UpdateFieldObjectsForCameraUpdate: @ 805F924
 	lsrs r4, 16
 	lsls r5, 16
 	lsrs r5, 16
-	bl UpdateFieldObjectCoordsForCameraUpdate
+	bl UpdateObjectEventCoordsForCameraUpdate
 	lsls r4, 16
 	asrs r4, 16
 	lsls r5, 16
@@ -3669,11 +3669,11 @@ UpdateFieldObjectsForCameraUpdate: @ 805F924
 	adds r0, r4, 0
 	adds r1, r5, 0
 	bl sub_805EC30
-	bl RemoveFieldObjectsOutsideView
+	bl RemoveObjectEventsOutsideView
 	pop {r4,r5}
 	pop {r0}
 	bx r0
-	thumb_func_end UpdateFieldObjectsForCameraUpdate
+	thumb_func_end UpdateObjectEventsForCameraUpdate
 
 	thumb_func_start AddCameraObject
 AddCameraObject: @ 805F950
@@ -4040,8 +4040,8 @@ _0805FBD2:
 	bx r1
 	thumb_func_end obj_unfreeze
 
-	thumb_func_start FieldObjectSetDirection
-FieldObjectSetDirection: @ 805FBDC
+	thumb_func_start ObjectEventSetDirection
+ObjectEventSetDirection: @ 805FBDC
 	push {r4,lr}
 	adds r3, r0, 0
 	lsls r1, 24
@@ -4076,10 +4076,10 @@ _0805FC0C:
 	pop {r4}
 	pop {r0}
 	bx r0
-	thumb_func_end FieldObjectSetDirection
+	thumb_func_end ObjectEventSetDirection
 
-	thumb_func_start GetFieldObjectScriptPointerByLocalIdAndMap
-GetFieldObjectScriptPointerByLocalIdAndMap: @ 805FC20
+	thumb_func_start GetObjectEventScriptPointerByLocalIdAndMap
+GetObjectEventScriptPointerByLocalIdAndMap: @ 805FC20
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -4087,18 +4087,18 @@ GetFieldObjectScriptPointerByLocalIdAndMap: @ 805FC20
 	lsrs r1, 24
 	lsls r2, 24
 	lsrs r2, 24
-	bl GetFieldObjectTemplateByLocalIdAndMap
+	bl GetObjectEventTemplateByLocalIdAndMap
 	ldr r0, [r0, 0x10]
 	pop {r1}
 	bx r1
-	thumb_func_end GetFieldObjectScriptPointerByLocalIdAndMap
+	thumb_func_end GetObjectEventScriptPointerByLocalIdAndMap
 
-	thumb_func_start GetFieldObjectScriptPointerByFieldObjectId
-GetFieldObjectScriptPointerByFieldObjectId: @ 805FC38
+	thumb_func_start GetObjectEventScriptPointerByObjectEventId
+GetObjectEventScriptPointerByObjectEventId: @ 805FC38
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
-	ldr r1, _0805FC58 @ =gMapObjects
+	ldr r1, _0805FC58 @ =gObjectEvents
 	lsls r2, r0, 3
 	adds r2, r0
 	lsls r2, 2
@@ -4106,15 +4106,15 @@ GetFieldObjectScriptPointerByFieldObjectId: @ 805FC38
 	ldrb r0, [r2, 0x8]
 	ldrb r1, [r2, 0x9]
 	ldrb r2, [r2, 0xA]
-	bl GetFieldObjectScriptPointerByLocalIdAndMap
+	bl GetObjectEventScriptPointerByLocalIdAndMap
 	pop {r1}
 	bx r1
 	.align 2, 0
-_0805FC58: .4byte gMapObjects
-	thumb_func_end GetFieldObjectScriptPointerByFieldObjectId
+_0805FC58: .4byte gObjectEvents
+	thumb_func_end GetObjectEventScriptPointerByObjectEventId
 
-	thumb_func_start GetFieldObjectFlagIdByLocalIdAndMap
-GetFieldObjectFlagIdByLocalIdAndMap: @ 805FC5C
+	thumb_func_start GetObjectEventFlagIdByLocalIdAndMap
+GetObjectEventFlagIdByLocalIdAndMap: @ 805FC5C
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -4122,18 +4122,18 @@ GetFieldObjectFlagIdByLocalIdAndMap: @ 805FC5C
 	lsrs r1, 24
 	lsls r2, 24
 	lsrs r2, 24
-	bl GetFieldObjectTemplateByLocalIdAndMap
+	bl GetObjectEventTemplateByLocalIdAndMap
 	ldrh r0, [r0, 0x14]
 	pop {r1}
 	bx r1
-	thumb_func_end GetFieldObjectFlagIdByLocalIdAndMap
+	thumb_func_end GetObjectEventFlagIdByLocalIdAndMap
 
-	thumb_func_start GetFieldObjectFlagIdByFieldObjectId
-GetFieldObjectFlagIdByFieldObjectId: @ 805FC74
+	thumb_func_start GetObjectEventFlagIdByObjectEventId
+GetObjectEventFlagIdByObjectEventId: @ 805FC74
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
-	ldr r1, _0805FC98 @ =gMapObjects
+	ldr r1, _0805FC98 @ =gObjectEvents
 	lsls r2, r0, 3
 	adds r2, r0
 	lsls r2, 2
@@ -4141,14 +4141,14 @@ GetFieldObjectFlagIdByFieldObjectId: @ 805FC74
 	ldrb r0, [r2, 0x8]
 	ldrb r1, [r2, 0x9]
 	ldrb r2, [r2, 0xA]
-	bl GetFieldObjectFlagIdByLocalIdAndMap
+	bl GetObjectEventFlagIdByLocalIdAndMap
 	lsls r0, 16
 	lsrs r0, 16
 	pop {r1}
 	bx r1
 	.align 2, 0
-_0805FC98: .4byte gMapObjects
-	thumb_func_end GetFieldObjectFlagIdByFieldObjectId
+_0805FC98: .4byte gObjectEvents
+	thumb_func_end GetObjectEventFlagIdByObjectEventId
 
 	thumb_func_start sub_805FC9C
 sub_805FC9C: @ 805FC9C
@@ -4161,11 +4161,11 @@ sub_805FC9C: @ 805FC9C
 	lsls r2, 24
 	lsrs r2, 24
 	mov r3, sp
-	bl TryGetFieldObjectIdByLocalIdAndMap
+	bl TryGetObjectEventIdByLocalIdAndMap
 	lsls r0, 24
 	cmp r0, 0
 	bne _0805FCD0
-	ldr r2, _0805FCCC @ =gMapObjects
+	ldr r2, _0805FCCC @ =gObjectEvents
 	mov r0, sp
 	ldrb r1, [r0]
 	lsls r0, r1, 3
@@ -4175,7 +4175,7 @@ sub_805FC9C: @ 805FC9C
 	ldrb r0, [r0, 0x7]
 	b _0805FCD2
 	.align 2, 0
-_0805FCCC: .4byte gMapObjects
+_0805FCCC: .4byte gObjectEvents
 _0805FCD0:
 	movs r0, 0xFF
 _0805FCD2:
@@ -4193,7 +4193,7 @@ sub_805FCD8: @ 805FCD8
 	lsrs r1, 24
 	lsls r2, 24
 	lsrs r2, 24
-	bl GetFieldObjectTemplateByLocalIdAndMap
+	bl GetObjectEventTemplateByLocalIdAndMap
 	ldrh r0, [r0, 0xC]
 	pop {r1}
 	bx r1
@@ -4203,7 +4203,7 @@ sub_805FCD8: @ 805FCD8
 sub_805FCF0: @ 805FCF0
 	lsls r0, 24
 	lsrs r0, 24
-	ldr r2, _0805FD04 @ =gMapObjects
+	ldr r2, _0805FD04 @ =gObjectEvents
 	lsls r1, r0, 3
 	adds r1, r0
 	lsls r1, 2
@@ -4211,7 +4211,7 @@ sub_805FCF0: @ 805FCF0
 	ldrb r0, [r1, 0x7]
 	bx lr
 	.align 2, 0
-_0805FD04: .4byte gMapObjects
+_0805FD04: .4byte gObjectEvents
 	thumb_func_end sub_805FCF0
 
 	thumb_func_start sub_805FD08
@@ -4225,11 +4225,11 @@ sub_805FD08: @ 805FD08
 	lsls r2, 24
 	lsrs r2, 24
 	mov r3, sp
-	bl TryGetFieldObjectIdByLocalIdAndMap
+	bl TryGetObjectEventIdByLocalIdAndMap
 	lsls r0, 24
 	cmp r0, 0
 	bne _0805FD3C
-	ldr r2, _0805FD38 @ =gMapObjects
+	ldr r2, _0805FD38 @ =gObjectEvents
 	mov r0, sp
 	ldrb r1, [r0]
 	lsls r0, r1, 3
@@ -4239,7 +4239,7 @@ sub_805FD08: @ 805FD08
 	ldrb r0, [r0, 0x1D]
 	b _0805FD3E
 	.align 2, 0
-_0805FD38: .4byte gMapObjects
+_0805FD38: .4byte gObjectEvents
 _0805FD3C:
 	movs r0, 0xFF
 _0805FD3E:
@@ -4248,11 +4248,11 @@ _0805FD3E:
 	bx r1
 	thumb_func_end sub_805FD08
 
-	thumb_func_start FieldObjectGetBerryTreeId
-FieldObjectGetBerryTreeId: @ 805FD44
+	thumb_func_start ObjectEventGetBerryTreeId
+ObjectEventGetBerryTreeId: @ 805FD44
 	lsls r0, 24
 	lsrs r0, 24
-	ldr r2, _0805FD58 @ =gMapObjects
+	ldr r2, _0805FD58 @ =gObjectEvents
 	lsls r1, r0, 3
 	adds r1, r0
 	lsls r1, 2
@@ -4260,11 +4260,11 @@ FieldObjectGetBerryTreeId: @ 805FD44
 	ldrb r0, [r1, 0x1D]
 	bx lr
 	.align 2, 0
-_0805FD58: .4byte gMapObjects
-	thumb_func_end FieldObjectGetBerryTreeId
+_0805FD58: .4byte gObjectEvents
+	thumb_func_end ObjectEventGetBerryTreeId
 
-	thumb_func_start GetFieldObjectTemplateByLocalIdAndMap
-GetFieldObjectTemplateByLocalIdAndMap: @ 805FD5C
+	thumb_func_start GetObjectEventTemplateByLocalIdAndMap
+GetObjectEventTemplateByLocalIdAndMap: @ 805FD5C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -4300,14 +4300,14 @@ _0805FD94:
 _0805FDA0:
 	ldrb r2, [r0]
 	adds r0, r4, 0
-	bl FindFieldObjectTemplateInArrayByLocalId
+	bl FindObjectEventTemplateInArrayByLocalId
 	pop {r4}
 	pop {r1}
 	bx r1
-	thumb_func_end GetFieldObjectTemplateByLocalIdAndMap
+	thumb_func_end GetObjectEventTemplateByLocalIdAndMap
 
-	thumb_func_start FindFieldObjectTemplateInArrayByLocalId
-FindFieldObjectTemplateInArrayByLocalId: @ 805FDB0
+	thumb_func_start FindObjectEventTemplateInArrayByLocalId
+FindObjectEventTemplateInArrayByLocalId: @ 805FDB0
 	push {r4,r5,lr}
 	adds r5, r1, 0
 	lsls r0, 24
@@ -4339,7 +4339,7 @@ _0805FDE0:
 	pop {r4,r5}
 	pop {r1}
 	bx r1
-	thumb_func_end FindFieldObjectTemplateInArrayByLocalId
+	thumb_func_end FindObjectEventTemplateInArrayByLocalId
 
 	thumb_func_start sub_805FDE8
 sub_805FDE8: @ 805FDE8
@@ -4454,7 +4454,7 @@ sub_805FE94: @ 805FE94
 	lsls r2, 24
 	lsrs r2, 24
 	mov r3, sp
-	bl TryGetFieldObjectIdByLocalIdAndMap
+	bl TryGetObjectEventIdByLocalIdAndMap
 	lsls r0, 24
 	cmp r0, 0
 	bne _0805FEC2
@@ -4463,7 +4463,7 @@ sub_805FE94: @ 805FE94
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _0805FEC8 @ =gMapObjects
+	ldr r1, _0805FEC8 @ =gObjectEvents
 	adds r0, r1
 	bl sub_805FE5C
 _0805FEC2:
@@ -4471,7 +4471,7 @@ _0805FEC2:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_0805FEC8: .4byte gMapObjects
+_0805FEC8: .4byte gObjectEvents
 	thumb_func_end sub_805FE94
 
 	thumb_func_start npc_paltag_set_load
@@ -4602,14 +4602,14 @@ sub_805FFB4: @ 805FFB4
 	lsls r0, r2, 3
 	adds r0, r2
 	lsls r0, 2
-	ldr r2, _0805FFD0 @ =gMapObjects
+	ldr r2, _0805FFD0 @ =gObjectEvents
 	adds r0, r2
 	ldr r2, _0805FFD4 @ =sub_805FFD8
-	bl FieldObjectStep
+	bl ObjectEventStep
 	pop {r0}
 	bx r0
 	.align 2, 0
-_0805FFD0: .4byte gMapObjects
+_0805FFD0: .4byte gObjectEvents
 _0805FFD4: .4byte sub_805FFD8
 	thumb_func_end sub_805FFB4
 
@@ -4628,14 +4628,14 @@ sub_805FFDC: @ 805FFDC
 	lsls r0, r2, 3
 	adds r0, r2
 	lsls r0, 2
-	ldr r2, _0805FFF8 @ =gMapObjects
+	ldr r2, _0805FFF8 @ =gObjectEvents
 	adds r0, r2
 	ldr r2, _0805FFFC @ =sub_8060000
-	bl FieldObjectStep
+	bl ObjectEventStep
 	pop {r0}
 	bx r0
 	.align 2, 0
-_0805FFF8: .4byte gMapObjects
+_0805FFF8: .4byte gObjectEvents
 _0805FFFC: .4byte sub_8060000
 	thumb_func_end sub_805FFDC
 
@@ -4667,14 +4667,14 @@ sub_8060020: @ 8060020
 	lsls r0, r2, 3
 	adds r0, r2
 	lsls r0, 2
-	ldr r2, _0806003C @ =gMapObjects
+	ldr r2, _0806003C @ =gObjectEvents
 	adds r0, r2
 	ldr r2, _08060040 @ =sub_8060044
-	bl FieldObjectStep
+	bl ObjectEventStep
 	pop {r0}
 	bx r0
 	.align 2, 0
-_0806003C: .4byte gMapObjects
+_0806003C: .4byte gObjectEvents
 _08060040: .4byte sub_8060044
 	thumb_func_end sub_8060020
 
@@ -4750,7 +4750,7 @@ sub_80600A4: @ 80600A4
 	movs r0, 0
 	ldrsh r1, [r1, r0]
 	adds r0, r6, 0
-	bl SetFieldObjectStepTimer
+	bl SetObjectEventStepTimer
 	strh r4, [r6, 0x30]
 	movs r0, 0x1
 	b _080600DA
@@ -4769,7 +4769,7 @@ sub_80600E0: @ 80600E0
 	push {r4,lr}
 	adds r4, r1, 0
 	adds r0, r4, 0
-	bl RunFieldObjectStepTimer
+	bl RunObjectEventStepTimer
 	lsls r0, 24
 	cmp r0, 0
 	bne _080600F4
@@ -4803,7 +4803,7 @@ sub_8060100: @ 8060100
 	ldrb r4, [r0]
 	adds r0, r5, 0
 	adds r1, r4, 0
-	bl FieldObjectSetDirection
+	bl ObjectEventSetDirection
 	movs r0, 0x5
 	strh r0, [r6, 0x30]
 	adds r0, r5, 0
@@ -4899,8 +4899,8 @@ _080601CA:
 	bx r1
 	thumb_func_end sub_80601AC
 
-	thumb_func_start FieldObjectIsTrainerAndCloseToPlayer
-FieldObjectIsTrainerAndCloseToPlayer: @ 80601D4
+	thumb_func_start ObjectEventIsTrainerAndCloseToPlayer
+ObjectEventIsTrainerAndCloseToPlayer: @ 80601D4
 	push {r4-r7,lr}
 	sub sp, 0x4
 	adds r5, r0, 0
@@ -4964,7 +4964,7 @@ _08060246:
 	pop {r4-r7}
 	pop {r1}
 	bx r1
-	thumb_func_end FieldObjectIsTrainerAndCloseToPlayer
+	thumb_func_end ObjectEventIsTrainerAndCloseToPlayer
 
 	thumb_func_start GetRegularRunningPastFacingDirection
 GetRegularRunningPastFacingDirection: @ 8060250
@@ -5362,7 +5362,7 @@ GetRunningPastFacingDirection: @ 8060504
 	adds r4, r0, 0
 	lsls r1, 24
 	lsrs r6, r1, 24
-	bl FieldObjectIsTrainerAndCloseToPlayer
+	bl ObjectEventIsTrainerAndCloseToPlayer
 	lsls r0, 24
 	cmp r0, 0
 	bne _0806051C
@@ -5437,14 +5437,14 @@ sub_806058C: @ 806058C
 	lsls r0, r2, 3
 	adds r0, r2
 	lsls r0, 2
-	ldr r2, _080605A8 @ =gMapObjects
+	ldr r2, _080605A8 @ =gObjectEvents
 	adds r0, r2
 	ldr r2, _080605AC @ =sub_80605B0
-	bl FieldObjectStep
+	bl ObjectEventStep
 	pop {r0}
 	bx r0
 	.align 2, 0
-_080605A8: .4byte gMapObjects
+_080605A8: .4byte gObjectEvents
 _080605AC: .4byte sub_80605B0
 	thumb_func_end sub_806058C
 
@@ -5521,7 +5521,7 @@ sub_8060610: @ 8060610
 	movs r0, 0
 	ldrsh r1, [r1, r0]
 	adds r0, r7, 0
-	bl SetFieldObjectStepTimer
+	bl SetObjectEventStepTimer
 	ldrb r1, [r6]
 	movs r0, 0x3
 	negs r0, r0
@@ -5543,12 +5543,12 @@ sub_8060654: @ 8060654
 	adds r4, r0, 0
 	adds r5, r1, 0
 	adds r0, r5, 0
-	bl RunFieldObjectStepTimer
+	bl RunObjectEventStepTimer
 	lsls r0, 24
 	cmp r0, 0
 	bne _08060672
 	adds r0, r4, 0
-	bl FieldObjectIsTrainerAndCloseToPlayer
+	bl ObjectEventIsTrainerAndCloseToPlayer
 	lsls r0, 24
 	cmp r0, 0
 	beq _0806067A
@@ -5590,7 +5590,7 @@ sub_8060684: @ 8060684
 	ldrb r1, [r0]
 _080606B4:
 	adds r0, r4, 0
-	bl FieldObjectSetDirection
+	bl ObjectEventSetDirection
 	movs r0, 0x1
 	strh r0, [r5, 0x30]
 	add sp, 0x4
@@ -5610,14 +5610,14 @@ sub_80606CC: @ 80606CC
 	lsls r0, r2, 3
 	adds r0, r2
 	lsls r0, 2
-	ldr r2, _080606E8 @ =gMapObjects
+	ldr r2, _080606E8 @ =gObjectEvents
 	adds r0, r2
 	ldr r2, _080606EC @ =sub_80606F0
-	bl FieldObjectStep
+	bl ObjectEventStep
 	pop {r0}
 	bx r0
 	.align 2, 0
-_080606E8: .4byte gMapObjects
+_080606E8: .4byte gObjectEvents
 _080606EC: .4byte sub_80606F0
 	thumb_func_end sub_80606CC
 
@@ -5693,7 +5693,7 @@ sub_8060750: @ 8060750
 	movs r0, 0
 	ldrsh r1, [r1, r0]
 	adds r0, r6, 0
-	bl SetFieldObjectStepTimer
+	bl SetObjectEventStepTimer
 	strh r4, [r6, 0x30]
 	movs r0, 0x1
 	b _08060786
@@ -5712,7 +5712,7 @@ sub_806078C: @ 806078C
 	push {r4,lr}
 	adds r4, r1, 0
 	adds r0, r4, 0
-	bl RunFieldObjectStepTimer
+	bl RunObjectEventStepTimer
 	lsls r0, 24
 	cmp r0, 0
 	bne _080607A0
@@ -5747,7 +5747,7 @@ sub_80607AC: @ 80607AC
 	ldrb r4, [r0]
 	adds r0, r5, 0
 	adds r1, r4, 0
-	bl FieldObjectSetDirection
+	bl ObjectEventSetDirection
 	movs r0, 0x5
 	strh r0, [r6, 0x30]
 	adds r0, r5, 0
@@ -5825,14 +5825,14 @@ sub_8060850: @ 8060850
 	lsls r0, r2, 3
 	adds r0, r2
 	lsls r0, 2
-	ldr r2, _0806086C @ =gMapObjects
+	ldr r2, _0806086C @ =gObjectEvents
 	adds r0, r2
 	ldr r2, _08060870 @ =sub_8060874
-	bl FieldObjectStep
+	bl ObjectEventStep
 	pop {r0}
 	bx r0
 	.align 2, 0
-_0806086C: .4byte gMapObjects
+_0806086C: .4byte gObjectEvents
 _08060870: .4byte sub_8060874
 	thumb_func_end sub_8060850
 
@@ -5908,7 +5908,7 @@ sub_80608D4: @ 80608D4
 	movs r0, 0
 	ldrsh r1, [r1, r0]
 	adds r0, r6, 0
-	bl SetFieldObjectStepTimer
+	bl SetObjectEventStepTimer
 	strh r4, [r6, 0x30]
 	movs r0, 0x1
 	b _0806090A
@@ -5927,7 +5927,7 @@ sub_8060910: @ 8060910
 	push {r4,lr}
 	adds r4, r1, 0
 	adds r0, r4, 0
-	bl RunFieldObjectStepTimer
+	bl RunObjectEventStepTimer
 	lsls r0, 24
 	cmp r0, 0
 	bne _08060924
@@ -5962,7 +5962,7 @@ sub_8060930: @ 8060930
 	ldrb r4, [r0]
 	adds r0, r5, 0
 	adds r1, r4, 0
-	bl FieldObjectSetDirection
+	bl ObjectEventSetDirection
 	movs r0, 0x5
 	strh r0, [r6, 0x30]
 	adds r0, r5, 0
@@ -6040,14 +6040,14 @@ sub_80609D4: @ 80609D4
 	lsls r0, r2, 3
 	adds r0, r2
 	lsls r0, 2
-	ldr r2, _080609F0 @ =gMapObjects
+	ldr r2, _080609F0 @ =gObjectEvents
 	adds r0, r2
 	ldr r2, _080609F4 @ =sub_80609F8
-	bl FieldObjectStep
+	bl ObjectEventStep
 	pop {r0}
 	bx r0
 	.align 2, 0
-_080609F0: .4byte gMapObjects
+_080609F0: .4byte gObjectEvents
 _080609F4: .4byte sub_80609F8
 	thumb_func_end sub_80609D4
 
@@ -6133,14 +6133,14 @@ sub_8060A74: @ 8060A74
 	lsls r0, r2, 3
 	adds r0, r2
 	lsls r0, 2
-	ldr r2, _08060A90 @ =gMapObjects
+	ldr r2, _08060A90 @ =gObjectEvents
 	adds r0, r2
 	ldr r2, _08060A94 @ =sub_8060A98
-	bl FieldObjectStep
+	bl ObjectEventStep
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08060A90: .4byte gMapObjects
+_08060A90: .4byte gObjectEvents
 _08060A94: .4byte sub_8060A98
 	thumb_func_end sub_8060A74
 
@@ -6217,7 +6217,7 @@ sub_8060AF8: @ 8060AF8
 	movs r0, 0
 	ldrsh r1, [r1, r0]
 	adds r0, r7, 0
-	bl SetFieldObjectStepTimer
+	bl SetObjectEventStepTimer
 	ldrb r1, [r6]
 	movs r0, 0x3
 	negs r0, r0
@@ -6239,12 +6239,12 @@ sub_8060B3C: @ 8060B3C
 	adds r4, r0, 0
 	adds r5, r1, 0
 	adds r0, r5, 0
-	bl RunFieldObjectStepTimer
+	bl RunObjectEventStepTimer
 	lsls r0, 24
 	cmp r0, 0
 	bne _08060B5A
 	adds r0, r4, 0
-	bl FieldObjectIsTrainerAndCloseToPlayer
+	bl ObjectEventIsTrainerAndCloseToPlayer
 	lsls r0, 24
 	cmp r0, 0
 	beq _08060B62
@@ -6286,7 +6286,7 @@ sub_8060B6C: @ 8060B6C
 	ldrb r1, [r0]
 _08060B9C:
 	adds r0, r4, 0
-	bl FieldObjectSetDirection
+	bl ObjectEventSetDirection
 	movs r0, 0x1
 	strh r0, [r5, 0x30]
 	add sp, 0x4
@@ -6306,14 +6306,14 @@ sub_8060BB4: @ 8060BB4
 	lsls r0, r2, 3
 	adds r0, r2
 	lsls r0, 2
-	ldr r2, _08060BD0 @ =gMapObjects
+	ldr r2, _08060BD0 @ =gObjectEvents
 	adds r0, r2
 	ldr r2, _08060BD4 @ =sub_8060BD8
-	bl FieldObjectStep
+	bl ObjectEventStep
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08060BD0: .4byte gMapObjects
+_08060BD0: .4byte gObjectEvents
 _08060BD4: .4byte sub_8060BD8
 	thumb_func_end sub_8060BB4
 
@@ -6390,7 +6390,7 @@ sub_8060C38: @ 8060C38
 	movs r0, 0
 	ldrsh r1, [r1, r0]
 	adds r0, r7, 0
-	bl SetFieldObjectStepTimer
+	bl SetObjectEventStepTimer
 	ldrb r1, [r6]
 	movs r0, 0x3
 	negs r0, r0
@@ -6412,12 +6412,12 @@ sub_8060C7C: @ 8060C7C
 	adds r4, r0, 0
 	adds r5, r1, 0
 	adds r0, r5, 0
-	bl RunFieldObjectStepTimer
+	bl RunObjectEventStepTimer
 	lsls r0, 24
 	cmp r0, 0
 	bne _08060C9A
 	adds r0, r4, 0
-	bl FieldObjectIsTrainerAndCloseToPlayer
+	bl ObjectEventIsTrainerAndCloseToPlayer
 	lsls r0, 24
 	cmp r0, 0
 	beq _08060CA2
@@ -6459,7 +6459,7 @@ sub_8060CAC: @ 8060CAC
 	ldrb r1, [r0]
 _08060CDC:
 	adds r0, r4, 0
-	bl FieldObjectSetDirection
+	bl ObjectEventSetDirection
 	movs r0, 0x1
 	strh r0, [r5, 0x30]
 	add sp, 0x4
@@ -6479,14 +6479,14 @@ sub_8060CF4: @ 8060CF4
 	lsls r0, r2, 3
 	adds r0, r2
 	lsls r0, 2
-	ldr r2, _08060D10 @ =gMapObjects
+	ldr r2, _08060D10 @ =gObjectEvents
 	adds r0, r2
 	ldr r2, _08060D14 @ =sub_8060D18
-	bl FieldObjectStep
+	bl ObjectEventStep
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08060D10: .4byte gMapObjects
+_08060D10: .4byte gObjectEvents
 _08060D14: .4byte sub_8060D18
 	thumb_func_end sub_8060CF4
 
@@ -6563,7 +6563,7 @@ sub_8060D78: @ 8060D78
 	movs r0, 0
 	ldrsh r1, [r1, r0]
 	adds r0, r7, 0
-	bl SetFieldObjectStepTimer
+	bl SetObjectEventStepTimer
 	ldrb r1, [r6]
 	movs r0, 0x3
 	negs r0, r0
@@ -6585,12 +6585,12 @@ sub_8060DBC: @ 8060DBC
 	adds r4, r0, 0
 	adds r5, r1, 0
 	adds r0, r5, 0
-	bl RunFieldObjectStepTimer
+	bl RunObjectEventStepTimer
 	lsls r0, 24
 	cmp r0, 0
 	bne _08060DDA
 	adds r0, r4, 0
-	bl FieldObjectIsTrainerAndCloseToPlayer
+	bl ObjectEventIsTrainerAndCloseToPlayer
 	lsls r0, 24
 	cmp r0, 0
 	beq _08060DE2
@@ -6632,7 +6632,7 @@ sub_8060DEC: @ 8060DEC
 	ldrb r1, [r0]
 _08060E1C:
 	adds r0, r4, 0
-	bl FieldObjectSetDirection
+	bl ObjectEventSetDirection
 	movs r0, 0x1
 	strh r0, [r5, 0x30]
 	add sp, 0x4
@@ -6652,14 +6652,14 @@ sub_8060E34: @ 8060E34
 	lsls r0, r2, 3
 	adds r0, r2
 	lsls r0, 2
-	ldr r2, _08060E50 @ =gMapObjects
+	ldr r2, _08060E50 @ =gObjectEvents
 	adds r0, r2
 	ldr r2, _08060E54 @ =sub_8060E58
-	bl FieldObjectStep
+	bl ObjectEventStep
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08060E50: .4byte gMapObjects
+_08060E50: .4byte gObjectEvents
 _08060E54: .4byte sub_8060E58
 	thumb_func_end sub_8060E34
 
@@ -6736,7 +6736,7 @@ sub_8060EB8: @ 8060EB8
 	movs r0, 0
 	ldrsh r1, [r1, r0]
 	adds r0, r7, 0
-	bl SetFieldObjectStepTimer
+	bl SetObjectEventStepTimer
 	ldrb r1, [r6]
 	movs r0, 0x3
 	negs r0, r0
@@ -6758,12 +6758,12 @@ sub_8060EFC: @ 8060EFC
 	adds r4, r0, 0
 	adds r5, r1, 0
 	adds r0, r5, 0
-	bl RunFieldObjectStepTimer
+	bl RunObjectEventStepTimer
 	lsls r0, 24
 	cmp r0, 0
 	bne _08060F1A
 	adds r0, r4, 0
-	bl FieldObjectIsTrainerAndCloseToPlayer
+	bl ObjectEventIsTrainerAndCloseToPlayer
 	lsls r0, 24
 	cmp r0, 0
 	beq _08060F22
@@ -6805,7 +6805,7 @@ sub_8060F2C: @ 8060F2C
 	ldrb r1, [r0]
 _08060F5C:
 	adds r0, r4, 0
-	bl FieldObjectSetDirection
+	bl ObjectEventSetDirection
 	movs r0, 0x1
 	strh r0, [r5, 0x30]
 	add sp, 0x4
@@ -6825,14 +6825,14 @@ sub_8060F74: @ 8060F74
 	lsls r0, r2, 3
 	adds r0, r2
 	lsls r0, 2
-	ldr r2, _08060F90 @ =gMapObjects
+	ldr r2, _08060F90 @ =gObjectEvents
 	adds r0, r2
 	ldr r2, _08060F94 @ =sub_8060F98
-	bl FieldObjectStep
+	bl ObjectEventStep
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08060F90: .4byte gMapObjects
+_08060F90: .4byte gObjectEvents
 _08060F94: .4byte sub_8060F98
 	thumb_func_end sub_8060F74
 
@@ -6909,7 +6909,7 @@ sub_8060FF8: @ 8060FF8
 	movs r0, 0
 	ldrsh r1, [r1, r0]
 	adds r0, r7, 0
-	bl SetFieldObjectStepTimer
+	bl SetObjectEventStepTimer
 	ldrb r1, [r6]
 	movs r0, 0x3
 	negs r0, r0
@@ -6931,12 +6931,12 @@ sub_806103C: @ 806103C
 	adds r4, r0, 0
 	adds r5, r1, 0
 	adds r0, r5, 0
-	bl RunFieldObjectStepTimer
+	bl RunObjectEventStepTimer
 	lsls r0, 24
 	cmp r0, 0
 	bne _0806105A
 	adds r0, r4, 0
-	bl FieldObjectIsTrainerAndCloseToPlayer
+	bl ObjectEventIsTrainerAndCloseToPlayer
 	lsls r0, 24
 	cmp r0, 0
 	beq _08061062
@@ -6978,7 +6978,7 @@ sub_806106C: @ 806106C
 	ldrb r1, [r0]
 _0806109C:
 	adds r0, r4, 0
-	bl FieldObjectSetDirection
+	bl ObjectEventSetDirection
 	movs r0, 0x1
 	strh r0, [r5, 0x30]
 	add sp, 0x4
@@ -6998,14 +6998,14 @@ sub_80610B4: @ 80610B4
 	lsls r0, r2, 3
 	adds r0, r2
 	lsls r0, 2
-	ldr r2, _080610D0 @ =gMapObjects
+	ldr r2, _080610D0 @ =gObjectEvents
 	adds r0, r2
 	ldr r2, _080610D4 @ =sub_80610D8
-	bl FieldObjectStep
+	bl ObjectEventStep
 	pop {r0}
 	bx r0
 	.align 2, 0
-_080610D0: .4byte gMapObjects
+_080610D0: .4byte gObjectEvents
 _080610D4: .4byte sub_80610D8
 	thumb_func_end sub_80610B4
 
@@ -7082,7 +7082,7 @@ sub_8061138: @ 8061138
 	movs r0, 0
 	ldrsh r1, [r1, r0]
 	adds r0, r7, 0
-	bl SetFieldObjectStepTimer
+	bl SetObjectEventStepTimer
 	ldrb r1, [r6]
 	movs r0, 0x3
 	negs r0, r0
@@ -7104,12 +7104,12 @@ sub_806117C: @ 806117C
 	adds r4, r0, 0
 	adds r5, r1, 0
 	adds r0, r5, 0
-	bl RunFieldObjectStepTimer
+	bl RunObjectEventStepTimer
 	lsls r0, 24
 	cmp r0, 0
 	bne _0806119A
 	adds r0, r4, 0
-	bl FieldObjectIsTrainerAndCloseToPlayer
+	bl ObjectEventIsTrainerAndCloseToPlayer
 	lsls r0, 24
 	cmp r0, 0
 	beq _080611A2
@@ -7151,7 +7151,7 @@ sub_80611AC: @ 80611AC
 	ldrb r1, [r0]
 _080611DC:
 	adds r0, r4, 0
-	bl FieldObjectSetDirection
+	bl ObjectEventSetDirection
 	movs r0, 0x1
 	strh r0, [r5, 0x30]
 	add sp, 0x4
@@ -7171,14 +7171,14 @@ sub_80611F4: @ 80611F4
 	lsls r0, r2, 3
 	adds r0, r2
 	lsls r0, 2
-	ldr r2, _08061210 @ =gMapObjects
+	ldr r2, _08061210 @ =gObjectEvents
 	adds r0, r2
 	ldr r2, _08061214 @ =sub_8061218
-	bl FieldObjectStep
+	bl ObjectEventStep
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08061210: .4byte gMapObjects
+_08061210: .4byte gObjectEvents
 _08061214: .4byte sub_8061218
 	thumb_func_end sub_80611F4
 
@@ -7255,7 +7255,7 @@ sub_8061278: @ 8061278
 	movs r0, 0
 	ldrsh r1, [r1, r0]
 	adds r0, r7, 0
-	bl SetFieldObjectStepTimer
+	bl SetObjectEventStepTimer
 	ldrb r1, [r6]
 	movs r0, 0x3
 	negs r0, r0
@@ -7277,12 +7277,12 @@ sub_80612BC: @ 80612BC
 	adds r4, r0, 0
 	adds r5, r1, 0
 	adds r0, r5, 0
-	bl RunFieldObjectStepTimer
+	bl RunObjectEventStepTimer
 	lsls r0, 24
 	cmp r0, 0
 	bne _080612DA
 	adds r0, r4, 0
-	bl FieldObjectIsTrainerAndCloseToPlayer
+	bl ObjectEventIsTrainerAndCloseToPlayer
 	lsls r0, 24
 	cmp r0, 0
 	beq _080612E2
@@ -7324,7 +7324,7 @@ sub_80612EC: @ 80612EC
 	ldrb r1, [r0]
 _0806131C:
 	adds r0, r4, 0
-	bl FieldObjectSetDirection
+	bl ObjectEventSetDirection
 	movs r0, 0x1
 	strh r0, [r5, 0x30]
 	add sp, 0x4
@@ -7344,14 +7344,14 @@ sub_8061334: @ 8061334
 	lsls r0, r2, 3
 	adds r0, r2
 	lsls r0, 2
-	ldr r2, _08061350 @ =gMapObjects
+	ldr r2, _08061350 @ =gObjectEvents
 	adds r0, r2
 	ldr r2, _08061354 @ =sub_8061358
-	bl FieldObjectStep
+	bl ObjectEventStep
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08061350: .4byte gMapObjects
+_08061350: .4byte gObjectEvents
 _08061354: .4byte sub_8061358
 	thumb_func_end sub_8061334
 
@@ -7428,7 +7428,7 @@ sub_80613B8: @ 80613B8
 	movs r0, 0
 	ldrsh r1, [r1, r0]
 	adds r0, r7, 0
-	bl SetFieldObjectStepTimer
+	bl SetObjectEventStepTimer
 	ldrb r1, [r6]
 	movs r0, 0x3
 	negs r0, r0
@@ -7450,12 +7450,12 @@ sub_80613FC: @ 80613FC
 	adds r4, r0, 0
 	adds r5, r1, 0
 	adds r0, r5, 0
-	bl RunFieldObjectStepTimer
+	bl RunObjectEventStepTimer
 	lsls r0, 24
 	cmp r0, 0
 	bne _0806141A
 	adds r0, r4, 0
-	bl FieldObjectIsTrainerAndCloseToPlayer
+	bl ObjectEventIsTrainerAndCloseToPlayer
 	lsls r0, 24
 	cmp r0, 0
 	beq _08061422
@@ -7497,7 +7497,7 @@ sub_806142C: @ 806142C
 	ldrb r1, [r0]
 _0806145C:
 	adds r0, r4, 0
-	bl FieldObjectSetDirection
+	bl ObjectEventSetDirection
 	movs r0, 0x1
 	strh r0, [r5, 0x30]
 	add sp, 0x4
@@ -7517,14 +7517,14 @@ sub_8061474: @ 8061474
 	lsls r0, r2, 3
 	adds r0, r2
 	lsls r0, 2
-	ldr r2, _08061490 @ =gMapObjects
+	ldr r2, _08061490 @ =gObjectEvents
 	adds r0, r2
 	ldr r2, _08061494 @ =sub_8061498
-	bl FieldObjectStep
+	bl ObjectEventStep
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08061490: .4byte gMapObjects
+_08061490: .4byte gObjectEvents
 _08061494: .4byte sub_8061498
 	thumb_func_end sub_8061474
 
@@ -7601,7 +7601,7 @@ sub_80614F8: @ 80614F8
 	movs r0, 0
 	ldrsh r1, [r1, r0]
 	adds r0, r7, 0
-	bl SetFieldObjectStepTimer
+	bl SetObjectEventStepTimer
 	ldrb r1, [r6]
 	movs r0, 0x3
 	negs r0, r0
@@ -7623,12 +7623,12 @@ sub_806153C: @ 806153C
 	adds r4, r0, 0
 	adds r5, r1, 0
 	adds r0, r5, 0
-	bl RunFieldObjectStepTimer
+	bl RunObjectEventStepTimer
 	lsls r0, 24
 	cmp r0, 0
 	bne _0806155A
 	adds r0, r4, 0
-	bl FieldObjectIsTrainerAndCloseToPlayer
+	bl ObjectEventIsTrainerAndCloseToPlayer
 	lsls r0, 24
 	cmp r0, 0
 	beq _08061562
@@ -7670,7 +7670,7 @@ sub_806156C: @ 806156C
 	ldrb r1, [r0]
 _0806159C:
 	adds r0, r4, 0
-	bl FieldObjectSetDirection
+	bl ObjectEventSetDirection
 	movs r0, 0x1
 	strh r0, [r5, 0x30]
 	add sp, 0x4
@@ -7690,14 +7690,14 @@ sub_80615B4: @ 80615B4
 	lsls r0, r2, 3
 	adds r0, r2
 	lsls r0, 2
-	ldr r2, _080615D0 @ =gMapObjects
+	ldr r2, _080615D0 @ =gObjectEvents
 	adds r0, r2
 	ldr r2, _080615D4 @ =sub_80615D8
-	bl FieldObjectStep
+	bl ObjectEventStep
 	pop {r0}
 	bx r0
 	.align 2, 0
-_080615D0: .4byte gMapObjects
+_080615D0: .4byte gObjectEvents
 _080615D4: .4byte sub_80615D8
 	thumb_func_end sub_80615B4
 
@@ -7774,7 +7774,7 @@ sub_8061638: @ 8061638
 	movs r0, 0
 	ldrsh r1, [r1, r0]
 	adds r0, r7, 0
-	bl SetFieldObjectStepTimer
+	bl SetObjectEventStepTimer
 	ldrb r1, [r6]
 	movs r0, 0x3
 	negs r0, r0
@@ -7796,12 +7796,12 @@ sub_806167C: @ 806167C
 	adds r4, r0, 0
 	adds r5, r1, 0
 	adds r0, r5, 0
-	bl RunFieldObjectStepTimer
+	bl RunObjectEventStepTimer
 	lsls r0, 24
 	cmp r0, 0
 	bne _0806169A
 	adds r0, r4, 0
-	bl FieldObjectIsTrainerAndCloseToPlayer
+	bl ObjectEventIsTrainerAndCloseToPlayer
 	lsls r0, 24
 	cmp r0, 0
 	beq _080616A2
@@ -7843,7 +7843,7 @@ sub_80616AC: @ 80616AC
 	ldrb r1, [r0]
 _080616DC:
 	adds r0, r4, 0
-	bl FieldObjectSetDirection
+	bl ObjectEventSetDirection
 	movs r0, 0x1
 	strh r0, [r5, 0x30]
 	add sp, 0x4
@@ -7863,14 +7863,14 @@ sub_80616F4: @ 80616F4
 	lsls r0, r2, 3
 	adds r0, r2
 	lsls r0, 2
-	ldr r2, _08061710 @ =gMapObjects
+	ldr r2, _08061710 @ =gObjectEvents
 	adds r0, r2
 	ldr r2, _08061714 @ =sub_8061718
-	bl FieldObjectStep
+	bl ObjectEventStep
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08061710: .4byte gMapObjects
+_08061710: .4byte gObjectEvents
 _08061714: .4byte sub_8061718
 	thumb_func_end sub_80616F4
 
@@ -7926,7 +7926,7 @@ sub_8061764: @ 8061764
 	beq _0806177E
 	adds r0, r4, 0
 	movs r1, 0x30
-	bl SetFieldObjectStepTimer
+	bl SetObjectEventStepTimer
 	movs r0, 0x2
 	strh r0, [r4, 0x30]
 _0806177E:
@@ -7942,12 +7942,12 @@ sub_8061788: @ 8061788
 	adds r4, r0, 0
 	adds r5, r1, 0
 	adds r0, r5, 0
-	bl RunFieldObjectStepTimer
+	bl RunObjectEventStepTimer
 	lsls r0, 24
 	cmp r0, 0
 	bne _080617A6
 	adds r0, r4, 0
-	bl FieldObjectIsTrainerAndCloseToPlayer
+	bl ObjectEventIsTrainerAndCloseToPlayer
 	lsls r0, 24
 	cmp r0, 0
 	beq _080617AA
@@ -7985,7 +7985,7 @@ sub_80617B4: @ 80617B4
 	ldrb r1, [r0]
 _080617E0:
 	adds r0, r4, 0
-	bl FieldObjectSetDirection
+	bl ObjectEventSetDirection
 	movs r0, 0
 	strh r0, [r5, 0x30]
 	movs r0, 0x1
@@ -8006,14 +8006,14 @@ sub_80617F8: @ 80617F8
 	lsls r0, r2, 3
 	adds r0, r2
 	lsls r0, 2
-	ldr r2, _08061814 @ =gMapObjects
+	ldr r2, _08061814 @ =gObjectEvents
 	adds r0, r2
 	ldr r2, _08061818 @ =sub_806181C
-	bl FieldObjectStep
+	bl ObjectEventStep
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08061814: .4byte gMapObjects
+_08061814: .4byte gObjectEvents
 _08061818: .4byte sub_806181C
 	thumb_func_end sub_80617F8
 
@@ -8069,7 +8069,7 @@ sub_8061868: @ 8061868
 	beq _08061882
 	adds r0, r4, 0
 	movs r1, 0x30
-	bl SetFieldObjectStepTimer
+	bl SetObjectEventStepTimer
 	movs r0, 0x2
 	strh r0, [r4, 0x30]
 _08061882:
@@ -8085,12 +8085,12 @@ sub_806188C: @ 806188C
 	adds r4, r0, 0
 	adds r5, r1, 0
 	adds r0, r5, 0
-	bl RunFieldObjectStepTimer
+	bl RunObjectEventStepTimer
 	lsls r0, 24
 	cmp r0, 0
 	bne _080618AA
 	adds r0, r4, 0
-	bl FieldObjectIsTrainerAndCloseToPlayer
+	bl ObjectEventIsTrainerAndCloseToPlayer
 	lsls r0, 24
 	cmp r0, 0
 	beq _080618AE
@@ -8128,7 +8128,7 @@ sub_80618B8: @ 80618B8
 	ldrb r1, [r0]
 _080618E4:
 	adds r0, r4, 0
-	bl FieldObjectSetDirection
+	bl ObjectEventSetDirection
 	movs r0, 0
 	strh r0, [r5, 0x30]
 	movs r0, 0x1
@@ -8149,14 +8149,14 @@ sub_80618FC: @ 80618FC
 	lsls r0, r2, 3
 	adds r0, r2
 	lsls r0, 2
-	ldr r2, _08061918 @ =gMapObjects
+	ldr r2, _08061918 @ =gObjectEvents
 	adds r0, r2
 	ldr r2, _0806191C @ =sub_8061920
-	bl FieldObjectStep
+	bl ObjectEventStep
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08061918: .4byte gMapObjects
+_08061918: .4byte gObjectEvents
 _0806191C: .4byte sub_8061920
 	thumb_func_end sub_80618FC
 
@@ -8211,7 +8211,7 @@ sub_8061954: @ 8061954
 	lsrs r1, r0, 24
 _08061976:
 	adds r0, r4, 0
-	bl FieldObjectSetDirection
+	bl ObjectEventSetDirection
 	movs r0, 0x2
 	strh r0, [r5, 0x30]
 	movs r0, 0x1
@@ -8245,7 +8245,7 @@ sub_806198C: @ 806198C
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r4, 0
-	bl FieldObjectSetDirection
+	bl ObjectEventSetDirection
 _080619BC:
 	ldrb r1, [r4, 0x18]
 	lsrs r1, 4
@@ -8272,7 +8272,7 @@ _080619BC:
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r4, 0
-	bl FieldObjectSetDirection
+	bl ObjectEventSetDirection
 	ldrb r0, [r4, 0x18]
 	lsrs r0, 4
 	bl sub_8063F84
@@ -8345,8 +8345,8 @@ sub_8061A6C: @ 8061A6C
 	bx r1
 	thumb_func_end sub_8061A6C
 
-	thumb_func_start MoveFieldObjectInNextDirectionInSequence
-MoveFieldObjectInNextDirectionInSequence: @ 8061A80
+	thumb_func_start MoveObjectEventInNextDirectionInSequence
+MoveObjectEventInNextDirectionInSequence: @ 8061A80
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -8371,7 +8371,7 @@ _08061AA2:
 	adds r0, r7, r0
 	ldrb r1, [r0]
 	adds r0, r4, 0
-	bl FieldObjectSetDirection
+	bl ObjectEventSetDirection
 	ldrb r0, [r4, 0x18]
 	lsrs r0, 4
 	bl sub_8063F84
@@ -8392,7 +8392,7 @@ _08061AA2:
 	adds r0, r7, r0
 	ldrb r1, [r0]
 	adds r0, r4, 0
-	bl FieldObjectSetDirection
+	bl ObjectEventSetDirection
 	ldrb r0, [r4, 0x18]
 	lsrs r0, 4
 	bl sub_8063F84
@@ -8431,7 +8431,7 @@ _08061B0E:
 	pop {r4-r7}
 	pop {r1}
 	bx r1
-	thumb_func_end MoveFieldObjectInNextDirectionInSequence
+	thumb_func_end MoveObjectEventInNextDirectionInSequence
 
 	thumb_func_start sub_8061B34
 sub_8061B34: @ 8061B34
@@ -8465,14 +8465,14 @@ sub_8061B5C: @ 8061B5C
 	lsls r0, r2, 3
 	adds r0, r2
 	lsls r0, 2
-	ldr r2, _08061B78 @ =gMapObjects
+	ldr r2, _08061B78 @ =gObjectEvents
 	adds r0, r2
 	ldr r2, _08061B7C @ =sub_8061B80
-	bl FieldObjectStep
+	bl ObjectEventStep
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08061B78: .4byte gMapObjects
+_08061B78: .4byte gObjectEvents
 _08061B7C: .4byte sub_8061B80
 	thumb_func_end sub_8061B5C
 
@@ -8522,7 +8522,7 @@ _08061BCC:
 	adds r0, r4, 0
 	adds r1, r5, 0
 	mov r2, sp
-	bl MoveFieldObjectInNextDirectionInSequence
+	bl MoveObjectEventInNextDirectionInSequence
 	lsls r0, 24
 	lsrs r0, 24
 	add sp, 0x4
@@ -8542,14 +8542,14 @@ sub_8061BE8: @ 8061BE8
 	lsls r0, r2, 3
 	adds r0, r2
 	lsls r0, 2
-	ldr r2, _08061C04 @ =gMapObjects
+	ldr r2, _08061C04 @ =gObjectEvents
 	adds r0, r2
 	ldr r2, _08061C08 @ =sub_8061C0C
-	bl FieldObjectStep
+	bl ObjectEventStep
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08061C04: .4byte gMapObjects
+_08061C04: .4byte gObjectEvents
 _08061C08: .4byte sub_8061C0C
 	thumb_func_end sub_8061BE8
 
@@ -8599,7 +8599,7 @@ _08061C58:
 	adds r0, r4, 0
 	adds r1, r5, 0
 	mov r2, sp
-	bl MoveFieldObjectInNextDirectionInSequence
+	bl MoveObjectEventInNextDirectionInSequence
 	lsls r0, 24
 	lsrs r0, 24
 	add sp, 0x4
@@ -8619,14 +8619,14 @@ sub_8061C74: @ 8061C74
 	lsls r0, r2, 3
 	adds r0, r2
 	lsls r0, 2
-	ldr r2, _08061C90 @ =gMapObjects
+	ldr r2, _08061C90 @ =gObjectEvents
 	adds r0, r2
 	ldr r2, _08061C94 @ =sub_8061C98
-	bl FieldObjectStep
+	bl ObjectEventStep
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08061C90: .4byte gMapObjects
+_08061C90: .4byte gObjectEvents
 _08061C94: .4byte sub_8061C98
 	thumb_func_end sub_8061C74
 
@@ -8676,7 +8676,7 @@ _08061CE4:
 	adds r0, r4, 0
 	adds r1, r5, 0
 	mov r2, sp
-	bl MoveFieldObjectInNextDirectionInSequence
+	bl MoveObjectEventInNextDirectionInSequence
 	lsls r0, 24
 	lsrs r0, 24
 	add sp, 0x4
@@ -8696,14 +8696,14 @@ sub_8061D00: @ 8061D00
 	lsls r0, r2, 3
 	adds r0, r2
 	lsls r0, 2
-	ldr r2, _08061D1C @ =gMapObjects
+	ldr r2, _08061D1C @ =gObjectEvents
 	adds r0, r2
 	ldr r2, _08061D20 @ =sub_8061D24
-	bl FieldObjectStep
+	bl ObjectEventStep
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08061D1C: .4byte gMapObjects
+_08061D1C: .4byte gObjectEvents
 _08061D20: .4byte sub_8061D24
 	thumb_func_end sub_8061D00
 
@@ -8753,7 +8753,7 @@ _08061D70:
 	adds r0, r4, 0
 	adds r1, r5, 0
 	mov r2, sp
-	bl MoveFieldObjectInNextDirectionInSequence
+	bl MoveObjectEventInNextDirectionInSequence
 	lsls r0, 24
 	lsrs r0, 24
 	add sp, 0x4
@@ -8773,14 +8773,14 @@ sub_8061D8C: @ 8061D8C
 	lsls r0, r2, 3
 	adds r0, r2
 	lsls r0, 2
-	ldr r2, _08061DA8 @ =gMapObjects
+	ldr r2, _08061DA8 @ =gObjectEvents
 	adds r0, r2
 	ldr r2, _08061DAC @ =sub_8061DB0
-	bl FieldObjectStep
+	bl ObjectEventStep
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08061DA8: .4byte gMapObjects
+_08061DA8: .4byte gObjectEvents
 _08061DAC: .4byte sub_8061DB0
 	thumb_func_end sub_8061D8C
 
@@ -8830,7 +8830,7 @@ _08061DFC:
 	adds r0, r4, 0
 	adds r1, r5, 0
 	mov r2, sp
-	bl MoveFieldObjectInNextDirectionInSequence
+	bl MoveObjectEventInNextDirectionInSequence
 	lsls r0, 24
 	lsrs r0, 24
 	add sp, 0x4
@@ -8850,14 +8850,14 @@ sub_8061E18: @ 8061E18
 	lsls r0, r2, 3
 	adds r0, r2
 	lsls r0, 2
-	ldr r2, _08061E34 @ =gMapObjects
+	ldr r2, _08061E34 @ =gObjectEvents
 	adds r0, r2
 	ldr r2, _08061E38 @ =sub_8061E3C
-	bl FieldObjectStep
+	bl ObjectEventStep
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08061E34: .4byte gMapObjects
+_08061E34: .4byte gObjectEvents
 _08061E38: .4byte sub_8061E3C
 	thumb_func_end sub_8061E18
 
@@ -8907,7 +8907,7 @@ _08061E88:
 	adds r0, r4, 0
 	adds r1, r5, 0
 	mov r2, sp
-	bl MoveFieldObjectInNextDirectionInSequence
+	bl MoveObjectEventInNextDirectionInSequence
 	lsls r0, 24
 	lsrs r0, 24
 	add sp, 0x4
@@ -8927,14 +8927,14 @@ sub_8061EA4: @ 8061EA4
 	lsls r0, r2, 3
 	adds r0, r2
 	lsls r0, 2
-	ldr r2, _08061EC0 @ =gMapObjects
+	ldr r2, _08061EC0 @ =gObjectEvents
 	adds r0, r2
 	ldr r2, _08061EC4 @ =sub_8061EC8
-	bl FieldObjectStep
+	bl ObjectEventStep
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08061EC0: .4byte gMapObjects
+_08061EC0: .4byte gObjectEvents
 _08061EC4: .4byte sub_8061EC8
 	thumb_func_end sub_8061EA4
 
@@ -8984,7 +8984,7 @@ _08061F14:
 	adds r0, r4, 0
 	adds r1, r5, 0
 	mov r2, sp
-	bl MoveFieldObjectInNextDirectionInSequence
+	bl MoveObjectEventInNextDirectionInSequence
 	lsls r0, 24
 	lsrs r0, 24
 	add sp, 0x4
@@ -9004,14 +9004,14 @@ sub_8061F30: @ 8061F30
 	lsls r0, r2, 3
 	adds r0, r2
 	lsls r0, 2
-	ldr r2, _08061F4C @ =gMapObjects
+	ldr r2, _08061F4C @ =gObjectEvents
 	adds r0, r2
 	ldr r2, _08061F50 @ =sub_8061F54
-	bl FieldObjectStep
+	bl ObjectEventStep
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08061F4C: .4byte gMapObjects
+_08061F4C: .4byte gObjectEvents
 _08061F50: .4byte sub_8061F54
 	thumb_func_end sub_8061F30
 
@@ -9061,7 +9061,7 @@ _08061FA0:
 	adds r0, r4, 0
 	adds r1, r5, 0
 	mov r2, sp
-	bl MoveFieldObjectInNextDirectionInSequence
+	bl MoveObjectEventInNextDirectionInSequence
 	lsls r0, 24
 	lsrs r0, 24
 	add sp, 0x4
@@ -9081,14 +9081,14 @@ sub_8061FBC: @ 8061FBC
 	lsls r0, r2, 3
 	adds r0, r2
 	lsls r0, 2
-	ldr r2, _08061FD8 @ =gMapObjects
+	ldr r2, _08061FD8 @ =gObjectEvents
 	adds r0, r2
 	ldr r2, _08061FDC @ =sub_8061FE0
-	bl FieldObjectStep
+	bl ObjectEventStep
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08061FD8: .4byte gMapObjects
+_08061FD8: .4byte gObjectEvents
 _08061FDC: .4byte sub_8061FE0
 	thumb_func_end sub_8061FBC
 
@@ -9138,7 +9138,7 @@ _0806202C:
 	adds r0, r4, 0
 	adds r1, r5, 0
 	mov r2, sp
-	bl MoveFieldObjectInNextDirectionInSequence
+	bl MoveObjectEventInNextDirectionInSequence
 	lsls r0, 24
 	lsrs r0, 24
 	add sp, 0x4
@@ -9158,14 +9158,14 @@ sub_8062048: @ 8062048
 	lsls r0, r2, 3
 	adds r0, r2
 	lsls r0, 2
-	ldr r2, _08062064 @ =gMapObjects
+	ldr r2, _08062064 @ =gObjectEvents
 	adds r0, r2
 	ldr r2, _08062068 @ =sub_806206C
-	bl FieldObjectStep
+	bl ObjectEventStep
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08062064: .4byte gMapObjects
+_08062064: .4byte gObjectEvents
 _08062068: .4byte sub_806206C
 	thumb_func_end sub_8062048
 
@@ -9215,7 +9215,7 @@ _080620B8:
 	adds r0, r4, 0
 	adds r1, r5, 0
 	mov r2, sp
-	bl MoveFieldObjectInNextDirectionInSequence
+	bl MoveObjectEventInNextDirectionInSequence
 	lsls r0, 24
 	lsrs r0, 24
 	add sp, 0x4
@@ -9235,14 +9235,14 @@ sub_80620D4: @ 80620D4
 	lsls r0, r2, 3
 	adds r0, r2
 	lsls r0, 2
-	ldr r2, _080620F0 @ =gMapObjects
+	ldr r2, _080620F0 @ =gObjectEvents
 	adds r0, r2
 	ldr r2, _080620F4 @ =sub_80620F8
-	bl FieldObjectStep
+	bl ObjectEventStep
 	pop {r0}
 	bx r0
 	.align 2, 0
-_080620F0: .4byte gMapObjects
+_080620F0: .4byte gObjectEvents
 _080620F4: .4byte sub_80620F8
 	thumb_func_end sub_80620D4
 
@@ -9292,7 +9292,7 @@ _08062144:
 	adds r0, r4, 0
 	adds r1, r5, 0
 	mov r2, sp
-	bl MoveFieldObjectInNextDirectionInSequence
+	bl MoveObjectEventInNextDirectionInSequence
 	lsls r0, 24
 	lsrs r0, 24
 	add sp, 0x4
@@ -9312,14 +9312,14 @@ sub_8062160: @ 8062160
 	lsls r0, r2, 3
 	adds r0, r2
 	lsls r0, 2
-	ldr r2, _0806217C @ =gMapObjects
+	ldr r2, _0806217C @ =gObjectEvents
 	adds r0, r2
 	ldr r2, _08062180 @ =sub_8062184
-	bl FieldObjectStep
+	bl ObjectEventStep
 	pop {r0}
 	bx r0
 	.align 2, 0
-_0806217C: .4byte gMapObjects
+_0806217C: .4byte gObjectEvents
 _08062180: .4byte sub_8062184
 	thumb_func_end sub_8062160
 
@@ -9369,7 +9369,7 @@ _080621D0:
 	adds r0, r4, 0
 	adds r1, r5, 0
 	mov r2, sp
-	bl MoveFieldObjectInNextDirectionInSequence
+	bl MoveObjectEventInNextDirectionInSequence
 	lsls r0, 24
 	lsrs r0, 24
 	add sp, 0x4
@@ -9389,14 +9389,14 @@ sub_80621EC: @ 80621EC
 	lsls r0, r2, 3
 	adds r0, r2
 	lsls r0, 2
-	ldr r2, _08062208 @ =gMapObjects
+	ldr r2, _08062208 @ =gObjectEvents
 	adds r0, r2
 	ldr r2, _0806220C @ =sub_8062210
-	bl FieldObjectStep
+	bl ObjectEventStep
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08062208: .4byte gMapObjects
+_08062208: .4byte gObjectEvents
 _0806220C: .4byte sub_8062210
 	thumb_func_end sub_80621EC
 
@@ -9446,7 +9446,7 @@ _0806225C:
 	adds r0, r4, 0
 	adds r1, r5, 0
 	mov r2, sp
-	bl MoveFieldObjectInNextDirectionInSequence
+	bl MoveObjectEventInNextDirectionInSequence
 	lsls r0, 24
 	lsrs r0, 24
 	add sp, 0x4
@@ -9466,14 +9466,14 @@ sub_8062278: @ 8062278
 	lsls r0, r2, 3
 	adds r0, r2
 	lsls r0, 2
-	ldr r2, _08062294 @ =gMapObjects
+	ldr r2, _08062294 @ =gObjectEvents
 	adds r0, r2
 	ldr r2, _08062298 @ =sub_806229C
-	bl FieldObjectStep
+	bl ObjectEventStep
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08062294: .4byte gMapObjects
+_08062294: .4byte gObjectEvents
 _08062298: .4byte sub_806229C
 	thumb_func_end sub_8062278
 
@@ -9523,7 +9523,7 @@ _080622E8:
 	adds r0, r4, 0
 	adds r1, r5, 0
 	mov r2, sp
-	bl MoveFieldObjectInNextDirectionInSequence
+	bl MoveObjectEventInNextDirectionInSequence
 	lsls r0, 24
 	lsrs r0, 24
 	add sp, 0x4
@@ -9543,14 +9543,14 @@ sub_8062304: @ 8062304
 	lsls r0, r2, 3
 	adds r0, r2
 	lsls r0, 2
-	ldr r2, _08062320 @ =gMapObjects
+	ldr r2, _08062320 @ =gObjectEvents
 	adds r0, r2
 	ldr r2, _08062324 @ =sub_8062328
-	bl FieldObjectStep
+	bl ObjectEventStep
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08062320: .4byte gMapObjects
+_08062320: .4byte gObjectEvents
 _08062324: .4byte sub_8062328
 	thumb_func_end sub_8062304
 
@@ -9600,7 +9600,7 @@ _08062374:
 	adds r0, r4, 0
 	adds r1, r5, 0
 	mov r2, sp
-	bl MoveFieldObjectInNextDirectionInSequence
+	bl MoveObjectEventInNextDirectionInSequence
 	lsls r0, 24
 	lsrs r0, 24
 	add sp, 0x4
@@ -9620,14 +9620,14 @@ sub_8062390: @ 8062390
 	lsls r0, r2, 3
 	adds r0, r2
 	lsls r0, 2
-	ldr r2, _080623AC @ =gMapObjects
+	ldr r2, _080623AC @ =gObjectEvents
 	adds r0, r2
 	ldr r2, _080623B0 @ =sub_80623B4
-	bl FieldObjectStep
+	bl ObjectEventStep
 	pop {r0}
 	bx r0
 	.align 2, 0
-_080623AC: .4byte gMapObjects
+_080623AC: .4byte gObjectEvents
 _080623B0: .4byte sub_80623B4
 	thumb_func_end sub_8062390
 
@@ -9677,7 +9677,7 @@ _08062400:
 	adds r0, r4, 0
 	adds r1, r5, 0
 	mov r2, sp
-	bl MoveFieldObjectInNextDirectionInSequence
+	bl MoveObjectEventInNextDirectionInSequence
 	lsls r0, 24
 	lsrs r0, 24
 	add sp, 0x4
@@ -9697,14 +9697,14 @@ sub_806241C: @ 806241C
 	lsls r0, r2, 3
 	adds r0, r2
 	lsls r0, 2
-	ldr r2, _08062438 @ =gMapObjects
+	ldr r2, _08062438 @ =gObjectEvents
 	adds r0, r2
 	ldr r2, _0806243C @ =sub_8062440
-	bl FieldObjectStep
+	bl ObjectEventStep
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08062438: .4byte gMapObjects
+_08062438: .4byte gObjectEvents
 _0806243C: .4byte sub_8062440
 	thumb_func_end sub_806241C
 
@@ -9754,7 +9754,7 @@ _0806248C:
 	adds r0, r4, 0
 	adds r1, r5, 0
 	mov r2, sp
-	bl MoveFieldObjectInNextDirectionInSequence
+	bl MoveObjectEventInNextDirectionInSequence
 	lsls r0, 24
 	lsrs r0, 24
 	add sp, 0x4
@@ -9774,14 +9774,14 @@ sub_80624A8: @ 80624A8
 	lsls r0, r2, 3
 	adds r0, r2
 	lsls r0, 2
-	ldr r2, _080624C4 @ =gMapObjects
+	ldr r2, _080624C4 @ =gObjectEvents
 	adds r0, r2
 	ldr r2, _080624C8 @ =sub_80624CC
-	bl FieldObjectStep
+	bl ObjectEventStep
 	pop {r0}
 	bx r0
 	.align 2, 0
-_080624C4: .4byte gMapObjects
+_080624C4: .4byte gObjectEvents
 _080624C8: .4byte sub_80624CC
 	thumb_func_end sub_80624A8
 
@@ -9831,7 +9831,7 @@ _08062518:
 	adds r0, r4, 0
 	adds r1, r5, 0
 	mov r2, sp
-	bl MoveFieldObjectInNextDirectionInSequence
+	bl MoveObjectEventInNextDirectionInSequence
 	lsls r0, 24
 	lsrs r0, 24
 	add sp, 0x4
@@ -9851,14 +9851,14 @@ sub_8062534: @ 8062534
 	lsls r0, r2, 3
 	adds r0, r2
 	lsls r0, 2
-	ldr r2, _08062550 @ =gMapObjects
+	ldr r2, _08062550 @ =gObjectEvents
 	adds r0, r2
 	ldr r2, _08062554 @ =sub_8062558
-	bl FieldObjectStep
+	bl ObjectEventStep
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08062550: .4byte gMapObjects
+_08062550: .4byte gObjectEvents
 _08062554: .4byte sub_8062558
 	thumb_func_end sub_8062534
 
@@ -9908,7 +9908,7 @@ _080625A4:
 	adds r0, r4, 0
 	adds r1, r5, 0
 	mov r2, sp
-	bl MoveFieldObjectInNextDirectionInSequence
+	bl MoveObjectEventInNextDirectionInSequence
 	lsls r0, 24
 	lsrs r0, 24
 	add sp, 0x4
@@ -9928,14 +9928,14 @@ sub_80625C0: @ 80625C0
 	lsls r0, r2, 3
 	adds r0, r2
 	lsls r0, 2
-	ldr r2, _080625DC @ =gMapObjects
+	ldr r2, _080625DC @ =gObjectEvents
 	adds r0, r2
 	ldr r2, _080625E0 @ =sub_80625E4
-	bl FieldObjectStep
+	bl ObjectEventStep
 	pop {r0}
 	bx r0
 	.align 2, 0
-_080625DC: .4byte gMapObjects
+_080625DC: .4byte gObjectEvents
 _080625E0: .4byte sub_80625E4
 	thumb_func_end sub_80625C0
 
@@ -9985,7 +9985,7 @@ _08062630:
 	adds r0, r4, 0
 	adds r1, r5, 0
 	mov r2, sp
-	bl MoveFieldObjectInNextDirectionInSequence
+	bl MoveObjectEventInNextDirectionInSequence
 	lsls r0, 24
 	lsrs r0, 24
 	add sp, 0x4
@@ -10005,14 +10005,14 @@ sub_806264C: @ 806264C
 	lsls r0, r2, 3
 	adds r0, r2
 	lsls r0, 2
-	ldr r2, _08062668 @ =gMapObjects
+	ldr r2, _08062668 @ =gObjectEvents
 	adds r0, r2
 	ldr r2, _0806266C @ =sub_8062670
-	bl FieldObjectStep
+	bl ObjectEventStep
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08062668: .4byte gMapObjects
+_08062668: .4byte gObjectEvents
 _0806266C: .4byte sub_8062670
 	thumb_func_end sub_806264C
 
@@ -10062,7 +10062,7 @@ _080626BC:
 	adds r0, r4, 0
 	adds r1, r5, 0
 	mov r2, sp
-	bl MoveFieldObjectInNextDirectionInSequence
+	bl MoveObjectEventInNextDirectionInSequence
 	lsls r0, 24
 	lsrs r0, 24
 	add sp, 0x4
@@ -10082,14 +10082,14 @@ sub_80626D8: @ 80626D8
 	lsls r0, r2, 3
 	adds r0, r2
 	lsls r0, 2
-	ldr r2, _080626F4 @ =gMapObjects
+	ldr r2, _080626F4 @ =gObjectEvents
 	adds r0, r2
 	ldr r2, _080626F8 @ =sub_80626FC
-	bl FieldObjectStep
+	bl ObjectEventStep
 	pop {r0}
 	bx r0
 	.align 2, 0
-_080626F4: .4byte gMapObjects
+_080626F4: .4byte gObjectEvents
 _080626F8: .4byte sub_80626FC
 	thumb_func_end sub_80626D8
 
@@ -10139,7 +10139,7 @@ _08062748:
 	adds r0, r4, 0
 	adds r1, r5, 0
 	mov r2, sp
-	bl MoveFieldObjectInNextDirectionInSequence
+	bl MoveObjectEventInNextDirectionInSequence
 	lsls r0, 24
 	lsrs r0, 24
 	add sp, 0x4
@@ -10159,14 +10159,14 @@ sub_8062764: @ 8062764
 	lsls r0, r2, 3
 	adds r0, r2
 	lsls r0, 2
-	ldr r2, _08062780 @ =gMapObjects
+	ldr r2, _08062780 @ =gObjectEvents
 	adds r0, r2
 	ldr r2, _08062784 @ =sub_8062788
-	bl FieldObjectStep
+	bl ObjectEventStep
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08062780: .4byte gMapObjects
+_08062780: .4byte gObjectEvents
 _08062784: .4byte sub_8062788
 	thumb_func_end sub_8062764
 
@@ -10216,7 +10216,7 @@ _080627D4:
 	adds r0, r4, 0
 	adds r1, r5, 0
 	mov r2, sp
-	bl MoveFieldObjectInNextDirectionInSequence
+	bl MoveObjectEventInNextDirectionInSequence
 	lsls r0, 24
 	lsrs r0, 24
 	add sp, 0x4
@@ -10236,14 +10236,14 @@ sub_80627F0: @ 80627F0
 	lsls r0, r2, 3
 	adds r0, r2
 	lsls r0, 2
-	ldr r2, _0806280C @ =gMapObjects
+	ldr r2, _0806280C @ =gObjectEvents
 	adds r0, r2
 	ldr r2, _08062810 @ =sub_8062814
-	bl FieldObjectStep
+	bl ObjectEventStep
 	pop {r0}
 	bx r0
 	.align 2, 0
-_0806280C: .4byte gMapObjects
+_0806280C: .4byte gObjectEvents
 _08062810: .4byte sub_8062814
 	thumb_func_end sub_80627F0
 
@@ -10293,7 +10293,7 @@ _08062860:
 	adds r0, r4, 0
 	adds r1, r5, 0
 	mov r2, sp
-	bl MoveFieldObjectInNextDirectionInSequence
+	bl MoveObjectEventInNextDirectionInSequence
 	lsls r0, 24
 	lsrs r0, 24
 	add sp, 0x4
@@ -10313,14 +10313,14 @@ sub_806287C: @ 806287C
 	lsls r0, r2, 3
 	adds r0, r2
 	lsls r0, 2
-	ldr r2, _08062898 @ =gMapObjects
+	ldr r2, _08062898 @ =gObjectEvents
 	adds r0, r2
 	ldr r2, _0806289C @ =sub_80628A0
-	bl FieldObjectStep
+	bl ObjectEventStep
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08062898: .4byte gMapObjects
+_08062898: .4byte gObjectEvents
 _0806289C: .4byte sub_80628A0
 	thumb_func_end sub_806287C
 
@@ -10368,7 +10368,7 @@ sub_80628E4: @ 80628E4
 	push {r4-r7,lr}
 	adds r6, r0, 0
 	adds r7, r1, 0
-	ldr r2, _08062908 @ =gMapObjects
+	ldr r2, _08062908 @ =gObjectEvents
 	ldr r3, _0806290C @ =gPlayerAvatar
 	ldrb r1, [r3, 0x5]
 	lsls r0, r1, 3
@@ -10385,7 +10385,7 @@ _08062904:
 	movs r0, 0
 	b _08062938
 	.align 2, 0
-_08062908: .4byte gMapObjects
+_08062908: .4byte gObjectEvents
 _0806290C: .4byte gPlayerAvatar
 _08062910:
 	ldr r5, _08062940 @ =gUnknown_83A6390
@@ -10505,7 +10505,7 @@ sub_80629B8: @ 80629B8
 	adds r1, r6, 0
 	mov r2, sp
 	adds r3, r5, 0
-	bl FieldObjectMoveDestCoords
+	bl ObjectEventMoveDestCoords
 	adds r0, r6, 0
 	bl sub_8063F84
 	adds r2, r0, 0
@@ -10594,7 +10594,7 @@ sub_8062A70: @ 8062A70
 	adds r1, r6, 0
 	mov r2, sp
 	adds r3, r5, 0
-	bl FieldObjectMoveDestCoords
+	bl ObjectEventMoveDestCoords
 	adds r0, r6, 0
 	bl sub_8063FB0
 	adds r2, r0, 0
@@ -10683,7 +10683,7 @@ sub_8062B28: @ 8062B28
 	adds r1, r6, 0
 	mov r2, sp
 	adds r3, r5, 0
-	bl FieldObjectMoveDestCoords
+	bl ObjectEventMoveDestCoords
 	adds r0, r6, 0
 	bl sub_8064034
 	adds r2, r0, 0
@@ -10772,7 +10772,7 @@ sub_8062BE0: @ 8062BE0
 	adds r1, r6, 0
 	mov r2, sp
 	adds r3, r5, 0
-	bl FieldObjectMoveDestCoords
+	bl ObjectEventMoveDestCoords
 	adds r0, r6, 0
 	bl sub_8064060
 	adds r2, r0, 0
@@ -10897,7 +10897,7 @@ sub_8062CE0: @ 8062CE0
 	adds r1, r6, 0
 	mov r2, sp
 	adds r3, r5, 0
-	bl FieldObjectMoveDestCoords
+	bl ObjectEventMoveDestCoords
 	adds r0, r6, 0
 	bl sub_8064194
 	adds r2, r0, 0
@@ -11064,14 +11064,14 @@ sub_8062E60: @ 8062E60
 	lsls r0, r2, 3
 	adds r0, r2
 	lsls r0, 2
-	ldr r2, _08062E7C @ =gMapObjects
+	ldr r2, _08062E7C @ =gObjectEvents
 	adds r0, r2
 	ldr r2, _08062E80 @ =sub_8062E84
-	bl FieldObjectStep
+	bl ObjectEventStep
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08062E7C: .4byte gMapObjects
+_08062E7C: .4byte gObjectEvents
 _08062E80: .4byte sub_8062E84
 	thumb_func_end sub_8062E60
 
@@ -11099,7 +11099,7 @@ mss_08062EA4: @ 8062EA4
 	push {r4-r7,lr}
 	adds r6, r0, 0
 	adds r7, r1, 0
-	ldr r2, _08062EC8 @ =gMapObjects
+	ldr r2, _08062EC8 @ =gObjectEvents
 	ldr r3, _08062ECC @ =gPlayerAvatar
 	ldrb r1, [r3, 0x5]
 	lsls r0, r1, 3
@@ -11116,7 +11116,7 @@ _08062EC4:
 	movs r0, 0
 	b _08062EF8
 	.align 2, 0
-_08062EC8: .4byte gMapObjects
+_08062EC8: .4byte gObjectEvents
 _08062ECC: .4byte gPlayerAvatar
 _08062ED0:
 	ldr r5, _08062F00 @ =gUnknown_83A6390
@@ -11145,8 +11145,8 @@ _08062F00: .4byte gUnknown_83A6390
 _08062F04: .4byte MetatileBehavior_IsTallGrass
 	thumb_func_end mss_08062EA4
 
-	thumb_func_start FieldObjectCB_TreeDisguise
-FieldObjectCB_TreeDisguise: @ 8062F08
+	thumb_func_start ObjectEventCB_TreeDisguise
+ObjectEventCB_TreeDisguise: @ 8062F08
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	movs r1, 0x2E
@@ -11154,7 +11154,7 @@ FieldObjectCB_TreeDisguise: @ 8062F08
 	lsls r1, r0, 3
 	adds r1, r0
 	lsls r1, 2
-	ldr r0, _08062F6C @ =gMapObjects
+	ldr r0, _08062F6C @ =gObjectEvents
 	adds r4, r1, r0
 	adds r6, r4, 0
 	adds r6, 0x21
@@ -11173,7 +11173,7 @@ _08062F30:
 	adds r3, r1, 0
 	adds r3, 0x8
 	adds r0, r4, 0
-	bl FieldObjectGetLocalIdAndMap
+	bl ObjectEventGetLocalIdAndMap
 	movs r0, 0x1C
 	bl FieldEffectStart
 	strb r0, [r4, 0x1A]
@@ -11188,19 +11188,19 @@ _08062F50:
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _08062F6C @ =gMapObjects
+	ldr r1, _08062F6C @ =gObjectEvents
 	adds r0, r1
 	ldr r2, _08062F74 @ =sub_8062F78
 	adds r1, r5, 0
-	bl FieldObjectStep
+	bl ObjectEventStep
 	pop {r4-r6}
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08062F6C: .4byte gMapObjects
+_08062F6C: .4byte gObjectEvents
 _08062F70: .4byte gFieldEffectArguments
 _08062F74: .4byte sub_8062F78
-	thumb_func_end FieldObjectCB_TreeDisguise
+	thumb_func_end ObjectEventCB_TreeDisguise
 
 	thumb_func_start sub_8062F78
 sub_8062F78: @ 8062F78
@@ -11211,8 +11211,8 @@ sub_8062F78: @ 8062F78
 	bx r1
 	thumb_func_end sub_8062F78
 
-	thumb_func_start FieldObjectCB_MountainDisguise
-FieldObjectCB_MountainDisguise: @ 8062F84
+	thumb_func_start ObjectEventCB_MountainDisguise
+ObjectEventCB_MountainDisguise: @ 8062F84
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	movs r1, 0x2E
@@ -11220,7 +11220,7 @@ FieldObjectCB_MountainDisguise: @ 8062F84
 	lsls r1, r0, 3
 	adds r1, r0
 	lsls r1, 2
-	ldr r0, _08062FE8 @ =gMapObjects
+	ldr r0, _08062FE8 @ =gObjectEvents
 	adds r4, r1, r0
 	adds r6, r4, 0
 	adds r6, 0x21
@@ -11239,7 +11239,7 @@ _08062FAC:
 	adds r3, r1, 0
 	adds r3, 0x8
 	adds r0, r4, 0
-	bl FieldObjectGetLocalIdAndMap
+	bl ObjectEventGetLocalIdAndMap
 	movs r0, 0x1D
 	bl FieldEffectStart
 	strb r0, [r4, 0x1A]
@@ -11254,27 +11254,27 @@ _08062FCC:
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _08062FE8 @ =gMapObjects
+	ldr r1, _08062FE8 @ =gObjectEvents
 	adds r0, r1
 	ldr r2, _08062FF0 @ =sub_8062F78
 	adds r1, r5, 0
-	bl FieldObjectStep
+	bl ObjectEventStep
 	pop {r4-r6}
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08062FE8: .4byte gMapObjects
+_08062FE8: .4byte gObjectEvents
 _08062FEC: .4byte gFieldEffectArguments
 _08062FF0: .4byte sub_8062F78
-	thumb_func_end FieldObjectCB_MountainDisguise
+	thumb_func_end ObjectEventCB_MountainDisguise
 
-	thumb_func_start FieldObjectCB_Hidden1
-FieldObjectCB_Hidden1: @ 8062FF4
+	thumb_func_start ObjectEventCB_Hidden1
+ObjectEventCB_Hidden1: @ 8062FF4
 	push {r4,lr}
 	adds r3, r0, 0
 	movs r1, 0x3C
 	ldrsh r0, [r3, r1]
-	ldr r4, _08063050 @ =gMapObjects
+	ldr r4, _08063050 @ =gObjectEvents
 	cmp r0, 0
 	bne _08063034
 	movs r0, 0x2E
@@ -11311,14 +11311,14 @@ _08063034:
 	adds r0, r4
 	ldr r2, _08063054 @ =sub_8063058
 	adds r1, r3, 0
-	bl FieldObjectStep
+	bl ObjectEventStep
 	pop {r4}
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08063050: .4byte gMapObjects
+_08063050: .4byte gObjectEvents
 _08063054: .4byte sub_8063058
-	thumb_func_end FieldObjectCB_Hidden1
+	thumb_func_end ObjectEventCB_Hidden1
 
 	thumb_func_start sub_8063058
 sub_8063058: @ 8063058
@@ -11374,14 +11374,14 @@ sub_80630A0: @ 80630A0
 	lsls r0, r2, 3
 	adds r0, r2
 	lsls r0, 2
-	ldr r2, _080630BC @ =gMapObjects
+	ldr r2, _080630BC @ =gObjectEvents
 	adds r0, r2
 	ldr r2, _080630C0 @ =sub_80630C4
-	bl FieldObjectStep
+	bl ObjectEventStep
 	pop {r0}
 	bx r0
 	.align 2, 0
-_080630BC: .4byte gMapObjects
+_080630BC: .4byte gObjectEvents
 _080630C0: .4byte sub_80630C4
 	thumb_func_end sub_80630A0
 
@@ -11436,14 +11436,14 @@ sub_8063110: @ 8063110
 	lsls r0, r2, 3
 	adds r0, r2
 	lsls r0, 2
-	ldr r2, _0806312C @ =gMapObjects
+	ldr r2, _0806312C @ =gObjectEvents
 	adds r0, r2
 	ldr r2, _08063130 @ =sub_8063134
-	bl FieldObjectStep
+	bl ObjectEventStep
 	pop {r0}
 	bx r0
 	.align 2, 0
-_0806312C: .4byte gMapObjects
+_0806312C: .4byte gObjectEvents
 _08063130: .4byte sub_8063134
 	thumb_func_end sub_8063110
 
@@ -11498,14 +11498,14 @@ sub_8063180: @ 8063180
 	lsls r0, r2, 3
 	adds r0, r2
 	lsls r0, 2
-	ldr r2, _0806319C @ =gMapObjects
+	ldr r2, _0806319C @ =gObjectEvents
 	adds r0, r2
 	ldr r2, _080631A0 @ =sub_80631A4
-	bl FieldObjectStep
+	bl ObjectEventStep
 	pop {r0}
 	bx r0
 	.align 2, 0
-_0806319C: .4byte gMapObjects
+_0806319C: .4byte gObjectEvents
 _080631A0: .4byte sub_80631A4
 	thumb_func_end sub_8063180
 
@@ -11560,14 +11560,14 @@ sub_80631F0: @ 80631F0
 	lsls r0, r2, 3
 	adds r0, r2
 	lsls r0, 2
-	ldr r2, _0806320C @ =gMapObjects
+	ldr r2, _0806320C @ =gObjectEvents
 	adds r0, r2
 	ldr r2, _08063210 @ =sub_8063214
-	bl FieldObjectStep
+	bl ObjectEventStep
 	pop {r0}
 	bx r0
 	.align 2, 0
-_0806320C: .4byte gMapObjects
+_0806320C: .4byte gObjectEvents
 _08063210: .4byte sub_8063214
 	thumb_func_end sub_80631F0
 
@@ -11657,14 +11657,14 @@ sub_8063298: @ 8063298
 	lsls r0, r2, 3
 	adds r0, r2
 	lsls r0, 2
-	ldr r2, _080632B4 @ =gMapObjects
+	ldr r2, _080632B4 @ =gObjectEvents
 	adds r0, r2
 	ldr r2, _080632B8 @ =sub_8063304
-	bl FieldObjectStep
+	bl ObjectEventStep
 	pop {r0}
 	bx r0
 	.align 2, 0
-_080632B4: .4byte gMapObjects
+_080632B4: .4byte gObjectEvents
 _080632B8: .4byte sub_8063304
 	thumb_func_end sub_8063298
 
@@ -11677,14 +11677,14 @@ sub_80632BC: @ 80632BC
 	lsls r0, r2, 3
 	adds r0, r2
 	lsls r0, 2
-	ldr r2, _080632D8 @ =gMapObjects
+	ldr r2, _080632D8 @ =gObjectEvents
 	adds r0, r2
 	ldr r2, _080632DC @ =sub_8063324
-	bl FieldObjectStep
+	bl ObjectEventStep
 	pop {r0}
 	bx r0
 	.align 2, 0
-_080632D8: .4byte gMapObjects
+_080632D8: .4byte gObjectEvents
 _080632DC: .4byte sub_8063324
 	thumb_func_end sub_80632BC
 
@@ -11697,14 +11697,14 @@ sub_80632E0: @ 80632E0
 	lsls r0, r2, 3
 	adds r0, r2
 	lsls r0, 2
-	ldr r2, _080632FC @ =gMapObjects
+	ldr r2, _080632FC @ =gObjectEvents
 	adds r0, r2
 	ldr r2, _08063300 @ =sub_8063344
-	bl FieldObjectStep
+	bl ObjectEventStep
 	pop {r0}
 	bx r0
 	.align 2, 0
-_080632FC: .4byte gMapObjects
+_080632FC: .4byte gObjectEvents
 _08063300: .4byte sub_8063344
 	thumb_func_end sub_80632E0
 
@@ -11885,8 +11885,8 @@ npc_reset: @ 8063410
 	bx lr
 	thumb_func_end npc_reset
 
-	thumb_func_start FieldObjectDirectionToImageAnimId
-FieldObjectDirectionToImageAnimId: @ 8063430
+	thumb_func_start ObjectEventDirectionToImageAnimId
+ObjectEventDirectionToImageAnimId: @ 8063430
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r1, _0806343C @ =gUnknown_83A640C
@@ -11895,7 +11895,7 @@ FieldObjectDirectionToImageAnimId: @ 8063430
 	bx lr
 	.align 2, 0
 _0806343C: .4byte gUnknown_83A640C
-	thumb_func_end FieldObjectDirectionToImageAnimId
+	thumb_func_end ObjectEventDirectionToImageAnimId
 
 	thumb_func_start get_go_image_anim_num
 get_go_image_anim_num: @ 8063440
@@ -12323,7 +12323,7 @@ npc_block_way: @ 80636AC
 	adds r0, r6, 0
 	adds r1, r5, 0
 	adds r2, r4, 0
-	bl IsCoordOutsideFieldObjectMovementRect
+	bl IsCoordOutsideObjectEventMovementRect
 	lsls r0, 24
 	cmp r0, 0
 	beq _080636E2
@@ -12384,7 +12384,7 @@ _0806374C:
 	adds r0, r6, 0
 	adds r1, r5, 0
 	adds r2, r4, 0
-	bl CheckForCollisionBetweenFieldObjects
+	bl CheckForCollisionBetweenObjectEvents
 	lsls r0, 24
 	cmp r0, 0
 	bne _08063760
@@ -12424,7 +12424,7 @@ sub_8063770: @ 8063770
 	adds r0, r7, 0
 	adds r1, r6, 0
 	adds r2, r5, 0
-	bl IsCoordOutsideFieldObjectMovementRect
+	bl IsCoordOutsideObjectEventMovementRect
 	lsls r0, 24
 	lsrs r0, 24
 	negs r1, r0
@@ -12486,7 +12486,7 @@ _08063814:
 	adds r0, r7, 0
 	adds r1, r6, 0
 	adds r2, r5, 0
-	bl CheckForCollisionBetweenFieldObjects
+	bl CheckForCollisionBetweenObjectEvents
 	lsls r0, 24
 	cmp r0, 0
 	beq _0806382C
@@ -12505,8 +12505,8 @@ _0806382C:
 	bx r1
 	thumb_func_end sub_8063770
 
-	thumb_func_start IsCoordOutsideFieldObjectMovementRect
-IsCoordOutsideFieldObjectMovementRect: @ 806383C
+	thumb_func_start IsCoordOutsideObjectEventMovementRect
+IsCoordOutsideObjectEventMovementRect: @ 806383C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	lsls r1, 16
@@ -12567,7 +12567,7 @@ _080638A6:
 	pop {r4,r5}
 	pop {r1}
 	bx r1
-	thumb_func_end IsCoordOutsideFieldObjectMovementRect
+	thumb_func_end IsCoordOutsideObjectEventMovementRect
 
 	thumb_func_start IsMetatileDirectionallyImpassable
 IsMetatileDirectionallyImpassable: @ 80638AC
@@ -12615,8 +12615,8 @@ _080638FE:
 	bx r1
 	thumb_func_end IsMetatileDirectionallyImpassable
 
-	thumb_func_start CheckForCollisionBetweenFieldObjects
-CheckForCollisionBetweenFieldObjects: @ 8063904
+	thumb_func_start CheckForCollisionBetweenObjectEvents
+CheckForCollisionBetweenObjectEvents: @ 8063904
 	push {r4-r7,lr}
 	adds r6, r0, 0
 	lsls r1, 16
@@ -12628,7 +12628,7 @@ _08063912:
 	lsls r0, r4, 3
 	adds r0, r4
 	lsls r0, 2
-	ldr r1, _08063968 @ =gMapObjects
+	ldr r1, _08063968 @ =gObjectEvents
 	adds r2, r0, r1
 	ldrb r0, [r2]
 	lsls r0, 31
@@ -12669,7 +12669,7 @@ _0806394C:
 	movs r0, 0x1
 	b _08063978
 	.align 2, 0
-_08063968: .4byte gMapObjects
+_08063968: .4byte gObjectEvents
 _0806396C:
 	adds r0, r4, 0x1
 	lsls r0, 24
@@ -12681,7 +12681,7 @@ _08063978:
 	pop {r4-r7}
 	pop {r1}
 	bx r1
-	thumb_func_end CheckForCollisionBetweenFieldObjects
+	thumb_func_end CheckForCollisionBetweenObjectEvents
 
 	thumb_func_start IsBerryTreeSparkling
 IsBerryTreeSparkling: @ 8063980
@@ -12694,12 +12694,12 @@ IsBerryTreeSparkling: @ 8063980
 	lsls r2, 24
 	lsrs r2, 24
 	mov r3, sp
-	bl TryGetFieldObjectIdByLocalIdAndMap
+	bl TryGetObjectEventIdByLocalIdAndMap
 	lsls r0, 24
 	cmp r0, 0
 	bne _080639CC
 	ldr r3, _080639C4 @ =gSprites
-	ldr r2, _080639C8 @ =gMapObjects
+	ldr r2, _080639C8 @ =gObjectEvents
 	mov r0, sp
 	ldrb r1, [r0]
 	lsls r0, r1, 3
@@ -12720,7 +12720,7 @@ IsBerryTreeSparkling: @ 8063980
 	b _080639CE
 	.align 2, 0
 _080639C4: .4byte gSprites
-_080639C8: .4byte gMapObjects
+_080639C8: .4byte gObjectEvents
 _080639CC:
 	movs r0, 0
 _080639CE:
@@ -12740,12 +12740,12 @@ sub_80639D4: @ 80639D4
 	lsls r2, 24
 	lsrs r2, 24
 	mov r3, sp
-	bl TryGetFieldObjectIdByLocalIdAndMap
+	bl TryGetObjectEventIdByLocalIdAndMap
 	lsls r0, 24
 	cmp r0, 0
 	bne _08063A12
 	ldr r3, _08063A18 @ =gSprites
-	ldr r2, _08063A1C @ =gMapObjects
+	ldr r2, _08063A1C @ =gObjectEvents
 	mov r0, sp
 	ldrb r1, [r0]
 	lsls r0, r1, 3
@@ -12767,7 +12767,7 @@ _08063A12:
 	bx r0
 	.align 2, 0
 _08063A18: .4byte gSprites
-_08063A1C: .4byte gMapObjects
+_08063A1C: .4byte gObjectEvents
 	thumb_func_end sub_80639D4
 
 	thumb_func_start MoveCoords
@@ -13039,8 +13039,8 @@ sub_8063BC4: @ 8063BC4
 	bx r0
 	thumb_func_end sub_8063BC4
 
-	thumb_func_start GetFieldObjectMovingCameraOffset
-GetFieldObjectMovingCameraOffset: @ 8063C10
+	thumb_func_start GetObjectEventMovingCameraOffset
+GetObjectEventMovingCameraOffset: @ 8063C10
 	push {lr}
 	adds r2, r0, 0
 	movs r0, 0
@@ -13077,10 +13077,10 @@ _08063C48:
 	bx r0
 	.align 2, 0
 _08063C4C: .4byte gUnknown_3005050
-	thumb_func_end GetFieldObjectMovingCameraOffset
+	thumb_func_end GetObjectEventMovingCameraOffset
 
-	thumb_func_start FieldObjectMoveDestCoords
-FieldObjectMoveDestCoords: @ 8063C50
+	thumb_func_start ObjectEventMoveDestCoords
+ObjectEventMoveDestCoords: @ 8063C50
 	push {r4,lr}
 	lsls r1, 24
 	lsrs r1, 24
@@ -13095,10 +13095,10 @@ FieldObjectMoveDestCoords: @ 8063C50
 	pop {r4}
 	pop {r0}
 	bx r0
-	thumb_func_end FieldObjectMoveDestCoords
+	thumb_func_end ObjectEventMoveDestCoords
 
-	thumb_func_start FieldObjectIsMovementOverridden
-FieldObjectIsMovementOverridden: @ 8063C70
+	thumb_func_start ObjectEventIsMovementOverridden
+ObjectEventIsMovementOverridden: @ 8063C70
 	push {lr}
 	ldrb r1, [r0]
 	movs r0, 0x42
@@ -13112,10 +13112,10 @@ _08063C80:
 _08063C82:
 	pop {r1}
 	bx r1
-	thumb_func_end FieldObjectIsMovementOverridden
+	thumb_func_end ObjectEventIsMovementOverridden
 
-	thumb_func_start FieldObjectIsSpecialAnimActive
-FieldObjectIsSpecialAnimActive: @ 8063C88
+	thumb_func_start ObjectEventIsSpecialAnimActive
+ObjectEventIsSpecialAnimActive: @ 8063C88
 	push {lr}
 	adds r1, r0, 0
 	ldrb r0, [r1]
@@ -13132,10 +13132,10 @@ _08063C9E:
 _08063CA0:
 	pop {r1}
 	bx r1
-	thumb_func_end FieldObjectIsSpecialAnimActive
+	thumb_func_end ObjectEventIsSpecialAnimActive
 
-	thumb_func_start FieldObjectSetHeldMovement
-FieldObjectSetHeldMovement: @ 8063CA4
+	thumb_func_start ObjectEventSetHeldMovement
+ObjectEventSetHeldMovement: @ 8063CA4
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	lsls r1, 24
@@ -13146,7 +13146,7 @@ FieldObjectSetHeldMovement: @ 8063CA4
 	cmp r0, 0x1
 	beq _08063CC8
 	adds r0, r4, 0
-	bl FieldObjectIsMovementOverridden
+	bl ObjectEventIsMovementOverridden
 	lsls r0, 24
 	cmp r0, 0
 	beq _08063CCE
@@ -13154,7 +13154,7 @@ FieldObjectSetHeldMovement: @ 8063CA4
 	b _08063CF4
 _08063CC8:
 	adds r0, r4, 0
-	bl FieldObjectClearAnimIfSpecialAnimActive
+	bl ObjectEventClearAnimIfSpecialAnimActive
 _08063CCE:
 	adds r0, r4, 0
 	bl npc_sync_anim_pause_bits
@@ -13180,25 +13180,25 @@ _08063CF4:
 	bx r1
 	.align 2, 0
 _08063CFC: .4byte gSprites
-	thumb_func_end FieldObjectSetHeldMovement
+	thumb_func_end ObjectEventSetHeldMovement
 
-	thumb_func_start FieldObjectForceSetSpecialAnim
-FieldObjectForceSetSpecialAnim: @ 8063D00
+	thumb_func_start ObjectEventForceSetSpecialAnim
+ObjectEventForceSetSpecialAnim: @ 8063D00
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	lsls r4, r1, 24
 	lsrs r4, 24
-	bl FieldObjectClearAnimIfSpecialAnimActive
+	bl ObjectEventClearAnimIfSpecialAnimActive
 	adds r0, r5, 0
 	adds r1, r4, 0
-	bl FieldObjectSetHeldMovement
+	bl ObjectEventSetHeldMovement
 	pop {r4,r5}
 	pop {r0}
 	bx r0
-	thumb_func_end FieldObjectForceSetSpecialAnim
+	thumb_func_end ObjectEventForceSetSpecialAnim
 
-	thumb_func_start FieldObjectClearAnimIfSpecialAnimActive
-FieldObjectClearAnimIfSpecialAnimActive: @ 8063D1C
+	thumb_func_start ObjectEventClearAnimIfSpecialAnimActive
+ObjectEventClearAnimIfSpecialAnimActive: @ 8063D1C
 	push {lr}
 	adds r1, r0, 0
 	ldrb r0, [r1]
@@ -13206,14 +13206,14 @@ FieldObjectClearAnimIfSpecialAnimActive: @ 8063D1C
 	cmp r0, 0
 	bge _08063D2E
 	adds r0, r1, 0
-	bl FieldObjectClearAnim
+	bl ObjectEventClearAnim
 _08063D2E:
 	pop {r0}
 	bx r0
-	thumb_func_end FieldObjectClearAnimIfSpecialAnimActive
+	thumb_func_end ObjectEventClearAnimIfSpecialAnimActive
 
-	thumb_func_start FieldObjectClearAnim
-FieldObjectClearAnim: @ 8063D34
+	thumb_func_start ObjectEventClearAnim
+ObjectEventClearAnim: @ 8063D34
 	movs r1, 0xFF
 	strb r1, [r0, 0x1C]
 	ldrb r2, [r0]
@@ -13240,10 +13240,10 @@ FieldObjectClearAnim: @ 8063D34
 	bx lr
 	.align 2, 0
 _08063D64: .4byte gSprites
-	thumb_func_end FieldObjectClearAnim
+	thumb_func_end ObjectEventClearAnim
 
-	thumb_func_start FieldObjectCheckHeldMovementStatus
-FieldObjectCheckHeldMovementStatus: @ 8063D68
+	thumb_func_start ObjectEventCheckHeldMovementStatus
+ObjectEventCheckHeldMovementStatus: @ 8063D68
 	push {lr}
 	ldrb r1, [r0]
 	lsls r0, r1, 25
@@ -13256,13 +13256,13 @@ _08063D76:
 _08063D78:
 	pop {r1}
 	bx r1
-	thumb_func_end FieldObjectCheckHeldMovementStatus
+	thumb_func_end ObjectEventCheckHeldMovementStatus
 
-	thumb_func_start FieldObjectClearHeldMovementIfFinished
-FieldObjectClearHeldMovementIfFinished: @ 8063D7C
+	thumb_func_start ObjectEventClearHeldMovementIfFinished
+ObjectEventClearHeldMovementIfFinished: @ 8063D7C
 	push {r4,r5,lr}
 	adds r5, r0, 0
-	bl FieldObjectCheckHeldMovementStatus
+	bl ObjectEventCheckHeldMovementStatus
 	lsls r0, 24
 	lsrs r4, r0, 24
 	cmp r4, 0
@@ -13270,16 +13270,16 @@ FieldObjectClearHeldMovementIfFinished: @ 8063D7C
 	cmp r4, 0x10
 	beq _08063D96
 	adds r0, r5, 0
-	bl FieldObjectClearAnimIfSpecialAnimActive
+	bl ObjectEventClearAnimIfSpecialAnimActive
 _08063D96:
 	adds r0, r4, 0
 	pop {r4,r5}
 	pop {r1}
 	bx r1
-	thumb_func_end FieldObjectClearHeldMovementIfFinished
+	thumb_func_end ObjectEventClearHeldMovementIfFinished
 
-	thumb_func_start FieldObjectGetSpecialAnim
-FieldObjectGetSpecialAnim: @ 8063DA0
+	thumb_func_start ObjectEventGetSpecialAnim
+ObjectEventGetSpecialAnim: @ 8063DA0
 	push {lr}
 	adds r1, r0, 0
 	ldrb r0, [r1]
@@ -13293,10 +13293,10 @@ _08063DB0:
 _08063DB2:
 	pop {r1}
 	bx r1
-	thumb_func_end FieldObjectGetSpecialAnim
+	thumb_func_end ObjectEventGetSpecialAnim
 
-	thumb_func_start FieldObjectStep
-FieldObjectStep: @ 8063DB8
+	thumb_func_start ObjectEventStep
+ObjectEventStep: @ 8063DB8
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -13306,13 +13306,13 @@ FieldObjectStep: @ 8063DB8
 	adds r1, r5, 0
 	bl sub_80679C8
 	adds r0, r4, 0
-	bl FieldObjectIsSpecialAnimActive
+	bl ObjectEventIsSpecialAnimActive
 	lsls r0, 24
 	cmp r0, 0
 	beq _08063DE2
 	adds r0, r4, 0
 	adds r1, r5, 0
-	bl FieldObjectExecSpecialAnim
+	bl ObjectEventExecSpecialAnim
 	b _08063DF8
 _08063DE2:
 	ldrb r0, [r4, 0x1]
@@ -13341,11 +13341,11 @@ _08063DF8:
 	bl sub_80679F8
 	adds r0, r4, 0
 	adds r1, r5, 0
-	bl FieldObjectUpdateSubpriority
+	bl ObjectEventUpdateSubpriority
 	pop {r4-r6}
 	pop {r0}
 	bx r0
-	thumb_func_end FieldObjectStep
+	thumb_func_end ObjectEventStep
 
 	thumb_func_start sub_8063E28
 sub_8063E28: @ 8063E28
@@ -13357,7 +13357,7 @@ sub_8063E28: @ 8063E28
 	adds r1, r5, 0
 	bl sub_80679C8
 	adds r0, r4, 0
-	bl FieldObjectIsSpecialAnimActive
+	bl ObjectEventIsSpecialAnimActive
 	lsls r0, 24
 	cmp r0, 0
 	beq _08063E5C
@@ -13410,7 +13410,7 @@ _08063E88:
 	bl sub_80679F8
 	adds r0, r4, 0
 	adds r1, r5, 0
-	bl FieldObjectUpdateSubpriority
+	bl ObjectEventUpdateSubpriority
 	pop {r4,r5}
 	pop {r0}
 	bx r0
@@ -14009,8 +14009,8 @@ _080642B4:
 _080642C4: .4byte gUnknown_83A655F
 	thumb_func_end GetStepInPlaceDelay4AnimId
 
-	thumb_func_start FieldObjectFaceOppositeDirection
-FieldObjectFaceOppositeDirection: @ 80642C8
+	thumb_func_start ObjectEventFaceOppositeDirection
+ObjectEventFaceOppositeDirection: @ 80642C8
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r0, r1, 24
@@ -14023,13 +14023,13 @@ FieldObjectFaceOppositeDirection: @ 80642C8
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r4, 0
-	bl FieldObjectSetHeldMovement
+	bl ObjectEventSetHeldMovement
 	lsls r0, 24
 	lsrs r0, 24
 	pop {r4}
 	pop {r1}
 	bx r1
-	thumb_func_end FieldObjectFaceOppositeDirection
+	thumb_func_end ObjectEventFaceOppositeDirection
 
 	thumb_func_start sub_80642F4
 sub_80642F4: @ 80642F4
@@ -14340,8 +14340,8 @@ _08064502:
 _08064508: .4byte gUnknown_83A65A9
 	thumb_func_end state_to_direction
 
-	thumb_func_start FieldObjectExecSpecialAnim
-FieldObjectExecSpecialAnim: @ 806450C
+	thumb_func_start ObjectEventExecSpecialAnim
+ObjectEventExecSpecialAnim: @ 806450C
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r2, _08064540 @ =gUnknown_83A65BC
@@ -14369,7 +14369,7 @@ _08064538:
 	bx r0
 	.align 2, 0
 _08064540: .4byte gUnknown_83A65BC
-	thumb_func_end FieldObjectExecSpecialAnim
+	thumb_func_end ObjectEventExecSpecialAnim
 
 	thumb_func_start sub_8064544
 sub_8064544: @ 8064544
@@ -14477,7 +14477,7 @@ an_look_any: @ 80645F4
 	adds r5, r1, 0
 	lsls r1, r2, 24
 	lsrs r1, 24
-	bl FieldObjectSetDirection
+	bl ObjectEventSetDirection
 	adds r0, r4, 0
 	bl npc_coords_shift_still
 	ldrb r0, [r4, 0x18]
@@ -14568,7 +14568,7 @@ sub_8064678: @ 8064678
 	strh r0, [r5]
 	mov r0, r8
 	adds r1, r4, 0
-	bl FieldObjectSetDirection
+	bl ObjectEventSetDirection
 	adds r0, r4, 0
 	mov r1, sp
 	adds r2, r5, 0
@@ -14731,7 +14731,7 @@ sub_80647C0: @ 80647C0
 	strh r0, [r4]
 	adds r0, r6, 0
 	adds r1, r5, 0
-	bl FieldObjectSetDirection
+	bl ObjectEventSetDirection
 	adds r0, r5, 0
 	mov r1, sp
 	adds r2, r4, 0
@@ -14842,7 +14842,7 @@ sub_8064894: @ 8064894
 	strh r0, [r4]
 	adds r0, r6, 0
 	adds r1, r5, 0
-	bl FieldObjectSetDirection
+	bl ObjectEventSetDirection
 	adds r0, r5, 0
 	mov r1, sp
 	adds r2, r4, 0
@@ -15249,7 +15249,7 @@ sub_8064B68: @ 8064B68
 	strh r0, [r4]
 	adds r0, r6, 0
 	adds r1, r5, 0
-	bl FieldObjectSetDirection
+	bl ObjectEventSetDirection
 	adds r0, r5, 0
 	mov r1, sp
 	adds r2, r4, 0
@@ -15675,7 +15675,7 @@ sub_8064E3C: @ 8064E3C
 	strh r0, [r6]
 	adds r0, r7, 0
 	adds r1, r4, 0
-	bl FieldObjectSetDirection
+	bl ObjectEventSetDirection
 	mov r1, r8
 	lsls r0, r1, 1
 	add r0, sp
@@ -15947,7 +15947,7 @@ _08065072:
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r4, 0
-	bl FieldObjectSetDirection
+	bl ObjectEventSetDirection
 	ldrb r0, [r4, 0x18]
 	lsls r0, 28
 	lsrs r0, 28
@@ -16468,7 +16468,7 @@ sub_80653F8: @ 80653F8
 	cmp r0, 0x1
 	beq _0806541A
 	movs r0, 0x1
-	bl FieldObjectDirectionToImageAnimId
+	bl ObjectEventDirectionToImageAnimId
 	adds r1, r0, 0
 	lsls r1, 24
 	lsrs r1, 24
@@ -16526,7 +16526,7 @@ sub_8065464: @ 8065464
 	cmp r0, 0x2
 	beq _08065486
 	movs r0, 0x2
-	bl FieldObjectDirectionToImageAnimId
+	bl ObjectEventDirectionToImageAnimId
 	adds r1, r0, 0
 	lsls r1, 24
 	lsrs r1, 24
@@ -16584,7 +16584,7 @@ sub_80654D0: @ 80654D0
 	cmp r0, 0x3
 	beq _080654F2
 	movs r0, 0x3
-	bl FieldObjectDirectionToImageAnimId
+	bl ObjectEventDirectionToImageAnimId
 	adds r1, r0, 0
 	lsls r1, 24
 	lsrs r1, 24
@@ -16642,7 +16642,7 @@ sub_806553C: @ 806553C
 	cmp r0, 0x4
 	beq _0806555E
 	movs r0, 0x4
-	bl FieldObjectDirectionToImageAnimId
+	bl ObjectEventDirectionToImageAnimId
 	adds r1, r0, 0
 	lsls r1, 24
 	lsrs r1, 24
@@ -16696,7 +16696,7 @@ sub_80655A8: @ 80655A8
 	adds r5, r1, 0
 	lsls r1, r2, 24
 	lsrs r1, 24
-	bl FieldObjectSetDirection
+	bl ObjectEventSetDirection
 	adds r0, r4, 0
 	bl npc_coords_shift_still
 	adds r2, r5, 0
@@ -16724,7 +16724,7 @@ sub_80655D4: @ 80655D4
 	cmp r0, 0x1
 	beq _080655F6
 	movs r0, 0x1
-	bl FieldObjectDirectionToImageAnimId
+	bl ObjectEventDirectionToImageAnimId
 	adds r1, r0, 0
 	lsls r1, 24
 	lsrs r1, 24
@@ -16754,7 +16754,7 @@ sub_8065610: @ 8065610
 	cmp r0, 0x2
 	beq _08065632
 	movs r0, 0x2
-	bl FieldObjectDirectionToImageAnimId
+	bl ObjectEventDirectionToImageAnimId
 	adds r1, r0, 0
 	lsls r1, 24
 	lsrs r1, 24
@@ -16784,7 +16784,7 @@ sub_806564C: @ 806564C
 	cmp r0, 0x3
 	beq _0806566E
 	movs r0, 0x3
-	bl FieldObjectDirectionToImageAnimId
+	bl ObjectEventDirectionToImageAnimId
 	adds r1, r0, 0
 	lsls r1, 24
 	lsrs r1, 24
@@ -16814,7 +16814,7 @@ sub_8065688: @ 8065688
 	cmp r0, 0x4
 	beq _080656AA
 	movs r0, 0x4
-	bl FieldObjectDirectionToImageAnimId
+	bl ObjectEventDirectionToImageAnimId
 	adds r1, r0, 0
 	lsls r1, 24
 	lsrs r1, 24
@@ -16849,7 +16849,7 @@ sub_80656C4: @ 80656C4
 	lsrs r4, 24
 	lsls r5, 16
 	lsrs r5, 16
-	bl FieldObjectSetDirection
+	bl ObjectEventSetDirection
 	mov r0, r8
 	adds r1, r6, 0
 	adds r2, r4, 0
@@ -18002,7 +18002,7 @@ sub_8065EF0: @ 8065EF0
 	strh r0, [r4]
 	adds r0, r6, 0
 	adds r1, r5, 0
-	bl FieldObjectSetDirection
+	bl ObjectEventSetDirection
 	adds r0, r5, 0
 	mov r1, sp
 	adds r2, r4, 0
@@ -18258,7 +18258,7 @@ npc_set_direction_and_anim__an_proceed: @ 80660C4
 	bl obj_anim_image_set_and_seek
 	adds r0, r6, 0
 	adds r1, r4, 0
-	bl FieldObjectSetDirection
+	bl ObjectEventSetDirection
 	movs r0, 0x1
 	strh r0, [r5, 0x32]
 	pop {r4-r6}
@@ -18653,7 +18653,7 @@ sub_806637C: @ 806637C
 	movs r1, 0
 	movs r2, 0
 	mov r3, sp
-	bl TryGetFieldObjectIdByLocalIdAndMap
+	bl TryGetObjectEventIdByLocalIdAndMap
 	lsls r0, 24
 	cmp r0, 0
 	bne _080663C6
@@ -18661,7 +18661,7 @@ sub_806637C: @ 806637C
 	ldrsh r0, [r5, r1]
 	movs r2, 0x12
 	ldrsh r1, [r5, r2]
-	ldr r4, _080663D4 @ =gMapObjects
+	ldr r4, _080663D4 @ =gObjectEvents
 	mov r2, sp
 	ldrb r2, [r2]
 	lsls r3, r2, 3
@@ -18687,7 +18687,7 @@ _080663C6:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_080663D4: .4byte gMapObjects
+_080663D4: .4byte gObjectEvents
 	thumb_func_end sub_806637C
 
 	thumb_func_start sub_80663D8
@@ -18700,7 +18700,7 @@ sub_80663D8: @ 80663D8
 	movs r1, 0
 	movs r2, 0
 	mov r3, sp
-	bl TryGetFieldObjectIdByLocalIdAndMap
+	bl TryGetObjectEventIdByLocalIdAndMap
 	lsls r0, 24
 	cmp r0, 0
 	bne _0806642A
@@ -18708,7 +18708,7 @@ sub_80663D8: @ 80663D8
 	ldrsh r0, [r5, r1]
 	movs r2, 0x12
 	ldrsh r1, [r5, r2]
-	ldr r4, _08066438 @ =gMapObjects
+	ldr r4, _08066438 @ =gObjectEvents
 	mov r2, sp
 	ldrb r2, [r2]
 	lsls r3, r2, 3
@@ -18737,7 +18737,7 @@ _0806642A:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_08066438: .4byte gMapObjects
+_08066438: .4byte gObjectEvents
 	thumb_func_end sub_80663D8
 
 	thumb_func_start sub_806643C
@@ -19417,7 +19417,7 @@ sub_80668D4: @ 80668D4
 	adds r4, r0, 0
 	adds r5, r1, 0
 	ldrb r0, [r4, 0x5]
-	bl GetFieldObjectGraphicsInfo
+	bl GetObjectEventGraphicsInfo
 	ldrb r1, [r0, 0xC]
 	lsls r1, 25
 	lsrs r1, 31
@@ -19466,7 +19466,7 @@ do_exclamation_mark_bubble_1: @ 8066920
 	adds r2, r1, 0x4
 	adds r3, r1, 0
 	adds r3, 0x8
-	bl FieldObjectGetLocalIdAndMap
+	bl ObjectEventGetLocalIdAndMap
 	movs r0, 0
 	bl FieldEffectStart
 	movs r0, 0x1
@@ -19486,7 +19486,7 @@ do_exclamation_mark_bubble_2: @ 8066944
 	adds r2, r1, 0x4
 	adds r3, r1, 0
 	adds r3, 0x8
-	bl FieldObjectGetLocalIdAndMap
+	bl ObjectEventGetLocalIdAndMap
 	movs r0, 0x21
 	bl FieldEffectStart
 	movs r0, 0x1
@@ -19506,7 +19506,7 @@ do_heart_bubble: @ 8066968
 	adds r2, r1, 0x4
 	adds r3, r1, 0
 	adds r3, 0x8
-	bl FieldObjectGetLocalIdAndMap
+	bl ObjectEventGetLocalIdAndMap
 	movs r0, 0x2E
 	bl FieldEffectStart
 	movs r0, 0x1
@@ -19526,7 +19526,7 @@ sub_806698C: @ 806698C
 	adds r2, r1, 0x4
 	adds r3, r1, 0
 	adds r3, 0x8
-	bl FieldObjectGetLocalIdAndMap
+	bl ObjectEventGetLocalIdAndMap
 	movs r0, 0x42
 	bl FieldEffectStart
 	movs r0, 0x1
@@ -19546,7 +19546,7 @@ sub_80669B0: @ 80669B0
 	adds r2, r1, 0x4
 	adds r3, r1, 0
 	adds r3, 0x8
-	bl FieldObjectGetLocalIdAndMap
+	bl ObjectEventGetLocalIdAndMap
 	movs r0, 0x40
 	bl FieldEffectStart
 	movs r0, 0x1
@@ -19643,7 +19643,7 @@ sub_8066A54: @ 8066A54
 	beq _08066A70
 	adds r0, r4, 0
 	movs r1, 0x20
-	bl SetFieldObjectStepTimer
+	bl SetObjectEventStepTimer
 	movs r0, 0x2
 	strh r0, [r4, 0x32]
 _08066A70:
@@ -19669,7 +19669,7 @@ sub_8066A78: @ 8066A78
 	orrs r0, r1
 	strb r0, [r4, 0x1]
 	adds r0, r5, 0
-	bl RunFieldObjectStepTimer
+	bl RunObjectEventStepTimer
 	lsls r0, 24
 	cmp r0, 0
 	beq _08066AAA
@@ -19713,7 +19713,7 @@ sub_8066AD0: @ 8066AD0
 	beq _08066AEC
 	adds r0, r4, 0
 	movs r1, 0x20
-	bl SetFieldObjectStepTimer
+	bl SetObjectEventStepTimer
 	movs r0, 0x2
 	strh r0, [r4, 0x32]
 _08066AEC:
@@ -19739,7 +19739,7 @@ sub_8066AF4: @ 8066AF4
 	orrs r0, r1
 	strb r0, [r4, 0x1]
 	adds r0, r5, 0
-	bl RunFieldObjectStepTimer
+	bl RunObjectEventStepTimer
 	lsls r0, 24
 	cmp r0, 0
 	beq _08066B26
@@ -19943,7 +19943,7 @@ sub_8066C70: @ 8066C70
 	lsls r4, r2, 24
 	lsrs r4, 24
 	adds r1, r4, 0
-	bl FieldObjectSetDirection
+	bl ObjectEventSetDirection
 	adds r0, r5, 0
 	bl npc_coords_shift_still
 	adds r0, r4, 0
@@ -21913,7 +21913,7 @@ sub_8067A10: @ 8067A10
 	ands r0, r1
 	strb r0, [r5, 0x1]
 	ldrb r0, [r5, 0x5]
-	bl GetFieldObjectGraphicsInfo
+	bl GetObjectEventGraphicsInfo
 	adds r7, r0, 0
 	adds r0, r4, 0
 	adds r0, 0x3E
diff --git a/asm/field_player_avatar.s b/asm/field_player_avatar.s
index f6b50bdc6..faab73bf6 100644
--- a/asm/field_player_avatar.s
+++ b/asm/field_player_avatar.s
@@ -14,14 +14,14 @@ sub_805B3B8: @ 805B3B8
 	lsls r0, r2, 3
 	adds r0, r2
 	lsls r0, 2
-	ldr r2, _0805B3D4 @ =gMapObjects
+	ldr r2, _0805B3D4 @ =gObjectEvents
 	adds r0, r2
 	ldr r2, _0805B3D8 @ =sub_805B3DC
-	bl FieldObjectStep
+	bl ObjectEventStep
 	pop {r0}
 	bx r0
 	.align 2, 0
-_0805B3D4: .4byte gMapObjects
+_0805B3D4: .4byte gObjectEvents
 _0805B3D8: .4byte sub_805B3DC
 	thumb_func_end sub_805B3B8
 
@@ -48,7 +48,7 @@ sub_805B3E0: @ 805B3E0
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _0805B458 @ =gMapObjects
+	ldr r1, _0805B458 @ =gObjectEvents
 	adds r5, r0, r1
 	adds r0, r5, 0
 	bl sub_805CC40
@@ -85,7 +85,7 @@ _0805B448:
 	bx r0
 	.align 2, 0
 _0805B454: .4byte gPlayerAvatar
-_0805B458: .4byte gMapObjects
+_0805B458: .4byte gObjectEvents
 	thumb_func_end sub_805B3E0
 
 	thumb_func_start sub_805B45C
@@ -94,17 +94,17 @@ sub_805B45C: @ 805B45C
 	adds r4, r0, 0
 	lsls r1, 24
 	lsrs r5, r1, 24
-	bl FieldObjectIsMovementOverridden
+	bl ObjectEventIsMovementOverridden
 	lsls r0, 24
 	cmp r0, 0
 	beq _0805B4A6
 	adds r0, r4, 0
-	bl FieldObjectClearHeldMovementIfFinished
+	bl ObjectEventClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	bne _0805B4A6
 	adds r0, r4, 0
-	bl FieldObjectGetSpecialAnim
+	bl ObjectEventGetSpecialAnim
 	lsls r0, 24
 	movs r1, 0xDF
 	lsls r1, 24
@@ -119,7 +119,7 @@ sub_805B45C: @ 805B45C
 	cmp r0, r5
 	beq _0805B4A2
 	adds r0, r4, 0
-	bl FieldObjectClearAnim
+	bl ObjectEventClearAnim
 	b _0805B4A6
 _0805B4A2:
 	movs r0, 0x1
@@ -222,7 +222,7 @@ sub_805B528: @ 805B528
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _0805B594 @ =gMapObjects
+	ldr r1, _0805B594 @ =gObjectEvents
 	adds r1, r0, r1
 	str r1, [r4]
 	ldrb r0, [r1]
@@ -245,7 +245,7 @@ sub_805B528: @ 805B528
 	strh r0, [r5, 0x1C]
 _0805B57A:
 	ldr r0, [r4]
-	bl FieldObjectClearAnim
+	bl ObjectEventClearAnim
 	ldrb r0, [r5, 0x1C]
 	bl sub_805C2CC
 _0805B586:
@@ -254,7 +254,7 @@ _0805B586:
 	.align 2, 0
 _0805B58C: .4byte gPlayerAvatar
 _0805B590: .4byte gUnknown_2036E30
-_0805B594: .4byte gMapObjects
+_0805B594: .4byte gObjectEvents
 _0805B598:
 	movs r0, 0
 _0805B59A:
@@ -273,7 +273,7 @@ sub_805B5A0: @ 805B5A0
 	ands r0, r1
 	cmp r0, 0
 	bne _0805B610
-	ldr r2, _0805B5F8 @ =gMapObjects
+	ldr r2, _0805B5F8 @ =gObjectEvents
 	ldrb r1, [r3, 0x5]
 	lsls r0, r1, 3
 	adds r0, r1
@@ -308,7 +308,7 @@ _0805B5CC:
 	b _0805B628
 	.align 2, 0
 _0805B5F4: .4byte gPlayerAvatar
-_0805B5F8: .4byte gMapObjects
+_0805B5F8: .4byte gObjectEvents
 _0805B5FC: .4byte gUnknown_835B764
 _0805B600:
 	ldr r0, _0805B60C @ =gPlayerAvatar
@@ -362,7 +362,7 @@ ForcedMovement_None: @ 805B644
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _0805B68C @ =gMapObjects
+	ldr r1, _0805B68C @ =gObjectEvents
 	adds r0, r1
 	ldrb r2, [r0, 0x1]
 	movs r1, 0x3
@@ -374,7 +374,7 @@ ForcedMovement_None: @ 805B644
 	ldrb r1, [r0, 0x18]
 	lsls r1, 28
 	lsrs r1, 28
-	bl FieldObjectSetDirection
+	bl ObjectEventSetDirection
 	ldrb r1, [r4]
 	movs r0, 0xBF
 	ands r0, r1
@@ -386,7 +386,7 @@ _0805B67E:
 	bx r1
 	.align 2, 0
 _0805B688: .4byte gPlayerAvatar
-_0805B68C: .4byte gMapObjects
+_0805B68C: .4byte gObjectEvents
 	thumb_func_end ForcedMovement_None
 
 	thumb_func_start DoForcedMovement
@@ -461,7 +461,7 @@ DoForcedMovementInCurrentDirection: @ 805B708
 	lsls r0, r2, 3
 	adds r0, r2
 	lsls r0, 2
-	ldr r2, _0805B738 @ =gMapObjects
+	ldr r2, _0805B738 @ =gObjectEvents
 	adds r0, r2
 	ldrb r2, [r0, 0x1]
 	movs r3, 0x4
@@ -476,7 +476,7 @@ DoForcedMovementInCurrentDirection: @ 805B708
 	bx r1
 	.align 2, 0
 _0805B734: .4byte gPlayerAvatar
-_0805B738: .4byte gMapObjects
+_0805B738: .4byte gObjectEvents
 	thumb_func_end DoForcedMovementInCurrentDirection
 
 	thumb_func_start ForcedMovement_Slip
@@ -683,7 +683,7 @@ ForcedMovement_Slide: @ 805B88C
 	lsls r2, r3, 3
 	adds r2, r3
 	lsls r2, 2
-	ldr r3, _0805B8C0 @ =gMapObjects
+	ldr r3, _0805B8C0 @ =gObjectEvents
 	adds r2, r3
 	ldrb r3, [r2, 0x1]
 	movs r4, 0x4
@@ -699,7 +699,7 @@ ForcedMovement_Slide: @ 805B88C
 	bx r1
 	.align 2, 0
 _0805B8BC: .4byte gPlayerAvatar
-_0805B8C0: .4byte gMapObjects
+_0805B8C0: .4byte gObjectEvents
 	thumb_func_end ForcedMovement_Slide
 
 	thumb_func_start ForcedMovement_SlideSouth
@@ -919,7 +919,7 @@ _0805BA30:
 	lsls r0, 24
 	cmp r0, 0
 	beq _0805BA8C
-	ldr r2, _0805BA70 @ =gMapObjects
+	ldr r2, _0805BA70 @ =gObjectEvents
 	ldrb r1, [r6, 0x5]
 	lsls r0, r1, 3
 	adds r0, r1
@@ -938,7 +938,7 @@ _0805BA30:
 	b _0805BA7A
 	.align 2, 0
 _0805BA6C: .4byte 0x0000082f
-_0805BA70: .4byte gMapObjects
+_0805BA70: .4byte gObjectEvents
 _0805BA74:
 	adds r0, r4, 0
 	bl sub_805C17C
@@ -979,7 +979,7 @@ sub_805BAAC: @ 805BAAC
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _0805BAE8 @ =gMapObjects
+	ldr r1, _0805BAE8 @ =gObjectEvents
 	adds r0, r1
 	ldrh r2, [r0, 0x10]
 	mov r1, sp
@@ -1000,7 +1000,7 @@ sub_805BAAC: @ 805BAAC
 	b _0805BB00
 	.align 2, 0
 _0805BAE4: .4byte gPlayerAvatar
-_0805BAE8: .4byte gMapObjects
+_0805BAE8: .4byte gObjectEvents
 _0805BAEC:
 	movs r0, 0x1
 	mov r1, sp
@@ -1039,7 +1039,7 @@ sub_805BB1C: @ 805BB1C
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _0805BB98 @ =gMapObjects
+	ldr r1, _0805BB98 @ =gObjectEvents
 	adds r5, r0, r1
 	ldrh r1, [r5, 0x10]
 	add r0, sp, 0x4
@@ -1086,7 +1086,7 @@ sub_805BB1C: @ 805BB1C
 	b _0805BB9E
 	.align 2, 0
 _0805BB94: .4byte gPlayerAvatar
-_0805BB98: .4byte gMapObjects
+_0805BB98: .4byte gObjectEvents
 _0805BB9C:
 	movs r0, 0x8
 _0805BB9E:
@@ -1218,7 +1218,7 @@ sub_805BC60: @ 805BC60
 	lsrs r0, r5, 16
 	lsrs r1, r4, 16
 	movs r2, 0x3
-	bl GetFieldObjectIdByXYZ
+	bl GetObjectEventIdByXYZ
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x10
@@ -1286,12 +1286,12 @@ sub_805BCEC: @ 805BCEC
 	ldrsh r0, [r0, r1]
 	movs r2, 0
 	ldrsh r1, [r5, r2]
-	bl GetFieldObjectIdByXY
+	bl GetObjectEventIdByXY
 	lsls r0, 24
 	lsrs r6, r0, 24
 	cmp r6, 0x10
 	beq _0805BDA0
-	ldr r0, _0805BD9C @ =gMapObjects
+	ldr r0, _0805BD9C @ =gObjectEvents
 	lsls r1, r6, 3
 	adds r1, r6
 	lsls r1, 2
@@ -1347,7 +1347,7 @@ _0805BD8A:
 	b _0805BDA2
 	.align 2, 0
 _0805BD98: .4byte 0x00000805
-_0805BD9C: .4byte gMapObjects
+_0805BD9C: .4byte gObjectEvents
 _0805BDA0:
 	movs r0, 0
 _0805BDA2:
@@ -1431,7 +1431,7 @@ _0805BE14:
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _0805BE58 @ =gMapObjects
+	ldr r1, _0805BE58 @ =gObjectEvents
 	adds r0, r1
 	ldr r1, [r2]
 	bl _call_via_r1
@@ -1452,7 +1452,7 @@ _0805BE48:
 	.align 2, 0
 _0805BE50: .4byte gPlayerAvatar
 _0805BE54: .4byte gUnknown_835B844
-_0805BE58: .4byte gMapObjects
+_0805BE58: .4byte gObjectEvents
 	thumb_func_end DoPlayerAvatarTransition
 
 	thumb_func_start nullsub_22
@@ -1552,7 +1552,7 @@ _0805BEF6:
 	thumb_func_start player_is_anim_in_certain_ranges
 player_is_anim_in_certain_ranges: @ 805BEFC
 	push {lr}
-	ldr r2, _0805BF48 @ =gMapObjects
+	ldr r2, _0805BF48 @ =gObjectEvents
 	ldr r0, _0805BF4C @ =gPlayerAvatar
 	ldrb r1, [r0, 0x5]
 	lsls r0, r1, 3
@@ -1590,7 +1590,7 @@ _0805BF42:
 	movs r0, 0x1
 	b _0805BF52
 	.align 2, 0
-_0805BF48: .4byte gMapObjects
+_0805BF48: .4byte gObjectEvents
 _0805BF4C: .4byte gPlayerAvatar
 _0805BF50:
 	movs r0, 0
@@ -1629,16 +1629,16 @@ PlayerIsAnimActive: @ 805BF7C
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _0805BF9C @ =gMapObjects
+	ldr r1, _0805BF9C @ =gObjectEvents
 	adds r0, r1
-	bl FieldObjectIsMovementOverridden
+	bl ObjectEventIsMovementOverridden
 	lsls r0, 24
 	lsrs r0, 24
 	pop {r1}
 	bx r1
 	.align 2, 0
 _0805BF98: .4byte gPlayerAvatar
-_0805BF9C: .4byte gMapObjects
+_0805BF9C: .4byte gObjectEvents
 	thumb_func_end PlayerIsAnimActive
 
 	thumb_func_start PlayerCheckIfAnimFinishedOrInactive
@@ -1649,21 +1649,21 @@ PlayerCheckIfAnimFinishedOrInactive: @ 805BFA0
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _0805BFC0 @ =gMapObjects
+	ldr r1, _0805BFC0 @ =gObjectEvents
 	adds r0, r1
-	bl FieldObjectCheckHeldMovementStatus
+	bl ObjectEventCheckHeldMovementStatus
 	lsls r0, 24
 	lsrs r0, 24
 	pop {r1}
 	bx r1
 	.align 2, 0
 _0805BFBC: .4byte gPlayerAvatar
-_0805BFC0: .4byte gMapObjects
+_0805BFC0: .4byte gObjectEvents
 	thumb_func_end PlayerCheckIfAnimFinishedOrInactive
 
 	thumb_func_start player_set_x22
 player_set_x22: @ 805BFC4
-	ldr r3, _0805BFD8 @ =gMapObjects
+	ldr r3, _0805BFD8 @ =gObjectEvents
 	ldr r1, _0805BFDC @ =gPlayerAvatar
 	ldrb r2, [r1, 0x5]
 	lsls r1, r2, 3
@@ -1674,13 +1674,13 @@ player_set_x22: @ 805BFC4
 	strb r0, [r1]
 	bx lr
 	.align 2, 0
-_0805BFD8: .4byte gMapObjects
+_0805BFD8: .4byte gObjectEvents
 _0805BFDC: .4byte gPlayerAvatar
 	thumb_func_end player_set_x22
 
 	thumb_func_start player_get_x22
 player_get_x22: @ 805BFE0
-	ldr r2, _0805BFF4 @ =gMapObjects
+	ldr r2, _0805BFF4 @ =gObjectEvents
 	ldr r0, _0805BFF8 @ =gPlayerAvatar
 	ldrb r1, [r0, 0x5]
 	lsls r0, r1, 3
@@ -1691,7 +1691,7 @@ player_get_x22: @ 805BFE0
 	ldrb r0, [r0]
 	bx lr
 	.align 2, 0
-_0805BFF4: .4byte gMapObjects
+_0805BFF4: .4byte gObjectEvents
 _0805BFF8: .4byte gPlayerAvatar
 	thumb_func_end player_get_x22
 
@@ -1706,14 +1706,14 @@ sub_805BFFC: @ 805BFFC
 	lsls r0, r2, 3
 	adds r0, r2
 	lsls r0, 2
-	ldr r2, _0805C020 @ =gMapObjects
+	ldr r2, _0805C020 @ =gObjectEvents
 	adds r0, r2
-	bl FieldObjectForceSetSpecialAnim
+	bl ObjectEventForceSetSpecialAnim
 	pop {r0}
 	bx r0
 	.align 2, 0
 _0805C01C: .4byte gPlayerAvatar
-_0805C020: .4byte gMapObjects
+_0805C020: .4byte gObjectEvents
 	thumb_func_end sub_805BFFC
 
 	thumb_func_start sub_805C024
@@ -1734,10 +1734,10 @@ sub_805C024: @ 805C024
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _0805C068 @ =gMapObjects
+	ldr r1, _0805C068 @ =gObjectEvents
 	adds r0, r1
 	adds r1, r5, 0
-	bl FieldObjectSetHeldMovement
+	bl ObjectEventSetHeldMovement
 	lsls r0, 24
 	cmp r0, 0
 	bne _0805C05E
@@ -1749,7 +1749,7 @@ _0805C05E:
 	bx r0
 	.align 2, 0
 _0805C064: .4byte gPlayerAvatar
-_0805C068: .4byte gMapObjects
+_0805C068: .4byte gObjectEvents
 	thumb_func_end sub_805C024
 
 	thumb_func_start sub_805C06C
@@ -1762,10 +1762,10 @@ sub_805C06C: @ 805C06C
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _0805C0A0 @ =gMapObjects
+	ldr r1, _0805C0A0 @ =gObjectEvents
 	adds r0, r1
 	adds r1, r4, 0
-	bl FieldObjectSetHeldMovement
+	bl ObjectEventSetHeldMovement
 	lsls r0, 24
 	cmp r0, 0
 	bne _0805C094
@@ -1778,7 +1778,7 @@ _0805C094:
 	bx r0
 	.align 2, 0
 _0805C09C: .4byte gPlayerAvatar
-_0805C0A0: .4byte gMapObjects
+_0805C0A0: .4byte gObjectEvents
 	thumb_func_end sub_805C06C
 
 	thumb_func_start sub_805C0A4
@@ -1789,7 +1789,7 @@ sub_805C0A4: @ 805C0A4
 	lsls r1, 24
 	lsrs r5, r1, 24
 	adds r1, r5, 0
-	bl FieldObjectSetHeldMovement
+	bl ObjectEventSetHeldMovement
 	lsls r0, 24
 	cmp r0, 0
 	bne _0805C0CA
@@ -2056,7 +2056,7 @@ _0805C27E:
 	lsls r0, 24
 	cmp r0, 0
 	beq _0805C2A6
-	ldr r2, _0805C2B0 @ =gMapObjects
+	ldr r2, _0805C2B0 @ =gObjectEvents
 	ldrb r1, [r4, 0x5]
 	lsls r0, r1, 3
 	adds r0, r1
@@ -2075,7 +2075,7 @@ _0805C2A6:
 	bx r0
 	.align 2, 0
 _0805C2AC: .4byte gPlayerAvatar
-_0805C2B0: .4byte gMapObjects
+_0805C2B0: .4byte gObjectEvents
 	thumb_func_end sub_805C270
 
 	thumb_func_start sub_805C2B4
@@ -2301,7 +2301,7 @@ sub_805C438: @ 805C438
 	lsls r0, 24
 	lsrs r5, r0, 24
 	adds r6, r5, 0
-	ldr r2, _0805C4E8 @ =gMapObjects
+	ldr r2, _0805C4E8 @ =gObjectEvents
 	ldr r0, _0805C4EC @ =gPlayerAvatar
 	ldrb r1, [r0, 0x5]
 	lsls r0, r1, 3
@@ -2378,7 +2378,7 @@ _0805C4DE:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_0805C4E8: .4byte gMapObjects
+_0805C4E8: .4byte gObjectEvents
 _0805C4EC: .4byte gPlayerAvatar
 _0805C4F0: .4byte gUnknown_835B864
 	thumb_func_end sub_805C438
@@ -2388,7 +2388,7 @@ GetXYCoordsOneStepInFrontOfPlayer: @ 805C4F4
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
-	ldr r3, _0805C530 @ =gMapObjects
+	ldr r3, _0805C530 @ =gObjectEvents
 	ldr r2, _0805C534 @ =gPlayerAvatar
 	ldrb r1, [r2, 0x5]
 	lsls r0, r1, 3
@@ -2414,14 +2414,14 @@ GetXYCoordsOneStepInFrontOfPlayer: @ 805C4F4
 	pop {r0}
 	bx r0
 	.align 2, 0
-_0805C530: .4byte gMapObjects
+_0805C530: .4byte gObjectEvents
 _0805C534: .4byte gPlayerAvatar
 	thumb_func_end GetXYCoordsOneStepInFrontOfPlayer
 
 	thumb_func_start PlayerGetDestCoords
 PlayerGetDestCoords: @ 805C538
 	push {r4,r5,lr}
-	ldr r5, _0805C560 @ =gMapObjects
+	ldr r5, _0805C560 @ =gObjectEvents
 	ldr r4, _0805C564 @ =gPlayerAvatar
 	ldrb r3, [r4, 0x5]
 	lsls r2, r3, 3
@@ -2441,7 +2441,7 @@ PlayerGetDestCoords: @ 805C538
 	pop {r0}
 	bx r0
 	.align 2, 0
-_0805C560: .4byte gMapObjects
+_0805C560: .4byte gObjectEvents
 _0805C564: .4byte gPlayerAvatar
 	thumb_func_end PlayerGetDestCoords
 
@@ -2455,7 +2455,7 @@ plaer_get_pos_including_state_based_drift: @ 805C568
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _0805C5C0 @ =gMapObjects
+	ldr r1, _0805C5C0 @ =gObjectEvents
 	adds r3, r0, r1
 	ldrb r1, [r3]
 	movs r0, 0xC0
@@ -2493,7 +2493,7 @@ _0805C5B0:
 	mov pc, r0
 	.align 2, 0
 _0805C5BC: .4byte gPlayerAvatar
-_0805C5C0: .4byte gMapObjects
+_0805C5C0: .4byte gObjectEvents
 _0805C5C4: .4byte gSprites
 _0805C5C8: .4byte _0805C5CC
 	.align 2, 0
@@ -2584,7 +2584,7 @@ _0805C6BC:
 
 	thumb_func_start GetPlayerFacingDirection
 GetPlayerFacingDirection: @ 805C6C4
-	ldr r2, _0805C6DC @ =gMapObjects
+	ldr r2, _0805C6DC @ =gObjectEvents
 	ldr r0, _0805C6E0 @ =gPlayerAvatar
 	ldrb r1, [r0, 0x5]
 	lsls r0, r1, 3
@@ -2596,13 +2596,13 @@ GetPlayerFacingDirection: @ 805C6C4
 	lsrs r0, 28
 	bx lr
 	.align 2, 0
-_0805C6DC: .4byte gMapObjects
+_0805C6DC: .4byte gObjectEvents
 _0805C6E0: .4byte gPlayerAvatar
 	thumb_func_end GetPlayerFacingDirection
 
 	thumb_func_start player_get_direction_upper_nybble
 player_get_direction_upper_nybble: @ 805C6E4
-	ldr r2, _0805C6F8 @ =gMapObjects
+	ldr r2, _0805C6F8 @ =gObjectEvents
 	ldr r0, _0805C6FC @ =gPlayerAvatar
 	ldrb r1, [r0, 0x5]
 	lsls r0, r1, 3
@@ -2613,13 +2613,13 @@ player_get_direction_upper_nybble: @ 805C6E4
 	lsrs r0, 4
 	bx lr
 	.align 2, 0
-_0805C6F8: .4byte gMapObjects
+_0805C6F8: .4byte gObjectEvents
 _0805C6FC: .4byte gPlayerAvatar
 	thumb_func_end player_get_direction_upper_nybble
 
 	thumb_func_start PlayerGetZCoord
 PlayerGetZCoord: @ 805C700
-	ldr r2, _0805C714 @ =gMapObjects
+	ldr r2, _0805C714 @ =gObjectEvents
 	ldr r0, _0805C718 @ =gPlayerAvatar
 	ldrb r1, [r0, 0x5]
 	lsls r0, r1, 3
@@ -2630,7 +2630,7 @@ PlayerGetZCoord: @ 805C700
 	lsrs r0, 4
 	bx lr
 	.align 2, 0
-_0805C714: .4byte gMapObjects
+_0805C714: .4byte gObjectEvents
 _0805C718: .4byte gPlayerAvatar
 	thumb_func_end PlayerGetZCoord
 
@@ -2644,7 +2644,7 @@ sub_805C71C: @ 805C71C
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _0805C748 @ =gMapObjects
+	ldr r1, _0805C748 @ =gObjectEvents
 	adds r0, r1
 	lsls r3, 16
 	asrs r3, 16
@@ -2656,7 +2656,7 @@ sub_805C71C: @ 805C71C
 	bx r0
 	.align 2, 0
 _0805C744: .4byte gPlayerAvatar
-_0805C748: .4byte gMapObjects
+_0805C748: .4byte gObjectEvents
 	thumb_func_end sub_805C71C
 
 	thumb_func_start TestPlayerAvatarFlags
@@ -2704,7 +2704,7 @@ sub_805C780: @ 805C780
 	lsls r4, r0, 3
 	adds r4, r0
 	lsls r4, 2
-	ldr r0, _0805C7C4 @ =gMapObjects
+	ldr r0, _0805C7C4 @ =gObjectEvents
 	adds r4, r0
 	adds r0, r4, 0
 	bl npc_clear_strange_bits
@@ -2712,7 +2712,7 @@ sub_805C780: @ 805C780
 	lsls r1, 28
 	lsrs r1, 28
 	adds r0, r4, 0
-	bl FieldObjectSetDirection
+	bl ObjectEventSetDirection
 	movs r0, 0x6
 	bl TestPlayerAvatarFlags
 	lsls r0, 24
@@ -2727,7 +2727,7 @@ _0805C7B8:
 	bx r0
 	.align 2, 0
 _0805C7C0: .4byte gPlayerAvatar
-_0805C7C4: .4byte gMapObjects
+_0805C7C4: .4byte gObjectEvents
 	thumb_func_end sub_805C780
 
 	thumb_func_start sub_805C7C8
@@ -2882,7 +2882,7 @@ IsPlayerFacingSurfableFishableWater: @ 805C8B0
 	lsls r4, r0, 3
 	adds r4, r0
 	lsls r4, 2
-	ldr r0, _0805C928 @ =gMapObjects
+	ldr r0, _0805C928 @ =gObjectEvents
 	adds r4, r0
 	ldrh r1, [r4, 0x10]
 	mov r0, sp
@@ -2930,7 +2930,7 @@ IsPlayerFacingSurfableFishableWater: @ 805C8B0
 	b _0805C92E
 	.align 2, 0
 _0805C924: .4byte gPlayerAvatar
-_0805C928: .4byte gMapObjects
+_0805C928: .4byte gObjectEvents
 _0805C92C:
 	movs r0, 0
 _0805C92E:
@@ -3145,14 +3145,14 @@ InitPlayerAvatar: @ 805CA3C
 	strh r3, [r0, 0xE]
 	str r3, [sp, 0x10]
 	strh r3, [r0, 0x14]
-	bl SpawnSpecialFieldObject
+	bl SpawnSpecialObjectEvent
 	adds r5, r0, 0
 	lsls r5, 24
 	lsrs r5, 24
 	lsls r4, r5, 3
 	adds r4, r5
 	lsls r4, 2
-	ldr r0, _0805CAFC @ =gMapObjects
+	ldr r0, _0805CAFC @ =gObjectEvents
 	adds r4, r0
 	ldrb r0, [r4, 0x2]
 	movs r1, 0x1
@@ -3162,7 +3162,7 @@ InitPlayerAvatar: @ 805CA3C
 	strb r0, [r4, 0x1B]
 	adds r0, r4, 0
 	mov r1, r9
-	bl FieldObjectTurn
+	bl ObjectEventTurn
 	bl ClearPlayerAvatarInfo
 	ldr r0, _0805CB00 @ =gPlayerAvatar
 	strb r6, [r0, 0x2]
@@ -3182,7 +3182,7 @@ InitPlayerAvatar: @ 805CA3C
 	pop {r0}
 	bx r0
 	.align 2, 0
-_0805CAFC: .4byte gMapObjects
+_0805CAFC: .4byte gObjectEvents
 _0805CB00: .4byte gPlayerAvatar
 	thumb_func_end InitPlayerAvatar
 
@@ -3191,7 +3191,7 @@ sub_805CB04: @ 805CB04
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
-	ldr r6, _0805CB64 @ =gMapObjects
+	ldr r6, _0805CB64 @ =gObjectEvents
 	ldr r5, _0805CB68 @ =gPlayerAvatar
 	ldrb r0, [r5, 0x5]
 	lsls r1, r0, 3
@@ -3236,7 +3236,7 @@ _0805CB5C:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_0805CB64: .4byte gMapObjects
+_0805CB64: .4byte gObjectEvents
 _0805CB68: .4byte gPlayerAvatar
 _0805CB6C: .4byte gSprites
 	thumb_func_end sub_805CB04
@@ -3249,7 +3249,7 @@ sub_805CB70: @ 805CB70
 	lsls r4, r0, 3
 	adds r4, r0
 	lsls r4, 2
-	ldr r0, _0805CBB0 @ =gMapObjects
+	ldr r0, _0805CBB0 @ =gObjectEvents
 	adds r4, r0
 	movs r0, 0x3
 	bl sub_805C808
@@ -3271,7 +3271,7 @@ sub_805CB70: @ 805CB70
 	bx r0
 	.align 2, 0
 _0805CBAC: .4byte gPlayerAvatar
-_0805CBB0: .4byte gMapObjects
+_0805CBB0: .4byte gObjectEvents
 _0805CBB4: .4byte gSprites
 	thumb_func_end sub_805CB70
 
@@ -3311,7 +3311,7 @@ sub_805CBE8: @ 805CBE8
 	lsls r4, r0, 3
 	adds r4, r0
 	lsls r4, 2
-	ldr r0, _0805CC24 @ =gMapObjects
+	ldr r0, _0805CC24 @ =gObjectEvents
 	adds r4, r0
 	bl sub_805CBB8
 	adds r1, r0, 0
@@ -3332,7 +3332,7 @@ sub_805CBE8: @ 805CBE8
 	bx r0
 	.align 2, 0
 _0805CC20: .4byte gPlayerAvatar
-_0805CC24: .4byte gMapObjects
+_0805CC24: .4byte gObjectEvents
 _0805CC28: .4byte gSprites
 	thumb_func_end sub_805CBE8
 
@@ -3468,7 +3468,7 @@ taskFF_bump_boulder: @ 805CD0C
 	lsrs r0, 24
 	ldr r6, _0805CD54 @ =gUnknown_835B8A0
 	ldr r2, _0805CD58 @ =gTasks
-	ldr r5, _0805CD5C @ =gMapObjects
+	ldr r5, _0805CD5C @ =gObjectEvents
 	lsls r1, r0, 2
 	adds r1, r0
 	lsls r1, 3
@@ -3502,7 +3502,7 @@ _0805CD20:
 	.align 2, 0
 _0805CD54: .4byte gUnknown_835B8A0
 _0805CD58: .4byte gTasks
-_0805CD5C: .4byte gMapObjects
+_0805CD5C: .4byte gObjectEvents
 _0805CD60: .4byte gPlayerAvatar
 	thumb_func_end taskFF_bump_boulder
 
@@ -3532,19 +3532,19 @@ sub_805CD84: @ 805CD84
 	adds r5, r1, 0
 	adds r4, r2, 0
 	adds r0, r5, 0
-	bl FieldObjectIsMovementOverridden
+	bl ObjectEventIsMovementOverridden
 	lsls r0, 24
 	cmp r0, 0
 	bne _0805CE0E
 	adds r0, r4, 0
-	bl FieldObjectIsMovementOverridden
+	bl ObjectEventIsMovementOverridden
 	lsls r0, 24
 	cmp r0, 0
 	bne _0805CE0E
 	adds r0, r5, 0
-	bl FieldObjectClearHeldMovementIfFinished
+	bl ObjectEventClearHeldMovementIfFinished
 	adds r0, r4, 0
-	bl FieldObjectClearHeldMovementIfFinished
+	bl ObjectEventClearHeldMovementIfFinished
 	ldrb r0, [r6, 0xC]
 	bl GetStepInPlaceDelay16AnimId
 	adds r1, r0, 0
@@ -3602,19 +3602,19 @@ sub_805CE20: @ 805CE20
 	adds r5, r1, 0
 	adds r4, r2, 0
 	adds r0, r5, 0
-	bl FieldObjectCheckHeldMovementStatus
+	bl ObjectEventCheckHeldMovementStatus
 	lsls r0, 24
 	cmp r0, 0
 	beq _0805CE70
 	adds r0, r4, 0
-	bl FieldObjectCheckHeldMovementStatus
+	bl ObjectEventCheckHeldMovementStatus
 	lsls r0, 24
 	cmp r0, 0
 	beq _0805CE70
 	adds r0, r5, 0
-	bl FieldObjectClearHeldMovementIfFinished
+	bl ObjectEventClearHeldMovementIfFinished
 	adds r0, r4, 0
-	bl FieldObjectClearHeldMovementIfFinished
+	bl ObjectEventClearHeldMovementIfFinished
 	adds r0, r4, 0
 	bl sub_806DE28
 	ldrh r0, [r4, 0x10]
@@ -3677,7 +3677,7 @@ _0805CEB2:
 	lsls r1, r0, 3
 	adds r1, r0
 	lsls r1, 2
-	ldr r0, _0805CEE8 @ =gMapObjects
+	ldr r0, _0805CEE8 @ =gObjectEvents
 	adds r1, r0
 	ldr r2, [r2]
 	adds r0, r4, 0
@@ -3692,7 +3692,7 @@ _0805CEB2:
 _0805CEDC: .4byte gUnknown_835B8AC
 _0805CEE0: .4byte gTasks
 _0805CEE4: .4byte gPlayerAvatar
-_0805CEE8: .4byte gMapObjects
+_0805CEE8: .4byte gObjectEvents
 	thumb_func_end sub_805CEA0
 
 	thumb_func_start PlayerAvatar_DoSecretBaseMatJump
@@ -3704,7 +3704,7 @@ PlayerAvatar_DoSecretBaseMatJump: @ 805CEEC
 	movs r0, 0x1
 	strb r0, [r5, 0x6]
 	adds r0, r4, 0
-	bl FieldObjectClearHeldMovementIfFinished
+	bl ObjectEventClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _0805CF48
@@ -3785,7 +3785,7 @@ _0805CF8A:
 	lsls r1, r0, 3
 	adds r1, r0
 	lsls r1, 2
-	ldr r0, _0805CFC0 @ =gMapObjects
+	ldr r0, _0805CFC0 @ =gObjectEvents
 	adds r1, r0
 	ldr r2, [r2]
 	adds r0, r4, 0
@@ -3800,7 +3800,7 @@ _0805CF8A:
 _0805CFB4: .4byte gUnknown_835B8B0
 _0805CFB8: .4byte gTasks
 _0805CFBC: .4byte gPlayerAvatar
-_0805CFC0: .4byte gMapObjects
+_0805CFC0: .4byte gObjectEvents
 	thumb_func_end sub_805CF78
 
 	thumb_func_start sub_805CFC4
@@ -3836,7 +3836,7 @@ sub_805CFEC: @ 805CFEC
 	movs r2, 0x4
 	bl memcpy
 	adds r0, r5, 0
-	bl FieldObjectClearHeldMovementIfFinished
+	bl ObjectEventClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _0805D054
@@ -3896,7 +3896,7 @@ sub_805D064: @ 805D064
 	movs r2, 0x5
 	bl memcpy
 	adds r0, r4, 0
-	bl FieldObjectClearHeldMovementIfFinished
+	bl ObjectEventClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _0805D094
@@ -3924,7 +3924,7 @@ sub_805D0A4: @ 805D0A4
 	adds r4, r0, 0
 	adds r5, r1, 0
 	adds r0, r5, 0
-	bl FieldObjectClearHeldMovementIfFinished
+	bl ObjectEventClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _0805D0E8
@@ -4070,15 +4070,15 @@ taskFF_0805D1D4: @ 805D1D4
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _0805D234 @ =gMapObjects
+	ldr r1, _0805D234 @ =gObjectEvents
 	adds r5, r0, r1
 	adds r0, r5, 0
-	bl FieldObjectIsMovementOverridden
+	bl ObjectEventIsMovementOverridden
 	lsls r0, 24
 	cmp r0, 0
 	beq _0805D200
 	adds r0, r5, 0
-	bl FieldObjectClearHeldMovementIfFinished
+	bl ObjectEventClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _0805D228
@@ -4106,7 +4106,7 @@ _0805D228:
 	bx r0
 	.align 2, 0
 _0805D230: .4byte gPlayerAvatar
-_0805D234: .4byte gMapObjects
+_0805D234: .4byte gObjectEvents
 _0805D238: .4byte gTasks
 _0805D23C: .4byte sub_805D240
 	thumb_func_end taskFF_0805D1D4
@@ -4121,10 +4121,10 @@ sub_805D240: @ 805D240
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _0805D2B8 @ =gMapObjects
+	ldr r1, _0805D2B8 @ =gObjectEvents
 	adds r4, r0, r1
 	adds r0, r4, 0
-	bl FieldObjectClearHeldMovementIfFinished
+	bl ObjectEventClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _0805D2AE
@@ -4147,7 +4147,7 @@ sub_805D240: @ 805D240
 	movs r0, 0
 	strb r0, [r6, 0x6]
 	bl ScriptContext2_Disable
-	bl UnfreezeMapObjects
+	bl UnfreezeObjectEvents
 	ldrb r1, [r4, 0x1A]
 	lsls r0, r1, 4
 	adds r0, r1
@@ -4164,7 +4164,7 @@ _0805D2AE:
 	bx r0
 	.align 2, 0
 _0805D2B4: .4byte gPlayerAvatar
-_0805D2B8: .4byte gMapObjects
+_0805D2B8: .4byte gObjectEvents
 _0805D2BC: .4byte gSprites
 	thumb_func_end sub_805D240
 
@@ -4281,7 +4281,7 @@ fish1: @ 805D35C
 	ldrh r1, [r6]
 	adds r1, r0
 	strh r1, [r5, 0x22]
-	ldr r3, _0805D3EC @ =gMapObjects
+	ldr r3, _0805D3EC @ =gObjectEvents
 	ldr r2, _0805D3F0 @ =gPlayerAvatar
 	ldrb r1, [r2, 0x5]
 	lsls r0, r1, 3
@@ -4296,7 +4296,7 @@ fish1: @ 805D35C
 	lsls r4, 2
 	adds r4, r3
 	adds r0, r4, 0
-	bl FieldObjectClearAnimIfSpecialAnimActive
+	bl ObjectEventClearAnimIfSpecialAnimActive
 	ldrb r0, [r4, 0x1]
 	movs r1, 0x8
 	orrs r0, r1
@@ -4316,7 +4316,7 @@ fish1: @ 805D35C
 	.align 2, 0
 _0805D3E4: .4byte gUnknown_835B90C
 _0805D3E8: .4byte gUnknown_835B912
-_0805D3EC: .4byte gMapObjects
+_0805D3EC: .4byte gObjectEvents
 _0805D3F0: .4byte gPlayerAvatar
 	thumb_func_end fish1
 
@@ -4727,7 +4727,7 @@ _0805D6EA:
 	lsls r4, r0, 3
 	adds r4, r0
 	lsls r4, 2
-	ldr r0, _0805D77C @ =gMapObjects
+	ldr r0, _0805D77C @ =gObjectEvents
 	mov r8, r0
 	add r4, r8
 	ldrh r1, [r5, 0x24]
@@ -4738,7 +4738,7 @@ _0805D6EA:
 	ldrb r1, [r4, 0x18]
 	lsrs r1, 4
 	adds r0, r4, 0
-	bl FieldObjectTurn
+	bl ObjectEventTurn
 	ldrb r1, [r7]
 	movs r0, 0x8
 	ands r0, r1
@@ -4777,7 +4777,7 @@ _0805D748:
 	.align 2, 0
 _0805D774: .4byte gPlayerAvatar
 _0805D778: .4byte gSprites
-_0805D77C: .4byte gMapObjects
+_0805D77C: .4byte gObjectEvents
 _0805D780:
 	movs r1, 0xA
 	ldrsh r0, [r5, r1]
@@ -4971,7 +4971,7 @@ sub_805D8D8: @ 805D8D8
 	lsls r4, r0, 3
 	adds r4, r0
 	lsls r4, 2
-	ldr r0, _0805D97C @ =gMapObjects
+	ldr r0, _0805D97C @ =gObjectEvents
 	mov r8, r0
 	add r4, r8
 	ldrh r1, [r6, 0x24]
@@ -4982,7 +4982,7 @@ sub_805D8D8: @ 805D8D8
 	ldrb r1, [r4, 0x18]
 	lsrs r1, 4
 	adds r0, r4, 0
-	bl FieldObjectTurn
+	bl ObjectEventTurn
 	ldrb r1, [r5]
 	movs r0, 0x8
 	ands r0, r1
@@ -5024,7 +5024,7 @@ _0805D968:
 	.align 2, 0
 _0805D974: .4byte gPlayerAvatar
 _0805D978: .4byte gSprites
-_0805D97C: .4byte gMapObjects
+_0805D97C: .4byte gObjectEvents
 	thumb_func_end sub_805D8D8
 
 	thumb_func_start sub_805D980
@@ -5040,7 +5040,7 @@ sub_805D980: @ 805D980
 	ldr r0, _0805D9BC @ =gPlayerAvatar
 	strb r1, [r0, 0x6]
 	bl ScriptContext2_Disable
-	bl UnfreezeMapObjects
+	bl UnfreezeObjectEvents
 	movs r0, 0
 	movs r1, 0x1
 	bl ClearDialogWindowAndFrame
@@ -5159,7 +5159,7 @@ _0805DA78:
 	ands r0, r1
 	cmp r0, 0
 	beq _0805DA9C
-	ldr r2, _0805DAAC @ =gMapObjects
+	ldr r2, _0805DAAC @ =gObjectEvents
 	ldrb r1, [r3, 0x5]
 	lsls r0, r1, 3
 	adds r0, r1
@@ -5177,7 +5177,7 @@ _0805DA9C:
 	.align 2, 0
 _0805DAA4: .4byte 0x0000fff8
 _0805DAA8: .4byte gPlayerAvatar
-_0805DAAC: .4byte gMapObjects
+_0805DAAC: .4byte gObjectEvents
 	thumb_func_end sub_805D9C4
 
 	thumb_func_start sub_805DAB0
@@ -5247,7 +5247,7 @@ sub_805DB04: @ 805DB04
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _0805DB4C @ =gMapObjects
+	ldr r1, _0805DB4C @ =gObjectEvents
 	adds r4, r0, r1
 	ldrb r1, [r4, 0x4]
 	lsls r0, r1, 4
@@ -5271,7 +5271,7 @@ sub_805DB04: @ 805DB04
 	b _0805DBFA
 	.align 2, 0
 _0805DB48: .4byte gPlayerAvatar
-_0805DB4C: .4byte gMapObjects
+_0805DB4C: .4byte gObjectEvents
 _0805DB50: .4byte gSprites
 _0805DB54: .4byte gTasks+0x8
 _0805DB58:
@@ -5280,7 +5280,7 @@ _0805DB58:
 	b _0805DBFA
 _0805DB5E:
 	adds r0, r4, 0
-	bl FieldObjectClearHeldMovementIfFinished
+	bl ObjectEventClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _0805DBFA
@@ -5406,7 +5406,7 @@ sub_805DC38: @ 805DC38
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _0805DC84 @ =gMapObjects
+	ldr r1, _0805DC84 @ =gObjectEvents
 	adds r4, r0, r1
 	ldrb r1, [r4, 0x4]
 	lsls r0, r1, 4
@@ -5431,7 +5431,7 @@ sub_805DC38: @ 805DC38
 	b _0805DDBA
 	.align 2, 0
 _0805DC80: .4byte gPlayerAvatar
-_0805DC84: .4byte gMapObjects
+_0805DC84: .4byte gObjectEvents
 _0805DC88: .4byte gSprites
 _0805DC8C: .4byte gTasks+0x8
 _0805DC90:
@@ -5455,7 +5455,7 @@ _0805DC9A:
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r4, 0
-	bl FieldObjectForceSetSpecialAnim
+	bl ObjectEventForceSetSpecialAnim
 	movs r0, 0
 	mov r9, r0
 	strh r6, [r5, 0x2]
@@ -5608,7 +5608,7 @@ sub_805DDC8: @ 805DDC8
 	ble _0805DE20
 _0805DDE4:
 	adds r0, r5, 0
-	bl FieldObjectCheckHeldMovementStatus
+	bl ObjectEventCheckHeldMovementStatus
 	lsls r0, 24
 	cmp r0, 0
 	beq _0805DE20
@@ -5623,7 +5623,7 @@ _0805DDE4:
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r5, 0
-	bl FieldObjectForceSetSpecialAnim
+	bl ObjectEventForceSetSpecialAnim
 	movs r0, 0
 	strh r0, [r6]
 	ldrb r0, [r5, 0x18]
diff --git a/asm/field_screen_effect.s b/asm/field_screen_effect.s
index 8d07f3779..f6e1c2f05 100644
--- a/asm/field_screen_effect.s
+++ b/asm/field_screen_effect.s
@@ -942,10 +942,10 @@ _0807F542:
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _0807F580 @ =gMapObjects
+	ldr r1, _0807F580 @ =gObjectEvents
 	adds r0, r1
 	movs r1, 0x2
-	bl FieldObjectTurn
+	bl ObjectEventTurn
 	ldr r1, _0807F584 @ =gTasks
 	lsls r0, r6, 2
 	adds r0, r6
@@ -958,7 +958,7 @@ _0807F542:
 	.align 2, 0
 _0807F578: .4byte gUnknown_841B5B6
 _0807F57C: .4byte gPlayerAvatar
-_0807F580: .4byte gMapObjects
+_0807F580: .4byte gObjectEvents
 _0807F584: .4byte gTasks
 _0807F588:
 	lsls r4, r6, 2
diff --git a/asm/link_rfu_3.s b/asm/link_rfu_3.s
index d1f18a8ae..3b76df047 100644
--- a/asm/link_rfu_3.s
+++ b/asm/link_rfu_3.s
@@ -10857,7 +10857,7 @@ _0811B294: .4byte gUnknown_203B06C
 sub_811B298: @ 811B298
 	push {lr}
 	bl ScriptContext2_Enable
-	bl ScriptFreezeMapObjects
+	bl ScriptFreezeObjectEvents
 	pop {r0}
 	bx r0
 	thumb_func_end sub_811B298
@@ -11348,7 +11348,7 @@ sub_811B64C: @ 811B64C
 	ldr r2, [r1]
 	ldrb r1, [r2, 0x5]
 	ldrb r2, [r2, 0x4]
-	bl RemoveFieldObjectByLocalIdAndMap
+	bl RemoveObjectEventByLocalIdAndMap
 	pop {r0}
 	bx r0
 	.align 2, 0
@@ -11369,7 +11369,7 @@ sub_811B66C: @ 811B66C
 	ldrb r1, [r2, 0x5]
 	ldrb r2, [r2, 0x4]
 	mov r3, sp
-	bl TryGetFieldObjectIdByLocalIdAndMap
+	bl TryGetObjectEventIdByLocalIdAndMap
 	lsls r0, 24
 	cmp r0, 0
 	bne _0811B6D0
@@ -11378,16 +11378,16 @@ sub_811B66C: @ 811B66C
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _0811B6C0 @ =gMapObjects
+	ldr r1, _0811B6C0 @ =gObjectEvents
 	adds r4, r0, r1
 	adds r0, r4, 0
-	bl FieldObjectIsMovementOverridden
+	bl ObjectEventIsMovementOverridden
 	lsls r0, 24
 	cmp r0, 0
 	bne _0811B6D0
 	ldrb r1, [r5]
 	adds r0, r4, 0
-	bl FieldObjectSetHeldMovement
+	bl ObjectEventSetHeldMovement
 	lsls r0, 24
 	cmp r0, 0
 	bne _0811B6C4
@@ -11396,7 +11396,7 @@ sub_811B66C: @ 811B66C
 	.align 2, 0
 _0811B6B8: .4byte gUnknown_8457120
 _0811B6BC: .4byte gSaveBlock1Ptr
-_0811B6C0: .4byte gMapObjects
+_0811B6C0: .4byte gObjectEvents
 _0811B6C4:
 	ldr r0, _0811B6DC @ =gUnknown_8457138	"C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/rfu_union_tool.c"
 	ldr r1, _0811B6E0 @ =0x00000183
@@ -11428,7 +11428,7 @@ sub_811B6E8: @ 811B6E8
 	ldrb r1, [r2, 0x5]
 	ldrb r2, [r2, 0x4]
 	mov r3, sp
-	bl TryGetFieldObjectIdByLocalIdAndMap
+	bl TryGetObjectEventIdByLocalIdAndMap
 	lsls r0, 24
 	cmp r0, 0
 	bne _0811B748
@@ -11437,10 +11437,10 @@ sub_811B6E8: @ 811B6E8
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _0811B72C @ =gMapObjects
+	ldr r1, _0811B72C @ =gObjectEvents
 	adds r4, r0, r1
 	adds r0, r4, 0
-	bl FieldObjectClearHeldMovementIfFinished
+	bl ObjectEventClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	bne _0811B730
@@ -11449,7 +11449,7 @@ sub_811B6E8: @ 811B6E8
 	.align 2, 0
 _0811B724: .4byte gUnknown_8457120
 _0811B728: .4byte gSaveBlock1Ptr
-_0811B72C: .4byte gMapObjects
+_0811B72C: .4byte gObjectEvents
 _0811B730:
 	bl ScriptContext2_IsEnabled
 	lsls r0, 24
@@ -11460,7 +11460,7 @@ _0811B730:
 	b _0811B748
 _0811B742:
 	adds r0, r4, 0
-	bl FreezeMapObject
+	bl FreezeObjectEvent
 _0811B748:
 	movs r0, 0x1
 _0811B74A:
diff --git a/asm/map_obj_80688E4.s b/asm/map_obj_80688E4.s
index 04df8c938..910e528ab 100644
--- a/asm/map_obj_80688E4.s
+++ b/asm/map_obj_80688E4.s
@@ -5,8 +5,8 @@
 
 	.text
 
-	thumb_func_start FreezeMapObject
-FreezeMapObject: @ 80688E4
+	thumb_func_start FreezeObjectEvent
+FreezeObjectEvent: @ 80688E4
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	ldrh r1, [r5]
@@ -80,13 +80,13 @@ _0806896E:
 	pop {r4,r5}
 	pop {r1}
 	bx r1
-	thumb_func_end FreezeMapObject
+	thumb_func_end FreezeObjectEvent
 
 	thumb_func_start FreezeEventObjects
 FreezeEventObjects: @ 8068974
 	push {r4,r5,lr}
 	movs r4, 0
-	ldr r5, _080689A8 @ =gMapObjects
+	ldr r5, _080689A8 @ =gObjectEvents
 _0806897A:
 	lsls r0, r4, 3
 	adds r0, r4
@@ -101,7 +101,7 @@ _0806897A:
 	cmp r4, r0
 	beq _08068998
 	adds r0, r1, 0
-	bl FreezeMapObject
+	bl FreezeObjectEvent
 _08068998:
 	adds r0, r4, 0x1
 	lsls r0, 24
@@ -112,17 +112,17 @@ _08068998:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_080689A8: .4byte gMapObjects
+_080689A8: .4byte gObjectEvents
 _080689AC: .4byte gPlayerAvatar
 	thumb_func_end FreezeEventObjects
 
-	thumb_func_start FreezeMapObjectsExceptOne
-FreezeMapObjectsExceptOne: @ 80689B0
+	thumb_func_start FreezeObjectEventsExceptOne
+FreezeObjectEventsExceptOne: @ 80689B0
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
 	movs r4, 0
-	ldr r6, _080689EC @ =gMapObjects
+	ldr r6, _080689EC @ =gObjectEvents
 _080689BA:
 	cmp r4, r5
 	beq _080689DC
@@ -139,7 +139,7 @@ _080689BA:
 	cmp r4, r0
 	beq _080689DC
 	adds r0, r1, 0
-	bl FreezeMapObject
+	bl FreezeObjectEvent
 _080689DC:
 	adds r0, r4, 0x1
 	lsls r0, 24
@@ -150,9 +150,9 @@ _080689DC:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_080689EC: .4byte gMapObjects
+_080689EC: .4byte gObjectEvents
 _080689F0: .4byte gPlayerAvatar
-	thumb_func_end FreezeMapObjectsExceptOne
+	thumb_func_end FreezeObjectEventsExceptOne
 
 	thumb_func_start npc_sync_anim_pause_bits
 npc_sync_anim_pause_bits: @ 80689F4
@@ -209,11 +209,11 @@ _08068A54: .4byte 0x00000101
 _08068A58: .4byte gSprites
 	thumb_func_end npc_sync_anim_pause_bits
 
-	thumb_func_start UnfreezeMapObjects
-UnfreezeMapObjects: @ 8068A5C
+	thumb_func_start UnfreezeObjectEvents
+UnfreezeObjectEvents: @ 8068A5C
 	push {r4,r5,lr}
 	movs r4, 0
-	ldr r5, _08068A88 @ =gMapObjects
+	ldr r5, _08068A88 @ =gObjectEvents
 _08068A62:
 	lsls r0, r4, 3
 	adds r0, r4
@@ -235,8 +235,8 @@ _08068A78:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08068A88: .4byte gMapObjects
-	thumb_func_end UnfreezeMapObjects
+_08068A88: .4byte gObjectEvents
+	thumb_func_end UnfreezeObjectEvents
 
 	thumb_func_start little_step
 little_step: @ 8068A8C
@@ -788,14 +788,14 @@ _08068E50: .4byte gUnknown_83A7202
 _08068E54: .4byte gUnknown_83A7208
 	thumb_func_end sub_8068DC4
 
-	thumb_func_start SetFieldObjectStepTimer
-SetFieldObjectStepTimer: @ 8068E58
+	thumb_func_start SetObjectEventStepTimer
+SetObjectEventStepTimer: @ 8068E58
 	strh r1, [r0, 0x34]
 	bx lr
-	thumb_func_end SetFieldObjectStepTimer
+	thumb_func_end SetObjectEventStepTimer
 
-	thumb_func_start RunFieldObjectStepTimer
-RunFieldObjectStepTimer: @ 8068E5C
+	thumb_func_start RunObjectEventStepTimer
+RunObjectEventStepTimer: @ 8068E5C
 	push {lr}
 	ldrh r1, [r0, 0x34]
 	subs r1, 0x1
@@ -810,7 +810,7 @@ _08068E6E:
 _08068E70:
 	pop {r1}
 	bx r1
-	thumb_func_end RunFieldObjectStepTimer
+	thumb_func_end RunObjectEventStepTimer
 
 	thumb_func_start obj_anim_image_set_and_seek
 obj_anim_image_set_and_seek: @ 8068E74
@@ -1099,7 +1099,7 @@ sub_8069058: @ 8069058
 	ldr r0, _08069090 @ =gSprites
 	adds r4, r0
 	adds r0, r5, 0
-	bl FieldObjectDirectionToImageAnimId
+	bl ObjectEventDirectionToImageAnimId
 	adds r1, r0, 0
 	lsls r1, 24
 	lsrs r1, 24
@@ -1130,7 +1130,7 @@ sub_8069094: @ 8069094
 	ldr r1, _080690F8 @ =gSprites
 	adds r4, r0, r1
 	adds r0, r5, 0
-	bl GetFieldObjectGraphicsInfo
+	bl GetObjectEventGraphicsInfo
 	ldrh r3, [r4, 0x4]
 	lsls r3, 22
 	ldr r1, [r0, 0x10]
@@ -1441,7 +1441,7 @@ oe_exec_and_other_stuff: @ 80692C8
 	adds r2, r1, 0x4
 	adds r3, r1, 0
 	adds r3, 0x8
-	bl FieldObjectGetLocalIdAndMap
+	bl ObjectEventGetLocalIdAndMap
 	adds r0, r4, 0
 	bl FieldEffectStart
 	pop {r4}
@@ -1474,7 +1474,7 @@ DoRippleFieldEffect: @ 806930C
 	push {r4,lr}
 	adds r4, r1, 0
 	ldrb r0, [r0, 0x5]
-	bl GetFieldObjectGraphicsInfo
+	bl GetObjectEventGraphicsInfo
 	ldr r2, _08069344 @ =gFieldEffectArguments
 	movs r3, 0x20
 	ldrsh r1, [r4, r3]
diff --git a/asm/overworld.s b/asm/overworld.s
index 370aa054d..d2ae0b792 100644
--- a/asm/overworld.s
+++ b/asm/overworld.s
@@ -3841,7 +3841,7 @@ CB2_ContinueSavedGame: @ 8056938
 	bl sub_8056420
 	bl set_current_map_header_from_sav1
 	bl sub_80550A8
-	bl UnfreezeMapObjects
+	bl UnfreezeObjectEvents
 	bl sub_8054E40
 	bl sub_80589E8
 	bl PlayTimeCounter_Start
@@ -4734,7 +4734,7 @@ sub_8057100: @ 8057100
 	thumb_func_start sub_8057114
 sub_8057114: @ 8057114
 	push {lr}
-	ldr r2, _08057138 @ =gMapObjects
+	ldr r2, _08057138 @ =gObjectEvents
 	ldr r3, _0805713C @ =gPlayerAvatar
 	ldrb r1, [r3, 0x5]
 	lsls r0, r1, 3
@@ -4750,7 +4750,7 @@ sub_8057114: @ 8057114
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08057138: .4byte gMapObjects
+_08057138: .4byte gObjectEvents
 _0805713C: .4byte gPlayerAvatar
 	thumb_func_end sub_8057114
 
@@ -4852,7 +4852,7 @@ _080571D8:
 	adds r4, r7
 	ldrb r3, [r4, 0x13]
 	adds r0, r5, 0
-	bl SpawnLinkPlayerMapObject
+	bl SpawnLinkPlayerObjectEvent
 	ldrb r1, [r4]
 	adds r0, r5, 0
 	bl sub_8058878
@@ -5126,7 +5126,7 @@ sub_8057430: @ 8057430
 	bl sub_8056420
 	bl set_current_map_header_from_sav1
 	bl sub_80550A8
-	bl UnfreezeMapObjects
+	bl UnfreezeObjectEvents
 	bl sub_8054E40
 	bl sub_80589E8
 	bl PlayTimeCounter_Start
@@ -7136,12 +7136,12 @@ _08058368: .4byte gUnknown_3005450
 _0805836C: .4byte 0x000008d2
 	thumb_func_end sub_805833C
 
-	thumb_func_start ZeroLinkPlayerMapObject
-ZeroLinkPlayerMapObject: @ 8058370
+	thumb_func_start ZeroLinkPlayerObjectEvent
+ZeroLinkPlayerObjectEvent: @ 8058370
 	movs r1, 0
 	str r1, [r0]
 	bx lr
-	thumb_func_end ZeroLinkPlayerMapObject
+	thumb_func_end ZeroLinkPlayerObjectEvent
 
 	thumb_func_start strange_npc_table_clear
 strange_npc_table_clear: @ 8058378
@@ -7156,18 +7156,18 @@ strange_npc_table_clear: @ 8058378
 _08058388: .4byte gUnknown_2031DEC
 	thumb_func_end strange_npc_table_clear
 
-	thumb_func_start ZeroMapObject
-ZeroMapObject: @ 805838C
+	thumb_func_start ZeroObjectEvent
+ZeroObjectEvent: @ 805838C
 	push {lr}
 	movs r1, 0
 	movs r2, 0x24
 	bl memset
 	pop {r0}
 	bx r0
-	thumb_func_end ZeroMapObject
+	thumb_func_end ZeroObjectEvent
 
-	thumb_func_start SpawnLinkPlayerMapObject
-SpawnLinkPlayerMapObject: @ 805839C
+	thumb_func_start SpawnLinkPlayerObjectEvent
+SpawnLinkPlayerObjectEvent: @ 805839C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -7200,12 +7200,12 @@ SpawnLinkPlayerMapObject: @ 805839C
 	lsls r5, r6, 3
 	adds r5, r6
 	lsls r5, 2
-	ldr r0, _08058444 @ =gMapObjects
+	ldr r0, _08058444 @ =gObjectEvents
 	adds r5, r0
 	adds r0, r4, 0
-	bl ZeroLinkPlayerMapObject
+	bl ZeroLinkPlayerObjectEvent
 	adds r0, r5, 0
-	bl ZeroMapObject
+	bl ZeroObjectEvent
 	movs r2, 0
 	movs r1, 0x1
 	movs r0, 0x1
@@ -7238,7 +7238,7 @@ SpawnLinkPlayerMapObject: @ 805839C
 	adds r0, r5, 0
 	mov r1, r9
 	mov r2, r10
-	bl InitLinkPlayerMapObjectPos
+	bl InitLinkPlayerObjectEventPos
 	pop {r3-r5}
 	mov r8, r3
 	mov r9, r4
@@ -7248,11 +7248,11 @@ SpawnLinkPlayerMapObject: @ 805839C
 	bx r0
 	.align 2, 0
 _08058440: .4byte gUnknown_2031DEC
-_08058444: .4byte gMapObjects
-	thumb_func_end SpawnLinkPlayerMapObject
+_08058444: .4byte gObjectEvents
+	thumb_func_end SpawnLinkPlayerObjectEvent
 
-	thumb_func_start InitLinkPlayerMapObjectPos
-InitLinkPlayerMapObjectPos: @ 8058448
+	thumb_func_start InitLinkPlayerObjectEventPos
+InitLinkPlayerObjectEventPos: @ 8058448
 	push {r4,lr}
 	adds r4, r0, 0
 	adds r0, r1, 0
@@ -7278,11 +7278,11 @@ InitLinkPlayerMapObjectPos: @ 8058448
 	adds r0, 0x8
 	strh r0, [r4, 0xC]
 	adds r0, r4, 0
-	bl FieldObjectUpdateZCoord
+	bl ObjectEventUpdateZCoord
 	pop {r4}
 	pop {r0}
 	bx r0
-	thumb_func_end InitLinkPlayerMapObjectPos
+	thumb_func_end InitLinkPlayerObjectEventPos
 
 	thumb_func_start sub_8058488
 sub_8058488: @ 8058488
@@ -7300,7 +7300,7 @@ sub_8058488: @ 8058488
 	lsls r1, r0, 3
 	adds r1, r0
 	lsls r1, 2
-	ldr r0, _080584B4 @ =gMapObjects
+	ldr r0, _080584B4 @ =gObjectEvents
 	adds r1, r0
 	strb r2, [r1, 0x19]
 _080584AA:
@@ -7308,7 +7308,7 @@ _080584AA:
 	bx r0
 	.align 2, 0
 _080584B0: .4byte gUnknown_2031DEC
-_080584B4: .4byte gMapObjects
+_080584B4: .4byte gObjectEvents
 	thumb_func_end sub_8058488
 
 	thumb_func_start sub_80584B8
@@ -7322,7 +7322,7 @@ sub_80584B8: @ 80584B8
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _080584FC @ =gMapObjects
+	ldr r1, _080584FC @ =gObjectEvents
 	adds r4, r0, r1
 	ldrb r0, [r4, 0x4]
 	cmp r0, 0x40
@@ -7346,7 +7346,7 @@ _080584E4:
 	bx r0
 	.align 2, 0
 _080584F8: .4byte gUnknown_2031DEC
-_080584FC: .4byte gMapObjects
+_080584FC: .4byte gObjectEvents
 _08058500: .4byte gSprites
 	thumb_func_end sub_80584B8
 
@@ -7360,13 +7360,13 @@ sub_8058504: @ 8058504
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _08058520 @ =gMapObjects
+	ldr r1, _08058520 @ =gObjectEvents
 	adds r0, r1
 	ldrb r0, [r0, 0x4]
 	bx lr
 	.align 2, 0
 _0805851C: .4byte gUnknown_2031DEC
-_08058520: .4byte gMapObjects
+_08058520: .4byte gObjectEvents
 	thumb_func_end sub_8058504
 
 	thumb_func_start sub_8058524
@@ -7379,7 +7379,7 @@ sub_8058524: @ 8058524
 	lsls r0, r3, 3
 	adds r0, r3
 	lsls r0, 2
-	ldr r3, _08058548 @ =gMapObjects
+	ldr r3, _08058548 @ =gObjectEvents
 	adds r0, r3
 	ldrh r3, [r0, 0x10]
 	strh r3, [r1]
@@ -7388,7 +7388,7 @@ sub_8058524: @ 8058524
 	bx lr
 	.align 2, 0
 _08058544: .4byte gUnknown_2031DEC
-_08058548: .4byte gMapObjects
+_08058548: .4byte gObjectEvents
 	thumb_func_end sub_8058524
 
 	thumb_func_start sub_805854C
@@ -7401,13 +7401,13 @@ sub_805854C: @ 805854C
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _08058568 @ =gMapObjects
+	ldr r1, _08058568 @ =gObjectEvents
 	adds r0, r1
 	ldrb r0, [r0, 0x19]
 	bx lr
 	.align 2, 0
 _08058564: .4byte gUnknown_2031DEC
-_08058568: .4byte gMapObjects
+_08058568: .4byte gObjectEvents
 	thumb_func_end sub_805854C
 
 	thumb_func_start sub_805856C
@@ -7420,7 +7420,7 @@ sub_805856C: @ 805856C
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _0805858C @ =gMapObjects
+	ldr r1, _0805858C @ =gObjectEvents
 	adds r0, r1
 	ldrb r0, [r0, 0xB]
 	lsls r0, 28
@@ -7428,7 +7428,7 @@ sub_805856C: @ 805856C
 	bx lr
 	.align 2, 0
 _08058588: .4byte gUnknown_2031DEC
-_0805858C: .4byte gMapObjects
+_0805858C: .4byte gObjectEvents
 	thumb_func_end sub_805856C
 
 	thumb_func_start sub_8058590
@@ -7441,7 +7441,7 @@ sub_8058590: @ 8058590
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _080585B4 @ =gMapObjects
+	ldr r1, _080585B4 @ =gObjectEvents
 	adds r0, r1
 	adds r0, 0x21
 	movs r1, 0
@@ -7451,7 +7451,7 @@ sub_8058590: @ 8058590
 	bx lr
 	.align 2, 0
 _080585B0: .4byte gUnknown_2031DEC
-_080585B4: .4byte gMapObjects
+_080585B4: .4byte gObjectEvents
 	thumb_func_end sub_8058590
 
 	thumb_func_start GetLinkPlayerIdAt
@@ -7479,7 +7479,7 @@ _080585DA:
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _08058600 @ =gMapObjects
+	ldr r1, _08058600 @ =gObjectEvents
 	adds r1, r0, r1
 	movs r6, 0x10
 	ldrsh r0, [r1, r6]
@@ -7493,7 +7493,7 @@ _080585DA:
 	b _08058610
 	.align 2, 0
 _080585FC: .4byte gUnknown_2031DEC
-_08058600: .4byte gMapObjects
+_08058600: .4byte gObjectEvents
 _08058604:
 	adds r0, r2, 0x1
 	lsls r0, 24
@@ -7521,7 +7521,7 @@ sub_8058618: @ 8058618
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _0805864C @ =gMapObjects
+	ldr r1, _0805864C @ =gObjectEvents
 	adds r6, r0, r1
 	ldrb r0, [r5]
 	cmp r0, 0
@@ -7535,7 +7535,7 @@ sub_8058618: @ 8058618
 	b _08058674
 	.align 2, 0
 _08058648: .4byte gUnknown_2031DEC
-_0805864C: .4byte gMapObjects
+_0805864C: .4byte gObjectEvents
 _08058650:
 	ldr r4, _0805867C @ =gUnknown_826D374
 	ldr r1, _08058680 @ =gUnknown_826D33C
@@ -7629,7 +7629,7 @@ sub_80586CC: @ 80586CC
 	adds r0, r5, 0
 	mov r2, sp
 	adds r3, r6, 0
-	bl FieldObjectMoveDestCoords
+	bl ObjectEventMoveDestCoords
 	ldrb r0, [r4, 0x2]
 	ldrb r1, [r5, 0x19]
 	mov r2, sp
@@ -7653,7 +7653,7 @@ sub_80586CC: @ 80586CC
 	adds r0, r5, 0
 	bl npc_coords_shift
 	adds r0, r5, 0
-	bl FieldObjectUpdateZCoord
+	bl ObjectEventUpdateZCoord
 	movs r0, 0x1
 	b _0805872C
 _0805872A:
@@ -7780,7 +7780,7 @@ npc_080587EC: @ 80587EC
 	mov r12, r2
 	lsls r3, 16
 	movs r4, 0
-	ldr r0, _08058850 @ =gMapObjects
+	ldr r0, _08058850 @ =gObjectEvents
 	mov r9, r0
 	lsrs r2, r3, 16
 	mov r10, r2
@@ -7820,7 +7820,7 @@ _0805884A:
 	movs r0, 0x1
 	b _0805886A
 	.align 2, 0
-_08058850: .4byte gMapObjects
+_08058850: .4byte gObjectEvents
 _08058854:
 	adds r0, r4, 0x1
 	lsls r0, 24
@@ -7857,7 +7857,7 @@ sub_8058878: @ 8058878
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _080588B8 @ =gMapObjects
+	ldr r1, _080588B8 @ =gObjectEvents
 	adds r4, r0, r1
 	ldrb r0, [r2]
 	cmp r0, 0
@@ -7875,7 +7875,7 @@ sub_8058878: @ 8058878
 	b _080588C6
 	.align 2, 0
 _080588B4: .4byte gUnknown_2031DEC
-_080588B8: .4byte gMapObjects
+_080588B8: .4byte gObjectEvents
 _080588BC:
 	ldrb r0, [r4]
 	lsls r0, 30
@@ -7931,7 +7931,7 @@ SpriteCB_LinkPlayer: @ 805890C
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _08058974 @ =gMapObjects
+	ldr r1, _08058974 @ =gObjectEvents
 	adds r6, r0, r1
 	ldrh r0, [r6, 0xC]
 	strh r0, [r5, 0x20]
@@ -7958,7 +7958,7 @@ SpriteCB_LinkPlayer: @ 805890C
 	cmp r0, 0
 	bne _08058978
 	ldrb r0, [r6, 0x19]
-	bl FieldObjectDirectionToImageAnimId
+	bl ObjectEventDirectionToImageAnimId
 	adds r1, r0, 0
 	lsls r1, 24
 	lsrs r1, 24
@@ -7967,7 +7967,7 @@ SpriteCB_LinkPlayer: @ 805890C
 	b _0805898A
 	.align 2, 0
 _08058970: .4byte gUnknown_2031DEC
-_08058974: .4byte gMapObjects
+_08058974: .4byte gObjectEvents
 _08058978:
 	ldrb r0, [r6, 0x19]
 	bl get_go_image_anim_num
diff --git a/asm/script_movement.s b/asm/script_movement.s
index a2d48d44a..7a7adec6c 100644
--- a/asm/script_movement.s
+++ b/asm/script_movement.s
@@ -17,7 +17,7 @@ ScriptMovement_StartObjectMovementScript: @ 8097434
 	lsls r2, 24
 	lsrs r2, 24
 	mov r3, sp
-	bl TryGetFieldObjectIdByLocalIdAndMap
+	bl TryGetObjectEventIdByLocalIdAndMap
 	lsls r0, 24
 	cmp r0, 0
 	beq _08097456
@@ -61,7 +61,7 @@ ScriptMovement_IsObjectMovementFinished: @ 809748C
 	lsls r2, 24
 	lsrs r2, 24
 	mov r3, sp
-	bl TryGetFieldObjectIdByLocalIdAndMap
+	bl TryGetObjectEventIdByLocalIdAndMap
 	lsls r0, 24
 	cmp r0, 0
 	bne _080974CE
@@ -480,7 +480,7 @@ _0809777C:
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _080977A8 @ =gMapObjects
+	ldr r1, _080977A8 @ =gObjectEvents
 	adds r0, r1
 	bl npc_sync_anim_pause_bits
 _08097792:
@@ -495,7 +495,7 @@ _08097792:
 	bx r0
 	.align 2, 0
 _080977A4: .4byte gTasks+0x8
-_080977A8: .4byte gMapObjects
+_080977A8: .4byte gObjectEvents
 	thumb_func_end UnfreezeObjects
 
 	thumb_func_start Task_80A244C
@@ -557,15 +557,15 @@ sub_80977F0: @ 80977F0
 	lsls r0, r4, 3
 	adds r0, r4
 	lsls r0, 2
-	ldr r1, _08097850 @ =gMapObjects
+	ldr r1, _08097850 @ =gObjectEvents
 	adds r4, r0, r1
 	adds r0, r4, 0
-	bl FieldObjectIsSpecialAnimActive
+	bl ObjectEventIsSpecialAnimActive
 	lsls r0, 24
 	cmp r0, 0
 	beq _08097838
 	adds r0, r4, 0
-	bl FieldObjectClearHeldMovementIfFinished
+	bl ObjectEventClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _0809786A
@@ -577,13 +577,13 @@ _08097838:
 	adds r1, r5, 0
 	bl sub_80976A8
 	adds r0, r4, 0
-	bl FreezeMapObject
+	bl FreezeObjectEvent
 	b _0809786A
 	.align 2, 0
-_08097850: .4byte gMapObjects
+_08097850: .4byte gObjectEvents
 _08097854:
 	adds r0, r4, 0
-	bl FieldObjectSetHeldMovement
+	bl ObjectEventSetHeldMovement
 	lsls r0, 24
 	cmp r0, 0
 	bne _0809786A
diff --git a/asm/shop.s b/asm/shop.s
new file mode 100644
index 000000000..7ed68952c
--- /dev/null
+++ b/asm/shop.s
@@ -0,0 +1,3563 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.syntax unified
+
+	.text
+
+	thumb_func_start sub_809AAB0
+sub_809AAB0: @ 809AAB0
+	push {r4-r6,lr}
+	sub sp, 0xC
+	lsls r0, 24
+	lsrs r0, 24
+	bl sub_809AB7C
+	ldr r4, _0809AAE8 @ =gUnknown_2039934
+	movs r1, 0xF
+	ands r1, r0
+	ldrb r2, [r4, 0x16]
+	movs r0, 0x10
+	negs r0, r0
+	ands r0, r2
+	orrs r0, r1
+	strb r0, [r4, 0x16]
+	movs r0, 0
+	strh r0, [r4, 0xC]
+	bl ContextNpcGetTextColor
+	lsls r0, 24
+	cmp r0, 0
+	bne _0809AAF0
+	ldrh r0, [r4, 0x16]
+	ldr r1, _0809AAEC @ =0xfffffe0f
+	ands r1, r0
+	movs r0, 0x40
+	b _0809AAF8
+	.align 2, 0
+_0809AAE8: .4byte gUnknown_2039934
+_0809AAEC: .4byte 0xfffffe0f
+_0809AAF0:
+	ldrh r0, [r4, 0x16]
+	ldr r1, _0809AB68 @ =0xfffffe0f
+	ands r1, r0
+	movs r0, 0x50
+_0809AAF8:
+	orrs r1, r0
+	strh r1, [r4, 0x16]
+	ldr r4, _0809AB6C @ =gUnknown_2039950
+	ldr r0, _0809AB70 @ =gUnknown_83DF0BC
+	bl AddWindow
+	strb r0, [r4]
+	ldrb r0, [r4]
+	movs r1, 0
+	bl SetStdWindowBorderStyle
+	movs r0, 0x2
+	movs r1, 0
+	bl GetMenuCursorDimensionByFont
+	adds r2, r0, 0
+	lsls r2, 24
+	lsrs r2, 24
+	ldrb r0, [r4]
+	movs r6, 0x10
+	str r6, [sp]
+	movs r5, 0x3
+	str r5, [sp, 0x4]
+	ldr r1, _0809AB74 @ =gUnknown_83DF09C
+	str r1, [sp, 0x8]
+	movs r1, 0x2
+	movs r3, 0x2
+	bl PrintTextArray
+	ldrb r0, [r4]
+	str r6, [sp]
+	str r5, [sp, 0x4]
+	movs r1, 0
+	str r1, [sp, 0x8]
+	movs r1, 0x2
+	movs r2, 0
+	movs r3, 0x2
+	bl Menu_InitCursor
+	ldrb r0, [r4]
+	bl PutWindowTilemap
+	ldrb r0, [r4]
+	movs r1, 0x1
+	bl CopyWindowToVram
+	ldr r0, _0809AB78 @ =sub_809AC10
+	movs r1, 0x8
+	bl CreateTask
+	lsls r0, 24
+	lsrs r0, 24
+	add sp, 0xC
+	pop {r4-r6}
+	pop {r1}
+	bx r1
+	.align 2, 0
+_0809AB68: .4byte 0xfffffe0f
+_0809AB6C: .4byte gUnknown_2039950
+_0809AB70: .4byte gUnknown_83DF0BC
+_0809AB74: .4byte gUnknown_83DF09C
+_0809AB78: .4byte sub_809AC10
+	thumb_func_end sub_809AAB0
+
+	thumb_func_start sub_809AB7C
+sub_809AB7C: @ 809AB7C
+	push {r4,r5,lr}
+	cmp r0, 0
+	beq _0809AB8C
+	lsls r0, 24
+	lsrs r0, 24
+	b _0809ABCE
+_0809AB88:
+	movs r0, 0x1
+	b _0809ABCE
+_0809AB8C:
+	movs r4, 0
+	ldr r1, _0809ABD4 @ =gUnknown_2039934
+	ldrh r0, [r1, 0x10]
+	cmp r4, r0
+	bcs _0809ABCC
+	ldr r0, [r1, 0x4]
+	ldrh r0, [r0]
+	cmp r0, 0
+	beq _0809ABCC
+	adds r5, r1, 0
+_0809ABA0:
+	ldr r1, [r5, 0x4]
+	lsls r0, r4, 1
+	adds r0, r1
+	ldrh r0, [r0]
+	bl ItemId_GetPocket
+	lsls r0, 24
+	lsrs r0, 24
+	cmp r0, 0x4
+	beq _0809AB88
+	adds r0, r4, 0x1
+	lsls r0, 16
+	lsrs r4, r0, 16
+	ldrh r0, [r5, 0x10]
+	cmp r4, r0
+	bcs _0809ABCC
+	ldr r0, [r5, 0x4]
+	lsls r1, r4, 1
+	adds r1, r0
+	ldrh r0, [r1]
+	cmp r0, 0
+	bne _0809ABA0
+_0809ABCC:
+	movs r0, 0
+_0809ABCE:
+	pop {r4,r5}
+	pop {r1}
+	bx r1
+	.align 2, 0
+_0809ABD4: .4byte gUnknown_2039934
+	thumb_func_end sub_809AB7C
+
+	thumb_func_start sub_809ABD8
+sub_809ABD8: @ 809ABD8
+	push {lr}
+	adds r1, r0, 0
+	ldr r2, _0809AC00 @ =gUnknown_2039934
+	str r1, [r2, 0x4]
+	movs r0, 0
+	strh r0, [r2, 0x10]
+	ldrh r0, [r1]
+	cmp r0, 0
+	beq _0809ABFC
+_0809ABEA:
+	ldrh r0, [r2, 0x10]
+	adds r0, 0x1
+	strh r0, [r2, 0x10]
+	ldrh r0, [r2, 0x10]
+	lsls r0, 1
+	adds r0, r1
+	ldrh r0, [r0]
+	cmp r0, 0
+	bne _0809ABEA
+_0809ABFC:
+	pop {r0}
+	bx r0
+	.align 2, 0
+_0809AC00: .4byte gUnknown_2039934
+	thumb_func_end sub_809ABD8
+
+	thumb_func_start sub_809AC04
+sub_809AC04: @ 809AC04
+	ldr r1, _0809AC0C @ =gUnknown_2039934
+	str r0, [r1]
+	bx lr
+	.align 2, 0
+_0809AC0C: .4byte gUnknown_2039934
+	thumb_func_end sub_809AC04
+
+	thumb_func_start sub_809AC10
+sub_809AC10: @ 809AC10
+	push {r4,r5,lr}
+	lsls r0, 24
+	lsrs r4, r0, 24
+	adds r5, r4, 0
+	bl Menu_ProcessInputNoWrapAround
+	lsls r0, 24
+	asrs r1, r0, 24
+	movs r0, 0x2
+	negs r0, r0
+	cmp r1, r0
+	beq _0809AC52
+	adds r0, 0x1
+	cmp r1, r0
+	bne _0809AC3C
+	movs r0, 0x5
+	bl PlaySE
+	adds r0, r4, 0
+	bl sub_809ACF8
+	b _0809AC52
+_0809AC3C:
+	ldr r4, _0809AC58 @ =gUnknown_83DF09C
+	bl Menu_GetCursorPos
+	lsls r0, 24
+	lsrs r0, 21
+	adds r4, 0x4
+	adds r0, r4
+	ldr r1, [r0]
+	adds r0, r5, 0
+	bl _call_via_r1
+_0809AC52:
+	pop {r4,r5}
+	pop {r0}
+	bx r0
+	.align 2, 0
+_0809AC58: .4byte gUnknown_83DF09C
+	thumb_func_end sub_809AC10
+
+	thumb_func_start sub_809AC5C
+sub_809AC5C: @ 809AC5C
+	push {r4,lr}
+	adds r4, r0, 0
+	lsls r4, 24
+	lsrs r4, 24
+	ldr r2, _0809AC8C @ =sub_809AE14
+	adds r0, r4, 0
+	movs r1, 0xE
+	bl SetWordTaskArg
+	movs r0, 0x1
+	movs r1, 0
+	bl fade_screen
+	ldr r1, _0809AC90 @ =gTasks
+	lsls r0, r4, 2
+	adds r0, r4
+	lsls r0, 3
+	adds r0, r1
+	ldr r1, _0809AC94 @ =sub_809AD40
+	str r1, [r0]
+	pop {r4}
+	pop {r0}
+	bx r0
+	.align 2, 0
+_0809AC8C: .4byte sub_809AE14
+_0809AC90: .4byte gTasks
+_0809AC94: .4byte sub_809AD40
+	thumb_func_end sub_809AC5C
+
+	thumb_func_start sub_809AC98
+sub_809AC98: @ 809AC98
+	push {r4,lr}
+	adds r4, r0, 0
+	lsls r4, 24
+	lsrs r4, 24
+	ldr r2, _0809ACC8 @ =sub_809ACD4
+	adds r0, r4, 0
+	movs r1, 0xE
+	bl SetWordTaskArg
+	movs r0, 0x1
+	movs r1, 0
+	bl fade_screen
+	ldr r1, _0809ACCC @ =gTasks
+	lsls r0, r4, 2
+	adds r0, r4
+	lsls r0, 3
+	adds r0, r1
+	ldr r1, _0809ACD0 @ =sub_809AD40
+	str r1, [r0]
+	pop {r4}
+	pop {r0}
+	bx r0
+	.align 2, 0
+_0809ACC8: .4byte sub_809ACD4
+_0809ACCC: .4byte gTasks
+_0809ACD0: .4byte sub_809AD40
+	thumb_func_end sub_809AC98
+
+	thumb_func_start sub_809ACD4
+sub_809ACD4: @ 809ACD4
+	push {lr}
+	ldr r2, _0809ACEC @ =CB2_ReturnToField
+	movs r0, 0x2
+	movs r1, 0x3
+	bl GoToBagMenu
+	ldr r1, _0809ACF0 @ =gFieldCallback
+	ldr r0, _0809ACF4 @ =sub_809AD74
+	str r0, [r1]
+	pop {r0}
+	bx r0
+	.align 2, 0
+_0809ACEC: .4byte CB2_ReturnToField
+_0809ACF0: .4byte gFieldCallback
+_0809ACF4: .4byte sub_809AD74
+	thumb_func_end sub_809ACD4
+
+	thumb_func_start sub_809ACF8
+sub_809ACF8: @ 809ACF8
+	push {r4,lr}
+	adds r4, r0, 0
+	lsls r4, 24
+	lsrs r4, 24
+	bl sub_809AD24
+	bl sub_809C138
+	adds r0, r4, 0
+	bl DestroyTask
+	ldr r0, _0809AD20 @ =gUnknown_2039934
+	ldr r0, [r0]
+	cmp r0, 0
+	beq _0809AD1A
+	bl _call_via_r0
+_0809AD1A:
+	pop {r4}
+	pop {r0}
+	bx r0
+	.align 2, 0
+_0809AD20: .4byte gUnknown_2039934
+	thumb_func_end sub_809ACF8
+
+	thumb_func_start sub_809AD24
+sub_809AD24: @ 809AD24
+	push {r4,lr}
+	ldr r4, _0809AD3C @ =gUnknown_2039950
+	ldrb r0, [r4]
+	movs r1, 0x2
+	bl ClearStdWindowAndFrameToTransparent
+	ldrb r0, [r4]
+	bl RemoveWindow
+	pop {r4}
+	pop {r0}
+	bx r0
+	.align 2, 0
+_0809AD3C: .4byte gUnknown_2039950
+	thumb_func_end sub_809AD24
+
+	thumb_func_start sub_809AD40
+sub_809AD40: @ 809AD40
+	push {r4,lr}
+	lsls r0, 24
+	lsrs r4, r0, 24
+	ldr r0, _0809AD70 @ =gPaletteFade
+	ldrb r1, [r0, 0x7]
+	movs r0, 0x80
+	ands r0, r1
+	cmp r0, 0
+	bne _0809AD68
+	adds r0, r4, 0
+	movs r1, 0xE
+	bl GetWordTaskArg
+	bl SetMainCallback2
+	bl FreeAllWindowBuffers
+	adds r0, r4, 0
+	bl DestroyTask
+_0809AD68:
+	pop {r4}
+	pop {r0}
+	bx r0
+	.align 2, 0
+_0809AD70: .4byte gPaletteFade
+	thumb_func_end sub_809AD40
+
+	thumb_func_start sub_809AD74
+sub_809AD74: @ 809AD74
+	push {lr}
+	bl sub_807DC00
+	ldr r0, _0809AD88 @ =sub_809AD8C
+	movs r1, 0x8
+	bl CreateTask
+	pop {r0}
+	bx r0
+	.align 2, 0
+_0809AD88: .4byte sub_809AD8C
+	thumb_func_end sub_809AD74
+
+	thumb_func_start sub_809AD8C
+sub_809AD8C: @ 809AD8C
+	push {r4,lr}
+	lsls r0, 24
+	lsrs r4, r0, 24
+	bl IsWeatherNotFadingIn
+	lsls r0, 24
+	lsrs r0, 24
+	cmp r0, 0x1
+	bne _0809ADB2
+	bl sub_809B56C
+	adds r1, r0, 0
+	lsls r1, 24
+	lsrs r1, 24
+	ldr r2, _0809ADB8 @ =gUnknown_841689E
+	ldr r3, _0809ADBC @ =sub_809ADC0
+	adds r0, r4, 0
+	bl DisplayItemMessageOnField
+_0809ADB2:
+	pop {r4}
+	pop {r0}
+	bx r0
+	.align 2, 0
+_0809ADB8: .4byte gUnknown_841689E
+_0809ADBC: .4byte sub_809ADC0
+	thumb_func_end sub_809AD8C
+
+	thumb_func_start sub_809ADC0
+sub_809ADC0: @ 809ADC0
+	push {r4,lr}
+	adds r4, r0, 0
+	lsls r4, 24
+	lsrs r4, 24
+	ldr r0, _0809ADE0 @ =gUnknown_2039934
+	ldrb r0, [r0, 0x16]
+	lsls r0, 28
+	lsrs r0, 28
+	bl sub_809AAB0
+	adds r0, r4, 0
+	bl DestroyTask
+	pop {r4}
+	pop {r0}
+	bx r0
+	.align 2, 0
+_0809ADE0: .4byte gUnknown_2039934
+	thumb_func_end sub_809ADC0
+
+	thumb_func_start sub_809ADE4
+sub_809ADE4: @ 809ADE4
+	push {lr}
+	bl RunTasks
+	bl AnimateSprites
+	bl BuildOamBuffer
+	bl UpdatePaletteFade
+	bl DoScheduledBgTilemapCopiesToVram
+	pop {r0}
+	bx r0
+	thumb_func_end sub_809ADE4
+
+	thumb_func_start sub_809AE00
+sub_809AE00: @ 809AE00
+	push {lr}
+	bl LoadOam
+	bl ProcessSpriteCopyRequests
+	bl TransferPlttBuffer
+	pop {r0}
+	bx r0
+	thumb_func_end sub_809AE00
+
+	thumb_func_start sub_809AE14
+sub_809AE14: @ 809AE14
+	push {r4,r5,lr}
+	sub sp, 0xC
+	ldr r0, _0809AE90 @ =gMain
+	movs r1, 0x87
+	lsls r1, 3
+	adds r5, r0, r1
+	ldrb r4, [r5]
+	cmp r4, 0
+	beq _0809AEAC
+	cmp r4, 0x1
+	bne _0809AE2C
+	b _0809AF54
+_0809AE2C:
+	ldr r0, _0809AE94 @ =gUnknown_2039934
+	movs r5, 0
+	strh r5, [r0, 0xC]
+	strh r5, [r0, 0xE]
+	bl sub_809B15C
+	bl sub_809B690
+	ldr r0, _0809AE98 @ =sub_809BBC0
+	movs r1, 0x8
+	bl CreateTask
+	adds r4, r0, 0
+	lsls r4, 24
+	lsrs r4, 24
+	ldr r0, _0809AE9C @ =gMultiuseListMenuTemplate
+	movs r1, 0
+	movs r2, 0
+	bl ListMenuInit
+	ldr r2, _0809AEA0 @ =gTasks
+	lsls r1, r4, 2
+	adds r1, r4
+	lsls r1, 3
+	adds r1, r2
+	lsls r0, 24
+	lsrs r0, 24
+	strh r0, [r1, 0x16]
+	movs r4, 0x1
+	negs r4, r4
+	adds r0, r4, 0
+	movs r1, 0x10
+	movs r2, 0
+	bl BlendPalettes
+	str r5, [sp]
+	adds r0, r4, 0
+	movs r1, 0
+	movs r2, 0x10
+	movs r3, 0
+	bl BeginNormalPaletteFade
+	ldr r0, _0809AEA4 @ =sub_809AE00
+	bl SetVBlankCallback
+	ldr r0, _0809AEA8 @ =sub_809ADE4
+	bl SetMainCallback2
+	b _0809AF64
+	.align 2, 0
+_0809AE90: .4byte gMain
+_0809AE94: .4byte gUnknown_2039934
+_0809AE98: .4byte sub_809BBC0
+_0809AE9C: .4byte gMultiuseListMenuTemplate
+_0809AEA0: .4byte gTasks
+_0809AEA4: .4byte sub_809AE00
+_0809AEA8: .4byte sub_809ADE4
+_0809AEAC:
+	bl SetVBlankHBlankCallbacksToNull
+	str r4, [sp, 0x8]
+	movs r1, 0xE0
+	lsls r1, 19
+	ldr r2, _0809AF4C @ =0x01000100
+	add r0, sp, 0x8
+	bl CpuFastSet
+	bl ScanlineEffect_Stop
+	bl ResetTempTileDataBuffers
+	bl FreeAllSpritePalettes
+	bl ResetPaletteFade
+	bl ResetSpriteData
+	bl ResetTasks
+	bl ClearScheduledBgCopiesToVram
+	bl ResetItemMenuIconState
+	bl sub_809AF6C
+	lsls r0, 24
+	cmp r0, 0
+	beq _0809AF64
+	bl sub_809B188
+	lsls r0, 24
+	cmp r0, 0
+	beq _0809AF64
+	bl sub_809AFD0
+	movs r4, 0x20
+	str r4, [sp]
+	str r4, [sp, 0x4]
+	movs r0, 0
+	movs r1, 0
+	movs r2, 0
+	movs r3, 0
+	bl FillBgTilemapBufferRect_Palette0
+	str r4, [sp]
+	str r4, [sp, 0x4]
+	movs r0, 0x1
+	movs r1, 0
+	movs r2, 0
+	movs r3, 0
+	bl FillBgTilemapBufferRect_Palette0
+	str r4, [sp]
+	str r4, [sp, 0x4]
+	movs r0, 0x2
+	movs r1, 0
+	movs r2, 0
+	movs r3, 0
+	bl FillBgTilemapBufferRect_Palette0
+	str r4, [sp]
+	str r4, [sp, 0x4]
+	movs r0, 0x3
+	movs r1, 0
+	movs r2, 0
+	movs r3, 0
+	bl FillBgTilemapBufferRect_Palette0
+	ldr r0, _0809AF50 @ =gUnknown_2039934
+	ldrb r0, [r0, 0x16]
+	lsls r0, 28
+	lsrs r0, 28
+	bl BuyMenuInitWindows
+	bl sub_809B080
+	b _0809AF5E
+	.align 2, 0
+_0809AF4C: .4byte 0x01000100
+_0809AF50: .4byte gUnknown_2039934
+_0809AF54:
+	bl FreeTempTileDataBuffersIfPossible
+	lsls r0, 24
+	cmp r0, 0
+	bne _0809AF64
+_0809AF5E:
+	ldrb r0, [r5]
+	adds r0, 0x1
+	strb r0, [r5]
+_0809AF64:
+	add sp, 0xC
+	pop {r4,r5}
+	pop {r0}
+	bx r0
+	thumb_func_end sub_809AE14
+
+	thumb_func_start sub_809AF6C
+sub_809AF6C: @ 809AF6C
+	push {r4,r5,lr}
+	ldr r4, _0809AFB0 @ =gUnknown_2039954
+	movs r5, 0x80
+	lsls r5, 4
+	adds r0, r5, 0
+	bl Alloc
+	str r0, [r4]
+	cmp r0, 0
+	beq _0809AFC0
+	ldr r4, _0809AFB4 @ =gUnknown_2039958
+	adds r0, r5, 0
+	bl Alloc
+	str r0, [r4]
+	cmp r0, 0
+	beq _0809AFC0
+	ldr r4, _0809AFB8 @ =gUnknown_203995C
+	adds r0, r5, 0
+	bl Alloc
+	str r0, [r4]
+	cmp r0, 0
+	beq _0809AFC0
+	ldr r4, _0809AFBC @ =gUnknown_2039960
+	adds r0, r5, 0
+	bl Alloc
+	str r0, [r4]
+	cmp r0, 0
+	beq _0809AFC0
+	movs r0, 0x1
+	b _0809AFCA
+	.align 2, 0
+_0809AFB0: .4byte gUnknown_2039954
+_0809AFB4: .4byte gUnknown_2039958
+_0809AFB8: .4byte gUnknown_203995C
+_0809AFBC: .4byte gUnknown_2039960
+_0809AFC0:
+	bl sub_809B604
+	bl sub_809B670
+	movs r0, 0
+_0809AFCA:
+	pop {r4,r5}
+	pop {r1}
+	bx r1
+	thumb_func_end sub_809AF6C
+
+	thumb_func_start sub_809AFD0
+sub_809AFD0: @ 809AFD0
+	push {lr}
+	movs r0, 0
+	bl ResetBgsAndClearDma3BusyFlags
+	ldr r1, _0809B070 @ =gUnknown_83DF0C4
+	movs r0, 0
+	movs r2, 0x4
+	bl InitBgsFromTemplates
+	ldr r0, _0809B074 @ =gUnknown_2039958
+	ldr r1, [r0]
+	movs r0, 0x1
+	bl SetBgTilemapBuffer
+	ldr r0, _0809B078 @ =gUnknown_2039960
+	ldr r1, [r0]
+	movs r0, 0x2
+	bl SetBgTilemapBuffer
+	ldr r0, _0809B07C @ =gUnknown_203995C
+	ldr r1, [r0]
+	movs r0, 0x3
+	bl SetBgTilemapBuffer
+	movs r0, 0x10
+	movs r1, 0
+	bl SetGpuReg
+	movs r0, 0x12
+	movs r1, 0
+	bl SetGpuReg
+	movs r0, 0x14
+	movs r1, 0
+	bl SetGpuReg
+	movs r0, 0x16
+	movs r1, 0
+	bl SetGpuReg
+	movs r0, 0x18
+	movs r1, 0
+	bl SetGpuReg
+	movs r0, 0x1A
+	movs r1, 0
+	bl SetGpuReg
+	movs r0, 0x1C
+	movs r1, 0
+	bl SetGpuReg
+	movs r0, 0x1E
+	movs r1, 0
+	bl SetGpuReg
+	movs r0, 0x50
+	movs r1, 0
+	bl SetGpuReg
+	movs r1, 0x82
+	lsls r1, 5
+	movs r0, 0
+	bl SetGpuReg
+	movs r0, 0
+	bl ShowBg
+	movs r0, 0x1
+	bl ShowBg
+	movs r0, 0x2
+	bl ShowBg
+	movs r0, 0x3
+	bl ShowBg
+	pop {r0}
+	bx r0
+	.align 2, 0
+_0809B070: .4byte gUnknown_83DF0C4
+_0809B074: .4byte gUnknown_2039958
+_0809B078: .4byte gUnknown_2039960
+_0809B07C: .4byte gUnknown_203995C
+	thumb_func_end sub_809AFD0
+
+	thumb_func_start sub_809B080
+sub_809B080: @ 809B080
+	push {r4,lr}
+	sub sp, 0x4
+	ldr r1, _0809B0B0 @ =gUnknown_8E85DC8
+	movs r2, 0x90
+	lsls r2, 3
+	movs r3, 0xF7
+	lsls r3, 2
+	movs r0, 0
+	str r0, [sp]
+	movs r0, 0x1
+	bl DecompressAndCopyTileDataToVram
+	ldr r0, _0809B0B4 @ =gUnknown_2039934
+	ldrb r1, [r0, 0x16]
+	movs r0, 0xF
+	ands r0, r1
+	cmp r0, 0x1
+	beq _0809B0C0
+	ldr r0, _0809B0B8 @ =gUnknown_8E85EFC
+	ldr r1, _0809B0BC @ =gUnknown_2039954
+	ldr r1, [r1]
+	bl LZDecompressWram
+	b _0809B0CA
+	.align 2, 0
+_0809B0B0: .4byte gUnknown_8E85DC8
+_0809B0B4: .4byte gUnknown_2039934
+_0809B0B8: .4byte gUnknown_8E85EFC
+_0809B0BC: .4byte gUnknown_2039954
+_0809B0C0:
+	ldr r0, _0809B100 @ =gUnknown_8E86038
+	ldr r1, _0809B104 @ =gUnknown_2039954
+	ldr r1, [r1]
+	bl LZDecompressWram
+_0809B0CA:
+	movs r0, 0x40
+	bl Alloc
+	adds r4, r0, 0
+	ldr r0, _0809B108 @ =gUnknown_8E86170
+	adds r1, r4, 0
+	bl LZDecompressWram
+	adds r0, r4, 0
+	movs r1, 0xB0
+	movs r2, 0x20
+	bl LoadPalette
+	adds r0, r4, 0
+	adds r0, 0x20
+	movs r1, 0x60
+	movs r2, 0x20
+	bl LoadPalette
+	adds r0, r4, 0
+	bl Free
+	add sp, 0x4
+	pop {r4}
+	pop {r0}
+	bx r0
+	.align 2, 0
+_0809B100: .4byte gUnknown_8E86038
+_0809B104: .4byte gUnknown_2039954
+_0809B108: .4byte gUnknown_8E86170
+	thumb_func_end sub_809B080
+
+	thumb_func_start sub_809B10C
+sub_809B10C: @ 809B10C
+	push {lr}
+	sub sp, 0x8
+	movs r2, 0x6
+	cmp r0, 0
+	bne _0809B118
+	movs r2, 0xB
+_0809B118:
+	ldr r0, _0809B138 @ =gUnknown_2039934
+	ldrb r1, [r0, 0x16]
+	movs r0, 0xF
+	ands r0, r1
+	cmp r0, 0x1
+	beq _0809B13C
+	movs r0, 0x6
+	str r0, [sp]
+	str r2, [sp, 0x4]
+	movs r0, 0x1
+	movs r1, 0
+	movs r2, 0xE
+	movs r3, 0x1E
+	bl SetBgTilemapPalette
+	b _0809B14E
+	.align 2, 0
+_0809B138: .4byte gUnknown_2039934
+_0809B13C:
+	movs r0, 0x8
+	str r0, [sp]
+	str r2, [sp, 0x4]
+	movs r0, 0x1
+	movs r1, 0
+	movs r2, 0xC
+	movs r3, 0x1E
+	bl SetBgTilemapPalette
+_0809B14E:
+	movs r0, 0x1
+	bl ScheduleBgCopyTilemapToVram
+	add sp, 0x8
+	pop {r0}
+	bx r0
+	thumb_func_end sub_809B10C
+
+	thumb_func_start sub_809B15C
+sub_809B15C: @ 809B15C
+	push {lr}
+	bl sub_809B764
+	bl sub_809BAFC
+	bl BuyMenuDrawMoneyBox
+	movs r0, 0
+	bl ScheduleBgCopyTilemapToVram
+	movs r0, 0x1
+	bl ScheduleBgCopyTilemapToVram
+	movs r0, 0x2
+	bl ScheduleBgCopyTilemapToVram
+	movs r0, 0x3
+	bl ScheduleBgCopyTilemapToVram
+	pop {r0}
+	bx r0
+	thumb_func_end sub_809B15C
+
+	thumb_func_start sub_809B188
+sub_809B188: @ 809B188
+	push {r4-r7,lr}
+	ldr r7, _0809B1C0 @ =gUnknown_2039964
+	ldr r4, _0809B1C4 @ =gUnknown_2039934
+	ldrh r0, [r4, 0x10]
+	adds r0, 0x1
+	lsls r0, 3
+	bl Alloc
+	str r0, [r7]
+	cmp r0, 0
+	beq _0809B1B2
+	ldr r5, _0809B1C8 @ =gUnknown_2039968
+	ldrh r0, [r4, 0x10]
+	adds r0, 0x1
+	movs r1, 0xD
+	muls r0, r1
+	bl Alloc
+	str r0, [r5]
+	cmp r0, 0
+	bne _0809B1CC
+_0809B1B2:
+	bl sub_809B604
+	bl sub_809B670
+	movs r0, 0
+	b _0809B2F0
+	.align 2, 0
+_0809B1C0: .4byte gUnknown_2039964
+_0809B1C4: .4byte gUnknown_2039934
+_0809B1C8: .4byte gUnknown_2039968
+_0809B1CC:
+	movs r6, 0
+	b _0809B1F2
+_0809B1D0:
+	lsls r1, r6, 3
+	ldr r0, [r7]
+	adds r0, r1
+	ldr r2, [r4, 0x4]
+	lsls r1, r6, 1
+	adds r1, r2
+	ldrh r1, [r1]
+	movs r2, 0xD
+	adds r3, r6, 0
+	muls r3, r2
+	ldr r2, [r5]
+	adds r2, r3
+	bl sub_809B300
+	adds r0, r6, 0x1
+	lsls r0, 16
+	lsrs r6, r0, 16
+_0809B1F2:
+	ldrh r0, [r4, 0x10]
+	cmp r6, r0
+	bcc _0809B1D0
+	ldr r5, _0809B2C8 @ =gUnknown_2039968
+	movs r0, 0xD
+	adds r4, r6, 0
+	muls r4, r0
+	ldr r0, [r5]
+	adds r0, r4
+	ldr r1, _0809B2CC @ =gFameCheckerText_Cancel
+	bl StringCopy
+	ldr r0, _0809B2D0 @ =gUnknown_2039964
+	ldr r2, [r0]
+	lsls r1, r6, 3
+	adds r1, r2
+	ldr r0, [r5]
+	adds r0, r4
+	str r0, [r1]
+	movs r0, 0x2
+	negs r0, r0
+	str r0, [r1, 0x4]
+	ldr r5, _0809B2D4 @ =gMultiuseListMenuTemplate
+	str r2, [r5]
+	ldr r6, _0809B2D8 @ =gUnknown_2039934
+	ldrh r0, [r6, 0x10]
+	adds r0, 0x1
+	movs r1, 0
+	strh r0, [r5, 0xC]
+	movs r0, 0x4
+	strb r0, [r5, 0x10]
+	strb r1, [r5, 0x11]
+	movs r0, 0x9
+	strb r0, [r5, 0x12]
+	movs r0, 0x1
+	strb r0, [r5, 0x13]
+	ldrb r1, [r5, 0x16]
+	subs r0, 0x9
+	ands r0, r1
+	movs r1, 0x39
+	negs r1, r1
+	ands r0, r1
+	movs r1, 0x10
+	orrs r0, r1
+	strb r0, [r5, 0x16]
+	ldrb r2, [r5, 0x14]
+	movs r1, 0x10
+	negs r1, r1
+	adds r0, r1, 0
+	ands r0, r2
+	movs r3, 0x2
+	orrs r0, r3
+	strb r0, [r5, 0x14]
+	ldrb r2, [r5, 0x17]
+	movs r0, 0x40
+	negs r0, r0
+	ands r0, r2
+	orrs r0, r3
+	strb r0, [r5, 0x17]
+	ldrb r0, [r5, 0x15]
+	ands r1, r0
+	strb r1, [r5, 0x15]
+	movs r0, 0x2
+	movs r1, 0x5
+	bl GetFontAttribute
+	lsls r0, 4
+	ldrb r2, [r5, 0x14]
+	movs r4, 0xF
+	adds r1, r4, 0
+	ands r1, r2
+	orrs r1, r0
+	strb r1, [r5, 0x14]
+	movs r0, 0x2
+	movs r1, 0x7
+	bl GetFontAttribute
+	lsls r0, 4
+	ldrb r2, [r5, 0x15]
+	adds r1, r4, 0
+	ands r1, r2
+	orrs r1, r0
+	strb r1, [r5, 0x15]
+	ldr r0, _0809B2DC @ =sub_809B320
+	str r0, [r5, 0x4]
+	ldr r0, _0809B2E0 @ =sub_809B408
+	str r0, [r5, 0x8]
+	ldrb r2, [r5, 0x16]
+	movs r1, 0x3F
+	adds r0, r1, 0
+	ands r0, r2
+	strb r0, [r5, 0x16]
+	ldrb r0, [r5, 0x17]
+	ands r1, r0
+	strb r1, [r5, 0x17]
+	ldrb r0, [r6, 0x16]
+	ands r4, r0
+	movs r1, 0x6
+	cmp r4, 0x1
+	bne _0809B2BC
+	movs r1, 0x5
+_0809B2BC:
+	ldrh r0, [r6, 0x10]
+	adds r0, 0x1
+	cmp r0, r1
+	ble _0809B2E4
+	strh r1, [r5, 0xE]
+	b _0809B2E6
+	.align 2, 0
+_0809B2C8: .4byte gUnknown_2039968
+_0809B2CC: .4byte gFameCheckerText_Cancel
+_0809B2D0: .4byte gUnknown_2039964
+_0809B2D4: .4byte gMultiuseListMenuTemplate
+_0809B2D8: .4byte gUnknown_2039934
+_0809B2DC: .4byte sub_809B320
+_0809B2E0: .4byte sub_809B408
+_0809B2E4:
+	strh r0, [r5, 0xE]
+_0809B2E6:
+	ldr r0, _0809B2F8 @ =gUnknown_2039934
+	ldr r1, _0809B2FC @ =gMultiuseListMenuTemplate
+	ldrh r1, [r1, 0xE]
+	strh r1, [r0, 0x12]
+	movs r0, 0x1
+_0809B2F0:
+	pop {r4-r7}
+	pop {r1}
+	bx r1
+	.align 2, 0
+_0809B2F8: .4byte gUnknown_2039934
+_0809B2FC: .4byte gMultiuseListMenuTemplate
+	thumb_func_end sub_809B188
+
+	thumb_func_start sub_809B300
+sub_809B300: @ 809B300
+	push {r4-r6,lr}
+	adds r4, r0, 0
+	adds r5, r1, 0
+	adds r6, r2, 0
+	lsls r5, 16
+	lsrs r5, 16
+	adds r0, r5, 0
+	adds r1, r6, 0
+	bl CopyItemName
+	str r6, [r4]
+	str r5, [r4, 0x4]
+	pop {r4-r6}
+	pop {r0}
+	bx r0
+	thumb_func_end sub_809B300
+
+	thumb_func_start sub_809B320
+sub_809B320: @ 809B320
+	push {r4-r7,lr}
+	sub sp, 0x14
+	adds r5, r0, 0
+	lsls r1, 24
+	lsrs r1, 24
+	cmp r1, 0x1
+	beq _0809B334
+	movs r0, 0x5
+	bl PlaySE
+_0809B334:
+	movs r0, 0x2
+	negs r0, r0
+	cmp r5, r0
+	beq _0809B348
+	lsls r0, r5, 16
+	lsrs r0, 16
+	bl ItemId_GetDescription
+	adds r7, r0, 0
+	b _0809B34A
+_0809B348:
+	ldr r7, _0809B384 @ =gUnknown_8416757
+_0809B34A:
+	movs r0, 0x5
+	movs r1, 0
+	bl FillWindowPixelBuffer
+	ldr r6, _0809B388 @ =gUnknown_2039934
+	ldrb r0, [r6, 0x16]
+	movs r4, 0xF
+	ands r4, r0
+	cmp r4, 0x1
+	beq _0809B3D8
+	ldrb r1, [r6, 0x17]
+	lsls r1, 29
+	lsrs r1, 30
+	movs r0, 0x1
+	eors r0, r1
+	bl DestroyItemMenuIcon
+	movs r0, 0x2
+	negs r0, r0
+	cmp r5, r0
+	beq _0809B38C
+	lsls r0, r5, 16
+	lsrs r0, 16
+	ldrb r1, [r6, 0x17]
+	lsls r1, 29
+	lsrs r1, 30
+	bl CreateItemMenuIcon
+	b _0809B398
+	.align 2, 0
+_0809B384: .4byte gUnknown_8416757
+_0809B388: .4byte gUnknown_2039934
+_0809B38C:
+	ldr r0, _0809B3D0 @ =0x00000177
+	ldrb r1, [r6, 0x17]
+	lsls r1, 29
+	lsrs r1, 30
+	bl CreateItemMenuIcon
+_0809B398:
+	ldr r3, _0809B3D4 @ =gUnknown_2039934
+	ldrb r2, [r3, 0x17]
+	lsls r0, r2, 29
+	lsrs r0, 30
+	movs r1, 0x1
+	eors r1, r0
+	lsls r1, 1
+	movs r0, 0x7
+	negs r0, r0
+	ands r0, r2
+	orrs r0, r1
+	strb r0, [r3, 0x17]
+	movs r0, 0x3
+	str r0, [sp]
+	movs r0, 0x2
+	str r0, [sp, 0x4]
+	movs r0, 0x1
+	str r0, [sp, 0x8]
+	movs r0, 0
+	str r0, [sp, 0xC]
+	str r0, [sp, 0x10]
+	movs r0, 0x5
+	movs r1, 0x2
+	adds r2, r7, 0
+	movs r3, 0
+	bl BuyMenuPrint
+	b _0809B400
+	.align 2, 0
+_0809B3D0: .4byte 0x00000177
+_0809B3D4: .4byte gUnknown_2039934
+_0809B3D8:
+	movs r0, 0x6
+	movs r1, 0
+	bl FillWindowPixelBuffer
+	adds r0, r5, 0
+	bl sub_809B494
+	movs r0, 0x3
+	str r0, [sp]
+	str r4, [sp, 0x4]
+	movs r0, 0
+	str r0, [sp, 0x8]
+	str r0, [sp, 0xC]
+	str r0, [sp, 0x10]
+	movs r0, 0x5
+	movs r1, 0x2
+	adds r2, r7, 0
+	movs r3, 0x2
+	bl BuyMenuPrint
+_0809B400:
+	add sp, 0x14
+	pop {r4-r7}
+	pop {r0}
+	bx r0
+	thumb_func_end sub_809B320
+
+	thumb_func_start sub_809B408
+sub_809B408: @ 809B408
+	push {r4-r6,lr}
+	sub sp, 0x14
+	lsls r0, 24
+	lsrs r6, r0, 24
+	lsls r2, 24
+	lsrs r5, r2, 24
+	movs r0, 0x2
+	negs r0, r0
+	cmp r1, r0
+	beq _0809B480
+	ldr r4, _0809B488 @ =gStringVar1
+	lsls r0, r1, 16
+	lsrs r0, 16
+	bl itemid_get_market_price
+	adds r1, r0, 0
+	lsls r1, 16
+	lsrs r1, 16
+	adds r0, r4, 0
+	movs r2, 0
+	movs r3, 0x4
+	bl ConvertIntToDecimalStringN
+	adds r0, r4, 0
+	bl StringLength
+	lsls r0, 16
+	lsrs r0, 16
+	movs r1, 0x4
+	subs r1, r0
+	ldr r2, _0809B48C @ =gStringVar4
+	adds r0, r1, 0
+	subs r1, 0x1
+	cmp r0, 0
+	beq _0809B45C
+	movs r3, 0
+_0809B450:
+	strb r3, [r2]
+	adds r2, 0x1
+	adds r0, r1, 0
+	subs r1, 0x1
+	cmp r0, 0
+	bne _0809B450
+_0809B45C:
+	ldr r1, _0809B490 @ =gText_PokedollarVar1
+	adds r0, r2, 0
+	bl StringExpandPlaceholders
+	ldr r2, _0809B48C @ =gStringVar4
+	str r5, [sp]
+	movs r0, 0
+	str r0, [sp, 0x4]
+	str r0, [sp, 0x8]
+	movs r0, 0xFF
+	str r0, [sp, 0xC]
+	movs r0, 0x1
+	str r0, [sp, 0x10]
+	adds r0, r6, 0
+	movs r1, 0
+	movs r3, 0x69
+	bl BuyMenuPrint
+_0809B480:
+	add sp, 0x14
+	pop {r4-r6}
+	pop {r0}
+	bx r0
+	.align 2, 0
+_0809B488: .4byte gStringVar1
+_0809B48C: .4byte gStringVar4
+_0809B490: .4byte gText_PokedollarVar1
+	thumb_func_end sub_809B408
+
+	thumb_func_start sub_809B494
+sub_809B494: @ 809B494
+	push {r4-r7,lr}
+	sub sp, 0x14
+	adds r7, r0, 0
+	movs r0, 0x2
+	negs r0, r0
+	cmp r7, r0
+	beq _0809B528
+	ldr r4, _0809B514 @ =gStringVar1
+	ldr r0, _0809B518 @ =0xfffffee0
+	adds r1, r7, r0
+	adds r0, r4, 0
+	movs r2, 0x2
+	movs r3, 0x2
+	bl ConvertIntToDecimalStringN
+	ldr r5, _0809B51C @ =gStringVar4
+	ldr r1, _0809B520 @ =gOtherText_UnkF9_08_Clear_01
+	adds r0, r5, 0
+	bl StringCopy
+	adds r0, r5, 0
+	adds r1, r4, 0
+	bl StringAppend
+	movs r4, 0
+	str r4, [sp]
+	str r4, [sp, 0x4]
+	str r4, [sp, 0x8]
+	movs r0, 0xFF
+	str r0, [sp, 0xC]
+	movs r6, 0x1
+	str r6, [sp, 0x10]
+	movs r0, 0x6
+	movs r1, 0
+	adds r2, r5, 0
+	movs r3, 0
+	bl BuyMenuPrint
+	lsls r0, r7, 16
+	lsrs r0, 16
+	bl ItemIdToBattleMoveId
+	lsls r0, 16
+	lsrs r0, 16
+	movs r1, 0xD
+	muls r1, r0
+	ldr r0, _0809B524 @ =gMoveNames
+	adds r1, r0
+	adds r0, r5, 0
+	bl StringCopy
+	movs r0, 0x10
+	str r0, [sp]
+	str r4, [sp, 0x4]
+	str r4, [sp, 0x8]
+	str r4, [sp, 0xC]
+	str r6, [sp, 0x10]
+	movs r0, 0x6
+	movs r1, 0x2
+	adds r2, r5, 0
+	movs r3, 0
+	bl BuyMenuPrint
+	b _0809B55C
+	.align 2, 0
+_0809B514: .4byte gStringVar1
+_0809B518: .4byte 0xfffffee0
+_0809B51C: .4byte gStringVar4
+_0809B520: .4byte gOtherText_UnkF9_08_Clear_01
+_0809B524: .4byte gMoveNames
+_0809B528:
+	ldr r2, _0809B564 @ =gText_ThreeHyphens
+	movs r4, 0
+	str r4, [sp]
+	str r4, [sp, 0x4]
+	str r4, [sp, 0x8]
+	movs r0, 0xFF
+	str r0, [sp, 0xC]
+	movs r5, 0x1
+	str r5, [sp, 0x10]
+	movs r0, 0x6
+	movs r1, 0
+	movs r3, 0
+	bl BuyMenuPrint
+	ldr r2, _0809B568 @ =gUnknown_8416217
+	movs r0, 0x10
+	str r0, [sp]
+	str r4, [sp, 0x4]
+	str r4, [sp, 0x8]
+	str r4, [sp, 0xC]
+	str r5, [sp, 0x10]
+	movs r0, 0x6
+	movs r1, 0x2
+	movs r3, 0
+	bl BuyMenuPrint
+_0809B55C:
+	add sp, 0x14
+	pop {r4-r7}
+	pop {r0}
+	bx r0
+	.align 2, 0
+_0809B564: .4byte gText_ThreeHyphens
+_0809B568: .4byte gUnknown_8416217
+	thumb_func_end sub_809B494
+
+	thumb_func_start sub_809B56C
+sub_809B56C: @ 809B56C
+	ldr r0, _0809B578 @ =gUnknown_2039934
+	ldrh r0, [r0, 0x16]
+	lsls r0, 23
+	lsrs r0, 27
+	bx lr
+	.align 2, 0
+_0809B578: .4byte gUnknown_2039934
+	thumb_func_end sub_809B56C
+
+	thumb_func_start sub_809B57C
+sub_809B57C: @ 809B57C
+	push {r4,lr}
+	adds r4, r1, 0
+	lsls r0, 24
+	lsrs r0, 24
+	lsls r4, 24
+	lsrs r4, 24
+	bl ListMenuGetYCoordForPrintingArrowCursor
+	lsls r0, 24
+	lsrs r0, 24
+	adds r1, r4, 0
+	bl sub_809B59C
+	pop {r4}
+	pop {r0}
+	bx r0
+	thumb_func_end sub_809B57C
+
+	thumb_func_start sub_809B59C
+sub_809B59C: @ 809B59C
+	push {r4,r5,lr}
+	sub sp, 0x14
+	lsls r0, 24
+	lsrs r5, r0, 24
+	lsls r1, 24
+	lsrs r1, 24
+	cmp r1, 0xFF
+	bne _0809B5E0
+	movs r0, 0x2
+	movs r1, 0
+	bl GetFontAttribute
+	adds r4, r0, 0
+	lsls r4, 24
+	lsrs r4, 24
+	movs r0, 0x2
+	movs r1, 0x1
+	bl GetFontAttribute
+	lsls r0, 24
+	lsrs r0, 24
+	str r4, [sp]
+	str r0, [sp, 0x4]
+	movs r0, 0x4
+	movs r1, 0
+	movs r2, 0x1
+	adds r3, r5, 0
+	bl FillWindowPixelRect
+	movs r0, 0x4
+	movs r1, 0x2
+	bl CopyWindowToVram
+	b _0809B5F8
+_0809B5E0:
+	ldr r2, _0809B600 @ =gFameCheckerText_ListMenuCursor
+	str r5, [sp]
+	movs r0, 0
+	str r0, [sp, 0x4]
+	str r0, [sp, 0x8]
+	str r0, [sp, 0xC]
+	str r1, [sp, 0x10]
+	movs r0, 0x4
+	movs r1, 0x2
+	movs r3, 0x1
+	bl BuyMenuPrint
+_0809B5F8:
+	add sp, 0x14
+	pop {r4,r5}
+	pop {r0}
+	bx r0
+	.align 2, 0
+_0809B600: .4byte gFameCheckerText_ListMenuCursor
+	thumb_func_end sub_809B59C
+
+	thumb_func_start sub_809B604
+sub_809B604: @ 809B604
+	push {lr}
+	ldr r0, _0809B658 @ =gUnknown_2039954
+	ldr r0, [r0]
+	cmp r0, 0
+	beq _0809B612
+	bl Free
+_0809B612:
+	ldr r0, _0809B65C @ =gUnknown_2039958
+	ldr r0, [r0]
+	cmp r0, 0
+	beq _0809B61E
+	bl Free
+_0809B61E:
+	ldr r0, _0809B660 @ =gUnknown_203995C
+	ldr r0, [r0]
+	cmp r0, 0
+	beq _0809B62A
+	bl Free
+_0809B62A:
+	ldr r0, _0809B664 @ =gUnknown_2039960
+	ldr r0, [r0]
+	cmp r0, 0
+	beq _0809B636
+	bl Free
+_0809B636:
+	ldr r0, _0809B668 @ =gUnknown_2039964
+	ldr r0, [r0]
+	cmp r0, 0
+	beq _0809B642
+	bl Free
+_0809B642:
+	ldr r0, _0809B66C @ =gUnknown_2039968
+	ldr r0, [r0]
+	cmp r0, 0
+	beq _0809B64E
+	bl Free
+_0809B64E:
+	bl FreeAllWindowBuffers
+	pop {r0}
+	bx r0
+	.align 2, 0
+_0809B658: .4byte gUnknown_2039954
+_0809B65C: .4byte gUnknown_2039958
+_0809B660: .4byte gUnknown_203995C
+_0809B664: .4byte gUnknown_2039960
+_0809B668: .4byte gUnknown_2039964
+_0809B66C: .4byte gUnknown_2039968
+	thumb_func_end sub_809B604
+
+	thumb_func_start sub_809B670
+sub_809B670: @ 809B670
+	push {lr}
+	ldr r0, _0809B684 @ =gFieldCallback
+	ldr r1, _0809B688 @ =sub_809AD74
+	str r1, [r0]
+	ldr r0, _0809B68C @ =CB2_ReturnToField
+	bl SetMainCallback2
+	pop {r0}
+	bx r0
+	.align 2, 0
+_0809B684: .4byte gFieldCallback
+_0809B688: .4byte sub_809AD74
+_0809B68C: .4byte CB2_ReturnToField
+	thumb_func_end sub_809B670
+
+	thumb_func_start sub_809B690
+sub_809B690: @ 809B690
+	push {r4,lr}
+	sub sp, 0x10
+	ldr r4, _0809B6C0 @ =gUnknown_2039934
+	ldrb r1, [r4, 0x16]
+	movs r0, 0xF
+	ands r0, r1
+	cmp r0, 0x1
+	beq _0809B6C4
+	ldrh r0, [r4, 0x10]
+	ldrh r1, [r4, 0x12]
+	subs r0, r1
+	adds r0, 0x1
+	str r0, [sp]
+	movs r0, 0x6E
+	str r0, [sp, 0x4]
+	str r0, [sp, 0x8]
+	adds r0, r4, 0
+	adds r0, 0xE
+	str r0, [sp, 0xC]
+	movs r0, 0x2
+	movs r1, 0xA0
+	movs r2, 0x8
+	movs r3, 0x68
+	b _0809B6E2
+	.align 2, 0
+_0809B6C0: .4byte gUnknown_2039934
+_0809B6C4:
+	ldrh r0, [r4, 0x10]
+	ldrh r1, [r4, 0x12]
+	subs r0, r1
+	adds r0, 0x1
+	str r0, [sp]
+	movs r0, 0x6E
+	str r0, [sp, 0x4]
+	str r0, [sp, 0x8]
+	adds r0, r4, 0
+	adds r0, 0xE
+	str r0, [sp, 0xC]
+	movs r0, 0x2
+	movs r1, 0xA0
+	movs r2, 0x8
+	movs r3, 0x58
+_0809B6E2:
+	bl AddScrollIndicatorArrowPairParameterized
+	lsls r0, 3
+	ldrb r2, [r4, 0x17]
+	movs r1, 0x7
+	ands r1, r2
+	orrs r1, r0
+	strb r1, [r4, 0x17]
+	add sp, 0x10
+	pop {r4}
+	pop {r0}
+	bx r0
+	thumb_func_end sub_809B690
+
+	thumb_func_start sub_809B6FC
+sub_809B6FC: @ 809B6FC
+	push {r4,lr}
+	sub sp, 0x10
+	ldr r4, _0809B738 @ =gUnknown_2039934
+	movs r0, 0x1
+	strh r0, [r4, 0x18]
+	movs r0, 0x2
+	str r0, [sp]
+	movs r0, 0x6E
+	str r0, [sp, 0x4]
+	str r0, [sp, 0x8]
+	adds r0, r4, 0
+	adds r0, 0x18
+	str r0, [sp, 0xC]
+	movs r0, 0x2
+	movs r1, 0x98
+	movs r2, 0x48
+	movs r3, 0x68
+	bl AddScrollIndicatorArrowPairParameterized
+	lsls r0, 3
+	ldrb r2, [r4, 0x17]
+	movs r1, 0x7
+	ands r1, r2
+	orrs r1, r0
+	strb r1, [r4, 0x17]
+	add sp, 0x10
+	pop {r4}
+	pop {r0}
+	bx r0
+	.align 2, 0
+_0809B738: .4byte gUnknown_2039934
+	thumb_func_end sub_809B6FC
+
+	thumb_func_start sub_809B73C
+sub_809B73C: @ 809B73C
+	push {r4,lr}
+	ldr r4, _0809B760 @ =gUnknown_2039934
+	ldrb r1, [r4, 0x17]
+	movs r0, 0xF8
+	ands r0, r1
+	cmp r0, 0xF8
+	beq _0809B758
+	lsrs r0, r1, 3
+	bl RemoveScrollIndicatorArrowPair
+	ldrb r0, [r4, 0x17]
+	movs r1, 0xF8
+	orrs r0, r1
+	strb r0, [r4, 0x17]
+_0809B758:
+	pop {r4}
+	pop {r0}
+	bx r0
+	.align 2, 0
+_0809B760: .4byte gUnknown_2039934
+	thumb_func_end sub_809B73C
+
+	thumb_func_start sub_809B764
+sub_809B764: @ 809B764
+	push {lr}
+	bl sub_809B92C
+	bl sub_809BA40
+	bl sub_809B778
+	pop {r0}
+	bx r0
+	thumb_func_end sub_809B764
+
+	thumb_func_start sub_809B778
+sub_809B778: @ 809B778
+	push {r4-r7,lr}
+	mov r7, r10
+	mov r6, r9
+	mov r5, r8
+	push {r5-r7}
+	sub sp, 0x4
+	ldr r0, _0809B804 @ =gMapHeader
+	ldr r0, [r0]
+	mov r9, r0
+	mov r4, sp
+	adds r4, 0x2
+	mov r0, sp
+	adds r1, r4, 0
+	bl GetXYCoordsOneStepInFrontOfPlayer
+	mov r1, sp
+	mov r0, sp
+	ldrh r0, [r0]
+	subs r0, 0x2
+	strh r0, [r1]
+	ldrh r0, [r4]
+	subs r0, 0x3
+	strh r0, [r4]
+	movs r1, 0
+	mov r10, r4
+_0809B7AA:
+	movs r4, 0
+	lsls r1, 16
+	mov r8, r1
+	asrs r7, r1, 16
+_0809B7B2:
+	mov r0, sp
+	movs r1, 0
+	ldrsh r0, [r0, r1]
+	lsls r4, 16
+	asrs r6, r4, 16
+	adds r0, r6
+	mov r2, r10
+	movs r3, 0
+	ldrsh r1, [r2, r3]
+	adds r1, r7
+	bl MapGridGetMetatileIdAt
+	lsls r0, 16
+	lsrs r5, r0, 16
+	mov r0, sp
+	ldrh r0, [r0]
+	adds r0, r6, r0
+	lsls r0, 16
+	asrs r0, 16
+	mov r2, r10
+	ldrh r1, [r2]
+	adds r1, r7, r1
+	lsls r1, 16
+	asrs r1, 16
+	bl MapGridGetMetatileLayerTypeAt
+	lsls r0, 24
+	lsrs r3, r0, 24
+	ldr r0, _0809B808 @ =0x0000027f
+	cmp r5, r0
+	bhi _0809B80C
+	mov r1, r9
+	ldr r0, [r1, 0x10]
+	lsls r1, r5, 4
+	ldr r2, [r0, 0xC]
+	adds r2, r1
+	adds r0, r6, 0
+	adds r1, r7, 0
+	bl sub_809B850
+	b _0809B822
+	.align 2, 0
+_0809B804: .4byte gMapHeader
+_0809B808: .4byte 0x0000027f
+_0809B80C:
+	mov r2, r9
+	ldr r0, [r2, 0x14]
+	ldr r2, _0809B84C @ =0xfffffd80
+	adds r1, r5, r2
+	lsls r1, 4
+	ldr r2, [r0, 0xC]
+	adds r2, r1
+	adds r0, r6, 0
+	adds r1, r7, 0
+	bl sub_809B850
+_0809B822:
+	movs r3, 0x80
+	lsls r3, 9
+	adds r0, r4, r3
+	lsrs r4, r0, 16
+	asrs r0, 16
+	cmp r0, 0x4
+	ble _0809B7B2
+	adds r0, r3, 0
+	add r0, r8
+	lsrs r1, r0, 16
+	asrs r0, 16
+	cmp r0, 0x9
+	ble _0809B7AA
+	add sp, 0x4
+	pop {r3-r5}
+	mov r8, r3
+	mov r9, r4
+	mov r10, r5
+	pop {r4-r7}
+	pop {r0}
+	bx r0
+	.align 2, 0
+_0809B84C: .4byte 0xfffffd80
+	thumb_func_end sub_809B778
+
+	thumb_func_start sub_809B850
+sub_809B850: @ 809B850
+	push {r4-r6,lr}
+	adds r6, r2, 0
+	lsls r3, 24
+	lsrs r3, 24
+	adds r2, r3, 0
+	lsls r0, 17
+	lsrs r5, r0, 16
+	lsls r1, 22
+	movs r0, 0x80
+	lsls r0, 15
+	adds r1, r0
+	lsrs r1, 16
+	cmp r3, 0x1
+	beq _0809B8A0
+	cmp r3, 0x1
+	bgt _0809B876
+	cmp r3, 0
+	beq _0809B87C
+	b _0809B8F6
+_0809B876:
+	cmp r2, 0x2
+	beq _0809B8D0
+	b _0809B8F6
+_0809B87C:
+	ldr r0, _0809B898 @ =gUnknown_2039960
+	ldr r0, [r0]
+	lsls r5, 16
+	asrs r5, 16
+	lsls r4, r1, 16
+	asrs r4, 16
+	adds r1, r5, 0
+	adds r2, r4, 0
+	adds r3, r6, 0
+	bl sub_809B904
+	ldr r0, _0809B89C @ =gUnknown_2039958
+	b _0809B8B8
+	.align 2, 0
+_0809B898: .4byte gUnknown_2039960
+_0809B89C: .4byte gUnknown_2039958
+_0809B8A0:
+	ldr r0, _0809B8C8 @ =gUnknown_203995C
+	ldr r0, [r0]
+	lsls r5, 16
+	asrs r5, 16
+	lsls r4, r1, 16
+	asrs r4, 16
+	adds r1, r5, 0
+	adds r2, r4, 0
+	adds r3, r6, 0
+	bl sub_809B904
+	ldr r0, _0809B8CC @ =gUnknown_2039960
+_0809B8B8:
+	ldr r0, [r0]
+	adds r3, r6, 0
+	adds r3, 0x8
+	adds r1, r5, 0
+	adds r2, r4, 0
+	bl sub_809B904
+	b _0809B8F6
+	.align 2, 0
+_0809B8C8: .4byte gUnknown_203995C
+_0809B8CC: .4byte gUnknown_2039960
+_0809B8D0:
+	ldr r0, _0809B8FC @ =gUnknown_203995C
+	ldr r0, [r0]
+	lsls r5, 16
+	asrs r5, 16
+	lsls r4, r1, 16
+	asrs r4, 16
+	adds r1, r5, 0
+	adds r2, r4, 0
+	adds r3, r6, 0
+	bl sub_809B904
+	ldr r0, _0809B900 @ =gUnknown_2039958
+	ldr r0, [r0]
+	adds r3, r6, 0
+	adds r3, 0x8
+	adds r1, r5, 0
+	adds r2, r4, 0
+	bl sub_809B904
+_0809B8F6:
+	pop {r4-r6}
+	pop {r0}
+	bx r0
+	.align 2, 0
+_0809B8FC: .4byte gUnknown_203995C
+_0809B900: .4byte gUnknown_2039958
+	thumb_func_end sub_809B850
+
+	thumb_func_start sub_809B904
+sub_809B904: @ 809B904
+	lsls r1, 16
+	asrs r1, 16
+	lsls r2, 16
+	asrs r2, 16
+	adds r1, r2
+	lsls r1, 1
+	adds r1, r0
+	ldrh r0, [r3]
+	strh r0, [r1]
+	ldrh r0, [r3, 0x2]
+	strh r0, [r1, 0x2]
+	adds r2, r1, 0
+	adds r2, 0x40
+	ldrh r0, [r3, 0x4]
+	strh r0, [r2]
+	adds r1, 0x42
+	ldrh r0, [r3, 0x6]
+	strh r0, [r1]
+	bx lr
+	thumb_func_end sub_809B904
+
+	thumb_func_start sub_809B92C
+sub_809B92C: @ 809B92C
+	push {r4-r7,lr}
+	mov r7, r10
+	mov r6, r9
+	mov r5, r8
+	push {r5-r7}
+	sub sp, 0x8
+	movs r0, 0
+	mov r9, r0
+	mov r4, sp
+	adds r4, 0x2
+	mov r0, sp
+	adds r1, r4, 0
+	bl GetXYCoordsOneStepInFrontOfPlayer
+	bl PlayerGetZCoord
+	lsls r0, 24
+	lsrs r0, 24
+	str r0, [sp, 0x4]
+	movs r5, 0
+	ldr r2, _0809B9DC @ =gUnknown_20398B4
+	movs r1, 0x10
+_0809B958:
+	lsls r0, r5, 3
+	adds r0, r2
+	strh r1, [r0]
+	adds r0, r5, 0x1
+	lsls r0, 24
+	lsrs r5, r0, 24
+	cmp r5, 0xF
+	bls _0809B958
+	movs r5, 0
+	ldr r6, _0809B9E0 @ =gUnknown_20398BA
+	subs r1, r6, 0x6
+	mov r8, r1
+_0809B970:
+	movs r4, 0
+	adds r2, r5, 0x1
+	mov r10, r2
+_0809B976:
+	mov r1, sp
+	ldr r3, _0809B9E4 @ =0x0000fffd
+	adds r0, r3, 0
+	ldrh r1, [r1]
+	adds r0, r1
+	adds r0, r4
+	lsls r0, 16
+	lsrs r0, 16
+	ldr r2, _0809B9E8 @ =0x0000fffe
+	adds r1, r2, 0
+	mov r3, sp
+	ldrh r3, [r3, 0x2]
+	adds r1, r3
+	adds r1, r5
+	lsls r1, 16
+	lsrs r1, 16
+	ldr r2, [sp, 0x4]
+	bl GetObjectEventIdByXYZ
+	lsls r0, 24
+	lsrs r3, r0, 24
+	cmp r3, 0x10
+	beq _0809BA1C
+	mov r0, r9
+	lsls r2, r0, 3
+	mov r1, r8
+	adds r0, r2, r1
+	movs r7, 0
+	strh r3, [r0]
+	mov r0, r8
+	adds r0, 0x2
+	adds r0, r2, r0
+	strh r4, [r0]
+	ldr r1, _0809B9EC @ =gUnknown_20398B8
+	adds r0, r2, r1
+	strh r5, [r0]
+	ldr r1, _0809B9F0 @ =gObjectEvents
+	lsls r0, r3, 3
+	adds r0, r3
+	lsls r0, 2
+	adds r0, r1
+	ldrb r0, [r0, 0x18]
+	lsls r0, 28
+	lsrs r0, 28
+	cmp r0, 0x2
+	beq _0809BA00
+	cmp r0, 0x2
+	bgt _0809B9F4
+	cmp r0, 0x1
+	beq _0809B9FA
+	b _0809BA0C
+	.align 2, 0
+_0809B9DC: .4byte gUnknown_20398B4
+_0809B9E0: .4byte gUnknown_20398BA
+_0809B9E4: .4byte 0x0000fffd
+_0809B9E8: .4byte 0x0000fffe
+_0809B9EC: .4byte gUnknown_20398B8
+_0809B9F0: .4byte gObjectEvents
+_0809B9F4:
+	cmp r0, 0x3
+	beq _0809BA06
+	b _0809BA0C
+_0809B9FA:
+	adds r0, r2, r6
+	strh r7, [r0]
+	b _0809BA12
+_0809BA00:
+	adds r1, r2, r6
+	movs r0, 0x1
+	b _0809BA10
+_0809BA06:
+	adds r1, r2, r6
+	movs r0, 0x2
+	b _0809BA10
+_0809BA0C:
+	adds r1, r2, r6
+	movs r0, 0x3
+_0809BA10:
+	strh r0, [r1]
+_0809BA12:
+	mov r0, r9
+	adds r0, 0x1
+	lsls r0, 24
+	lsrs r0, 24
+	mov r9, r0
+_0809BA1C:
+	adds r0, r4, 0x1
+	lsls r0, 24
+	lsrs r4, r0, 24
+	cmp r4, 0x6
+	bls _0809B976
+	mov r2, r10
+	lsls r0, r2, 24
+	lsrs r5, r0, 24
+	cmp r5, 0x4
+	bls _0809B970
+	add sp, 0x8
+	pop {r3-r5}
+	mov r8, r3
+	mov r9, r4
+	mov r10, r5
+	pop {r4-r7}
+	pop {r0}
+	bx r0
+	thumb_func_end sub_809B92C
+
+	thumb_func_start sub_809BA40
+sub_809BA40: @ 809BA40
+	push {r4-r7,lr}
+	mov r7, r9
+	mov r6, r8
+	push {r6,r7}
+	sub sp, 0x4
+	movs r6, 0
+	ldr r7, _0809BAE8 @ =gUnknown_20398B4
+	ldr r0, _0809BAEC @ =gObjectEvents
+	mov r8, r0
+	adds r1, r7, 0x6
+	mov r9, r1
+_0809BA56:
+	lsls r5, r6, 3
+	adds r4, r5, r7
+	movs r1, 0
+	ldrsh r0, [r4, r1]
+	cmp r0, 0x10
+	beq _0809BACE
+	adds r1, r0, 0
+	lsls r0, r1, 3
+	adds r0, r1
+	lsls r0, 2
+	add r0, r8
+	ldrb r0, [r0, 0x5]
+	bl GetObjectEventGraphicsInfo
+	movs r1, 0
+	ldrsh r2, [r4, r1]
+	lsls r1, r2, 3
+	adds r1, r2
+	lsls r1, 2
+	add r1, r8
+	ldrb r4, [r1, 0x5]
+	adds r1, r7, 0x2
+	adds r1, r5, r1
+	ldrh r2, [r1]
+	lsls r2, 20
+	ldr r1, _0809BAF0 @ =0xfff80000
+	adds r2, r1
+	asrs r2, 16
+	adds r1, r7, 0x4
+	adds r1, r5, r1
+	ldrh r3, [r1]
+	lsls r3, 4
+	movs r1, 0xA
+	ldrsh r0, [r0, r1]
+	lsrs r1, r0, 31
+	adds r0, r1
+	asrs r0, 1
+	subs r0, 0x30
+	subs r3, r0
+	lsls r3, 16
+	asrs r3, 16
+	movs r0, 0x2
+	str r0, [sp]
+	adds r0, r4, 0
+	ldr r1, _0809BAF4 @ =SpriteCallbackDummy
+	bl AddPseudoEventObject
+	lsls r0, 24
+	lsrs r0, 24
+	lsls r2, r0, 4
+	adds r2, r0
+	lsls r2, 2
+	ldr r0, _0809BAF8 @ =gSprites
+	adds r2, r0
+	mov r1, r9
+	adds r0, r5, r1
+	ldrb r1, [r0]
+	adds r0, r2, 0
+	bl StartSpriteAnim
+_0809BACE:
+	adds r0, r6, 0x1
+	lsls r0, 24
+	lsrs r6, r0, 24
+	cmp r6, 0xF
+	bls _0809BA56
+	add sp, 0x4
+	pop {r3,r4}
+	mov r8, r3
+	mov r9, r4
+	pop {r4-r7}
+	pop {r0}
+	bx r0
+	.align 2, 0
+_0809BAE8: .4byte gUnknown_20398B4
+_0809BAEC: .4byte gObjectEvents
+_0809BAF0: .4byte 0xfff80000
+_0809BAF4: .4byte SpriteCallbackDummy
+_0809BAF8: .4byte gSprites
+	thumb_func_end sub_809BA40
+
+	thumb_func_start sub_809BAFC
+sub_809BAFC: @ 809BAFC
+	push {r4-r6,lr}
+	ldr r0, _0809BB34 @ =gUnknown_2039958
+	ldr r4, [r0]
+	ldr r0, _0809BB38 @ =gUnknown_2039954
+	ldr r3, [r0]
+	movs r1, 0
+	ldr r0, _0809BB3C @ =0x0000b3dc
+	adds r6, r0, 0
+	ldr r5, _0809BB40 @ =0x000003ff
+_0809BB0E:
+	lsls r0, r1, 16
+	asrs r2, r0, 16
+	lsls r1, r2, 1
+	adds r0, r1, r3
+	ldrh r0, [r0]
+	cmp r0, 0
+	beq _0809BB22
+	adds r1, r4
+	adds r0, r6
+	strh r0, [r1]
+_0809BB22:
+	adds r0, r2, 0x1
+	lsls r0, 16
+	lsrs r1, r0, 16
+	asrs r0, 16
+	cmp r0, r5
+	ble _0809BB0E
+	pop {r4-r6}
+	pop {r0}
+	bx r0
+	.align 2, 0
+_0809BB34: .4byte gUnknown_2039958
+_0809BB38: .4byte gUnknown_2039954
+_0809BB3C: .4byte 0x0000b3dc
+_0809BB40: .4byte 0x000003ff
+	thumb_func_end sub_809BAFC
+
+	thumb_func_start sub_809BB44
+sub_809BB44: @ 809BB44
+	push {r4,lr}
+	sub sp, 0x14
+	lsls r0, 24
+	lsrs r0, 24
+	lsls r4, r0, 2
+	adds r4, r0
+	lsls r4, 3
+	ldr r0, _0809BBAC @ =gTasks+0x8
+	adds r4, r0
+	movs r0, 0x3
+	movs r1, 0x11
+	bl FillWindowPixelBuffer
+	ldr r0, _0809BBB0 @ =gUnknown_2039934
+	ldr r3, [r0, 0x8]
+	movs r0, 0xFF
+	str r0, [sp]
+	movs r0, 0x3
+	movs r1, 0x36
+	movs r2, 0xA
+	bl PrintMoneyAmount
+	ldr r0, _0809BBB4 @ =gStringVar1
+	movs r2, 0x2
+	ldrsh r1, [r4, r2]
+	movs r2, 0x2
+	movs r3, 0x2
+	bl ConvertIntToDecimalStringN
+	ldr r4, _0809BBB8 @ =gStringVar4
+	ldr r1, _0809BBBC @ =gText_TimesStrVar1
+	adds r0, r4, 0
+	bl StringExpandPlaceholders
+	movs r0, 0xA
+	str r0, [sp]
+	movs r0, 0
+	str r0, [sp, 0x4]
+	str r0, [sp, 0x8]
+	str r0, [sp, 0xC]
+	movs r0, 0x1
+	str r0, [sp, 0x10]
+	movs r0, 0x3
+	movs r1, 0
+	adds r2, r4, 0
+	movs r3, 0x2
+	bl BuyMenuPrint
+	add sp, 0x14
+	pop {r4}
+	pop {r0}
+	bx r0
+	.align 2, 0
+_0809BBAC: .4byte gTasks+0x8
+_0809BBB0: .4byte gUnknown_2039934
+_0809BBB4: .4byte gStringVar1
+_0809BBB8: .4byte gStringVar4
+_0809BBBC: .4byte gText_TimesStrVar1
+	thumb_func_end sub_809BB44
+
+	thumb_func_start sub_809BBC0
+sub_809BBC0: @ 809BBC0
+	push {r4-r7,lr}
+	lsls r0, 24
+	lsrs r6, r0, 24
+	lsls r0, r6, 2
+	adds r0, r6
+	lsls r0, 3
+	ldr r1, _0809BC00 @ =gTasks+0x8
+	adds r5, r0, r1
+	ldr r0, _0809BC04 @ =gPaletteFade
+	ldrb r1, [r0, 0x7]
+	movs r0, 0x80
+	ands r0, r1
+	cmp r0, 0
+	bne _0809BC8E
+	ldrb r0, [r5, 0xE]
+	bl ListMenu_ProcessInput
+	adds r4, r0, 0
+	ldrb r0, [r5, 0xE]
+	ldr r7, _0809BC08 @ =gUnknown_2039942
+	subs r2, r7, 0x2
+	adds r1, r7, 0
+	bl ListMenuGetScrollAndRow
+	movs r0, 0x2
+	negs r0, r0
+	cmp r4, r0
+	beq _0809BC0C
+	adds r0, 0x1
+	cmp r4, r0
+	bne _0809BC1A
+	b _0809BC8E
+	.align 2, 0
+_0809BC00: .4byte gTasks+0x8
+_0809BC04: .4byte gPaletteFade
+_0809BC08: .4byte gUnknown_2039942
+_0809BC0C:
+	movs r0, 0x5
+	bl PlaySE
+	adds r0, r6, 0
+	bl sub_809C004
+	b _0809BC8E
+_0809BC1A:
+	movs r0, 0x5
+	bl PlaySE
+	strh r4, [r5, 0xA]
+	movs r0, 0x5
+	bl ClearWindowTilemap
+	bl sub_809B73C
+	ldrb r0, [r5, 0xE]
+	movs r1, 0x2
+	bl sub_809B57C
+	movs r0, 0x1
+	bl sub_809B10C
+	lsls r0, r4, 16
+	lsrs r4, r0, 16
+	adds r0, r4, 0
+	bl itemid_get_market_price
+	adds r1, r0, 0
+	adds r0, r7, 0
+	subs r0, 0xE
+	lsls r1, 16
+	lsrs r1, 16
+	str r1, [r0, 0x8]
+	ldr r0, _0809BC70 @ =gSaveBlock1Ptr
+	ldr r0, [r0]
+	movs r2, 0xA4
+	lsls r2, 2
+	adds r0, r2
+	bl IsEnoughMoney
+	lsls r0, 24
+	cmp r0, 0
+	bne _0809BC7C
+	ldr r1, _0809BC74 @ =gUnknown_8416842
+	ldr r2, _0809BC78 @ =sub_809BF98
+	adds r0, r6, 0
+	bl BuyMenuDisplayMessage
+	b _0809BC8E
+	.align 2, 0
+_0809BC70: .4byte gSaveBlock1Ptr
+_0809BC74: .4byte gUnknown_8416842
+_0809BC78: .4byte sub_809BF98
+_0809BC7C:
+	ldr r1, _0809BC94 @ =gStringVar1
+	adds r0, r4, 0
+	bl CopyItemName
+	ldr r1, _0809BC98 @ =gUnknown_8416766
+	ldr r2, _0809BC9C @ =sub_809BCA0
+	adds r0, r6, 0
+	bl BuyMenuDisplayMessage
+_0809BC8E:
+	pop {r4-r7}
+	pop {r0}
+	bx r0
+	.align 2, 0
+_0809BC94: .4byte gStringVar1
+_0809BC98: .4byte gUnknown_8416766
+_0809BC9C: .4byte sub_809BCA0
+	thumb_func_end sub_809BBC0
+
+	thumb_func_start sub_809BCA0
+sub_809BCA0: @ 809BCA0
+	push {r4-r7,lr}
+	sub sp, 0x14
+	lsls r0, 24
+	lsrs r7, r0, 24
+	lsls r5, r7, 2
+	adds r5, r7
+	lsls r5, 3
+	ldr r0, _0809BD40 @ =gTasks+0x8
+	adds r5, r0
+	ldrh r0, [r5, 0xA]
+	bl BagGetQuantityByItemId
+	adds r4, r0, 0
+	lsls r4, 16
+	lsrs r4, 16
+	movs r0, 0x1
+	movs r1, 0
+	bl BuyMenuQuantityBoxThinBorder
+	ldr r0, _0809BD44 @ =gStringVar1
+	adds r1, r4, 0
+	movs r2, 0x1
+	movs r3, 0x3
+	bl ConvertIntToDecimalStringN
+	ldr r6, _0809BD48 @ =gStringVar4
+	ldr r1, _0809BD4C @ =gUnknown_8416749
+	adds r0, r6, 0
+	bl StringExpandPlaceholders
+	movs r0, 0x2
+	str r0, [sp]
+	movs r0, 0
+	str r0, [sp, 0x4]
+	str r0, [sp, 0x8]
+	str r0, [sp, 0xC]
+	movs r4, 0x1
+	str r4, [sp, 0x10]
+	movs r0, 0x1
+	movs r1, 0x2
+	adds r2, r6, 0
+	movs r3, 0
+	bl BuyMenuPrint
+	strh r4, [r5, 0x2]
+	movs r0, 0x3
+	movs r1, 0
+	bl BuyMenuQuantityBoxNormalBorder
+	adds r0, r7, 0
+	bl sub_809BB44
+	movs r0, 0
+	bl ScheduleBgCopyTilemapToVram
+	ldr r0, _0809BD50 @ =gSaveBlock1Ptr
+	ldr r0, [r0]
+	movs r1, 0xA4
+	lsls r1, 2
+	adds r0, r1
+	bl GetMoney
+	adds r4, r0, 0
+	ldrh r0, [r5, 0xA]
+	bl itemid_get_market_price
+	adds r1, r0, 0
+	lsls r1, 16
+	lsrs r1, 16
+	adds r0, r4, 0
+	bl __udivsi3
+	lsls r0, 16
+	lsrs r2, r0, 16
+	cmp r2, 0x63
+	bls _0809BD58
+	ldr r1, _0809BD54 @ =gUnknown_2039934
+	movs r0, 0x63
+	b _0809BD5E
+	.align 2, 0
+_0809BD40: .4byte gTasks+0x8
+_0809BD44: .4byte gStringVar1
+_0809BD48: .4byte gStringVar4
+_0809BD4C: .4byte gUnknown_8416749
+_0809BD50: .4byte gSaveBlock1Ptr
+_0809BD54: .4byte gUnknown_2039934
+_0809BD58:
+	ldr r1, _0809BD80 @ =gUnknown_2039934
+	lsls r0, r2, 24
+	lsrs r0, 24
+_0809BD5E:
+	strh r0, [r1, 0x14]
+	cmp r2, 0x1
+	beq _0809BD68
+	bl sub_809B6FC
+_0809BD68:
+	ldr r0, _0809BD84 @ =gTasks
+	lsls r1, r7, 2
+	adds r1, r7
+	lsls r1, 3
+	adds r1, r0
+	ldr r0, _0809BD88 @ =sub_809BD8C
+	str r0, [r1]
+	add sp, 0x14
+	pop {r4-r7}
+	pop {r0}
+	bx r0
+	.align 2, 0
+_0809BD80: .4byte gUnknown_2039934
+_0809BD84: .4byte gTasks
+_0809BD88: .4byte sub_809BD8C
+	thumb_func_end sub_809BCA0
+
+	thumb_func_start sub_809BD8C
+sub_809BD8C: @ 809BD8C
+	push {r4-r7,lr}
+	lsls r0, 24
+	lsrs r5, r0, 24
+	adds r7, r5, 0
+	lsls r0, r5, 2
+	adds r0, r5
+	lsls r0, 3
+	ldr r1, _0809BDCC @ =gTasks+0x8
+	adds r4, r0, r1
+	adds r0, r4, 0x2
+	ldr r6, _0809BDD0 @ =gUnknown_2039934
+	ldrh r1, [r6, 0x14]
+	bl AdjustQuantityAccordingToDPadInput
+	lsls r0, 24
+	lsrs r0, 24
+	cmp r0, 0x1
+	bne _0809BDD4
+	ldrh r0, [r4, 0xA]
+	bl itemid_get_market_price
+	lsls r0, 16
+	lsrs r0, 16
+	movs r2, 0x2
+	ldrsh r1, [r4, r2]
+	muls r0, r1
+	str r0, [r6, 0x8]
+	adds r0, r5, 0
+	bl sub_809BB44
+	b _0809BE88
+	.align 2, 0
+_0809BDCC: .4byte gTasks+0x8
+_0809BDD0: .4byte gUnknown_2039934
+_0809BDD4:
+	ldr r0, _0809BE3C @ =gMain
+	ldrh r1, [r0, 0x2E]
+	movs r0, 0x1
+	ands r0, r1
+	cmp r0, 0
+	beq _0809BE54
+	movs r0, 0x5
+	bl PlaySE
+	bl sub_809B73C
+	movs r0, 0x3
+	movs r1, 0
+	bl ClearStdWindowAndFrameToTransparent
+	movs r0, 0x1
+	movs r1, 0
+	bl ClearStdWindowAndFrameToTransparent
+	movs r0, 0x3
+	bl ClearWindowTilemap
+	movs r0, 0x1
+	bl ClearWindowTilemap
+	movs r0, 0x4
+	bl PutWindowTilemap
+	ldrh r0, [r4, 0xA]
+	ldr r1, _0809BE40 @ =gStringVar1
+	bl CopyItemName
+	ldr r0, _0809BE44 @ =gStringVar2
+	movs r2, 0x2
+	ldrsh r1, [r4, r2]
+	movs r2, 0
+	movs r3, 0x2
+	bl ConvertIntToDecimalStringN
+	ldr r0, _0809BE48 @ =gStringVar3
+	ldr r1, [r6, 0x8]
+	movs r2, 0
+	movs r3, 0x8
+	bl ConvertIntToDecimalStringN
+	ldr r1, _0809BE4C @ =gUnknown_841678E
+	ldr r2, _0809BE50 @ =sub_809BE90
+	adds r0, r5, 0
+	bl BuyMenuDisplayMessage
+	b _0809BE88
+	.align 2, 0
+_0809BE3C: .4byte gMain
+_0809BE40: .4byte gStringVar1
+_0809BE44: .4byte gStringVar2
+_0809BE48: .4byte gStringVar3
+_0809BE4C: .4byte gUnknown_841678E
+_0809BE50: .4byte sub_809BE90
+_0809BE54:
+	movs r0, 0x2
+	ands r0, r1
+	cmp r0, 0
+	beq _0809BE88
+	movs r0, 0x5
+	bl PlaySE
+	bl sub_809B73C
+	movs r0, 0x3
+	movs r1, 0
+	bl ClearStdWindowAndFrameToTransparent
+	movs r0, 0x1
+	movs r1, 0
+	bl ClearStdWindowAndFrameToTransparent
+	movs r0, 0x3
+	bl ClearWindowTilemap
+	movs r0, 0x1
+	bl ClearWindowTilemap
+	adds r0, r7, 0
+	bl sub_809BF98
+_0809BE88:
+	pop {r4-r7}
+	pop {r0}
+	bx r0
+	thumb_func_end sub_809BD8C
+
+	thumb_func_start sub_809BE90
+sub_809BE90: @ 809BE90
+	push {lr}
+	lsls r0, 24
+	lsrs r0, 24
+	ldr r1, _0809BEA0 @ =gUnknown_83DF0B4
+	bl BuyMenuConfirmPurchase
+	pop {r0}
+	bx r0
+	.align 2, 0
+_0809BEA0: .4byte gUnknown_83DF0B4
+	thumb_func_end sub_809BE90
+
+	thumb_func_start sub_809BEA4
+sub_809BEA4: @ 809BEA4
+	push {r4,r5,lr}
+	lsls r0, 24
+	lsrs r5, r0, 24
+	lsls r0, r5, 2
+	adds r0, r5
+	lsls r0, 3
+	ldr r1, _0809BEE8 @ =gTasks+0x8
+	adds r4, r0, r1
+	movs r0, 0x4
+	bl PutWindowTilemap
+	ldrh r0, [r4, 0xA]
+	ldrh r1, [r4, 0x2]
+	bl AddBagItem
+	lsls r0, 24
+	lsrs r0, 24
+	cmp r0, 0x1
+	bne _0809BEF4
+	ldr r1, _0809BEEC @ =gUnknown_84167E7
+	ldr r2, _0809BEF0 @ =sub_809BF0C
+	adds r0, r5, 0
+	bl BuyMenuDisplayMessage
+	adds r0, r5, 0
+	bl nullsub_52
+	ldrh r0, [r4, 0xA]
+	ldrh r1, [r4, 0x2]
+	movs r2, 0x1
+	bl sub_809C09C
+	b _0809BEFE
+	.align 2, 0
+_0809BEE8: .4byte gTasks+0x8
+_0809BEEC: .4byte gUnknown_84167E7
+_0809BEF0: .4byte sub_809BF0C
+_0809BEF4:
+	ldr r1, _0809BF04 @ =gUnknown_8416861
+	ldr r2, _0809BF08 @ =sub_809BF98
+	adds r0, r5, 0
+	bl BuyMenuDisplayMessage
+_0809BEFE:
+	pop {r4,r5}
+	pop {r0}
+	bx r0
+	.align 2, 0
+_0809BF04: .4byte gUnknown_8416861
+_0809BF08: .4byte sub_809BF98
+	thumb_func_end sub_809BEA4
+
+	thumb_func_start sub_809BF0C
+sub_809BF0C: @ 809BF0C
+	push {r4-r6,lr}
+	adds r4, r0, 0
+	lsls r4, 24
+	lsrs r4, 24
+	movs r0, 0x26
+	bl IncrementGameStat
+	ldr r6, _0809BF58 @ =gSaveBlock1Ptr
+	ldr r0, [r6]
+	movs r5, 0xA4
+	lsls r5, 2
+	adds r0, r5
+	ldr r1, _0809BF5C @ =gUnknown_2039934
+	ldr r1, [r1, 0x8]
+	bl RemoveMoney
+	movs r0, 0xF8
+	bl PlaySE
+	ldr r0, [r6]
+	adds r0, r5
+	bl GetMoney
+	adds r1, r0, 0
+	movs r0, 0
+	movs r2, 0
+	bl PrintMoneyAmountInMoneyBox
+	ldr r1, _0809BF60 @ =gTasks
+	lsls r0, r4, 2
+	adds r0, r4
+	lsls r0, 3
+	adds r0, r1
+	ldr r1, _0809BF64 @ =sub_809BF68
+	str r1, [r0]
+	pop {r4-r6}
+	pop {r0}
+	bx r0
+	.align 2, 0
+_0809BF58: .4byte gSaveBlock1Ptr
+_0809BF5C: .4byte gUnknown_2039934
+_0809BF60: .4byte gTasks
+_0809BF64: .4byte sub_809BF68
+	thumb_func_end sub_809BF0C
+
+	thumb_func_start sub_809BF68
+sub_809BF68: @ 809BF68
+	push {r4,lr}
+	lsls r0, 24
+	lsrs r4, r0, 24
+	ldr r0, _0809BF94 @ =gMain
+	ldrh r1, [r0, 0x2E]
+	movs r0, 0x1
+	ands r0, r1
+	cmp r0, 0
+	bne _0809BF82
+	movs r0, 0x2
+	ands r0, r1
+	cmp r0, 0
+	beq _0809BF8E
+_0809BF82:
+	movs r0, 0x5
+	bl PlaySE
+	adds r0, r4, 0
+	bl sub_809BF98
+_0809BF8E:
+	pop {r4}
+	pop {r0}
+	bx r0
+	.align 2, 0
+_0809BF94: .4byte gMain
+	thumb_func_end sub_809BF68
+
+	thumb_func_start sub_809BF98
+sub_809BF98: @ 809BF98
+	push {r4-r6,lr}
+	lsls r0, 24
+	lsrs r0, 24
+	lsls r1, r0, 2
+	adds r1, r0
+	lsls r5, r1, 3
+	ldr r6, _0809BFF8 @ =gTasks+0x8
+	adds r4, r5, r6
+	movs r0, 0x2
+	movs r1, 0
+	bl ClearDialogWindowAndFrameToTransparent
+	ldrb r0, [r4, 0xE]
+	movs r1, 0x1
+	bl sub_809B57C
+	movs r0, 0
+	bl sub_809B10C
+	movs r0, 0x4
+	bl PutWindowTilemap
+	movs r0, 0x5
+	bl PutWindowTilemap
+	ldr r0, _0809BFFC @ =gUnknown_2039934
+	ldrb r1, [r0, 0x16]
+	movs r0, 0xF
+	ands r0, r1
+	cmp r0, 0x1
+	bne _0809BFDC
+	movs r0, 0x6
+	bl PutWindowTilemap
+_0809BFDC:
+	movs r0, 0
+	bl ScheduleBgCopyTilemapToVram
+	bl sub_809B690
+	adds r0, r6, 0
+	subs r0, 0x8
+	adds r0, r5, r0
+	ldr r1, _0809C000 @ =sub_809BBC0
+	str r1, [r0]
+	pop {r4-r6}
+	pop {r0}
+	bx r0
+	.align 2, 0
+_0809BFF8: .4byte gTasks+0x8
+_0809BFFC: .4byte gUnknown_2039934
+_0809C000: .4byte sub_809BBC0
+	thumb_func_end sub_809BF98
+
+	thumb_func_start sub_809C004
+sub_809C004: @ 809C004
+	push {r4,lr}
+	sub sp, 0x4
+	adds r4, r0, 0
+	lsls r4, 24
+	lsrs r4, 24
+	ldr r1, _0809C03C @ =gFieldCallback
+	ldr r0, _0809C040 @ =sub_809AD74
+	str r0, [r1]
+	movs r0, 0x1
+	negs r0, r0
+	movs r1, 0
+	str r1, [sp]
+	movs r2, 0
+	movs r3, 0x10
+	bl BeginNormalPaletteFade
+	ldr r1, _0809C044 @ =gTasks
+	lsls r0, r4, 2
+	adds r0, r4
+	lsls r0, 3
+	adds r0, r1
+	ldr r1, _0809C048 @ =sub_809C04C
+	str r1, [r0]
+	add sp, 0x4
+	pop {r4}
+	pop {r0}
+	bx r0
+	.align 2, 0
+_0809C03C: .4byte gFieldCallback
+_0809C040: .4byte sub_809AD74
+_0809C044: .4byte gTasks
+_0809C048: .4byte sub_809C04C
+	thumb_func_end sub_809C004
+
+	thumb_func_start sub_809C04C
+sub_809C04C: @ 809C04C
+	push {r4,lr}
+	lsls r0, 24
+	lsrs r4, r0, 24
+	lsls r0, r4, 2
+	adds r0, r4
+	lsls r0, 3
+	ldr r1, _0809C088 @ =gTasks+0x8
+	adds r2, r0, r1
+	ldr r0, _0809C08C @ =gPaletteFade
+	ldrb r1, [r0, 0x7]
+	movs r0, 0x80
+	ands r0, r1
+	cmp r0, 0
+	bne _0809C082
+	ldrb r0, [r2, 0xE]
+	movs r1, 0
+	movs r2, 0
+	bl DestroyListMenuTask
+	bl sub_809B604
+	ldr r0, _0809C090 @ =CB2_ReturnToField
+	bl SetMainCallback2
+	adds r0, r4, 0
+	bl DestroyTask
+_0809C082:
+	pop {r4}
+	pop {r0}
+	bx r0
+	.align 2, 0
+_0809C088: .4byte gTasks+0x8
+_0809C08C: .4byte gPaletteFade
+_0809C090: .4byte CB2_ReturnToField
+	thumb_func_end sub_809C04C
+
+	thumb_func_start nullsub_52
+nullsub_52: @ 809C094
+	bx lr
+	thumb_func_end nullsub_52
+
+	thumb_func_start nullsub_53
+nullsub_53: @ 809C098
+	bx lr
+	thumb_func_end nullsub_53
+
+	thumb_func_start sub_809C09C
+sub_809C09C: @ 809C09C
+	push {r4-r6,lr}
+	lsls r0, 16
+	lsrs r3, r0, 16
+	lsls r1, 16
+	lsrs r6, r1, 16
+	lsls r2, 24
+	lsrs r5, r2, 24
+	ldr r1, _0809C0B8 @ =gUnknown_203996C
+	ldrb r2, [r1, 0xA]
+	cmp r2, r5
+	bne _0809C0BC
+	adds r4, r1, 0
+	b _0809C0D4
+	.align 2, 0
+_0809C0B8: .4byte gUnknown_203996C
+_0809C0BC:
+	ldrb r0, [r1, 0x16]
+	cmp r0, r5
+	bne _0809C0C8
+	adds r4, r1, 0
+	adds r4, 0xC
+	b _0809C0D4
+_0809C0C8:
+	adds r4, r1, 0
+	adds r4, 0xC
+	cmp r2, 0
+	bne _0809C0D2
+	adds r4, r1, 0
+_0809C0D2:
+	strb r5, [r4, 0xA]
+_0809C0D4:
+	ldrh r0, [r4, 0x4]
+	cmp r0, 0
+	beq _0809C0DE
+	movs r0, 0x1
+	strb r0, [r4, 0x9]
+_0809C0DE:
+	strh r3, [r4, 0x4]
+	ldrh r1, [r4, 0x6]
+	ldr r0, _0809C128 @ =0x000003e6
+	cmp r1, r0
+	bhi _0809C0F8
+	adds r0, r6, r1
+	strh r0, [r4, 0x6]
+	lsls r0, 16
+	lsrs r0, 16
+	ldr r1, _0809C12C @ =0x000003e7
+	cmp r0, r1
+	bls _0809C0F8
+	strh r1, [r4, 0x6]
+_0809C0F8:
+	ldr r1, [r4]
+	ldr r0, _0809C130 @ =0x000f423e
+	cmp r1, r0
+	bhi _0809C120
+	adds r0, r3, 0
+	bl itemid_get_market_price
+	lsls r0, 16
+	lsrs r0, 16
+	subs r1, r5, 0x1
+	asrs r0, r1
+	adds r1, r0, 0
+	muls r1, r6
+	ldr r0, [r4]
+	adds r0, r1
+	str r0, [r4]
+	ldr r1, _0809C134 @ =0x000f423f
+	cmp r0, r1
+	bls _0809C120
+	str r1, [r4]
+_0809C120:
+	pop {r4-r6}
+	pop {r0}
+	bx r0
+	.align 2, 0
+_0809C128: .4byte 0x000003e6
+_0809C12C: .4byte 0x000003e7
+_0809C130: .4byte 0x000f423e
+_0809C134: .4byte 0x000f423f
+	thumb_func_end sub_809C09C
+
+	thumb_func_start sub_809C138
+sub_809C138: @ 809C138
+	push {r4,lr}
+	ldr r4, _0809C160 @ =gUnknown_203996C
+	ldrb r0, [r4, 0xA]
+	cmp r0, 0
+	beq _0809C14A
+	adds r0, 0x24
+	adds r1, r4, 0
+	bl sub_8113550
+_0809C14A:
+	ldrb r0, [r4, 0x16]
+	cmp r0, 0
+	beq _0809C15A
+	adds r0, 0x24
+	adds r1, r4, 0
+	adds r1, 0xC
+	bl sub_8113550
+_0809C15A:
+	pop {r4}
+	pop {r0}
+	bx r0
+	.align 2, 0
+_0809C160: .4byte gUnknown_203996C
+	thumb_func_end sub_809C138
+
+	thumb_func_start CreatePokemartMenu
+CreatePokemartMenu: @ 809C164
+	push {r4,lr}
+	bl sub_809ABD8
+	movs r0, 0
+	bl sub_809AAB0
+	ldr r0, _0809C194 @ =EnableBothScriptContexts
+	bl sub_809AC04
+	bl nullsub_53
+	ldr r4, _0809C198 @ =gUnknown_203996C
+	adds r0, r4, 0
+	movs r1, 0
+	movs r2, 0x18
+	bl memset
+	ldr r0, _0809C19C @ =gMapHeader
+	ldrb r0, [r0, 0x14]
+	strb r0, [r4, 0x8]
+	strb r0, [r4, 0x14]
+	pop {r4}
+	pop {r0}
+	bx r0
+	.align 2, 0
+_0809C194: .4byte EnableBothScriptContexts
+_0809C198: .4byte gUnknown_203996C
+_0809C19C: .4byte gMapHeader
+	thumb_func_end CreatePokemartMenu
+
+	thumb_func_start CreateDecorationShop1Menu
+CreateDecorationShop1Menu: @ 809C1A0
+	push {lr}
+	bl sub_809ABD8
+	movs r0, 0x2
+	bl sub_809AAB0
+	ldr r0, _0809C1B8 @ =EnableBothScriptContexts
+	bl sub_809AC04
+	pop {r0}
+	bx r0
+	.align 2, 0
+_0809C1B8: .4byte EnableBothScriptContexts
+	thumb_func_end CreateDecorationShop1Menu
+
+	thumb_func_start CreateDecorationShop2Menu
+CreateDecorationShop2Menu: @ 809C1BC
+	push {lr}
+	bl sub_809ABD8
+	movs r0, 0x3
+	bl sub_809AAB0
+	ldr r0, _0809C1D4 @ =EnableBothScriptContexts
+	bl sub_809AC04
+	pop {r0}
+	bx r0
+	.align 2, 0
+_0809C1D4: .4byte EnableBothScriptContexts
+	thumb_func_end CreateDecorationShop2Menu
+
+	thumb_func_start sub_809C1D8
+sub_809C1D8: @ 809C1D8
+	push {r4-r7,lr}
+	mov r7, r10
+	mov r6, r9
+	mov r5, r8
+	push {r5-r7}
+	sub sp, 0x10
+	mov r9, r1
+	lsls r0, 24
+	lsrs r0, 24
+	lsls r2, 16
+	lsrs r2, 16
+	mov r10, r2
+	ldr r2, _0809C26C @ =gTasks
+	lsls r1, r0, 2
+	adds r1, r0
+	lsls r1, 3
+	adds r1, r2
+	ldrh r0, [r1, 0x10]
+	subs r0, 0x1
+	lsls r0, 16
+	lsrs r5, r0, 16
+	ldrh r0, [r1, 0x12]
+	subs r0, 0x1
+	lsls r0, 16
+	lsrs r3, r0, 16
+	ldrh r4, [r1, 0xA]
+	movs r2, 0xC
+	ldrsh r0, [r1, r2]
+	cmp r0, 0
+	bne _0809C29C
+	movs r2, 0
+	lsls r5, 16
+	str r5, [sp, 0xC]
+	lsls r0, r3, 16
+	lsls r1, r4, 16
+	asrs r0, 16
+	str r0, [sp]
+	asrs r1, 16
+	str r1, [sp, 0x4]
+	lsls r0, r1, 1
+	mov r1, r9
+	adds r7, r0, r1
+_0809C22C:
+	movs r4, 0
+	lsls r2, 16
+	mov r8, r2
+	asrs r0, r2, 16
+	ldr r2, [sp]
+	adds r6, r2, r0
+_0809C238:
+	ldr r0, [sp, 0xC]
+	asrs r1, r0, 16
+	lsls r4, 16
+	asrs r0, r4, 16
+	adds r5, r1, r0
+	adds r0, r5, 0
+	adds r1, r6, 0
+	bl MapGridGetMetatileIdAt
+	movs r2, 0
+	ldrsh r1, [r7, r2]
+	lsls r0, 16
+	asrs r0, 16
+	cmp r1, r0
+	bne _0809C280
+	ldr r0, [sp, 0x4]
+	cmp r0, 0x2
+	beq _0809C270
+	ldrh r0, [r7, 0x2]
+	mov r2, r10
+	orrs r2, r0
+	adds r0, r5, 0
+	adds r1, r6, 0
+	bl MapGridSetMetatileIdAt
+	b _0809C280
+	.align 2, 0
+_0809C26C: .4byte gTasks
+_0809C270:
+	mov r1, r9
+	ldrh r0, [r1]
+	mov r2, r10
+	orrs r2, r0
+	adds r0, r5, 0
+	adds r1, r6, 0
+	bl MapGridSetMetatileIdAt
+_0809C280:
+	movs r2, 0x80
+	lsls r2, 9
+	adds r0, r4, r2
+	lsrs r4, r0, 16
+	asrs r0, 16
+	cmp r0, 0x2
+	ble _0809C238
+	adds r0, r2, 0
+	add r0, r8
+	lsrs r2, r0, 16
+	asrs r0, 16
+	cmp r0, 0x2
+	ble _0809C22C
+	b _0809C324
+_0809C29C:
+	movs r2, 0
+	lsls r5, 16
+	str r5, [sp, 0xC]
+	lsls r0, r3, 16
+	lsls r1, r4, 16
+	asrs r0, 16
+	str r0, [sp, 0x8]
+	asrs r7, r1, 16
+_0809C2AC:
+	movs r4, 0
+	lsls r2, 16
+	mov r8, r2
+	asrs r0, r2, 16
+	ldr r1, [sp, 0x8]
+	adds r6, r1, r0
+_0809C2B8:
+	ldr r2, [sp, 0xC]
+	asrs r1, r2, 16
+	lsls r4, 16
+	asrs r0, r4, 16
+	adds r5, r1, r0
+	adds r0, r5, 0
+	adds r1, r6, 0
+	bl MapGridGetMetatileIdAt
+	movs r1, 0x2
+	subs r1, r7
+	lsls r1, 1
+	add r1, r9
+	movs r2, 0
+	ldrsh r1, [r1, r2]
+	lsls r0, 16
+	asrs r0, 16
+	cmp r1, r0
+	bne _0809C30A
+	cmp r7, 0x2
+	beq _0809C2FA
+	movs r0, 0x1
+	subs r0, r7
+	lsls r0, 1
+	add r0, r9
+	ldrh r0, [r0]
+	mov r2, r10
+	orrs r2, r0
+	adds r0, r5, 0
+	adds r1, r6, 0
+	bl MapGridSetMetatileIdAt
+	b _0809C30A
+_0809C2FA:
+	mov r1, r9
+	ldrh r0, [r1, 0x4]
+	mov r2, r10
+	orrs r2, r0
+	adds r0, r5, 0
+	adds r1, r6, 0
+	bl MapGridSetMetatileIdAt
+_0809C30A:
+	movs r2, 0x80
+	lsls r2, 9
+	adds r0, r4, r2
+	lsrs r4, r0, 16
+	asrs r0, 16
+	cmp r0, 0x2
+	ble _0809C2B8
+	adds r0, r2, 0
+	add r0, r8
+	lsrs r2, r0, 16
+	asrs r0, 16
+	cmp r0, 0x2
+	ble _0809C2AC
+_0809C324:
+	add sp, 0x10
+	pop {r3-r5}
+	mov r8, r3
+	mov r9, r4
+	mov r10, r5
+	pop {r4-r7}
+	pop {r0}
+	bx r0
+	thumb_func_end sub_809C1D8
+
+	thumb_func_start sub_809C334
+sub_809C334: @ 809C334
+	push {r4,r5,lr}
+	lsls r0, 24
+	lsrs r3, r0, 24
+	lsls r0, r3, 2
+	adds r0, r3
+	lsls r0, 3
+	ldr r1, _0809C35C @ =gTasks+0x8
+	adds r4, r0, r1
+	movs r0, 0x1
+	strh r0, [r4, 0x6]
+	movs r1, 0
+	ldrsh r0, [r4, r1]
+	cmp r0, 0x6
+	bhi _0809C3CE
+	lsls r0, 2
+	ldr r1, _0809C360 @ =_0809C364
+	adds r0, r1
+	ldr r0, [r0]
+	mov pc, r0
+	.align 2, 0
+_0809C35C: .4byte gTasks+0x8
+_0809C360: .4byte _0809C364
+	.align 2, 0
+_0809C364:
+	.4byte _0809C380
+	.4byte _0809C388
+	.4byte _0809C390
+	.4byte _0809C398
+	.4byte _0809C3A0
+	.4byte _0809C3B4
+	.4byte _0809C3C4
+_0809C380:
+	ldr r1, _0809C384 @ =gUnknown_83DF0D4
+	b _0809C3B6
+	.align 2, 0
+_0809C384: .4byte gUnknown_83DF0D4
+_0809C388:
+	ldr r1, _0809C38C @ =gUnknown_83DF0DA
+	b _0809C3B6
+	.align 2, 0
+_0809C38C: .4byte gUnknown_83DF0DA
+_0809C390:
+	ldr r1, _0809C394 @ =gUnknown_83DF0E0
+	b _0809C3A2
+	.align 2, 0
+_0809C394: .4byte gUnknown_83DF0E0
+_0809C398:
+	ldr r1, _0809C39C @ =gUnknown_83DF0E6
+	b _0809C3B6
+	.align 2, 0
+_0809C39C: .4byte gUnknown_83DF0E6
+_0809C3A0:
+	ldr r1, _0809C3B0 @ =gUnknown_83DF0EC
+_0809C3A2:
+	movs r2, 0xC0
+	lsls r2, 4
+	adds r0, r3, 0
+	bl sub_809C1D8
+	b _0809C3CE
+	.align 2, 0
+_0809C3B0: .4byte gUnknown_83DF0EC
+_0809C3B4:
+	ldr r1, _0809C3C0 @ =gUnknown_83DF0F2
+_0809C3B6:
+	adds r0, r3, 0
+	movs r2, 0
+	bl sub_809C1D8
+	b _0809C3CE
+	.align 2, 0
+_0809C3C0: .4byte gUnknown_83DF0F2
+_0809C3C4:
+	ldr r1, _0809C3F8 @ =gUnknown_83DF0F8
+	adds r0, r3, 0
+	movs r2, 0
+	bl sub_809C1D8
+_0809C3CE:
+	ldrh r0, [r4]
+	adds r0, 0x1
+	movs r1, 0x7
+	ands r0, r1
+	strh r0, [r4]
+	adds r5, r0, 0
+	cmp r5, 0
+	bne _0809C3F2
+	bl DrawWholeMapView
+	movs r1, 0x2
+	ldrsh r0, [r4, r1]
+	adds r0, 0x1
+	movs r1, 0x3
+	bl __modsi3
+	strh r0, [r4, 0x2]
+	strh r5, [r4, 0x6]
+_0809C3F2:
+	pop {r4,r5}
+	pop {r0}
+	bx r0
+	.align 2, 0
+_0809C3F8: .4byte gUnknown_83DF0F8
+	thumb_func_end sub_809C334
+
+	thumb_func_start sub_809C3FC
+sub_809C3FC: @ 809C3FC
+	push {r4-r7,lr}
+	adds r5, r0, 0
+	lsls r5, 16
+	lsrs r5, 16
+	ldr r6, _0809C440 @ =sub_809C334
+	adds r0, r6, 0
+	movs r1, 0
+	bl CreateTask
+	adds r4, r0, 0
+	lsls r4, 24
+	lsrs r4, 24
+	lsls r0, r4, 2
+	adds r0, r4
+	lsls r0, 3
+	ldr r1, _0809C444 @ =gTasks+0x8
+	adds r7, r0, r1
+	adds r0, r7, 0
+	adds r0, 0x8
+	adds r1, r7, 0
+	adds r1, 0xA
+	bl PlayerGetDestCoords
+	movs r0, 0
+	strh r0, [r7]
+	strh r0, [r7, 0x2]
+	strh r5, [r7, 0x4]
+	adds r0, r4, 0
+	bl _call_via_r6
+	adds r0, r4, 0
+	pop {r4-r7}
+	pop {r1}
+	bx r1
+	.align 2, 0
+_0809C440: .4byte sub_809C334
+_0809C444: .4byte gTasks+0x8
+	thumb_func_end sub_809C3FC
+
+	thumb_func_start sub_809C448
+sub_809C448: @ 809C448
+	push {lr}
+	lsls r0, 24
+	lsrs r0, 24
+	bl sub_809C3FC
+	ldr r1, _0809C45C @ =gUnknown_2039984
+	strb r0, [r1]
+	pop {r0}
+	bx r0
+	.align 2, 0
+_0809C45C: .4byte gUnknown_2039984
+	thumb_func_end sub_809C448
+
+	thumb_func_start sub_809C460
+sub_809C460: @ 809C460
+	push {lr}
+	ldr r0, _0809C470 @ =gUnknown_2039984
+	ldrb r0, [r0]
+	bl DestroyTask
+	pop {r0}
+	bx r0
+	.align 2, 0
+_0809C470: .4byte gUnknown_2039984
+	thumb_func_end sub_809C460
+
+	thumb_func_start sub_809C474
+sub_809C474: @ 809C474
+	push {lr}
+	ldr r2, _0809C498 @ =gTasks
+	ldr r0, _0809C49C @ =gUnknown_2039984
+	ldrb r1, [r0]
+	lsls r0, r1, 2
+	adds r0, r1
+	lsls r0, 3
+	adds r1, r0, r2
+	movs r2, 0xE
+	ldrsh r0, [r1, r2]
+	cmp r0, 0
+	bne _0809C4A0
+	movs r2, 0xA
+	ldrsh r0, [r1, r2]
+	cmp r0, 0x2
+	bne _0809C4A0
+	movs r0, 0
+	b _0809C4A2
+	.align 2, 0
+_0809C498: .4byte gTasks
+_0809C49C: .4byte gUnknown_2039984
+_0809C4A0:
+	movs r0, 0x1
+_0809C4A2:
+	pop {r1}
+	bx r1
+	thumb_func_end sub_809C474
+
+	thumb_func_start sub_809C4A8
+sub_809C4A8: @ 809C4A8
+	push {r4,lr}
+	ldr r0, _0809C4E0 @ =sub_809C500
+	movs r1, 0
+	bl CreateTask
+	lsls r0, 24
+	lsrs r0, 24
+	ldr r2, _0809C4E4 @ =gTasks
+	lsls r1, r0, 2
+	adds r1, r0
+	lsls r1, 3
+	adds r4, r1, r2
+	movs r0, 0
+	strh r0, [r4, 0x8]
+	strh r0, [r4, 0xA]
+	adds r2, 0x8
+	adds r1, r2
+	adds r0, r1, 0x4
+	adds r1, 0x6
+	bl PlayerGetDestCoords
+	ldr r0, _0809C4E8 @ =gSpecialVar_0x8004
+	ldrh r0, [r0]
+	cmp r0, 0
+	bne _0809C4EC
+	ldrh r0, [r4, 0xC]
+	adds r0, 0x6
+	b _0809C4F0
+	.align 2, 0
+_0809C4E0: .4byte sub_809C500
+_0809C4E4: .4byte gTasks
+_0809C4E8: .4byte gSpecialVar_0x8004
+_0809C4EC:
+	ldrh r0, [r4, 0xC]
+	subs r0, 0x1
+_0809C4F0:
+	strh r0, [r4, 0xC]
+	ldrh r0, [r4, 0xE]
+	subs r0, 0x5
+	strh r0, [r4, 0xE]
+	pop {r4}
+	pop {r0}
+	bx r0
+	thumb_func_end sub_809C4A8
+
+	thumb_func_start sub_809C500
+sub_809C500: @ 809C500
+	push {r4,r5,lr}
+	lsls r0, 24
+	lsrs r5, r0, 24
+	lsls r0, r5, 2
+	adds r0, r5
+	lsls r0, 3
+	ldr r1, _0809C544 @ =gTasks+0x8
+	adds r4, r0, r1
+	movs r1, 0
+	ldrsh r0, [r4, r1]
+	cmp r0, 0
+	bne _0809C588
+	ldrh r1, [r4, 0x2]
+	movs r0, 0x1
+	ands r0, r1
+	cmp r0, 0
+	bne _0809C550
+	movs r2, 0x4
+	ldrsh r0, [r4, r2]
+	movs r2, 0x6
+	ldrsh r1, [r4, r2]
+	ldr r2, _0809C548 @ =0x00000eb5
+	bl MapGridSetMetatileIdAt
+	movs r1, 0x4
+	ldrsh r0, [r4, r1]
+	movs r2, 0x6
+	ldrsh r1, [r4, r2]
+	adds r1, 0x2
+	ldr r2, _0809C54C @ =0x00000eb7
+	bl MapGridSetMetatileIdAt
+	b _0809C56E
+	.align 2, 0
+_0809C544: .4byte gTasks+0x8
+_0809C548: .4byte 0x00000eb5
+_0809C54C: .4byte 0x00000eb7
+_0809C550:
+	movs r1, 0x4
+	ldrsh r0, [r4, r1]
+	movs r2, 0x6
+	ldrsh r1, [r4, r2]
+	ldr r2, _0809C5EC @ =0x00000eb6
+	bl MapGridSetMetatileIdAt
+	movs r1, 0x4
+	ldrsh r0, [r4, r1]
+	movs r2, 0x6
+	ldrsh r1, [r4, r2]
+	adds r1, 0x2
+	ldr r2, _0809C5F0 @ =0x00000eb8
+	bl MapGridSetMetatileIdAt
+_0809C56E:
+	movs r1, 0x4
+	ldrsh r0, [r4, r1]
+	movs r2, 0x6
+	ldrsh r1, [r4, r2]
+	bl CurrentMapDrawMetatileAt
+	movs r1, 0x4
+	ldrsh r0, [r4, r1]
+	movs r2, 0x6
+	ldrsh r1, [r4, r2]
+	adds r1, 0x2
+	bl CurrentMapDrawMetatileAt
+_0809C588:
+	ldrh r0, [r4]
+	adds r0, 0x1
+	strh r0, [r4]
+	lsls r0, 16
+	asrs r0, 16
+	cmp r0, 0x10
+	bne _0809C5E6
+	movs r0, 0
+	strh r0, [r4]
+	ldrh r0, [r4, 0x2]
+	adds r0, 0x1
+	strh r0, [r4, 0x2]
+	lsls r0, 16
+	asrs r0, 16
+	cmp r0, 0xD
+	bne _0809C5E6
+	movs r1, 0x4
+	ldrsh r0, [r4, r1]
+	movs r2, 0x6
+	ldrsh r1, [r4, r2]
+	ldr r2, _0809C5F4 @ =0x00000e8a
+	bl MapGridSetMetatileIdAt
+	movs r1, 0x4
+	ldrsh r0, [r4, r1]
+	movs r2, 0x6
+	ldrsh r1, [r4, r2]
+	adds r1, 0x2
+	ldr r2, _0809C5F8 @ =0x00000e96
+	bl MapGridSetMetatileIdAt
+	movs r1, 0x4
+	ldrsh r0, [r4, r1]
+	movs r2, 0x6
+	ldrsh r1, [r4, r2]
+	bl CurrentMapDrawMetatileAt
+	movs r1, 0x4
+	ldrsh r0, [r4, r1]
+	movs r2, 0x6
+	ldrsh r1, [r4, r2]
+	adds r1, 0x2
+	bl CurrentMapDrawMetatileAt
+	adds r0, r5, 0
+	bl DestroyTask
+_0809C5E6:
+	pop {r4,r5}
+	pop {r0}
+	bx r0
+	.align 2, 0
+_0809C5EC: .4byte 0x00000eb6
+_0809C5F0: .4byte 0x00000eb8
+_0809C5F4: .4byte 0x00000e8a
+_0809C5F8: .4byte 0x00000e96
+	thumb_func_end sub_809C500
+
+	thumb_func_start sub_809C5FC
+sub_809C5FC: @ 809C5FC
+	push {r4,lr}
+	ldr r0, _0809C638 @ =sub_809C640
+	movs r1, 0
+	bl CreateTask
+	lsls r0, 24
+	lsrs r0, 24
+	ldr r2, _0809C63C @ =gTasks
+	lsls r1, r0, 2
+	adds r1, r0
+	lsls r1, 3
+	adds r4, r1, r2
+	movs r0, 0
+	strh r0, [r4, 0x8]
+	strh r0, [r4, 0xA]
+	adds r2, 0x8
+	adds r1, r2
+	adds r0, r1, 0x4
+	adds r1, 0x6
+	bl PlayerGetDestCoords
+	ldrh r0, [r4, 0xC]
+	adds r0, 0x4
+	strh r0, [r4, 0xC]
+	ldrh r0, [r4, 0xE]
+	subs r0, 0x5
+	strh r0, [r4, 0xE]
+	pop {r4}
+	pop {r0}
+	bx r0
+	.align 2, 0
+_0809C638: .4byte sub_809C640
+_0809C63C: .4byte gTasks
+	thumb_func_end sub_809C5FC
+
+	thumb_func_start sub_809C640
+sub_809C640: @ 809C640
+	push {r4,r5,lr}
+	lsls r0, 24
+	lsrs r5, r0, 24
+	lsls r0, r5, 2
+	adds r0, r5
+	lsls r0, 3
+	ldr r1, _0809C6A8 @ =gTasks+0x8
+	adds r4, r0, r1
+	movs r1, 0
+	ldrsh r0, [r4, r1]
+	cmp r0, 0
+	bne _0809C6F2
+	movs r2, 0x2
+	ldrsh r0, [r4, r2]
+	cmp r0, 0
+	beq _0809C6BA
+	movs r1, 0x4
+	ldrsh r0, [r4, r1]
+	movs r2, 0x6
+	ldrsh r1, [r4, r2]
+	ldr r2, _0809C6AC @ =0x00000e85
+	bl MapGridSetMetatileIdAt
+	movs r1, 0x4
+	ldrsh r0, [r4, r1]
+	movs r2, 0x6
+	ldrsh r1, [r4, r2]
+	adds r1, 0x1
+	ldr r2, _0809C6B0 @ =0x00000eb4
+	bl MapGridSetMetatileIdAt
+	movs r1, 0x4
+	ldrsh r0, [r4, r1]
+	movs r2, 0x6
+	ldrsh r1, [r4, r2]
+	bl CurrentMapDrawMetatileAt
+	movs r1, 0x4
+	ldrsh r0, [r4, r1]
+	movs r2, 0x6
+	ldrsh r1, [r4, r2]
+	adds r1, 0x1
+	bl CurrentMapDrawMetatileAt
+	movs r1, 0x2
+	ldrsh r0, [r4, r1]
+	cmp r0, 0x4
+	bne _0809C6B4
+	adds r0, r5, 0
+	bl DestroyTask
+	b _0809C70A
+	.align 2, 0
+_0809C6A8: .4byte gTasks+0x8
+_0809C6AC: .4byte 0x00000e85
+_0809C6B0: .4byte 0x00000eb4
+_0809C6B4:
+	ldrh r0, [r4, 0x4]
+	subs r0, 0x1
+	strh r0, [r4, 0x4]
+_0809C6BA:
+	movs r2, 0x4
+	ldrsh r0, [r4, r2]
+	movs r2, 0x6
+	ldrsh r1, [r4, r2]
+	ldr r2, _0809C710 @ =0x00000eb9
+	bl MapGridSetMetatileIdAt
+	movs r1, 0x4
+	ldrsh r0, [r4, r1]
+	movs r2, 0x6
+	ldrsh r1, [r4, r2]
+	adds r1, 0x1
+	ldr r2, _0809C714 @ =0x00000eba
+	bl MapGridSetMetatileIdAt
+	movs r1, 0x4
+	ldrsh r0, [r4, r1]
+	movs r2, 0x6
+	ldrsh r1, [r4, r2]
+	bl CurrentMapDrawMetatileAt
+	movs r1, 0x4
+	ldrsh r0, [r4, r1]
+	movs r2, 0x6
+	ldrsh r1, [r4, r2]
+	adds r1, 0x1
+	bl CurrentMapDrawMetatileAt
+_0809C6F2:
+	ldrh r0, [r4]
+	adds r0, 0x1
+	strh r0, [r4]
+	lsls r0, 16
+	asrs r0, 16
+	cmp r0, 0x4
+	bne _0809C70A
+	movs r0, 0
+	strh r0, [r4]
+	ldrh r0, [r4, 0x2]
+	adds r0, 0x1
+	strh r0, [r4, 0x2]
+_0809C70A:
+	pop {r4,r5}
+	pop {r0}
+	bx r0
+	.align 2, 0
+_0809C710: .4byte 0x00000eb9
+_0809C714: .4byte 0x00000eba
+	thumb_func_end sub_809C640
+
+	.align 2, 0 @ Don't pad with nop.
diff --git a/asm/trainer_see.s b/asm/trainer_see.s
index a2210173a..c12bcaeeb 100644
--- a/asm/trainer_see.s
+++ b/asm/trainer_see.s
@@ -19,7 +19,7 @@ _08081B40:
 	b _08081B7A
 _08081B44:
 	movs r4, 0
-	ldr r5, _08081B80 @ =gMapObjects
+	ldr r5, _08081B80 @ =gObjectEvents
 _08081B48:
 	lsls r0, r4, 3
 	adds r0, r4
@@ -53,7 +53,7 @@ _08081B7A:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_08081B80: .4byte gMapObjects
+_08081B80: .4byte gObjectEvents
 	thumb_func_end CheckForTrainersWantingBattle
 
 	thumb_func_start sub_8081B84
@@ -62,7 +62,7 @@ sub_8081B84: @ 8081B84
 	lsls r0, 24
 	lsrs r5, r0, 24
 	adds r0, r5, 0
-	bl GetFieldObjectScriptPointerByFieldObjectId
+	bl GetObjectEventScriptPointerByObjectEventId
 	adds r6, r0, 0
 	bl GetTrainerFlagFromScriptPointer
 	cmp r0, 0
@@ -70,7 +70,7 @@ sub_8081B84: @ 8081B84
 	lsls r4, r5, 3
 	adds r0, r4, r5
 	lsls r0, 2
-	ldr r1, _08081BE0 @ =gMapObjects
+	ldr r1, _08081BE0 @ =gObjectEvents
 	adds r0, r1
 	bl sub_8081BEC
 	lsls r0, 24
@@ -90,7 +90,7 @@ _08081BC0:
 	bl ConfigureAndSetUpOneTrainerBattle
 	adds r0, r4, r5
 	lsls r0, 2
-	ldr r1, _08081BE0 @ =gMapObjects
+	ldr r1, _08081BE0 @ =gObjectEvents
 	adds r0, r1
 	subs r1, r7, 0x1
 	lsls r1, 24
@@ -99,7 +99,7 @@ _08081BC0:
 	movs r0, 0x1
 	b _08081BE6
 	.align 2, 0
-_08081BE0: .4byte gMapObjects
+_08081BE0: .4byte gObjectEvents
 _08081BE4:
 	movs r0, 0
 _08081BE6:
@@ -590,7 +590,7 @@ _08081F54:
 	adds r3, r1, 0
 	adds r3, 0x8
 	adds r0, r4, 0
-	bl FieldObjectGetLocalIdAndMap
+	bl ObjectEventGetLocalIdAndMap
 	movs r0, 0
 	bl FieldEffectStart
 	ldrb r0, [r4, 0x18]
@@ -601,7 +601,7 @@ _08081F54:
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r4, 0
-	bl FieldObjectSetHeldMovement
+	bl ObjectEventSetHeldMovement
 	ldrh r0, [r5, 0x8]
 	adds r0, 0x1
 _08081F82:
@@ -658,12 +658,12 @@ sub_8081FD0: @ 8081FD0
 	adds r5, r1, 0
 	adds r4, r2, 0
 	adds r0, r4, 0
-	bl FieldObjectIsMovementOverridden
+	bl ObjectEventIsMovementOverridden
 	lsls r0, 24
 	cmp r0, 0
 	beq _08081FEE
 	adds r0, r4, 0
-	bl FieldObjectClearHeldMovementIfFinished
+	bl ObjectEventClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _08082022
@@ -680,7 +680,7 @@ _08081FEE:
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r4, 0
-	bl FieldObjectSetHeldMovement
+	bl ObjectEventSetHeldMovement
 	ldrh r0, [r5, 0xE]
 	subs r0, 0x1
 	strh r0, [r5, 0xE]
@@ -688,7 +688,7 @@ _08081FEE:
 _08082014:
 	adds r0, r4, 0
 	movs r1, 0x4A
-	bl FieldObjectSetHeldMovement
+	bl ObjectEventSetHeldMovement
 	ldrh r0, [r5, 0x8]
 	adds r0, 0x1
 	strh r0, [r5, 0x8]
@@ -705,12 +705,12 @@ sub_808202C: @ 808202C
 	adds r5, r1, 0
 	adds r4, r2, 0
 	adds r0, r4, 0
-	bl FieldObjectIsMovementOverridden
+	bl ObjectEventIsMovementOverridden
 	lsls r0, 24
 	cmp r0, 0
 	beq _0808204A
 	adds r0, r4, 0
-	bl FieldObjectClearHeldMovementIfFinished
+	bl ObjectEventClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _080820AC
@@ -740,15 +740,15 @@ _0808204A:
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _080820B8 @ =gMapObjects
+	ldr r1, _080820B8 @ =gObjectEvents
 	adds r4, r0, r1
 	adds r0, r4, 0
-	bl FieldObjectIsMovementOverridden
+	bl ObjectEventIsMovementOverridden
 	lsls r0, 24
 	cmp r0, 0
 	beq _080820A2
 	adds r0, r4, 0
-	bl FieldObjectClearHeldMovementIfFinished
+	bl ObjectEventClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _080820AC
@@ -764,7 +764,7 @@ _080820AC:
 	bx r1
 	.align 2, 0
 _080820B4: .4byte gPlayerAvatar
-_080820B8: .4byte gMapObjects
+_080820B8: .4byte gObjectEvents
 	thumb_func_end sub_808202C
 
 	thumb_func_start sub_80820BC
@@ -777,15 +777,15 @@ sub_80820BC: @ 80820BC
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r1, _080820FC @ =gMapObjects
+	ldr r1, _080820FC @ =gObjectEvents
 	adds r4, r0, r1
 	adds r0, r4, 0
-	bl FieldObjectIsMovementOverridden
+	bl ObjectEventIsMovementOverridden
 	lsls r0, 24
 	cmp r0, 0
 	beq _080820E8
 	adds r0, r4, 0
-	bl FieldObjectClearHeldMovementIfFinished
+	bl ObjectEventClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _080820EE
@@ -799,7 +799,7 @@ _080820EE:
 	bx r1
 	.align 2, 0
 _080820F8: .4byte gPlayerAvatar
-_080820FC: .4byte gMapObjects
+_080820FC: .4byte gObjectEvents
 	thumb_func_end sub_80820BC
 
 	thumb_func_start sub_8082100
@@ -808,19 +808,19 @@ sub_8082100: @ 8082100
 	adds r5, r1, 0
 	adds r4, r2, 0
 	adds r0, r4, 0
-	bl FieldObjectIsMovementOverridden
+	bl ObjectEventIsMovementOverridden
 	lsls r0, 24
 	cmp r0, 0
 	beq _0808211E
 	adds r0, r4, 0
-	bl FieldObjectClearHeldMovementIfFinished
+	bl ObjectEventClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _0808212C
 _0808211E:
 	adds r0, r4, 0
 	movs r1, 0x67
-	bl FieldObjectSetHeldMovement
+	bl ObjectEventSetHeldMovement
 	ldrh r0, [r5, 0x8]
 	adds r0, 0x1
 	strh r0, [r5, 0x8]
@@ -836,7 +836,7 @@ sub_8082134: @ 8082134
 	push {r4,lr}
 	adds r4, r1, 0
 	adds r0, r2, 0
-	bl FieldObjectClearHeldMovementIfFinished
+	bl ObjectEventClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _08082148
@@ -855,19 +855,19 @@ sub_8082150: @ 8082150
 	adds r5, r1, 0
 	adds r4, r2, 0
 	adds r0, r4, 0
-	bl FieldObjectIsMovementOverridden
+	bl ObjectEventIsMovementOverridden
 	lsls r0, 24
 	cmp r0, 0
 	beq _0808216E
 	adds r0, r4, 0
-	bl FieldObjectClearHeldMovementIfFinished
+	bl ObjectEventClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _0808217C
 _0808216E:
 	adds r0, r4, 0
 	movs r1, 0x4A
-	bl FieldObjectSetHeldMovement
+	bl ObjectEventSetHeldMovement
 	ldrh r0, [r5, 0x8]
 	adds r0, 0x1
 	strh r0, [r5, 0x8]
@@ -884,7 +884,7 @@ sub_8082184: @ 8082184
 	adds r5, r1, 0
 	adds r4, r2, 0
 	adds r0, r4, 0
-	bl FieldObjectCheckHeldMovementStatus
+	bl ObjectEventCheckHeldMovementStatus
 	lsls r0, 24
 	cmp r0, 0
 	beq _080821CA
@@ -961,7 +961,7 @@ sub_80821DC: @ 80821DC
 	orrs r1, r2
 	strb r1, [r0, 0x5]
 	adds r0, r4, 0
-	bl FieldObjectClearHeldMovementIfFinished
+	bl ObjectEventClearHeldMovementIfFinished
 	ldrb r0, [r4, 0x18]
 	lsls r0, 28
 	lsrs r0, 28
@@ -970,7 +970,7 @@ sub_80821DC: @ 80821DC
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r4, 0
-	bl FieldObjectSetHeldMovement
+	bl ObjectEventSetHeldMovement
 	ldrh r0, [r5, 0x8]
 	adds r0, 0x1
 	strh r0, [r5, 0x8]
@@ -1024,8 +1024,8 @@ sub_808226C: @ 808226C
 	movs r0, 0x12
 	movs r1, 0x7
 	movs r2, 0x7F
-	bl SpawnSpecialFieldObjectParameterized
-	ldr r2, _080822C8 @ =gMapObjects
+	bl SpawnSpecialObjectEventParameterized
+	ldr r2, _080822C8 @ =gObjectEvents
 	lsls r1, r0, 3
 	adds r1, r0
 	lsls r1, 2
@@ -1046,7 +1046,7 @@ sub_808226C: @ 808226C
 	bx r1
 	.align 2, 0
 _080822C4: .4byte gSaveBlock1Ptr
-_080822C8: .4byte gMapObjects
+_080822C8: .4byte gObjectEvents
 	thumb_func_end sub_808226C
 
 	thumb_func_start sub_80822CC
@@ -1061,15 +1061,15 @@ sub_80822CC: @ 80822CC
 	ldrb r2, [r0, 0x4]
 	movs r0, 0x7F
 	mov r3, sp
-	bl TryGetFieldObjectIdByLocalIdAndMap
+	bl TryGetObjectEventIdByLocalIdAndMap
 	mov r0, sp
 	ldrb r1, [r0]
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r4, _0808234C @ =gMapObjects
+	ldr r4, _0808234C @ =gObjectEvents
 	adds r0, r4
-	bl FieldObjectIsMovementOverridden
+	bl ObjectEventIsMovementOverridden
 	lsls r0, 24
 	cmp r0, 0
 	beq _08082312
@@ -1079,7 +1079,7 @@ sub_80822CC: @ 80822CC
 	adds r0, r1
 	lsls r0, 2
 	adds r0, r4
-	bl FieldObjectClearHeldMovementIfFinished
+	bl ObjectEventClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _0808236E
@@ -1096,7 +1096,7 @@ _08082312:
 	lsls r4, r0, 3
 	adds r4, r0
 	lsls r4, 2
-	ldr r0, _0808234C @ =gMapObjects
+	ldr r0, _0808234C @ =gObjectEvents
 	adds r4, r0
 	movs r0, 0x2
 	bl sub_8063FB0
@@ -1104,21 +1104,21 @@ _08082312:
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r4, 0
-	bl FieldObjectSetHeldMovement
+	bl ObjectEventSetHeldMovement
 	ldrh r0, [r5, 0x12]
 	adds r0, 0x1
 	strh r0, [r5, 0x12]
 	b _0808236E
 	.align 2, 0
 _08082348: .4byte gSaveBlock1Ptr
-_0808234C: .4byte gMapObjects
+_0808234C: .4byte gObjectEvents
 _08082350:
 	ldr r1, _08082378 @ =gFieldEffectArguments
 	adds r2, r1, 0x4
 	adds r3, r1, 0
 	adds r3, 0x8
 	adds r0, r6, 0
-	bl FieldObjectGetLocalIdAndMap
+	bl ObjectEventGetLocalIdAndMap
 	movs r0, 0
 	bl FieldEffectStart
 	movs r0, 0
@@ -1147,7 +1147,7 @@ sub_808237C: @ 808237C
 	ldrb r2, [r0, 0x4]
 	movs r0, 0x7F
 	mov r3, sp
-	bl TryGetFieldObjectIdByLocalIdAndMap
+	bl TryGetObjectEventIdByLocalIdAndMap
 	movs r0, 0
 	bl FieldEffectActiveListContains
 	lsls r0, 24
@@ -1158,9 +1158,9 @@ sub_808237C: @ 808237C
 	lsls r0, r1, 3
 	adds r0, r1
 	lsls r0, 2
-	ldr r4, _08082408 @ =gMapObjects
+	ldr r4, _08082408 @ =gObjectEvents
 	adds r0, r4
-	bl FieldObjectIsMovementOverridden
+	bl ObjectEventIsMovementOverridden
 	lsls r0, 24
 	cmp r0, 0
 	beq _080823CC
@@ -1170,7 +1170,7 @@ sub_808237C: @ 808237C
 	adds r0, r1
 	lsls r0, 2
 	adds r0, r4
-	bl FieldObjectClearHeldMovementIfFinished
+	bl ObjectEventClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _0808242E
@@ -1187,7 +1187,7 @@ _080823CC:
 	lsls r4, r0, 3
 	adds r4, r0
 	lsls r4, 2
-	ldr r0, _08082408 @ =gMapObjects
+	ldr r0, _08082408 @ =gObjectEvents
 	adds r4, r0
 	movs r0, 0x1
 	bl sub_8063FB0
@@ -1195,14 +1195,14 @@ _080823CC:
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r4, 0
-	bl FieldObjectSetHeldMovement
+	bl ObjectEventSetHeldMovement
 	ldrh r0, [r5, 0x12]
 	adds r0, 0x1
 	strh r0, [r5, 0x12]
 	b _0808242E
 	.align 2, 0
 _08082404: .4byte gSaveBlock1Ptr
-_08082408: .4byte gMapObjects
+_08082408: .4byte gObjectEvents
 _0808240C:
 	bl GetPlayerAvatarObjectId
 	lsls r0, 24
@@ -1213,7 +1213,7 @@ _0808240C:
 	ldrb r1, [r0, 0x5]
 	ldrb r2, [r0, 0x4]
 	movs r0, 0x7F
-	bl RemoveFieldObjectByLocalIdAndMap
+	bl RemoveObjectEventByLocalIdAndMap
 	movs r0, 0
 	strh r0, [r5, 0x12]
 	movs r0, 0x2
@@ -1249,7 +1249,7 @@ sub_808243C: @ 808243C
 	cmp r0, 0
 	bne _0808246E
 	ldr r0, [sp]
-	bl FieldObjectClearAnim
+	bl ObjectEventClearAnim
 	ldrh r0, [r4, 0x16]
 	adds r0, 0x1
 	strh r0, [r4, 0x16]
@@ -1560,7 +1560,7 @@ objc_exclamation_mark_probably: @ 80826A8
 	lsls r2, 24
 	lsrs r2, 24
 	mov r3, sp
-	bl TryGetFieldObjectIdByLocalIdAndMap
+	bl TryGetObjectEventIdByLocalIdAndMap
 	lsls r0, 24
 	cmp r0, 0
 	bne _080826DA
@@ -1579,7 +1579,7 @@ _080826DA:
 	bl FieldEffectStop
 	b _08082736
 _080826E8:
-	ldr r2, _0808272C @ =gMapObjects
+	ldr r2, _0808272C @ =gObjectEvents
 	mov r0, sp
 	ldrb r1, [r0]
 	lsls r0, r1, 3
@@ -1614,7 +1614,7 @@ _080826E8:
 	strh r0, [r4, 0x34]
 	b _08082736
 	.align 2, 0
-_0808272C: .4byte gMapObjects
+_0808272C: .4byte gObjectEvents
 _08082730: .4byte gSprites
 _08082734:
 	strh r2, [r4, 0x34]
diff --git a/berry_fix/payload/include/global.fieldmap.h b/berry_fix/payload/include/global.fieldmap.h
index f876e5a56..a75b36265 100644
--- a/berry_fix/payload/include/global.fieldmap.h
+++ b/berry_fix/payload/include/global.fieldmap.h
@@ -309,8 +309,8 @@ struct Camera
     s32 y;
 };
 
-extern struct EventObject gMapObjects[];
-extern u8 gSelectedEventObject;
+extern struct EventObject gObjectEvents[];
+extern u8 gSelectedObjectEvent;
 extern struct MapHeader gMapHeader;
 extern struct PlayerAvatar gPlayerAvatar;
 
diff --git a/data/field_map_obj.s b/data/field_map_obj.s
index 19f0fac9f..3e140ec9c 100644
--- a/data/field_map_obj.s
+++ b/data/field_map_obj.s
@@ -14,536 +14,536 @@ gUnknown_835B95C:: @ 835B95C
 	.4byte CameraObject_2
 
 gUnknown_835B968:: @ 835B968
-	.incbin "graphics/map_objects/0.gbapal"
+	.incbin "graphics/object_events/0.gbapal"
 
 gUnknown_835B988::
-	.incbin "graphics/map_objects/unk_835B988.gbapal"
+	.incbin "graphics/object_events/unk_835B988.gbapal"
 
 gUnknown_835B9A0::
 	.space 0x1C0
 
 gUnknown_835BB68:: @ 835BB68
-	.incbin "graphics/map_objects/000.4bpp"
+	.incbin "graphics/object_events/000.4bpp"
 
 gUnknown_835C468:: @ 835C468
-	.incbin "graphics/map_objects/002.4bpp"
+	.incbin "graphics/object_events/002.4bpp"
 
 gUnknown_835D268:: @ 835D268
-	.incbin "graphics/map_objects/007.4bpp"
+	.incbin "graphics/object_events/007.4bpp"
 
 gUnknown_835DB68:: @ 835DB68
-	.incbin "graphics/map_objects/009.4bpp"
+	.incbin "graphics/object_events/009.4bpp"
 
 gUnknown_835E968:: @ 835E968
-	.incbin "graphics/map_objects/1.gbapal"
+	.incbin "graphics/object_events/1.gbapal"
 
 gUnknown_835E988:: @ 835E988
-	.incbin "graphics/map_objects/2.gbapal"
+	.incbin "graphics/object_events/2.gbapal"
 
 gUnknown_835E9A8:: @ 835E9A8
-	.incbin "graphics/map_objects/005.4bpp"
+	.incbin "graphics/object_events/005.4bpp"
 
 gUnknown_835F2A8:: @ 835F2A8
-	.incbin "graphics/map_objects/012.4bpp"
+	.incbin "graphics/object_events/012.4bpp"
 
 @ 35FBA8
-	.incbin "graphics/map_objects/male_surf.4bpp"
+	.incbin "graphics/object_events/male_surf.4bpp"
 
 @ 360DA8
-	.incbin "graphics/map_objects/female_surf.4bpp"
+	.incbin "graphics/object_events/female_surf.4bpp"
 
 gUnknown_8361FA8:: @ 8361FA8
-	.incbin "graphics/map_objects/001.4bpp"
+	.incbin "graphics/object_events/001.4bpp"
 
 gUnknown_83631A8:: @ 83631A8
-	.incbin "graphics/map_objects/006.4bpp"
+	.incbin "graphics/object_events/006.4bpp"
 
 gUnknown_8363DA8:: @ 8363DA8
-	.incbin "graphics/map_objects/008.4bpp"
+	.incbin "graphics/object_events/008.4bpp"
 
 gUnknown_8364FA8:: @ 8364FA8
-	.incbin "graphics/map_objects/013.4bpp"
+	.incbin "graphics/object_events/013.4bpp"
 
 gUnknown_8365BA8:: @ 8365BA8
-	.incbin "graphics/map_objects/014.4bpp"
+	.incbin "graphics/object_events/014.4bpp"
 
 gUnknown_83664A8:: @ 83664A8
-	.incbin "graphics/map_objects/015.4bpp"
+	.incbin "graphics/object_events/015.4bpp"
 
 gUnknown_8366DA8:: @ 8366DA8
-	.incbin "graphics/map_objects/004.4bpp"
+	.incbin "graphics/object_events/004.4bpp"
 
 gUnknown_83685A8:: @ 83685A8
-	.incbin "graphics/map_objects/011.4bpp"
+	.incbin "graphics/object_events/011.4bpp"
 
 gUnknown_8369DA8:: @ 8369DA8
-	.incbin "graphics/map_objects/094.4bpp"
+	.incbin "graphics/object_events/094.4bpp"
 
 gUnknown_8369E28:: @ 8369E28
-	.incbin "graphics/map_objects/093.4bpp"
+	.incbin "graphics/object_events/093.4bpp"
 
 @ 8369F28
-	.incbin "graphics/map_objects/unk_8369F28.4bpp"
+	.incbin "graphics/object_events/unk_8369F28.4bpp"
 
 gUnknown_836A228:: @ 836A228
-	.incbin "graphics/map_objects/087.4bpp"
+	.incbin "graphics/object_events/087.4bpp"
 
 gUnknown_836AB28:: @ 836AB28
-	.incbin "graphics/map_objects/086.4bpp"
+	.incbin "graphics/object_events/086.4bpp"
 
 gUnknown_836AE28:: @ 836AE28
-	.incbin "graphics/map_objects/085.4bpp"
+	.incbin "graphics/object_events/085.4bpp"
 
 gUnknown_836B128:: @ 836B128
-	.incbin "graphics/map_objects/076.4bpp"
+	.incbin "graphics/object_events/076.4bpp"
 
 gUnknown_836BA28:: @ 836BA28
-	.incbin "graphics/map_objects/077.4bpp"
+	.incbin "graphics/object_events/077.4bpp"
 
 gUnknown_836C328:: @ 836C328
-	.incbin "graphics/map_objects/083.4bpp"
+	.incbin "graphics/object_events/083.4bpp"
 
 gUnknown_836C628:: @ 836C628
-	.incbin "graphics/map_objects/084.4bpp"
+	.incbin "graphics/object_events/084.4bpp"
 
 gUnknown_836C928:: @ 836C928
-	.incbin "graphics/map_objects/080.4bpp"
+	.incbin "graphics/object_events/080.4bpp"
 
 gUnknown_836CC28:: @ 836CC28
-	.incbin "graphics/map_objects/082.4bpp"
+	.incbin "graphics/object_events/082.4bpp"
 
 gUnknown_836CF28:: @ 836CF28
-	.incbin "graphics/map_objects/073.4bpp"
+	.incbin "graphics/object_events/073.4bpp"
 
 gUnknown_836D828:: @ 836D828
-	.incbin "graphics/map_objects/3.gbapal"
+	.incbin "graphics/object_events/3.gbapal"
 
 gUnknown_836D848:: @ 836D848
-	.incbin "graphics/map_objects/4.gbapal"
+	.incbin "graphics/object_events/4.gbapal"
 
 gUnknown_836D868:: @ 836D868
-	.incbin "graphics/map_objects/5.gbapal"
+	.incbin "graphics/object_events/5.gbapal"
 
 gUnknown_836D888:: @ 836D888
-	.incbin "graphics/map_objects/6.gbapal"
+	.incbin "graphics/object_events/6.gbapal"
 
 gUnknown_836D8A8:: @ 836D8A8
-	.incbin "graphics/map_objects/7.gbapal"
+	.incbin "graphics/object_events/7.gbapal"
 
 gUnknown_836D8C8:: @ 836D8C8
-	.incbin "graphics/map_objects/8.gbapal"
+	.incbin "graphics/object_events/8.gbapal"
 
 gUnknown_836D8E8:: @ 836D8E8
-	.incbin "graphics/map_objects/9.gbapal"
+	.incbin "graphics/object_events/9.gbapal"
 
 gUnknown_836D908:: @ 836D908
-	.incbin "graphics/map_objects/10.gbapal"
+	.incbin "graphics/object_events/10.gbapal"
 
 gUnknown_836D928:: @ 836D928
-	.incbin "graphics/map_objects/016.4bpp"
+	.incbin "graphics/object_events/016.4bpp"
 
 gUnknown_836DDA8:: @ 836DDA8
-	.incbin "graphics/map_objects/017.4bpp"
+	.incbin "graphics/object_events/017.4bpp"
 
 gUnknown_836E2A8:: @ 836E2A8
-	.incbin "graphics/map_objects/021.4bpp"
+	.incbin "graphics/object_events/021.4bpp"
 
 gUnknown_836E5A8:: @ 836E5A8
-	.incbin "graphics/map_objects/022.4bpp"
+	.incbin "graphics/object_events/022.4bpp"
 
 gUnknown_836EFA8:: @ 836EFA8
-	.incbin "graphics/map_objects/018.4bpp"
+	.incbin "graphics/object_events/018.4bpp"
 
 gUnknown_836F9A8:: @ 836F9A8
-	.incbin "graphics/map_objects/019.4bpp"
+	.incbin "graphics/object_events/019.4bpp"
 
 gUnknown_83703A8:: @ 83703A8
-	.incbin "graphics/map_objects/023.4bpp"
+	.incbin "graphics/object_events/023.4bpp"
 
 gUnknown_8370DA8:: @ 8370DA8
-	.incbin "graphics/map_objects/031.4bpp"
+	.incbin "graphics/object_events/031.4bpp"
 
 gUnknown_83716A8:: @ 83716A8
-	.incbin "graphics/map_objects/020.4bpp"
+	.incbin "graphics/object_events/020.4bpp"
 
 gUnknown_83720A8:: @ 83720A8
-	.incbin "graphics/map_objects/024.4bpp"
+	.incbin "graphics/object_events/024.4bpp"
 
 @ 8372AA8
-	.incbin "graphics/map_objects/unk_8372AA8.4bpp"
+	.incbin "graphics/object_events/unk_8372AA8.4bpp"
 
 gUnknown_83733A8:: @ 83733A8
-	.incbin "graphics/map_objects/027.4bpp"
+	.incbin "graphics/object_events/027.4bpp"
 
 gUnknown_8373CA8:: @ 8373CA8
-	.incbin "graphics/map_objects/030.4bpp"
+	.incbin "graphics/object_events/030.4bpp"
 
 gUnknown_83746A8:: @ 83746A8
-	.incbin "graphics/map_objects/028.4bpp"
+	.incbin "graphics/object_events/028.4bpp"
 
 gUnknown_83750A8:: @ 83750A8
-	.incbin "graphics/map_objects/032.4bpp"
+	.incbin "graphics/object_events/032.4bpp"
 
 gUnknown_8375AA8:: @ 8375AA8
-	.incbin "graphics/map_objects/034.4bpp"
+	.incbin "graphics/object_events/034.4bpp"
 
 gUnknown_8375CA8:: @ 8375CA8
-	.incbin "graphics/map_objects/047.4bpp"
+	.incbin "graphics/object_events/047.4bpp"
 
 gUnknown_83766A8:: @ 83766A8
-	.incbin "graphics/map_objects/048.4bpp"
+	.incbin "graphics/object_events/048.4bpp"
 
 gUnknown_83770A8:: @ 83770A8
-	.incbin "graphics/map_objects/029.4bpp"
+	.incbin "graphics/object_events/029.4bpp"
 
 gUnknown_8377AA8:: @ 8377AA8
-	.incbin "graphics/map_objects/059.4bpp"
+	.incbin "graphics/object_events/059.4bpp"
 
 gUnknown_83783A8:: @ 83783A8
-	.incbin "graphics/map_objects/033.4bpp"
+	.incbin "graphics/object_events/033.4bpp"
 
 gUnknown_8378CA8:: @ 8378CA8
-	.incbin "graphics/map_objects/035.4bpp"
+	.incbin "graphics/object_events/035.4bpp"
 
 gUnknown_83795A8:: @ 83795A8
-	.incbin "graphics/map_objects/039.4bpp"
+	.incbin "graphics/object_events/039.4bpp"
 
 gUnknown_8379FA8:: @ 8379FA8
-	.incbin "graphics/map_objects/040.4bpp"
+	.incbin "graphics/object_events/040.4bpp"
 
 gUnknown_837A9A8:: @ 837A9A8
-	.incbin "graphics/map_objects/041.4bpp"
+	.incbin "graphics/object_events/041.4bpp"
 
 gUnknown_837B3A8:: @ 837B3A8
-	.incbin "graphics/map_objects/042.4bpp"
+	.incbin "graphics/object_events/042.4bpp"
 
 gUnknown_837BDA8:: @ 837BDA8
-	.incbin "graphics/map_objects/121.4bpp"
+	.incbin "graphics/object_events/121.4bpp"
 
 gUnknown_837BF28:: @ 837BF28
-	.incbin "graphics/map_objects/052.4bpp"
+	.incbin "graphics/object_events/052.4bpp"
 
 gUnknown_837C928:: @ 837C928
-	.incbin "graphics/map_objects/058.4bpp"
+	.incbin "graphics/object_events/058.4bpp"
 
 gUnknown_837D328:: @ 837D328
-	.incbin "graphics/map_objects/050.4bpp"
+	.incbin "graphics/object_events/050.4bpp"
 
 gUnknown_837DC28:: @ 837DC28
-	.incbin "graphics/map_objects/043.4bpp"
+	.incbin "graphics/object_events/043.4bpp"
 
 gUnknown_837E628:: @ 837E628
-	.incbin "graphics/map_objects/044.4bpp"
+	.incbin "graphics/object_events/044.4bpp"
 
 gUnknown_837F028:: @ 837F028
-	.incbin "graphics/map_objects/045.4bpp"
+	.incbin "graphics/object_events/045.4bpp"
 
 gUnknown_837FA28:: @ 837FA28
-	.incbin "graphics/map_objects/046.4bpp"
+	.incbin "graphics/object_events/046.4bpp"
 
 gUnknown_8380428:: @ 8380428
-	.incbin "graphics/map_objects/054.4bpp"
+	.incbin "graphics/object_events/054.4bpp"
 
 gUnknown_8380E28:: @ 8380E28
-	.incbin "graphics/map_objects/055.4bpp"
+	.incbin "graphics/object_events/055.4bpp"
 
 gUnknown_8381828:: @ 8381828
-	.incbin "graphics/map_objects/061.4bpp"
+	.incbin "graphics/object_events/061.4bpp"
 
 gUnknown_8382228:: @ 8382228
-	.incbin "graphics/map_objects/062.4bpp"
+	.incbin "graphics/object_events/062.4bpp"
 
 gUnknown_8382C28:: @ 8382C28
-	.incbin "graphics/map_objects/063.4bpp"
+	.incbin "graphics/object_events/063.4bpp"
 
 gUnknown_8383528:: @ 8383528
-	.incbin "graphics/map_objects/057.4bpp"
+	.incbin "graphics/object_events/057.4bpp"
 
 gUnknown_8383F28:: @ 8383F28
-	.incbin "graphics/map_objects/090.4bpp"
+	.incbin "graphics/object_events/090.4bpp"
 
 gUnknown_8384828:: @ 8384828
-	.incbin "graphics/map_objects/152.4bpp"
+	.incbin "graphics/object_events/152.4bpp"
 
 gUnknown_8385128:: @ 8385128
-	.incbin "graphics/map_objects/037.4bpp"
+	.incbin "graphics/object_events/037.4bpp"
 
 gUnknown_8385628:: @ 8385628
-	.incbin "graphics/map_objects/036.4bpp"
+	.incbin "graphics/object_events/036.4bpp"
 
 gUnknown_8385B28:: @ 8385B28
-	.incbin "graphics/map_objects/038.4bpp"
+	.incbin "graphics/object_events/038.4bpp"
 
 gUnknown_8386028:: @ 8386028
-	.incbin "graphics/map_objects/056.4bpp"
+	.incbin "graphics/object_events/056.4bpp"
 
 gUnknown_8386A28:: @ 8386A28
-	.incbin "graphics/map_objects/053.4bpp"
+	.incbin "graphics/object_events/053.4bpp"
 
 gUnknown_8387E28:: @ 8387E28
-	.incbin "graphics/map_objects/091.4bpp"
+	.incbin "graphics/object_events/091.4bpp"
 
 gUnknown_8388728:: @ 8388728
-	.incbin "graphics/map_objects/025.4bpp"
+	.incbin "graphics/object_events/025.4bpp"
 
 gUnknown_8389128:: @ 8389128
-	.incbin "graphics/map_objects/026.4bpp"
+	.incbin "graphics/object_events/026.4bpp"
 
 gUnknown_8389B28:: @ 8389B28
-	.incbin "graphics/map_objects/071.4bpp"
+	.incbin "graphics/object_events/071.4bpp"
 
 gUnknown_838A428:: @ 838A428
-	.incbin "graphics/map_objects/072.4bpp"
+	.incbin "graphics/object_events/072.4bpp"
 
 gUnknown_838AD28:: @ 838AD28
-	.incbin "graphics/map_objects/064.4bpp"
+	.incbin "graphics/object_events/064.4bpp"
 
 gUnknown_838B128:: @ 838B128
-	.incbin "graphics/map_objects/065.4bpp"
+	.incbin "graphics/object_events/065.4bpp"
 
 gUnknown_838B428:: @ 838B428
-	.incbin "graphics/map_objects/066.4bpp"
+	.incbin "graphics/object_events/066.4bpp"
 
 gUnknown_838B728:: @ 838B728
-	.incbin "graphics/map_objects/067.4bpp"
+	.incbin "graphics/object_events/067.4bpp"
 
 gUnknown_838BA28:: @ 838BA28
-	.incbin "graphics/map_objects/092.4bpp"
+	.incbin "graphics/object_events/092.4bpp"
 
 gUnknown_838BAA8:: @ 838BAA8
-	.incbin "graphics/map_objects/078.4bpp"
+	.incbin "graphics/object_events/078.4bpp"
 
 gUnknown_838C3A8:: @ 838C3A8
-	.incbin "graphics/map_objects/079.4bpp"
+	.incbin "graphics/object_events/079.4bpp"
 
 gUnknown_838C6A8:: @ 838C6A8
-	.incbin "graphics/map_objects/068.4bpp"
+	.incbin "graphics/object_events/068.4bpp"
 
 gUnknown_838CFA8:: @ 838CFA8
-	.incbin "graphics/map_objects/069.4bpp"
+	.incbin "graphics/object_events/069.4bpp"
 
 gUnknown_838D2A8:: @ 838D2A8
-	.incbin "graphics/map_objects/070.4bpp"
+	.incbin "graphics/object_events/070.4bpp"
 
 gUnknown_838D5A8:: @ 838D5A8
-	.incbin "graphics/map_objects/unk_838D5A8.4bpp"
+	.incbin "graphics/object_events/unk_838D5A8.4bpp"
 
 gUnknown_838DEA8:: @ 838DEA8
-	.incbin "graphics/map_objects/049.4bpp"
+	.incbin "graphics/object_events/049.4bpp"
 
 gUnknown_838E7A8:: @ 838E7A8
-	.incbin "graphics/map_objects/089.4bpp"
+	.incbin "graphics/object_events/089.4bpp"
 
 gUnknown_838F0A8:: @ 838F0A8
-	.incbin "graphics/map_objects/135.4bpp"
+	.incbin "graphics/object_events/135.4bpp"
 
 gUnknown_838F228:: @ 838F228
-	.incbin "graphics/map_objects/136.4bpp"
+	.incbin "graphics/object_events/136.4bpp"
 
 gUnknown_838F428:: @ 838F428
-	.incbin "graphics/map_objects/137.4bpp"
+	.incbin "graphics/object_events/137.4bpp"
 
 gUnknown_838F628:: @ 838F628
-	.incbin "graphics/map_objects/138.4bpp"
+	.incbin "graphics/object_events/138.4bpp"
 
 gUnknown_838F828:: @ 838F828
-	.incbin "graphics/map_objects/139.4bpp"
+	.incbin "graphics/object_events/139.4bpp"
 
 gUnknown_838F8A8:: @ 838F8A8
-	.incbin "graphics/map_objects/140.4bpp"
+	.incbin "graphics/object_events/140.4bpp"
 
 gUnknown_838F928:: @ 838F928
-	.incbin "graphics/map_objects/141.4bpp"
+	.incbin "graphics/object_events/141.4bpp"
 
 gUnknown_838F9A8:: @ 838F9A8
-	.incbin "graphics/map_objects/143.4bpp"
+	.incbin "graphics/object_events/143.4bpp"
 
 gUnknown_838FA28:: @ 838FA28
-	.incbin "graphics/map_objects/142.4bpp"
+	.incbin "graphics/object_events/142.4bpp"
 
 gUnknown_838FAA8:: @ 838FAA8
-	.incbin "graphics/map_objects/144.4bpp"
+	.incbin "graphics/object_events/144.4bpp"
 
 gUnknown_838FEA8:: @ 838FEA8
-	.incbin "graphics/map_objects/145.4bpp"
+	.incbin "graphics/object_events/145.4bpp"
 
 gUnknown_83902A8:: @ 83902A8
-	.incbin "graphics/map_objects/146.4bpp"
+	.incbin "graphics/object_events/146.4bpp"
 
 gUnknown_8390328:: @ 8390328
-	.incbin "graphics/map_objects/148.4bpp"
+	.incbin "graphics/object_events/148.4bpp"
 
 gUnknown_8390728:: @ 8390728
-	.incbin "graphics/map_objects/149.4bpp"
+	.incbin "graphics/object_events/149.4bpp"
 
 gUnknown_8390B28:: @ 8390B28
-	.incbin "graphics/map_objects/150.4bpp"
+	.incbin "graphics/object_events/150.4bpp"
 
 gUnknown_8390F28:: @ 8390F28
-	.incbin "graphics/map_objects/075.4bpp"
+	.incbin "graphics/object_events/075.4bpp"
 
 gUnknown_8391228:: @ 8391228
-	.incbin "graphics/map_objects/081.4bpp"
+	.incbin "graphics/object_events/081.4bpp"
 
 gUnknown_8391528:: @ 8391528
-	.incbin "graphics/map_objects/074.4bpp"
+	.incbin "graphics/object_events/074.4bpp"
 
 gUnknown_8391828:: @ 8391828
-	.incbin "graphics/map_objects/051.4bpp"
+	.incbin "graphics/object_events/051.4bpp"
 
 gUnknown_8391B28:: @ 8391B28
-	.incbin "graphics/map_objects/088.4bpp"
+	.incbin "graphics/object_events/088.4bpp"
 
 gUnknown_8391E28:: @ 8391E28
-	.incbin "graphics/map_objects/114.4bpp"
+	.incbin "graphics/object_events/114.4bpp"
 
 gUnknown_8391FA8:: @ 8391FA8
-	.incbin "graphics/map_objects/118.4bpp"
+	.incbin "graphics/object_events/118.4bpp"
 
 gUnknown_8392128:: @ 8392128
-	.incbin "graphics/map_objects/119.4bpp"
+	.incbin "graphics/object_events/119.4bpp"
 
 gUnknown_83922A8:: @ 83922A8
-	.incbin "graphics/map_objects/122.4bpp"
+	.incbin "graphics/object_events/122.4bpp"
 
 gUnknown_8392428:: @ 8392428
-	.incbin "graphics/map_objects/123.4bpp"
+	.incbin "graphics/object_events/123.4bpp"
 
 gUnknown_83925A8:: @ 83925A8
-	.incbin "graphics/map_objects/124.4bpp"
+	.incbin "graphics/object_events/124.4bpp"
 
 gUnknown_8392728:: @ 8392728
-	.incbin "graphics/map_objects/125.4bpp"
+	.incbin "graphics/object_events/125.4bpp"
 
 gUnknown_83928A8:: @ 83928A8
-	.incbin "graphics/map_objects/126.4bpp"
+	.incbin "graphics/object_events/126.4bpp"
 
 gUnknown_8392A28:: @ 8392A28
-	.incbin "graphics/map_objects/127.4bpp"
+	.incbin "graphics/object_events/127.4bpp"
 
 gUnknown_8392BA8:: @ 8392BA8
-	.incbin "graphics/map_objects/128.4bpp"
+	.incbin "graphics/object_events/128.4bpp"
 
 gUnknown_8392D28:: @ 8392D28
-	.incbin "graphics/map_objects/129.4bpp"
+	.incbin "graphics/object_events/129.4bpp"
 
 gUnknown_8392EA8:: @ 8392EA8
-	.incbin "graphics/map_objects/130.4bpp"
+	.incbin "graphics/object_events/130.4bpp"
 
 gUnknown_8393028:: @ 8393028
-	.incbin "graphics/map_objects/131.4bpp"
+	.incbin "graphics/object_events/131.4bpp"
 
 gUnknown_83931A8:: @ 83931A8
-	.incbin "graphics/map_objects/132.4bpp"
+	.incbin "graphics/object_events/132.4bpp"
 
 gUnknown_8393328:: @ 8393328
-	.incbin "graphics/map_objects/133.4bpp"
+	.incbin "graphics/object_events/133.4bpp"
 
 gUnknown_83934A8:: @ 83934A8
-	.incbin "graphics/map_objects/147.4bpp"
+	.incbin "graphics/object_events/147.4bpp"
 
 gUnknown_8393628:: @ 8393628
-	.incbin "graphics/map_objects/134.4bpp"
+	.incbin "graphics/object_events/134.4bpp"
 
 gUnknown_83937A8:: @ 83937A8
-	.incbin "graphics/map_objects/109.4bpp"
+	.incbin "graphics/object_events/109.4bpp"
 
 gUnknown_83939A8:: @ 83939A8
-	.incbin "graphics/map_objects/110.4bpp"
+	.incbin "graphics/object_events/110.4bpp"
 
 gUnknown_8393B28:: @ 8393B28
-	.incbin "graphics/map_objects/111.4bpp"
+	.incbin "graphics/object_events/111.4bpp"
 
 gUnknown_8393CA8:: @ 8393CA8
-	.incbin "graphics/map_objects/112.4bpp"
+	.incbin "graphics/object_events/112.4bpp"
 
 gUnknown_8393E28:: @ 8393E28
-	.incbin "graphics/map_objects/117.4bpp"
+	.incbin "graphics/object_events/117.4bpp"
 
 gUnknown_8393FA8:: @ 8393FA8
-	.incbin "graphics/map_objects/120.4bpp"
+	.incbin "graphics/object_events/120.4bpp"
 
 gUnknown_8394128:: @ 8394128
-	.incbin "graphics/map_objects/115.4bpp"
+	.incbin "graphics/object_events/115.4bpp"
 
 gUnknown_83942A8:: @ 83942A8
-	.incbin "graphics/map_objects/116.4bpp"
+	.incbin "graphics/object_events/116.4bpp"
 
 gUnknown_8394428:: @ 8394428
-	.incbin "graphics/map_objects/113.4bpp"
+	.incbin "graphics/object_events/113.4bpp"
 
 gUnknown_83945A8:: @ 83945A8
-	.incbin "graphics/map_objects/095.4bpp"
+	.incbin "graphics/object_events/095.4bpp"
 
 gUnknown_83947A8:: @ 83947A8
-	.incbin "graphics/map_objects/096.4bpp"
+	.incbin "graphics/object_events/096.4bpp"
 
 gUnknown_83949A8:: @ 83949A8
-	.incbin "graphics/map_objects/097.4bpp"
+	.incbin "graphics/object_events/097.4bpp"
 
 gUnknown_8394A28:: @ 8394A28
-	.incbin "graphics/map_objects/098.4bpp"
+	.incbin "graphics/object_events/098.4bpp"
 
 gUnknown_8394AA8:: @ 8394AA8
-	.incbin "graphics/map_objects/099.4bpp"
+	.incbin "graphics/object_events/099.4bpp"
 
 gUnknown_8394B28:: @ 8394B28
-	.incbin "graphics/map_objects/100.4bpp"
+	.incbin "graphics/object_events/100.4bpp"
 
 gUnknown_8394BA8:: @ 8394BA8
-	.incbin "graphics/map_objects/101.4bpp"
+	.incbin "graphics/object_events/101.4bpp"
 
 gUnknown_8394C28:: @ 8394C28
-	.incbin "graphics/map_objects/102.4bpp"
+	.incbin "graphics/object_events/102.4bpp"
 
 gUnknown_8394D28:: @ 8394D28
-	.incbin "graphics/map_objects/103.4bpp"
+	.incbin "graphics/object_events/103.4bpp"
 
 gUnknown_8394DA8:: @ 8394DA8
-	.incbin "graphics/map_objects/104.4bpp"
+	.incbin "graphics/object_events/104.4bpp"
 
 gUnknown_8394E28:: @ 8394E28
-	.incbin "graphics/map_objects/105.4bpp"
+	.incbin "graphics/object_events/105.4bpp"
 
 gUnknown_8394EA8:: @ 8394EA8
-	.incbin "graphics/map_objects/19.gbapal"
+	.incbin "graphics/object_events/19.gbapal"
 
 gUnknown_8394EC8:: @ 8394EC8
-	.incbin "graphics/map_objects/106.4bpp"
+	.incbin "graphics/object_events/106.4bpp"
 
 gUnknown_83950C8:: @ 83950C8
-	.incbin "graphics/map_objects/107.4bpp"
+	.incbin "graphics/object_events/107.4bpp"
 
 gUnknown_83952C8:: @ 83952C8
-	.incbin "graphics/map_objects/20.gbapal"
+	.incbin "graphics/object_events/20.gbapal"
 
 gUnknown_83952E8:: @ 83952E8
-	.incbin "graphics/map_objects/108.4bpp"
+	.incbin "graphics/object_events/108.4bpp"
 
 gUnknown_8395AE8:: @ 8395AE8
-	.incbin "graphics/map_objects/21.gbapal"
+	.incbin "graphics/object_events/21.gbapal"
 
 gUnknown_8395B08:: @ 8395B08
-	.incbin "graphics/map_objects/151.4bpp"
-	.incbin "graphics/map_objects/unk_396B08.4bpp"
+	.incbin "graphics/object_events/151.4bpp"
+	.incbin "graphics/object_events/unk_396B08.4bpp"
 
 gUnknown_8397708:: @ 8397708
-	.incbin "graphics/map_objects/060.4bpp"
+	.incbin "graphics/object_events/060.4bpp"
 
 gUnknown_8398008:: @ 8398008
-	.incbin "graphics/map_objects/11.gbapal"
+	.incbin "graphics/object_events/11.gbapal"
 
 gUnknown_8398028:: @ 8398028
-	.incbin "graphics/map_objects/12.gbapal"
+	.incbin "graphics/object_events/12.gbapal"
 
 	.incbin "baserom.gba", 0x398048, 0x600
 
 gUnknown_8398648::
-	.incbin "graphics/map_objects/fldeff_cut.4bpp"
-	.incbin "graphics/map_objects/fldeff_cut.4bpp"
+	.incbin "graphics/object_events/fldeff_cut.4bpp"
+	.incbin "graphics/object_events/fldeff_cut.4bpp"
 
 gUnknown_8398688::
-	.incbin "graphics/map_objects/fldeff_cut.gbapal"
+	.incbin "graphics/object_events/fldeff_cut.gbapal"
 	.incbin "baserom.gba", 0x3986A8, 0xCE0
 
 gUnknown_8399388:: @ 8399388
@@ -561,159 +561,159 @@ gUnknown_839FD0C:: @ 839FD0C
 gUnknown_839FD5D:: @ 839FD5D
 	.incbin "baserom.gba", 0x39FD5D, 0x53
 
-gMapObjectGraphicsInfoPointers:: @ 839FDB0
-	.4byte gMapObjectGraphicsInfo_83A3BB0
-	.4byte gMapObjectGraphicsInfo_83A3BD4
-	.4byte gMapObjectGraphicsInfo_83A3BF8
-	.4byte gMapObjectGraphicsInfo_83A3C1C
-	.4byte gMapObjectGraphicsInfo_83A4858
-	.4byte gMapObjectGraphicsInfo_83A48A0
-	.4byte gMapObjectGraphicsInfo_83A48C4
-	.4byte gMapObjectGraphicsInfo_83A4564
-	.4byte gMapObjectGraphicsInfo_83A4588
-	.4byte gMapObjectGraphicsInfo_83A45AC
-	.4byte gMapObjectGraphicsInfo_83A45D0
-	.4byte gMapObjectGraphicsInfo_83A487C
-	.4byte gMapObjectGraphicsInfo_83A48E8
-	.4byte gMapObjectGraphicsInfo_83A490C
-	.4byte gMapObjectGraphicsInfo_83A3C64
-	.4byte gMapObjectGraphicsInfo_83A3C88
-	.4byte gMapObjectGraphicsInfo_83A3CAC
-	.4byte gMapObjectGraphicsInfo_83A3CD0
-	.4byte gMapObjectGraphicsInfo_83A3D3C
-	.4byte gMapObjectGraphicsInfo_83A3DA8
-	.4byte gMapObjectGraphicsInfo_83A3DF0
-	.4byte gMapObjectGraphicsInfo_83A3CF4
-	.4byte gMapObjectGraphicsInfo_83A3D18
-	.4byte gMapObjectGraphicsInfo_83A3D60
-	.4byte gMapObjectGraphicsInfo_83A3DCC
-	.4byte gMapObjectGraphicsInfo_83A4390
-	.4byte gMapObjectGraphicsInfo_83A43B4
-	.4byte gMapObjectGraphicsInfo_83A3E14
-	.4byte gMapObjectGraphicsInfo_83A3E5C
-	.4byte gMapObjectGraphicsInfo_83A3EEC
-	.4byte gMapObjectGraphicsInfo_83A3E38
-	.4byte gMapObjectGraphicsInfo_83A3D84
-	.4byte gMapObjectGraphicsInfo_83A3E80
-	.4byte gMapObjectGraphicsInfo_83A3F34
-	.4byte gMapObjectGraphicsInfo_83A4420
-	.4byte gMapObjectGraphicsInfo_83A3F58
-	.4byte gMapObjectGraphicsInfo_83A424C
-	.4byte gMapObjectGraphicsInfo_83A4228
-	.4byte gMapObjectGraphicsInfo_83A4270
-	.4byte gMapObjectGraphicsInfo_83A3F7C
-	.4byte gMapObjectGraphicsInfo_83A3FA0
-	.4byte gMapObjectGraphicsInfo_83A3FC4
-	.4byte gMapObjectGraphicsInfo_83A3FE8
-	.4byte gMapObjectGraphicsInfo_83A4078
-	.4byte gMapObjectGraphicsInfo_83A409C
-	.4byte gMapObjectGraphicsInfo_83A40C0
-	.4byte gMapObjectGraphicsInfo_83A40E4
-	.4byte gMapObjectGraphicsInfo_83A3EA4
-	.4byte gMapObjectGraphicsInfo_83A3EC8
-	.4byte gMapObjectGraphicsInfo_83A4618
-	.4byte gMapObjectGraphicsInfo_83A4054
-	.4byte gMapObjectGraphicsInfo_83A4978
-	.4byte gMapObjectGraphicsInfo_83A400C
-	.4byte gMapObjectGraphicsInfo_83A42B8
-	.4byte gMapObjectGraphicsInfo_83A4108
-	.4byte gMapObjectGraphicsInfo_83A412C
-	.4byte gMapObjectGraphicsInfo_83A4294
-	.4byte gMapObjectGraphicsInfo_83A41BC
-	.4byte gMapObjectGraphicsInfo_83A4030
-	.4byte gMapObjectGraphicsInfo_83A3F10
-	.4byte gMapObjectGraphicsInfo_83A3C40
-	.4byte gMapObjectGraphicsInfo_83A4150
-	.4byte gMapObjectGraphicsInfo_83A4174
-	.4byte gMapObjectGraphicsInfo_83A4198
-	.4byte gMapObjectGraphicsInfo_83A4300
-	.4byte gMapObjectGraphicsInfo_83A44D4
-	.4byte gMapObjectGraphicsInfo_83A44F8
-	.4byte gMapObjectGraphicsInfo_83A4324
-	.4byte gMapObjectGraphicsInfo_83A4468
-	.4byte gMapObjectGraphicsInfo_83A448C
-	.4byte gMapObjectGraphicsInfo_83A44B0
-	.4byte gMapObjectGraphicsInfo_83A436C
-	.4byte gMapObjectGraphicsInfo_83A4834
-	.4byte gMapObjectGraphicsInfo_83A47A4
-	.4byte gMapObjectGraphicsInfo_83A4810
-	.4byte gMapObjectGraphicsInfo_83A4660
-	.4byte gMapObjectGraphicsInfo_83A47C8
-	.4byte gMapObjectGraphicsInfo_83A47EC
-	.4byte gMapObjectGraphicsInfo_83A43D8
-	.4byte gMapObjectGraphicsInfo_83A43FC
-	.4byte gMapObjectGraphicsInfo_83A4684
-	.4byte gMapObjectGraphicsInfo_83A46A8
-	.4byte gMapObjectGraphicsInfo_83A46CC
-	.4byte gMapObjectGraphicsInfo_83A46F0
-	.4byte gMapObjectGraphicsInfo_83A4714
-	.4byte gMapObjectGraphicsInfo_83A4780
-	.4byte gMapObjectGraphicsInfo_83A475C
-	.4byte gMapObjectGraphicsInfo_83A4738
-	.4byte gMapObjectGraphicsInfo_83A50EC
-	.4byte gMapObjectGraphicsInfo_83A463C
-	.4byte gMapObjectGraphicsInfo_83A41E0
-	.4byte gMapObjectGraphicsInfo_83A42DC
-	.4byte gMapObjectGraphicsInfo_83A4348
-	.4byte gMapObjectGraphicsInfo_83A4930
-	.4byte gMapObjectGraphicsInfo_83A4954
-	.4byte gMapObjectGraphicsInfo_83A4444
-	.4byte gMapObjectGraphicsInfo_83A451C
-	.4byte gMapObjectGraphicsInfo_83A4540
-	.4byte gMapObjectGraphicsInfo_83A49C0
-	.4byte gMapObjectGraphicsInfo_83A49E4
-	.4byte gMapObjectGraphicsInfo_83A4A08
-	.4byte gMapObjectGraphicsInfo_83A4A2C
-	.4byte gMapObjectGraphicsInfo_83A4A50
-	.4byte gMapObjectGraphicsInfo_83A4A74
-	.4byte gMapObjectGraphicsInfo_83A4A98
-	.4byte gMapObjectGraphicsInfo_83A4ABC
-	.4byte gMapObjectGraphicsInfo_83A4AE0
-	.4byte gMapObjectGraphicsInfo_83A4B04
-	.4byte gMapObjectGraphicsInfo_83A5110
-	.4byte gMapObjectGraphicsInfo_83A499C
-	.4byte gMapObjectGraphicsInfo_83A4B28
-	.4byte gMapObjectGraphicsInfo_83A4F84
-	.4byte gMapObjectGraphicsInfo_83A4FF0
-	.4byte gMapObjectGraphicsInfo_83A50C8
-	.4byte gMapObjectGraphicsInfo_83A5014
-	.4byte gMapObjectGraphicsInfo_83A5080
-	.4byte gMapObjectGraphicsInfo_83A50A4
-	.4byte gMapObjectGraphicsInfo_83A5038
-	.4byte gMapObjectGraphicsInfo_83A4B4C
-	.4byte gMapObjectGraphicsInfo_83A4B70
-	.4byte gMapObjectGraphicsInfo_83A505C
-	.4byte gMapObjectGraphicsInfo_83A4B94
-	.4byte gMapObjectGraphicsInfo_83A4BB8
-	.4byte gMapObjectGraphicsInfo_83A4BDC
-	.4byte gMapObjectGraphicsInfo_83A4C00
-	.4byte gMapObjectGraphicsInfo_83A4C24
-	.4byte gMapObjectGraphicsInfo_83A4C48
-	.4byte gMapObjectGraphicsInfo_83A4C6C
-	.4byte gMapObjectGraphicsInfo_83A4C90
-	.4byte gMapObjectGraphicsInfo_83A4CB4
-	.4byte gMapObjectGraphicsInfo_83A4CD8
-	.4byte gMapObjectGraphicsInfo_83A4CFC
-	.4byte gMapObjectGraphicsInfo_83A4D20
-	.4byte gMapObjectGraphicsInfo_83A4D44
-	.4byte gMapObjectGraphicsInfo_83A4FA8
-	.4byte gMapObjectGraphicsInfo_83A4D68
-	.4byte gMapObjectGraphicsInfo_83A4D8C
-	.4byte gMapObjectGraphicsInfo_83A4DB0
-	.4byte gMapObjectGraphicsInfo_83A4DD4
-	.4byte gMapObjectGraphicsInfo_83A4E64
-	.4byte gMapObjectGraphicsInfo_83A4E88
-	.4byte gMapObjectGraphicsInfo_83A4EAC
-	.4byte gMapObjectGraphicsInfo_83A4EF4
-	.4byte gMapObjectGraphicsInfo_83A4ED0
-	.4byte gMapObjectGraphicsInfo_83A4F18
-	.4byte gMapObjectGraphicsInfo_83A4F3C
-	.4byte gMapObjectGraphicsInfo_83A4F60
-	.4byte gMapObjectGraphicsInfo_83A4FCC
-	.4byte gMapObjectGraphicsInfo_83A4DF8
-	.4byte gMapObjectGraphicsInfo_83A4E1C
-	.4byte gMapObjectGraphicsInfo_83A4E40
-	.4byte gMapObjectGraphicsInfo_83A5134
+gObjectEventGraphicsInfoPointers:: @ 839FDB0
+	.4byte gObjectEventGraphicsInfo_83A3BB0
+	.4byte gObjectEventGraphicsInfo_83A3BD4
+	.4byte gObjectEventGraphicsInfo_83A3BF8
+	.4byte gObjectEventGraphicsInfo_83A3C1C
+	.4byte gObjectEventGraphicsInfo_83A4858
+	.4byte gObjectEventGraphicsInfo_83A48A0
+	.4byte gObjectEventGraphicsInfo_83A48C4
+	.4byte gObjectEventGraphicsInfo_83A4564
+	.4byte gObjectEventGraphicsInfo_83A4588
+	.4byte gObjectEventGraphicsInfo_83A45AC
+	.4byte gObjectEventGraphicsInfo_83A45D0
+	.4byte gObjectEventGraphicsInfo_83A487C
+	.4byte gObjectEventGraphicsInfo_83A48E8
+	.4byte gObjectEventGraphicsInfo_83A490C
+	.4byte gObjectEventGraphicsInfo_83A3C64
+	.4byte gObjectEventGraphicsInfo_83A3C88
+	.4byte gObjectEventGraphicsInfo_83A3CAC
+	.4byte gObjectEventGraphicsInfo_83A3CD0
+	.4byte gObjectEventGraphicsInfo_83A3D3C
+	.4byte gObjectEventGraphicsInfo_83A3DA8
+	.4byte gObjectEventGraphicsInfo_83A3DF0
+	.4byte gObjectEventGraphicsInfo_83A3CF4
+	.4byte gObjectEventGraphicsInfo_83A3D18
+	.4byte gObjectEventGraphicsInfo_83A3D60
+	.4byte gObjectEventGraphicsInfo_83A3DCC
+	.4byte gObjectEventGraphicsInfo_83A4390
+	.4byte gObjectEventGraphicsInfo_83A43B4
+	.4byte gObjectEventGraphicsInfo_83A3E14
+	.4byte gObjectEventGraphicsInfo_83A3E5C
+	.4byte gObjectEventGraphicsInfo_83A3EEC
+	.4byte gObjectEventGraphicsInfo_83A3E38
+	.4byte gObjectEventGraphicsInfo_83A3D84
+	.4byte gObjectEventGraphicsInfo_83A3E80
+	.4byte gObjectEventGraphicsInfo_83A3F34
+	.4byte gObjectEventGraphicsInfo_83A4420
+	.4byte gObjectEventGraphicsInfo_83A3F58
+	.4byte gObjectEventGraphicsInfo_83A424C
+	.4byte gObjectEventGraphicsInfo_83A4228
+	.4byte gObjectEventGraphicsInfo_83A4270
+	.4byte gObjectEventGraphicsInfo_83A3F7C
+	.4byte gObjectEventGraphicsInfo_83A3FA0
+	.4byte gObjectEventGraphicsInfo_83A3FC4
+	.4byte gObjectEventGraphicsInfo_83A3FE8
+	.4byte gObjectEventGraphicsInfo_83A4078
+	.4byte gObjectEventGraphicsInfo_83A409C
+	.4byte gObjectEventGraphicsInfo_83A40C0
+	.4byte gObjectEventGraphicsInfo_83A40E4
+	.4byte gObjectEventGraphicsInfo_83A3EA4
+	.4byte gObjectEventGraphicsInfo_83A3EC8
+	.4byte gObjectEventGraphicsInfo_83A4618
+	.4byte gObjectEventGraphicsInfo_83A4054
+	.4byte gObjectEventGraphicsInfo_83A4978
+	.4byte gObjectEventGraphicsInfo_83A400C
+	.4byte gObjectEventGraphicsInfo_83A42B8
+	.4byte gObjectEventGraphicsInfo_83A4108
+	.4byte gObjectEventGraphicsInfo_83A412C
+	.4byte gObjectEventGraphicsInfo_83A4294
+	.4byte gObjectEventGraphicsInfo_83A41BC
+	.4byte gObjectEventGraphicsInfo_83A4030
+	.4byte gObjectEventGraphicsInfo_83A3F10
+	.4byte gObjectEventGraphicsInfo_83A3C40
+	.4byte gObjectEventGraphicsInfo_83A4150
+	.4byte gObjectEventGraphicsInfo_83A4174
+	.4byte gObjectEventGraphicsInfo_83A4198
+	.4byte gObjectEventGraphicsInfo_83A4300
+	.4byte gObjectEventGraphicsInfo_83A44D4
+	.4byte gObjectEventGraphicsInfo_83A44F8
+	.4byte gObjectEventGraphicsInfo_83A4324
+	.4byte gObjectEventGraphicsInfo_83A4468
+	.4byte gObjectEventGraphicsInfo_83A448C
+	.4byte gObjectEventGraphicsInfo_83A44B0
+	.4byte gObjectEventGraphicsInfo_83A436C
+	.4byte gObjectEventGraphicsInfo_83A4834
+	.4byte gObjectEventGraphicsInfo_83A47A4
+	.4byte gObjectEventGraphicsInfo_83A4810
+	.4byte gObjectEventGraphicsInfo_83A4660
+	.4byte gObjectEventGraphicsInfo_83A47C8
+	.4byte gObjectEventGraphicsInfo_83A47EC
+	.4byte gObjectEventGraphicsInfo_83A43D8
+	.4byte gObjectEventGraphicsInfo_83A43FC
+	.4byte gObjectEventGraphicsInfo_83A4684
+	.4byte gObjectEventGraphicsInfo_83A46A8
+	.4byte gObjectEventGraphicsInfo_83A46CC
+	.4byte gObjectEventGraphicsInfo_83A46F0
+	.4byte gObjectEventGraphicsInfo_83A4714
+	.4byte gObjectEventGraphicsInfo_83A4780
+	.4byte gObjectEventGraphicsInfo_83A475C
+	.4byte gObjectEventGraphicsInfo_83A4738
+	.4byte gObjectEventGraphicsInfo_83A50EC
+	.4byte gObjectEventGraphicsInfo_83A463C
+	.4byte gObjectEventGraphicsInfo_83A41E0
+	.4byte gObjectEventGraphicsInfo_83A42DC
+	.4byte gObjectEventGraphicsInfo_83A4348
+	.4byte gObjectEventGraphicsInfo_83A4930
+	.4byte gObjectEventGraphicsInfo_83A4954
+	.4byte gObjectEventGraphicsInfo_83A4444
+	.4byte gObjectEventGraphicsInfo_83A451C
+	.4byte gObjectEventGraphicsInfo_83A4540
+	.4byte gObjectEventGraphicsInfo_83A49C0
+	.4byte gObjectEventGraphicsInfo_83A49E4
+	.4byte gObjectEventGraphicsInfo_83A4A08
+	.4byte gObjectEventGraphicsInfo_83A4A2C
+	.4byte gObjectEventGraphicsInfo_83A4A50
+	.4byte gObjectEventGraphicsInfo_83A4A74
+	.4byte gObjectEventGraphicsInfo_83A4A98
+	.4byte gObjectEventGraphicsInfo_83A4ABC
+	.4byte gObjectEventGraphicsInfo_83A4AE0
+	.4byte gObjectEventGraphicsInfo_83A4B04
+	.4byte gObjectEventGraphicsInfo_83A5110
+	.4byte gObjectEventGraphicsInfo_83A499C
+	.4byte gObjectEventGraphicsInfo_83A4B28
+	.4byte gObjectEventGraphicsInfo_83A4F84
+	.4byte gObjectEventGraphicsInfo_83A4FF0
+	.4byte gObjectEventGraphicsInfo_83A50C8
+	.4byte gObjectEventGraphicsInfo_83A5014
+	.4byte gObjectEventGraphicsInfo_83A5080
+	.4byte gObjectEventGraphicsInfo_83A50A4
+	.4byte gObjectEventGraphicsInfo_83A5038
+	.4byte gObjectEventGraphicsInfo_83A4B4C
+	.4byte gObjectEventGraphicsInfo_83A4B70
+	.4byte gObjectEventGraphicsInfo_83A505C
+	.4byte gObjectEventGraphicsInfo_83A4B94
+	.4byte gObjectEventGraphicsInfo_83A4BB8
+	.4byte gObjectEventGraphicsInfo_83A4BDC
+	.4byte gObjectEventGraphicsInfo_83A4C00
+	.4byte gObjectEventGraphicsInfo_83A4C24
+	.4byte gObjectEventGraphicsInfo_83A4C48
+	.4byte gObjectEventGraphicsInfo_83A4C6C
+	.4byte gObjectEventGraphicsInfo_83A4C90
+	.4byte gObjectEventGraphicsInfo_83A4CB4
+	.4byte gObjectEventGraphicsInfo_83A4CD8
+	.4byte gObjectEventGraphicsInfo_83A4CFC
+	.4byte gObjectEventGraphicsInfo_83A4D20
+	.4byte gObjectEventGraphicsInfo_83A4D44
+	.4byte gObjectEventGraphicsInfo_83A4FA8
+	.4byte gObjectEventGraphicsInfo_83A4D68
+	.4byte gObjectEventGraphicsInfo_83A4D8C
+	.4byte gObjectEventGraphicsInfo_83A4DB0
+	.4byte gObjectEventGraphicsInfo_83A4DD4
+	.4byte gObjectEventGraphicsInfo_83A4E64
+	.4byte gObjectEventGraphicsInfo_83A4E88
+	.4byte gObjectEventGraphicsInfo_83A4EAC
+	.4byte gObjectEventGraphicsInfo_83A4EF4
+	.4byte gObjectEventGraphicsInfo_83A4ED0
+	.4byte gObjectEventGraphicsInfo_83A4F18
+	.4byte gObjectEventGraphicsInfo_83A4F3C
+	.4byte gObjectEventGraphicsInfo_83A4F60
+	.4byte gObjectEventGraphicsInfo_83A4FCC
+	.4byte gObjectEventGraphicsInfo_83A4DF8
+	.4byte gObjectEventGraphicsInfo_83A4E1C
+	.4byte gObjectEventGraphicsInfo_83A4E40
+	.4byte gObjectEventGraphicsInfo_83A5134
 
 gUnknown_83A0010:: @ 83A0010
 	.incbin "baserom.gba", 0x3A0010, 0x90
@@ -3658,7 +3658,7 @@ gSubspriteTables_83A3A50:: @ 83A3A50
 
 	.incbin "baserom.gba", 0x3A3A80, 0x130
 
-gMapObjectGraphicsInfo_83A3BB0:: @ 83A3BB0
+gObjectEventGraphicsInfo_83A3BB0:: @ 83A3BB0
 	.2byte 0xFFFF, 0x1100, 0x1102, 0x200, 16, 32
 	.byte 0 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -3669,7 +3669,7 @@ gMapObjectGraphicsInfo_83A3BB0:: @ 83A3BB0
 	.4byte gSpriteImages_83A00A0
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A3BD4:: @ 83A3BD4
+gObjectEventGraphicsInfo_83A3BD4:: @ 83A3BD4
 	.2byte 0xFFFF, 0x1100, 0x1102, 0x200, 32, 32
 	.byte 0 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 2
@@ -3680,7 +3680,7 @@ gMapObjectGraphicsInfo_83A3BD4:: @ 83A3BD4
 	.4byte gSpriteImages_83A0140
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A3BF8:: @ 83A3BF8
+gObjectEventGraphicsInfo_83A3BF8:: @ 83A3BF8
 	.2byte 0xFFFF, 0x1100, 0x11FF, 0x100, 16, 32
 	.byte 0 | (1 << 4) | (0 << 6) | (1 << 7)
 	.byte 1
@@ -3691,7 +3691,7 @@ gMapObjectGraphicsInfo_83A3BF8:: @ 83A3BF8
 	.4byte gSpriteImages_83A0270
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A3C1C:: @ 83A3C1C
+gObjectEventGraphicsInfo_83A3C1C:: @ 83A3C1C
 	.2byte 0xFFFF, 0x1100, 0x1102, 0x100, 16, 32
 	.byte 0 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -3702,7 +3702,7 @@ gMapObjectGraphicsInfo_83A3C1C:: @ 83A3C1C
 	.4byte gSpriteImages_83A0330
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A3C40:: @ 83A3C40
+gObjectEventGraphicsInfo_83A3C40:: @ 83A3C40
 	.2byte 0xFFFF, 0x1103, 0x11FF, 0x100, 16, 32
 	.byte 2 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -3713,7 +3713,7 @@ gMapObjectGraphicsInfo_83A3C40:: @ 83A3C40
 	.4byte gSpriteImages_83A04C0
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A3C64:: @ 83A3C64
+gObjectEventGraphicsInfo_83A3C64:: @ 83A3C64
 	.2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32
 	.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -3724,7 +3724,7 @@ gMapObjectGraphicsInfo_83A3C64:: @ 83A3C64
 	.4byte gSpriteImages_83A0420
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A3C88:: @ 83A3C88
+gObjectEventGraphicsInfo_83A3C88:: @ 83A3C88
 	.2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32
 	.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -3735,7 +3735,7 @@ gMapObjectGraphicsInfo_83A3C88:: @ 83A3C88
 	.4byte gSpriteImages_83A0470
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A3CAC:: @ 83A3CAC
+gObjectEventGraphicsInfo_83A3CAC:: @ 83A3CAC
 	.2byte 0xFFFF, 0x1106, 0x11FF, 0x80, 16, 16
 	.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -3746,7 +3746,7 @@ gMapObjectGraphicsInfo_83A3CAC:: @ 83A3CAC
 	.4byte gSpriteImages_83A0508
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A3CD0:: @ 83A3CD0
+gObjectEventGraphicsInfo_83A3CD0:: @ 83A3CD0
 	.2byte 0xFFFF, 0x1104, 0x11FF, 0x80, 16, 16
 	.byte 3 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -3757,7 +3757,7 @@ gMapObjectGraphicsInfo_83A3CD0:: @ 83A3CD0
 	.4byte gSpriteImages_83A0550
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A3CF4:: @ 83A3CF4
+gObjectEventGraphicsInfo_83A3CF4:: @ 83A3CF4
 	.2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32
 	.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -3768,7 +3768,7 @@ gMapObjectGraphicsInfo_83A3CF4:: @ 83A3CF4
 	.4byte gSpriteImages_83A05A0
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A3D18:: @ 83A3D18
+gObjectEventGraphicsInfo_83A3D18:: @ 83A3D18
 	.2byte 0xFFFF, 0x1103, 0x11FF, 0x100, 16, 32
 	.byte 2 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -3779,7 +3779,7 @@ gMapObjectGraphicsInfo_83A3D18:: @ 83A3D18
 	.4byte gSpriteImages_83A05E8
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A3D3C:: @ 83A3D3C
+gObjectEventGraphicsInfo_83A3D3C:: @ 83A3D3C
 	.2byte 0xFFFF, 0x1103, 0x11FF, 0x100, 16, 32
 	.byte 2 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -3790,7 +3790,7 @@ gMapObjectGraphicsInfo_83A3D3C:: @ 83A3D3C
 	.4byte gSpriteImages_83A0638
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A3D60:: @ 83A3D60
+gObjectEventGraphicsInfo_83A3D60:: @ 83A3D60
 	.2byte 0xFFFF, 0x1105, 0x11FF, 0x100, 16, 32
 	.byte 4 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -3801,7 +3801,7 @@ gMapObjectGraphicsInfo_83A3D60:: @ 83A3D60
 	.4byte gSpriteImages_83A0688
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A3D84:: @ 83A3D84
+gObjectEventGraphicsInfo_83A3D84:: @ 83A3D84
 	.2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32
 	.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -3812,7 +3812,7 @@ gMapObjectGraphicsInfo_83A3D84:: @ 83A3D84
 	.4byte gSpriteImages_83A06D8
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A3DA8:: @ 83A3DA8
+gObjectEventGraphicsInfo_83A3DA8:: @ 83A3DA8
 	.2byte 0xFFFF, 0x1105, 0x11FF, 0x100, 16, 32
 	.byte 4 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -3823,7 +3823,7 @@ gMapObjectGraphicsInfo_83A3DA8:: @ 83A3DA8
 	.4byte gSpriteImages_83A0C40
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A3DCC:: @ 83A3DCC
+gObjectEventGraphicsInfo_83A3DCC:: @ 83A3DCC
 	.2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32
 	.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -3834,7 +3834,7 @@ gMapObjectGraphicsInfo_83A3DCC:: @ 83A3DCC
 	.4byte gSpriteImages_83A0720
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A3DF0:: @ 83A3DF0
+gObjectEventGraphicsInfo_83A3DF0:: @ 83A3DF0
 	.2byte 0xFFFF, 0x1105, 0x11FF, 0x100, 16, 32
 	.byte 4 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -3845,7 +3845,7 @@ gMapObjectGraphicsInfo_83A3DF0:: @ 83A3DF0
 	.4byte gSpriteImages_83A0770
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A3E14:: @ 83A3E14
+gObjectEventGraphicsInfo_83A3E14:: @ 83A3E14
 	.2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32
 	.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -3856,7 +3856,7 @@ gMapObjectGraphicsInfo_83A3E14:: @ 83A3E14
 	.4byte gSpriteImages_83A07C0
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A3E38:: @ 83A3E38
+gObjectEventGraphicsInfo_83A3E38:: @ 83A3E38
 	.2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32
 	.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -3867,7 +3867,7 @@ gMapObjectGraphicsInfo_83A3E38:: @ 83A3E38
 	.4byte gSpriteImages_83A0808
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A3E5C:: @ 83A3E5C
+gObjectEventGraphicsInfo_83A3E5C:: @ 83A3E5C
 	.2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32
 	.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -3878,7 +3878,7 @@ gMapObjectGraphicsInfo_83A3E5C:: @ 83A3E5C
 	.4byte gSpriteImages_83A0858
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A3E80:: @ 83A3E80
+gObjectEventGraphicsInfo_83A3E80:: @ 83A3E80
 	.2byte 0xFFFF, 0x1104, 0x11FF, 0x100, 16, 32
 	.byte 3 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -3889,7 +3889,7 @@ gMapObjectGraphicsInfo_83A3E80:: @ 83A3E80
 	.4byte gSpriteImages_83A08A8
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A3EA4:: @ 83A3EA4
+gObjectEventGraphicsInfo_83A3EA4:: @ 83A3EA4
 	.2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32
 	.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -3900,7 +3900,7 @@ gMapObjectGraphicsInfo_83A3EA4:: @ 83A3EA4
 	.4byte gSpriteImages_83A08F8
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A3EC8:: @ 83A3EC8
+gObjectEventGraphicsInfo_83A3EC8:: @ 83A3EC8
 	.2byte 0xFFFF, 0x1105, 0x11FF, 0x100, 16, 32
 	.byte 4 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -3911,7 +3911,7 @@ gMapObjectGraphicsInfo_83A3EC8:: @ 83A3EC8
 	.4byte gSpriteImages_83A0940
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A3EEC:: @ 83A3EEC
+gObjectEventGraphicsInfo_83A3EEC:: @ 83A3EEC
 	.2byte 0xFFFF, 0x1103, 0x11FF, 0x100, 16, 32
 	.byte 2 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -3922,7 +3922,7 @@ gMapObjectGraphicsInfo_83A3EEC:: @ 83A3EEC
 	.4byte gSpriteImages_83A0988
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A3F10:: @ 83A3F10
+gObjectEventGraphicsInfo_83A3F10:: @ 83A3F10
 	.2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32
 	.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -3933,7 +3933,7 @@ gMapObjectGraphicsInfo_83A3F10:: @ 83A3F10
 	.4byte gSpriteImages_83A09D8
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A3F34:: @ 83A3F34
+gObjectEventGraphicsInfo_83A3F34:: @ 83A3F34
 	.2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32
 	.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -3944,7 +3944,7 @@ gMapObjectGraphicsInfo_83A3F34:: @ 83A3F34
 	.4byte gSpriteImages_83A0A20
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A3F58:: @ 83A3F58
+gObjectEventGraphicsInfo_83A3F58:: @ 83A3F58
 	.2byte 0xFFFF, 0x1104, 0x11FF, 0x100, 16, 32
 	.byte 3 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -3955,7 +3955,7 @@ gMapObjectGraphicsInfo_83A3F58:: @ 83A3F58
 	.4byte gSpriteImages_83A0AB8
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A3F7C:: @ 83A3F7C
+gObjectEventGraphicsInfo_83A3F7C:: @ 83A3F7C
 	.2byte 0xFFFF, 0x1105, 0x11FF, 0x100, 16, 32
 	.byte 4 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -3966,7 +3966,7 @@ gMapObjectGraphicsInfo_83A3F7C:: @ 83A3F7C
 	.4byte gSpriteImages_83A0B00
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A3FA0:: @ 83A3FA0
+gObjectEventGraphicsInfo_83A3FA0:: @ 83A3FA0
 	.2byte 0xFFFF, 0x1105, 0x11FF, 0x100, 16, 32
 	.byte 4 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -3977,7 +3977,7 @@ gMapObjectGraphicsInfo_83A3FA0:: @ 83A3FA0
 	.4byte gSpriteImages_83A0B50
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A3FC4:: @ 83A3FC4
+gObjectEventGraphicsInfo_83A3FC4:: @ 83A3FC4
 	.2byte 0xFFFF, 0x1103, 0x11FF, 0x100, 16, 32
 	.byte 2 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -3988,7 +3988,7 @@ gMapObjectGraphicsInfo_83A3FC4:: @ 83A3FC4
 	.4byte gSpriteImages_83A0BA0
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A3FE8:: @ 83A3FE8
+gObjectEventGraphicsInfo_83A3FE8:: @ 83A3FE8
 	.2byte 0xFFFF, 0x1103, 0x11FF, 0x100, 16, 32
 	.byte 2 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -3999,7 +3999,7 @@ gMapObjectGraphicsInfo_83A3FE8:: @ 83A3FE8
 	.4byte gSpriteImages_83A0BF0
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A400C:: @ 83A400C
+gObjectEventGraphicsInfo_83A400C:: @ 83A400C
 	.2byte 0xFFFF, 0x1104, 0x11FF, 0x100, 16, 32
 	.byte 3 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -4010,7 +4010,7 @@ gMapObjectGraphicsInfo_83A400C:: @ 83A400C
 	.4byte gSpriteImages_83A0C90
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A4030:: @ 83A4030
+gObjectEventGraphicsInfo_83A4030:: @ 83A4030
 	.2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32
 	.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -4021,7 +4021,7 @@ gMapObjectGraphicsInfo_83A4030:: @ 83A4030
 	.4byte gSpriteImages_83A0CE0
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A4054:: @ 83A4054
+gObjectEventGraphicsInfo_83A4054:: @ 83A4054
 	.2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32
 	.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -4032,7 +4032,7 @@ gMapObjectGraphicsInfo_83A4054:: @ 83A4054
 	.4byte gSpriteImages_83A0D30
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A4078:: @ 83A4078
+gObjectEventGraphicsInfo_83A4078:: @ 83A4078
 	.2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32
 	.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -4043,7 +4043,7 @@ gMapObjectGraphicsInfo_83A4078:: @ 83A4078
 	.4byte gSpriteImages_83A0D78
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A409C:: @ 83A409C
+gObjectEventGraphicsInfo_83A409C:: @ 83A409C
 	.2byte 0xFFFF, 0x1105, 0x11FF, 0x100, 16, 32
 	.byte 4 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -4054,7 +4054,7 @@ gMapObjectGraphicsInfo_83A409C:: @ 83A409C
 	.4byte gSpriteImages_83A0DC8
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A40C0:: @ 83A40C0
+gObjectEventGraphicsInfo_83A40C0:: @ 83A40C0
 	.2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32
 	.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -4065,7 +4065,7 @@ gMapObjectGraphicsInfo_83A40C0:: @ 83A40C0
 	.4byte gSpriteImages_83A0E18
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A40E4:: @ 83A40E4
+gObjectEventGraphicsInfo_83A40E4:: @ 83A40E4
 	.2byte 0xFFFF, 0x1103, 0x11FF, 0x100, 16, 32
 	.byte 2 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -4076,7 +4076,7 @@ gMapObjectGraphicsInfo_83A40E4:: @ 83A40E4
 	.4byte gSpriteImages_83A0E68
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A4108:: @ 83A4108
+gObjectEventGraphicsInfo_83A4108:: @ 83A4108
 	.2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32
 	.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -4087,7 +4087,7 @@ gMapObjectGraphicsInfo_83A4108:: @ 83A4108
 	.4byte gSpriteImages_83A0EB8
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A412C:: @ 83A412C
+gObjectEventGraphicsInfo_83A412C:: @ 83A412C
 	.2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32
 	.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -4098,7 +4098,7 @@ gMapObjectGraphicsInfo_83A412C:: @ 83A412C
 	.4byte gSpriteImages_83A0F08
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A4150:: @ 83A4150
+gObjectEventGraphicsInfo_83A4150:: @ 83A4150
 	.2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32
 	.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -4109,7 +4109,7 @@ gMapObjectGraphicsInfo_83A4150:: @ 83A4150
 	.4byte gSpriteImages_83A0F58
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A4174:: @ 83A4174
+gObjectEventGraphicsInfo_83A4174:: @ 83A4174
 	.2byte 0xFFFF, 0x1104, 0x11FF, 0x100, 16, 32
 	.byte 3 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -4120,7 +4120,7 @@ gMapObjectGraphicsInfo_83A4174:: @ 83A4174
 	.4byte gSpriteImages_83A0FA8
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A4198:: @ 83A4198
+gObjectEventGraphicsInfo_83A4198:: @ 83A4198
 	.2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32
 	.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -4131,7 +4131,7 @@ gMapObjectGraphicsInfo_83A4198:: @ 83A4198
 	.4byte gSpriteImages_83A0FF8
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A41BC:: @ 83A41BC
+gObjectEventGraphicsInfo_83A41BC:: @ 83A41BC
 	.2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32
 	.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -4142,7 +4142,7 @@ gMapObjectGraphicsInfo_83A41BC:: @ 83A41BC
 	.4byte gSpriteImages_83A1040
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A41E0:: @ 83A41E0
+gObjectEventGraphicsInfo_83A41E0:: @ 83A41E0
 	.2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32
 	.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -4153,7 +4153,7 @@ gMapObjectGraphicsInfo_83A41E0:: @ 83A41E0
 	.4byte gSpriteImages_83A1090
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A4204:: @ 83A4204
+gObjectEventGraphicsInfo_83A4204:: @ 83A4204
 	.2byte 0xFFFF, 0x1104, 0x11FF, 0x100, 16, 32
 	.byte 3 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -4164,7 +4164,7 @@ gMapObjectGraphicsInfo_83A4204:: @ 83A4204
 	.4byte gSpriteImages_83A10D8
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A4228:: @ 83A4228
+gObjectEventGraphicsInfo_83A4228:: @ 83A4228
 	.2byte 0xFFFF, 0x1106, 0x11FF, 0x80, 16, 16
 	.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -4175,7 +4175,7 @@ gMapObjectGraphicsInfo_83A4228:: @ 83A4228
 	.4byte gSpriteImages_83A1120
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A424C:: @ 83A424C
+gObjectEventGraphicsInfo_83A424C:: @ 83A424C
 	.2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16
 	.byte 2 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -4186,7 +4186,7 @@ gMapObjectGraphicsInfo_83A424C:: @ 83A424C
 	.4byte gSpriteImages_83A1170
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A4270:: @ 83A4270
+gObjectEventGraphicsInfo_83A4270:: @ 83A4270
 	.2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16
 	.byte 2 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -4197,7 +4197,7 @@ gMapObjectGraphicsInfo_83A4270:: @ 83A4270
 	.4byte gSpriteImages_83A11C0
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A4294:: @ 83A4294
+gObjectEventGraphicsInfo_83A4294:: @ 83A4294
 	.2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32
 	.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -4208,7 +4208,7 @@ gMapObjectGraphicsInfo_83A4294:: @ 83A4294
 	.4byte gSpriteImages_83A1210
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A42B8:: @ 83A42B8
+gObjectEventGraphicsInfo_83A42B8:: @ 83A42B8
 	.2byte 0xFFFF, 0x1104, 0x11FF, 0x200, 32, 32
 	.byte 3 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 2
@@ -4219,7 +4219,7 @@ gMapObjectGraphicsInfo_83A42B8:: @ 83A42B8
 	.4byte gSpriteImages_83A1260
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A42DC:: @ 83A42DC
+gObjectEventGraphicsInfo_83A42DC:: @ 83A42DC
 	.2byte 0xFFFF, 0x1104, 0x11FF, 0x100, 16, 32
 	.byte 3 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 2
@@ -4230,7 +4230,7 @@ gMapObjectGraphicsInfo_83A42DC:: @ 83A42DC
 	.4byte gSpriteImages_83A12B0
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A4300:: @ 83A4300
+gObjectEventGraphicsInfo_83A4300:: @ 83A4300
 	.2byte 0xFFFF, 0x1104, 0x11FF, 0x100, 16, 32
 	.byte 3 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -4241,7 +4241,7 @@ gMapObjectGraphicsInfo_83A4300:: @ 83A4300
 	.4byte gSpriteImages_83A12F8
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A4324:: @ 83A4324
+gObjectEventGraphicsInfo_83A4324:: @ 83A4324
 	.2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32
 	.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -4252,7 +4252,7 @@ gMapObjectGraphicsInfo_83A4324:: @ 83A4324
 	.4byte gSpriteImages_83A1348
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A4348:: @ 83A4348
+gObjectEventGraphicsInfo_83A4348:: @ 83A4348
 	.2byte 0xFFFF, 0x1106, 0x11FF, 0x80, 16, 16
 	.byte 5 | (0 << 4) | (1 << 6) | (0 << 7)
 	.byte 0
@@ -4263,7 +4263,7 @@ gMapObjectGraphicsInfo_83A4348:: @ 83A4348
 	.4byte gSpriteImages_83A1390
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A436C:: @ 83A436C
+gObjectEventGraphicsInfo_83A436C:: @ 83A436C
 	.2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32
 	.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -4274,7 +4274,7 @@ gMapObjectGraphicsInfo_83A436C:: @ 83A436C
 	.4byte gSpriteImages_83A1398
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A4390:: @ 83A4390
+gObjectEventGraphicsInfo_83A4390:: @ 83A4390
 	.2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32
 	.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -4285,7 +4285,7 @@ gMapObjectGraphicsInfo_83A4390:: @ 83A4390
 	.4byte gSpriteImages_83A13E0
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A43B4:: @ 83A43B4
+gObjectEventGraphicsInfo_83A43B4:: @ 83A43B4
 	.2byte 0xFFFF, 0x1103, 0x11FF, 0x100, 16, 32
 	.byte 2 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -4296,7 +4296,7 @@ gMapObjectGraphicsInfo_83A43B4:: @ 83A43B4
 	.4byte gSpriteImages_83A1430
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A43D8:: @ 83A43D8
+gObjectEventGraphicsInfo_83A43D8:: @ 83A43D8
 	.2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32
 	.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -4307,7 +4307,7 @@ gMapObjectGraphicsInfo_83A43D8:: @ 83A43D8
 	.4byte gSpriteImages_83A1480
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A43FC:: @ 83A43FC
+gObjectEventGraphicsInfo_83A43FC:: @ 83A43FC
 	.2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32
 	.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -4318,7 +4318,7 @@ gMapObjectGraphicsInfo_83A43FC:: @ 83A43FC
 	.4byte gSpriteImages_83A14C8
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A4420:: @ 83A4420
+gObjectEventGraphicsInfo_83A4420:: @ 83A4420
 	.2byte 0xFFFF, 0x1104, 0x11FF, 0x200, 32, 32
 	.byte 3 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -4329,7 +4329,7 @@ gMapObjectGraphicsInfo_83A4420:: @ 83A4420
 	.4byte gSpriteImages_83A0A70
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A4444:: @ 83A4444
+gObjectEventGraphicsInfo_83A4444:: @ 83A4444
 	.2byte 0xFFFF, 0x1105, 0x11FF, 0x80, 16, 16
 	.byte 4 | (0 << 4) | (1 << 6) | (0 << 7)
 	.byte 0
@@ -4340,7 +4340,7 @@ gMapObjectGraphicsInfo_83A4444:: @ 83A4444
 	.4byte gSpriteImages_83A1510
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A4468:: @ 83A4468
+gObjectEventGraphicsInfo_83A4468:: @ 83A4468
 	.2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32
 	.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -4351,7 +4351,7 @@ gMapObjectGraphicsInfo_83A4468:: @ 83A4468
 	.4byte gSpriteImages_83A1530
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A448C:: @ 83A448C
+gObjectEventGraphicsInfo_83A448C:: @ 83A448C
 	.2byte 0xFFFF, 0x1105, 0x11FF, 0x100, 16, 32
 	.byte 4 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -4362,7 +4362,7 @@ gMapObjectGraphicsInfo_83A448C:: @ 83A448C
 	.4byte gSpriteImages_83A1578
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A44B0:: @ 83A44B0
+gObjectEventGraphicsInfo_83A44B0:: @ 83A44B0
 	.2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32
 	.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -4373,7 +4373,7 @@ gMapObjectGraphicsInfo_83A44B0:: @ 83A44B0
 	.4byte gSpriteImages_83A15C0
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A44D4:: @ 83A44D4
+gObjectEventGraphicsInfo_83A44D4:: @ 83A44D4
 	.2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32
 	.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -4384,7 +4384,7 @@ gMapObjectGraphicsInfo_83A44D4:: @ 83A44D4
 	.4byte gSpriteImages_83A1608
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A44F8:: @ 83A44F8
+gObjectEventGraphicsInfo_83A44F8:: @ 83A44F8
 	.2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32
 	.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -4395,7 +4395,7 @@ gMapObjectGraphicsInfo_83A44F8:: @ 83A44F8
 	.4byte gSpriteImages_83A1650
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A451C:: @ 83A451C
+gObjectEventGraphicsInfo_83A451C:: @ 83A451C
 	.2byte 0xFFFF, 0x1106, 0x11FF, 0x80, 16, 16
 	.byte 5 | (0 << 4) | (1 << 6) | (0 << 7)
 	.byte 0
@@ -4406,7 +4406,7 @@ gMapObjectGraphicsInfo_83A451C:: @ 83A451C
 	.4byte gSpriteImages_83A1698
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A4540:: @ 83A4540
+gObjectEventGraphicsInfo_83A4540:: @ 83A4540
 	.2byte 0xFFFF, 0x1106, 0x11FF, 0x80, 16, 16
 	.byte 5 | (0 << 4) | (1 << 6) | (0 << 7)
 	.byte 0
@@ -4417,7 +4417,7 @@ gMapObjectGraphicsInfo_83A4540:: @ 83A4540
 	.4byte gSpriteImages_83A16B8
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A4564:: @ 83A4564
+gObjectEventGraphicsInfo_83A4564:: @ 83A4564
 	.2byte 0xFFFF, 0x1110, 0x1102, 0x200, 16, 32
 	.byte 0 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -4428,7 +4428,7 @@ gMapObjectGraphicsInfo_83A4564:: @ 83A4564
 	.4byte gSpriteImages_83A0188
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A4588:: @ 83A4588
+gObjectEventGraphicsInfo_83A4588:: @ 83A4588
 	.2byte 0xFFFF, 0x1110, 0x1102, 0x200, 32, 32
 	.byte 0 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 2
@@ -4439,7 +4439,7 @@ gMapObjectGraphicsInfo_83A4588:: @ 83A4588
 	.4byte gSpriteImages_83A0228
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A45AC:: @ 83A45AC
+gObjectEventGraphicsInfo_83A45AC:: @ 83A45AC
 	.2byte 0xFFFF, 0x1110, 0x11FF, 0x100, 16, 32
 	.byte 0 | (1 << 4) | (0 << 6) | (1 << 7)
 	.byte 1
@@ -4450,7 +4450,7 @@ gMapObjectGraphicsInfo_83A45AC:: @ 83A45AC
 	.4byte gSpriteImages_83A02D0
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A45D0:: @ 83A45D0
+gObjectEventGraphicsInfo_83A45D0:: @ 83A45D0
 	.2byte 0xFFFF, 0x1110, 0x1102, 0x100, 16, 32
 	.byte 0 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -4461,7 +4461,7 @@ gMapObjectGraphicsInfo_83A45D0:: @ 83A45D0
 	.4byte gSpriteImages_83A0378
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A45F4:: @ 83A45F4
+gObjectEventGraphicsInfo_83A45F4:: @ 83A45F4
 	.2byte 0xFFFF, 0x1100, 0x1102, 0x200, 32, 32
 	.byte 10 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 2
@@ -4472,7 +4472,7 @@ gMapObjectGraphicsInfo_83A45F4:: @ 83A45F4
 	.4byte gSpriteImages_83A0140
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A4618:: @ 83A4618
+gObjectEventGraphicsInfo_83A4618:: @ 83A4618
 	.2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32
 	.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -4483,7 +4483,7 @@ gMapObjectGraphicsInfo_83A4618:: @ 83A4618
 	.4byte gSpriteImages_83A16C0
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A463C:: @ 83A463C
+gObjectEventGraphicsInfo_83A463C:: @ 83A463C
 	.2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32
 	.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -4494,7 +4494,7 @@ gMapObjectGraphicsInfo_83A463C:: @ 83A463C
 	.4byte gSpriteImages_83A1708
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A4660:: @ 83A4660
+gObjectEventGraphicsInfo_83A4660:: @ 83A4660
 	.2byte 0xFFFF, 0x1104, 0x11FF, 0x100, 16, 32
 	.byte 3 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -4505,7 +4505,7 @@ gMapObjectGraphicsInfo_83A4660:: @ 83A4660
 	.4byte gSpriteImages_83A1750
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A4684:: @ 83A4684
+gObjectEventGraphicsInfo_83A4684:: @ 83A4684
 	.2byte 0xFFFF, 0x1105, 0x11FF, 0x100, 16, 32
 	.byte 4 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -4516,7 +4516,7 @@ gMapObjectGraphicsInfo_83A4684:: @ 83A4684
 	.4byte gSpriteImages_83A1798
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A46A8:: @ 83A46A8
+gObjectEventGraphicsInfo_83A46A8:: @ 83A46A8
 	.2byte 0xFFFF, 0x1103, 0x11FF, 0x100, 16, 32
 	.byte 2 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -4527,7 +4527,7 @@ gMapObjectGraphicsInfo_83A46A8:: @ 83A46A8
 	.4byte gSpriteImages_83A17E0
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A46CC:: @ 83A46CC
+gObjectEventGraphicsInfo_83A46CC:: @ 83A46CC
 	.2byte 0xFFFF, 0x1105, 0x11FF, 0x100, 16, 32
 	.byte 4 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -4538,7 +4538,7 @@ gMapObjectGraphicsInfo_83A46CC:: @ 83A46CC
 	.4byte gSpriteImages_83A1828
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A46F0:: @ 83A46F0
+gObjectEventGraphicsInfo_83A46F0:: @ 83A46F0
 	.2byte 0xFFFF, 0x1103, 0x11FF, 0x100, 16, 32
 	.byte 2 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -4549,7 +4549,7 @@ gMapObjectGraphicsInfo_83A46F0:: @ 83A46F0
 	.4byte gSpriteImages_83A1870
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A4714:: @ 83A4714
+gObjectEventGraphicsInfo_83A4714:: @ 83A4714
 	.2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32
 	.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -4560,7 +4560,7 @@ gMapObjectGraphicsInfo_83A4714:: @ 83A4714
 	.4byte gSpriteImages_83A18B8
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A4738:: @ 83A4738
+gObjectEventGraphicsInfo_83A4738:: @ 83A4738
 	.2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32
 	.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -4571,7 +4571,7 @@ gMapObjectGraphicsInfo_83A4738:: @ 83A4738
 	.4byte gSpriteImages_83A1900
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A475C:: @ 83A475C
+gObjectEventGraphicsInfo_83A475C:: @ 83A475C
 	.2byte 0xFFFF, 0x1104, 0x11FF, 0x100, 16, 32
 	.byte 3 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -4582,7 +4582,7 @@ gMapObjectGraphicsInfo_83A475C:: @ 83A475C
 	.4byte gSpriteImages_83A1948
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A4780:: @ 83A4780
+gObjectEventGraphicsInfo_83A4780:: @ 83A4780
 	.2byte 0xFFFF, 0x1103, 0x11FF, 0x100, 16, 32
 	.byte 2 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -4593,7 +4593,7 @@ gMapObjectGraphicsInfo_83A4780:: @ 83A4780
 	.4byte gSpriteImages_83A1990
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A47A4:: @ 83A47A4
+gObjectEventGraphicsInfo_83A47A4:: @ 83A47A4
 	.2byte 0xFFFF, 0x1103, 0x11FF, 0x100, 16, 32
 	.byte 2 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -4604,7 +4604,7 @@ gMapObjectGraphicsInfo_83A47A4:: @ 83A47A4
 	.4byte gSpriteImages_83A19D8
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A47C8:: @ 83A47C8
+gObjectEventGraphicsInfo_83A47C8:: @ 83A47C8
 	.2byte 0xFFFF, 0x1105, 0x11FF, 0x100, 16, 32
 	.byte 4 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -4615,7 +4615,7 @@ gMapObjectGraphicsInfo_83A47C8:: @ 83A47C8
 	.4byte gSpriteImages_83A1A20
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A47EC:: @ 83A47EC
+gObjectEventGraphicsInfo_83A47EC:: @ 83A47EC
 	.2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32
 	.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -4626,7 +4626,7 @@ gMapObjectGraphicsInfo_83A47EC:: @ 83A47EC
 	.4byte gSpriteImages_83A1A68
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A4810:: @ 83A4810
+gObjectEventGraphicsInfo_83A4810:: @ 83A4810
 	.2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32
 	.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -4637,7 +4637,7 @@ gMapObjectGraphicsInfo_83A4810:: @ 83A4810
 	.4byte gSpriteImages_83A1AB0
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A4834:: @ 83A4834
+gObjectEventGraphicsInfo_83A4834:: @ 83A4834
 	.2byte 0xFFFF, 0x1105, 0x11FF, 0x100, 16, 32
 	.byte 4 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -4648,7 +4648,7 @@ gMapObjectGraphicsInfo_83A4834:: @ 83A4834
 	.4byte gSpriteImages_83A1AF8
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A4858:: @ 83A4858
+gObjectEventGraphicsInfo_83A4858:: @ 83A4858
 	.2byte 0xFFFF, 0x1100, 0x1102, 0x200, 32, 32
 	.byte 0 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -4659,7 +4659,7 @@ gMapObjectGraphicsInfo_83A4858:: @ 83A4858
 	.4byte gSpriteImages_83A1B40
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A487C:: @ 83A487C
+gObjectEventGraphicsInfo_83A487C:: @ 83A487C
 	.2byte 0xFFFF, 0x1110, 0x1102, 0x200, 32, 32
 	.byte 0 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -4670,7 +4670,7 @@ gMapObjectGraphicsInfo_83A487C:: @ 83A487C
 	.4byte gSpriteImages_83A1BA0
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A48A0:: @ 83A48A0
+gObjectEventGraphicsInfo_83A48A0:: @ 83A48A0
 	.2byte 0xFFFF, 0x1100, 0x1102, 0x100, 16, 32
 	.byte 0 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -4681,7 +4681,7 @@ gMapObjectGraphicsInfo_83A48A0:: @ 83A48A0
 	.4byte gSpriteImages_83A0330
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A48C4:: @ 83A48C4
+gObjectEventGraphicsInfo_83A48C4:: @ 83A48C4
 	.2byte 0xFFFF, 0x1100, 0x1102, 0x200, 32, 32
 	.byte 0 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -4692,7 +4692,7 @@ gMapObjectGraphicsInfo_83A48C4:: @ 83A48C4
 	.4byte gSpriteImages_83A03C0
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A48E8:: @ 83A48E8
+gObjectEventGraphicsInfo_83A48E8:: @ 83A48E8
 	.2byte 0xFFFF, 0x1100, 0x1102, 0x100, 16, 32
 	.byte 0 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -4703,7 +4703,7 @@ gMapObjectGraphicsInfo_83A48E8:: @ 83A48E8
 	.4byte gSpriteImages_83A0378
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A490C:: @ 83A490C
+gObjectEventGraphicsInfo_83A490C:: @ 83A490C
 	.2byte 0xFFFF, 0x1100, 0x1102, 0x200, 32, 32
 	.byte 0 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -4714,7 +4714,7 @@ gMapObjectGraphicsInfo_83A490C:: @ 83A490C
 	.4byte gSpriteImages_83A03F0
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A4930:: @ 83A4930
+gObjectEventGraphicsInfo_83A4930:: @ 83A4930
 	.2byte 0xFFFF, 0x1103, 0x11FF, 0x100, 32, 16
 	.byte 2 | (0 << 4) | (1 << 6) | (0 << 7)
 	.byte 0
@@ -4725,7 +4725,7 @@ gMapObjectGraphicsInfo_83A4930:: @ 83A4930
 	.4byte gSpriteImages_83A1C00
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A4954:: @ 83A4954
+gObjectEventGraphicsInfo_83A4954:: @ 83A4954
 	.2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16
 	.byte 2 | (0 << 4) | (1 << 6) | (0 << 7)
 	.byte 0
@@ -4736,7 +4736,7 @@ gMapObjectGraphicsInfo_83A4954:: @ 83A4954
 	.4byte gSpriteImages_83A1C08
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A4978:: @ 83A4978
+gObjectEventGraphicsInfo_83A4978:: @ 83A4978
 	.2byte 0xFFFF, 0x1104, 0x11FF, 0x100, 16, 32
 	.byte 3 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -4747,7 +4747,7 @@ gMapObjectGraphicsInfo_83A4978:: @ 83A4978
 	.4byte gSpriteImages_83A1C10
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A499C:: @ 83A499C
+gObjectEventGraphicsInfo_83A499C:: @ 83A499C
 	.2byte 0xFFFF, 0x1103, 0x11FF, 0x200, 32, 32
 	.byte 2 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -4758,7 +4758,7 @@ gMapObjectGraphicsInfo_83A499C:: @ 83A499C
 	.4byte gSpriteImages_83A1D38
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A49C0:: @ 83A49C0
+gObjectEventGraphicsInfo_83A49C0:: @ 83A49C0
 	.2byte 0xFFFF, 0x1106, 0x11FF, 0x80, 16, 16
 	.byte 5 | (0 << 4) | (1 << 6) | (0 << 7)
 	.byte 0
@@ -4769,7 +4769,7 @@ gMapObjectGraphicsInfo_83A49C0:: @ 83A49C0
 	.4byte gSpriteImages_83A1C58
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A49E4:: @ 83A49E4
+gObjectEventGraphicsInfo_83A49E4:: @ 83A49E4
 	.2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16
 	.byte 2 | (0 << 4) | (1 << 6) | (0 << 7)
 	.byte 0
@@ -4780,7 +4780,7 @@ gMapObjectGraphicsInfo_83A49E4:: @ 83A49E4
 	.4byte gSpriteImages_83A1C60
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A4A08:: @ 83A4A08
+gObjectEventGraphicsInfo_83A4A08:: @ 83A4A08
 	.2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16
 	.byte 2 | (0 << 4) | (1 << 6) | (0 << 7)
 	.byte 0
@@ -4791,7 +4791,7 @@ gMapObjectGraphicsInfo_83A4A08:: @ 83A4A08
 	.4byte gSpriteImages_83A1C68
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A4A2C:: @ 83A4A2C
+gObjectEventGraphicsInfo_83A4A2C:: @ 83A4A2C
 	.2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16
 	.byte 2 | (0 << 4) | (1 << 6) | (0 << 7)
 	.byte 0
@@ -4802,7 +4802,7 @@ gMapObjectGraphicsInfo_83A4A2C:: @ 83A4A2C
 	.4byte gSpriteImages_83A1C70
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A4A50:: @ 83A4A50
+gObjectEventGraphicsInfo_83A4A50:: @ 83A4A50
 	.2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32
 	.byte 5 | (0 << 4) | (1 << 6) | (0 << 7)
 	.byte 0
@@ -4813,7 +4813,7 @@ gMapObjectGraphicsInfo_83A4A50:: @ 83A4A50
 	.4byte gSpriteImages_83A1C78
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A4A74:: @ 83A4A74
+gObjectEventGraphicsInfo_83A4A74:: @ 83A4A74
 	.2byte 0xFFFF, 0x1106, 0x11FF, 0x80, 16, 16
 	.byte 5 | (0 << 4) | (1 << 6) | (0 << 7)
 	.byte 0
@@ -4824,7 +4824,7 @@ gMapObjectGraphicsInfo_83A4A74:: @ 83A4A74
 	.4byte gSpriteImages_83A1C80
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A4A98:: @ 83A4A98
+gObjectEventGraphicsInfo_83A4A98:: @ 83A4A98
 	.2byte 0xFFFF, 0x1106, 0x11FF, 0x80, 16, 16
 	.byte 5 | (0 << 4) | (1 << 6) | (0 << 7)
 	.byte 0
@@ -4835,7 +4835,7 @@ gMapObjectGraphicsInfo_83A4A98:: @ 83A4A98
 	.4byte gSpriteImages_83A1C88
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A4ABC:: @ 83A4ABC
+gObjectEventGraphicsInfo_83A4ABC:: @ 83A4ABC
 	.2byte 0xFFFF, 0x1106, 0x11FF, 0x80, 16, 16
 	.byte 5 | (0 << 4) | (1 << 6) | (0 << 7)
 	.byte 0
@@ -4846,7 +4846,7 @@ gMapObjectGraphicsInfo_83A4ABC:: @ 83A4ABC
 	.4byte gSpriteImages_83A1C90
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A4AE0:: @ 83A4AE0
+gObjectEventGraphicsInfo_83A4AE0:: @ 83A4AE0
 	.2byte 0xFFFF, 0x1113, 0x11FF, 0x200, 32, 32
 	.byte 10 | (0 << 4) | (1 << 6) | (0 << 7)
 	.byte 0
@@ -4857,7 +4857,7 @@ gMapObjectGraphicsInfo_83A4AE0:: @ 83A4AE0
 	.4byte gSpriteImages_83A1C98
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A4B04:: @ 83A4B04
+gObjectEventGraphicsInfo_83A4B04:: @ 83A4B04
 	.2byte 0xFFFF, 0x1104, 0x11FF, 0x200, 32, 32
 	.byte 3 | (0 << 4) | (1 << 6) | (0 << 7)
 	.byte 0
@@ -4868,7 +4868,7 @@ gMapObjectGraphicsInfo_83A4B04:: @ 83A4B04
 	.4byte gSpriteImages_83A1CA0
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A4B28:: @ 83A4B28
+gObjectEventGraphicsInfo_83A4B28:: @ 83A4B28
 	.2byte 0xFFFF, 0x1106, 0x11FF, 0x80, 16, 16
 	.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -4879,7 +4879,7 @@ gMapObjectGraphicsInfo_83A4B28:: @ 83A4B28
 	.4byte gSpriteImages_83A1D80
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A4B4C:: @ 83A4B4C
+gObjectEventGraphicsInfo_83A4B4C:: @ 83A4B4C
 	.2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16
 	.byte 2 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -4890,7 +4890,7 @@ gMapObjectGraphicsInfo_83A4B4C:: @ 83A4B4C
 	.4byte gSpriteImages_83A1E10
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A4B70:: @ 83A4B70
+gObjectEventGraphicsInfo_83A4B70:: @ 83A4B70
 	.2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16
 	.byte 2 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -4901,7 +4901,7 @@ gMapObjectGraphicsInfo_83A4B70:: @ 83A4B70
 	.4byte gSpriteImages_83A1E58
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A4B94:: @ 83A4B94
+gObjectEventGraphicsInfo_83A4B94:: @ 83A4B94
 	.2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16
 	.byte 2 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -4912,7 +4912,7 @@ gMapObjectGraphicsInfo_83A4B94:: @ 83A4B94
 	.4byte gSpriteImages_83A1EA0
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A4BB8:: @ 83A4BB8
+gObjectEventGraphicsInfo_83A4BB8:: @ 83A4BB8
 	.2byte 0xFFFF, 0x1104, 0x11FF, 0x80, 16, 16
 	.byte 3 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -4923,7 +4923,7 @@ gMapObjectGraphicsInfo_83A4BB8:: @ 83A4BB8
 	.4byte gSpriteImages_83A1EE8
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A4BDC:: @ 83A4BDC
+gObjectEventGraphicsInfo_83A4BDC:: @ 83A4BDC
 	.2byte 0xFFFF, 0x1105, 0x11FF, 0x80, 16, 16
 	.byte 4 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -4934,7 +4934,7 @@ gMapObjectGraphicsInfo_83A4BDC:: @ 83A4BDC
 	.4byte gSpriteImages_83A1F30
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A4C00:: @ 83A4C00
+gObjectEventGraphicsInfo_83A4C00:: @ 83A4C00
 	.2byte 0xFFFF, 0x1105, 0x11FF, 0x80, 16, 16
 	.byte 4 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -4945,7 +4945,7 @@ gMapObjectGraphicsInfo_83A4C00:: @ 83A4C00
 	.4byte gSpriteImages_83A1F78
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A4C24:: @ 83A4C24
+gObjectEventGraphicsInfo_83A4C24:: @ 83A4C24
 	.2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16
 	.byte 2 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -4956,7 +4956,7 @@ gMapObjectGraphicsInfo_83A4C24:: @ 83A4C24
 	.4byte gSpriteImages_83A1FC0
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A4C48:: @ 83A4C48
+gObjectEventGraphicsInfo_83A4C48:: @ 83A4C48
 	.2byte 0xFFFF, 0x1104, 0x11FF, 0x80, 16, 16
 	.byte 3 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -4967,7 +4967,7 @@ gMapObjectGraphicsInfo_83A4C48:: @ 83A4C48
 	.4byte gSpriteImages_83A2008
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A4C6C:: @ 83A4C6C
+gObjectEventGraphicsInfo_83A4C6C:: @ 83A4C6C
 	.2byte 0xFFFF, 0x1106, 0x11FF, 0x80, 16, 16
 	.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -4978,7 +4978,7 @@ gMapObjectGraphicsInfo_83A4C6C:: @ 83A4C6C
 	.4byte gSpriteImages_83A2050
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A4C90:: @ 83A4C90
+gObjectEventGraphicsInfo_83A4C90:: @ 83A4C90
 	.2byte 0xFFFF, 0x1104, 0x11FF, 0x80, 16, 16
 	.byte 3 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -4989,7 +4989,7 @@ gMapObjectGraphicsInfo_83A4C90:: @ 83A4C90
 	.4byte gSpriteImages_83A2098
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A4CB4:: @ 83A4CB4
+gObjectEventGraphicsInfo_83A4CB4:: @ 83A4CB4
 	.2byte 0xFFFF, 0x1104, 0x11FF, 0x80, 16, 16
 	.byte 3 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -5000,7 +5000,7 @@ gMapObjectGraphicsInfo_83A4CB4:: @ 83A4CB4
 	.4byte gSpriteImages_83A20E0
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A4CD8:: @ 83A4CD8
+gObjectEventGraphicsInfo_83A4CD8:: @ 83A4CD8
 	.2byte 0xFFFF, 0x1104, 0x11FF, 0x80, 16, 16
 	.byte 3 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -5011,7 +5011,7 @@ gMapObjectGraphicsInfo_83A4CD8:: @ 83A4CD8
 	.4byte gSpriteImages_83A2128
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A4CFC:: @ 83A4CFC
+gObjectEventGraphicsInfo_83A4CFC:: @ 83A4CFC
 	.2byte 0xFFFF, 0x1104, 0x11FF, 0x80, 16, 16
 	.byte 3 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -5022,7 +5022,7 @@ gMapObjectGraphicsInfo_83A4CFC:: @ 83A4CFC
 	.4byte gSpriteImages_83A2170
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A4D20:: @ 83A4D20
+gObjectEventGraphicsInfo_83A4D20:: @ 83A4D20
 	.2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16
 	.byte 2 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -5033,7 +5033,7 @@ gMapObjectGraphicsInfo_83A4D20:: @ 83A4D20
 	.4byte gSpriteImages_83A21B8
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A4D44:: @ 83A4D44
+gObjectEventGraphicsInfo_83A4D44:: @ 83A4D44
 	.2byte 0xFFFF, 0x1106, 0x11FF, 0x80, 16, 16
 	.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -5044,7 +5044,7 @@ gMapObjectGraphicsInfo_83A4D44:: @ 83A4D44
 	.4byte gSpriteImages_83A2200
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A4D68:: @ 83A4D68
+gObjectEventGraphicsInfo_83A4D68:: @ 83A4D68
 	.2byte 0xFFFF, 0x1104, 0x11FF, 0x80, 16, 16
 	.byte 3 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -5055,7 +5055,7 @@ gMapObjectGraphicsInfo_83A4D68:: @ 83A4D68
 	.4byte gSpriteImages_83A2248
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A4D8C:: @ 83A4D8C
+gObjectEventGraphicsInfo_83A4D8C:: @ 83A4D8C
 	.2byte 0xFFFF, 0x1103, 0x11FF, 0x200, 32, 32
 	.byte 2 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -5066,7 +5066,7 @@ gMapObjectGraphicsInfo_83A4D8C:: @ 83A4D8C
 	.4byte gSpriteImages_83A2290
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A4DB0:: @ 83A4DB0
+gObjectEventGraphicsInfo_83A4DB0:: @ 83A4DB0
 	.2byte 0xFFFF, 0x1103, 0x11FF, 0x200, 32, 32
 	.byte 2 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -5077,7 +5077,7 @@ gMapObjectGraphicsInfo_83A4DB0:: @ 83A4DB0
 	.4byte gSpriteImages_83A22D8
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A4DD4:: @ 83A4DD4
+gObjectEventGraphicsInfo_83A4DD4:: @ 83A4DD4
 	.2byte 0xFFFF, 0x1104, 0x11FF, 0x200, 32, 32
 	.byte 3 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -5088,7 +5088,7 @@ gMapObjectGraphicsInfo_83A4DD4:: @ 83A4DD4
 	.4byte gSpriteImages_83A2320
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A4DF8:: @ 83A4DF8
+gObjectEventGraphicsInfo_83A4DF8:: @ 83A4DF8
 	.2byte 0xFFFF, 0x1103, 0x11FF, 0x200, 32, 32
 	.byte 2 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -5099,7 +5099,7 @@ gMapObjectGraphicsInfo_83A4DF8:: @ 83A4DF8
 	.4byte gSpriteImages_83A2368
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A4E1C:: @ 83A4E1C
+gObjectEventGraphicsInfo_83A4E1C:: @ 83A4E1C
 	.2byte 0xFFFF, 0x1103, 0x11FF, 0x200, 32, 32
 	.byte 2 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -5110,7 +5110,7 @@ gMapObjectGraphicsInfo_83A4E1C:: @ 83A4E1C
 	.4byte gSpriteImages_83A23B0
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A4E40:: @ 83A4E40
+gObjectEventGraphicsInfo_83A4E40:: @ 83A4E40
 	.2byte 0xFFFF, 0x1103, 0x11FF, 0x200, 32, 32
 	.byte 2 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -5121,7 +5121,7 @@ gMapObjectGraphicsInfo_83A4E40:: @ 83A4E40
 	.4byte gSpriteImages_83A23F8
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A4E64:: @ 83A4E64
+gObjectEventGraphicsInfo_83A4E64:: @ 83A4E64
 	.2byte 0xFFFF, 0x1104, 0x11FF, 0x80, 16, 16
 	.byte 3 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -5132,7 +5132,7 @@ gMapObjectGraphicsInfo_83A4E64:: @ 83A4E64
 	.4byte gSpriteImages_83A2440
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A4E88:: @ 83A4E88
+gObjectEventGraphicsInfo_83A4E88:: @ 83A4E88
 	.2byte 0xFFFF, 0x1105, 0x11FF, 0x80, 16, 16
 	.byte 4 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -5143,7 +5143,7 @@ gMapObjectGraphicsInfo_83A4E88:: @ 83A4E88
 	.4byte gSpriteImages_83A2488
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A4EAC:: @ 83A4EAC
+gObjectEventGraphicsInfo_83A4EAC:: @ 83A4EAC
 	.2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16
 	.byte 2 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -5154,7 +5154,7 @@ gMapObjectGraphicsInfo_83A4EAC:: @ 83A4EAC
 	.4byte gSpriteImages_83A24D0
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A4ED0:: @ 83A4ED0
+gObjectEventGraphicsInfo_83A4ED0:: @ 83A4ED0
 	.2byte 0xFFFF, 0x1105, 0x11FF, 0x80, 16, 16
 	.byte 4 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -5165,7 +5165,7 @@ gMapObjectGraphicsInfo_83A4ED0:: @ 83A4ED0
 	.4byte gSpriteImages_83A2518
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A4EF4:: @ 83A4EF4
+gObjectEventGraphicsInfo_83A4EF4:: @ 83A4EF4
 	.2byte 0xFFFF, 0x1104, 0x11FF, 0x80, 16, 16
 	.byte 3 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -5176,7 +5176,7 @@ gMapObjectGraphicsInfo_83A4EF4:: @ 83A4EF4
 	.4byte gSpriteImages_83A2560
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A4F18:: @ 83A4F18
+gObjectEventGraphicsInfo_83A4F18:: @ 83A4F18
 	.2byte 0xFFFF, 0x1104, 0x11FF, 0x200, 32, 32
 	.byte 3 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -5187,7 +5187,7 @@ gMapObjectGraphicsInfo_83A4F18:: @ 83A4F18
 	.4byte gSpriteImages_83A25A8
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A4F3C:: @ 83A4F3C
+gObjectEventGraphicsInfo_83A4F3C:: @ 83A4F3C
 	.2byte 0xFFFF, 0x1103, 0x11FF, 0x200, 32, 32
 	.byte 2 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -5198,7 +5198,7 @@ gMapObjectGraphicsInfo_83A4F3C:: @ 83A4F3C
 	.4byte gSpriteImages_83A25F0
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A4F60:: @ 83A4F60
+gObjectEventGraphicsInfo_83A4F60:: @ 83A4F60
 	.2byte 0xFFFF, 0x1105, 0x11FF, 0x80, 16, 16
 	.byte 4 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -5209,7 +5209,7 @@ gMapObjectGraphicsInfo_83A4F60:: @ 83A4F60
 	.4byte gSpriteImages_83A2638
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A4F84:: @ 83A4F84
+gObjectEventGraphicsInfo_83A4F84:: @ 83A4F84
 	.2byte 0xFFFF, 0x1106, 0x11FF, 0x80, 16, 16
 	.byte 5 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -5220,7 +5220,7 @@ gMapObjectGraphicsInfo_83A4F84:: @ 83A4F84
 	.4byte gSpriteImages_83A2680
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A4FA8:: @ 83A4FA8
+gObjectEventGraphicsInfo_83A4FA8:: @ 83A4FA8
 	.2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16
 	.byte 2 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -5231,7 +5231,7 @@ gMapObjectGraphicsInfo_83A4FA8:: @ 83A4FA8
 	.4byte gSpriteImages_83A2878
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A4FCC:: @ 83A4FCC
+gObjectEventGraphicsInfo_83A4FCC:: @ 83A4FCC
 	.2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16
 	.byte 2 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -5242,7 +5242,7 @@ gMapObjectGraphicsInfo_83A4FCC:: @ 83A4FCC
 	.4byte gSpriteImages_83A28C0
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A4FF0:: @ 83A4FF0
+gObjectEventGraphicsInfo_83A4FF0:: @ 83A4FF0
 	.2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16
 	.byte 2 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -5253,7 +5253,7 @@ gMapObjectGraphicsInfo_83A4FF0:: @ 83A4FF0
 	.4byte gSpriteImages_83A26C8
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A5014:: @ 83A5014
+gObjectEventGraphicsInfo_83A5014:: @ 83A5014
 	.2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16
 	.byte 2 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -5264,7 +5264,7 @@ gMapObjectGraphicsInfo_83A5014:: @ 83A5014
 	.4byte gSpriteImages_83A1DC8
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A5038:: @ 83A5038
+gObjectEventGraphicsInfo_83A5038:: @ 83A5038
 	.2byte 0xFFFF, 0x1104, 0x11FF, 0x80, 16, 16
 	.byte 3 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -5275,7 +5275,7 @@ gMapObjectGraphicsInfo_83A5038:: @ 83A5038
 	.4byte gSpriteImages_83A2710
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A505C:: @ 83A505C
+gObjectEventGraphicsInfo_83A505C:: @ 83A505C
 	.2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16
 	.byte 2 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -5286,7 +5286,7 @@ gMapObjectGraphicsInfo_83A505C:: @ 83A505C
 	.4byte gSpriteImages_83A2758
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A5080:: @ 83A5080
+gObjectEventGraphicsInfo_83A5080:: @ 83A5080
 	.2byte 0xFFFF, 0x1104, 0x11FF, 0x80, 16, 16
 	.byte 3 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -5297,7 +5297,7 @@ gMapObjectGraphicsInfo_83A5080:: @ 83A5080
 	.4byte gSpriteImages_83A27A0
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A50A4:: @ 83A50A4
+gObjectEventGraphicsInfo_83A50A4:: @ 83A50A4
 	.2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16
 	.byte 2 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -5308,7 +5308,7 @@ gMapObjectGraphicsInfo_83A50A4:: @ 83A50A4
 	.4byte gSpriteImages_83A27E8
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A50C8:: @ 83A50C8
+gObjectEventGraphicsInfo_83A50C8:: @ 83A50C8
 	.2byte 0xFFFF, 0x1104, 0x11FF, 0x80, 16, 16
 	.byte 3 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -5319,7 +5319,7 @@ gMapObjectGraphicsInfo_83A50C8:: @ 83A50C8
 	.4byte gSpriteImages_83A2830
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A50EC:: @ 83A50EC
+gObjectEventGraphicsInfo_83A50EC:: @ 83A50EC
 	.2byte 0xFFFF, 0x1103, 0x11FF, 0x100, 16, 32
 	.byte 2 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 1
@@ -5330,7 +5330,7 @@ gMapObjectGraphicsInfo_83A50EC:: @ 83A50EC
 	.4byte gSpriteImages_83A2908
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A5110:: @ 83A5110
+gObjectEventGraphicsInfo_83A5110:: @ 83A5110
 	.2byte 0xFFFF, 0x1114, 0x11FF, 0x800, 64, 64
 	.byte 10 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 0
@@ -5341,7 +5341,7 @@ gMapObjectGraphicsInfo_83A5110:: @ 83A5110
 	.4byte gSpriteImages_83A1CA8
 	.4byte gDummySpriteAffineAnimTable
 
-gMapObjectGraphicsInfo_83A5134:: @ 83A5134
+gObjectEventGraphicsInfo_83A5134:: @ 83A5134
 	.2byte 0xFFFF, 0x1115, 0x11FF, 0x1000, 128, 64
 	.byte 10 | (1 << 4) | (0 << 6) | (0 << 7)
 	.byte 0
diff --git a/data/trainer_see.s b/data/trainer_see.s
index 3392f090f..3014d8ba0 100644
--- a/data/trainer_see.s
+++ b/data/trainer_see.s
@@ -5,7 +5,7 @@
 	.align 2
 
 gUnknown_83C6AC8::
-	.incbin "graphics/map_objects/emoticons.4bpp"
+	.incbin "graphics/object_events/emoticons.4bpp"
 
 gUnknown_83C7248:: @ 83C7248
 	.4byte IsTrainerInRangeSouth
diff --git a/graphics/map_objects/0.pal b/graphics/object_events/0.pal
index 3097a6556..3097a6556 100644
--- a/graphics/map_objects/0.pal
+++ b/graphics/object_events/0.pal
diff --git a/graphics/map_objects/000.png b/graphics/object_events/000.png
index 8b72a852f..8b72a852f 100644
--- a/graphics/map_objects/000.png
+++ b/graphics/object_events/000.png
diff --git a/graphics/map_objects/001.png b/graphics/object_events/001.png
index ee7d0a1d3..ee7d0a1d3 100644
--- a/graphics/map_objects/001.png
+++ b/graphics/object_events/001.png
diff --git a/graphics/map_objects/002.png b/graphics/object_events/002.png
index 961bff7a8..961bff7a8 100644
--- a/graphics/map_objects/002.png
+++ b/graphics/object_events/002.png
diff --git a/graphics/map_objects/004.png b/graphics/object_events/004.png
index a5ae8b3d1..a5ae8b3d1 100644
--- a/graphics/map_objects/004.png
+++ b/graphics/object_events/004.png
diff --git a/graphics/map_objects/005.png b/graphics/object_events/005.png
index 66d53ea88..66d53ea88 100644
--- a/graphics/map_objects/005.png
+++ b/graphics/object_events/005.png
diff --git a/graphics/map_objects/006.png b/graphics/object_events/006.png
index 90b198edb..90b198edb 100644
--- a/graphics/map_objects/006.png
+++ b/graphics/object_events/006.png
diff --git a/graphics/map_objects/007.png b/graphics/object_events/007.png
index c65b97a5c..c65b97a5c 100644
--- a/graphics/map_objects/007.png
+++ b/graphics/object_events/007.png
diff --git a/graphics/map_objects/008.png b/graphics/object_events/008.png
index b1e1ede7a..b1e1ede7a 100644
--- a/graphics/map_objects/008.png
+++ b/graphics/object_events/008.png
diff --git a/graphics/map_objects/009.png b/graphics/object_events/009.png
index 7246e388d..7246e388d 100644
--- a/graphics/map_objects/009.png
+++ b/graphics/object_events/009.png
diff --git a/graphics/map_objects/011.png b/graphics/object_events/011.png
index 61446035c..61446035c 100644
--- a/graphics/map_objects/011.png
+++ b/graphics/object_events/011.png
diff --git a/graphics/map_objects/012.png b/graphics/object_events/012.png
index c1cd5c574..c1cd5c574 100644
--- a/graphics/map_objects/012.png
+++ b/graphics/object_events/012.png
diff --git a/graphics/map_objects/013.png b/graphics/object_events/013.png
index f4140b8d0..f4140b8d0 100644
--- a/graphics/map_objects/013.png
+++ b/graphics/object_events/013.png
diff --git a/graphics/map_objects/014.png b/graphics/object_events/014.png
index b79967c4b..b79967c4b 100644
--- a/graphics/map_objects/014.png
+++ b/graphics/object_events/014.png
diff --git a/graphics/map_objects/015.png b/graphics/object_events/015.png
index 6cc84665c..6cc84665c 100644
--- a/graphics/map_objects/015.png
+++ b/graphics/object_events/015.png
diff --git a/graphics/map_objects/016.png b/graphics/object_events/016.png
index e53418256..e53418256 100644
--- a/graphics/map_objects/016.png
+++ b/graphics/object_events/016.png
diff --git a/graphics/map_objects/017.png b/graphics/object_events/017.png
index 2ce6d6355..2ce6d6355 100644
--- a/graphics/map_objects/017.png
+++ b/graphics/object_events/017.png
diff --git a/graphics/map_objects/018.png b/graphics/object_events/018.png
index 13f4ee1f2..13f4ee1f2 100644
--- a/graphics/map_objects/018.png
+++ b/graphics/object_events/018.png
diff --git a/graphics/map_objects/019.png b/graphics/object_events/019.png
index 749051218..749051218 100644
--- a/graphics/map_objects/019.png
+++ b/graphics/object_events/019.png
diff --git a/graphics/map_objects/020.png b/graphics/object_events/020.png
index dd33a7921..dd33a7921 100644
--- a/graphics/map_objects/020.png
+++ b/graphics/object_events/020.png
diff --git a/graphics/map_objects/021.png b/graphics/object_events/021.png
index 15eabb0b3..15eabb0b3 100644
--- a/graphics/map_objects/021.png
+++ b/graphics/object_events/021.png
diff --git a/graphics/map_objects/022.png b/graphics/object_events/022.png
index 82d08630c..82d08630c 100644
--- a/graphics/map_objects/022.png
+++ b/graphics/object_events/022.png
diff --git a/graphics/map_objects/023.png b/graphics/object_events/023.png
index b3922d5f8..b3922d5f8 100644
--- a/graphics/map_objects/023.png
+++ b/graphics/object_events/023.png
diff --git a/graphics/map_objects/024.png b/graphics/object_events/024.png
index 20125262a..20125262a 100644
--- a/graphics/map_objects/024.png
+++ b/graphics/object_events/024.png
diff --git a/graphics/map_objects/025.png b/graphics/object_events/025.png
index d3c38275a..d3c38275a 100644
--- a/graphics/map_objects/025.png
+++ b/graphics/object_events/025.png
diff --git a/graphics/map_objects/026.png b/graphics/object_events/026.png
index 44b8b5c50..44b8b5c50 100644
--- a/graphics/map_objects/026.png
+++ b/graphics/object_events/026.png
diff --git a/graphics/map_objects/027.png b/graphics/object_events/027.png
index b5ed884fd..b5ed884fd 100644
--- a/graphics/map_objects/027.png
+++ b/graphics/object_events/027.png
diff --git a/graphics/map_objects/028.png b/graphics/object_events/028.png
index 95d3c5e0f..95d3c5e0f 100644
--- a/graphics/map_objects/028.png
+++ b/graphics/object_events/028.png
diff --git a/graphics/map_objects/029.png b/graphics/object_events/029.png
index 006b67036..006b67036 100644
--- a/graphics/map_objects/029.png
+++ b/graphics/object_events/029.png
diff --git a/graphics/map_objects/030.png b/graphics/object_events/030.png
index 1c2d8eb63..1c2d8eb63 100644
--- a/graphics/map_objects/030.png
+++ b/graphics/object_events/030.png
diff --git a/graphics/map_objects/031.png b/graphics/object_events/031.png
index fc278b97e..fc278b97e 100644
--- a/graphics/map_objects/031.png
+++ b/graphics/object_events/031.png
diff --git a/graphics/map_objects/032.png b/graphics/object_events/032.png
index 87d1e4ce4..87d1e4ce4 100644
--- a/graphics/map_objects/032.png
+++ b/graphics/object_events/032.png
diff --git a/graphics/map_objects/033.png b/graphics/object_events/033.png
index f6913ed9b..f6913ed9b 100644
--- a/graphics/map_objects/033.png
+++ b/graphics/object_events/033.png
diff --git a/graphics/map_objects/034.png b/graphics/object_events/034.png
index 05a775388..05a775388 100644
--- a/graphics/map_objects/034.png
+++ b/graphics/object_events/034.png
diff --git a/graphics/map_objects/035.png b/graphics/object_events/035.png
index a99ab0238..a99ab0238 100644
--- a/graphics/map_objects/035.png
+++ b/graphics/object_events/035.png
diff --git a/graphics/map_objects/036.png b/graphics/object_events/036.png
index 23fe7c6e3..23fe7c6e3 100644
--- a/graphics/map_objects/036.png
+++ b/graphics/object_events/036.png
diff --git a/graphics/map_objects/037.png b/graphics/object_events/037.png
index c4f962acb..c4f962acb 100644
--- a/graphics/map_objects/037.png
+++ b/graphics/object_events/037.png
diff --git a/graphics/map_objects/038.png b/graphics/object_events/038.png
index b53913af7..b53913af7 100644
--- a/graphics/map_objects/038.png
+++ b/graphics/object_events/038.png
diff --git a/graphics/map_objects/039.png b/graphics/object_events/039.png
index 45d4400d8..45d4400d8 100644
--- a/graphics/map_objects/039.png
+++ b/graphics/object_events/039.png
diff --git a/graphics/map_objects/040.png b/graphics/object_events/040.png
index 8bff4d72e..8bff4d72e 100644
--- a/graphics/map_objects/040.png
+++ b/graphics/object_events/040.png
diff --git a/graphics/map_objects/041.png b/graphics/object_events/041.png
index df48acad0..df48acad0 100644
--- a/graphics/map_objects/041.png
+++ b/graphics/object_events/041.png
diff --git a/graphics/map_objects/042.png b/graphics/object_events/042.png
index 63a47e95b..63a47e95b 100644
--- a/graphics/map_objects/042.png
+++ b/graphics/object_events/042.png
diff --git a/graphics/map_objects/043.png b/graphics/object_events/043.png
index ded67966a..ded67966a 100644
--- a/graphics/map_objects/043.png
+++ b/graphics/object_events/043.png
diff --git a/graphics/map_objects/044.png b/graphics/object_events/044.png
index a76e9bd47..a76e9bd47 100644
--- a/graphics/map_objects/044.png
+++ b/graphics/object_events/044.png
diff --git a/graphics/map_objects/045.png b/graphics/object_events/045.png
index 9e862173a..9e862173a 100644
--- a/graphics/map_objects/045.png
+++ b/graphics/object_events/045.png
diff --git a/graphics/map_objects/046.png b/graphics/object_events/046.png
index 2f7a5f796..2f7a5f796 100644
--- a/graphics/map_objects/046.png
+++ b/graphics/object_events/046.png
diff --git a/graphics/map_objects/047.png b/graphics/object_events/047.png
index 361e028c4..361e028c4 100644
--- a/graphics/map_objects/047.png
+++ b/graphics/object_events/047.png
diff --git a/graphics/map_objects/048.png b/graphics/object_events/048.png
index 20a4e3a15..20a4e3a15 100644
--- a/graphics/map_objects/048.png
+++ b/graphics/object_events/048.png
diff --git a/graphics/map_objects/049.png b/graphics/object_events/049.png
index 07222b9ba..07222b9ba 100644
--- a/graphics/map_objects/049.png
+++ b/graphics/object_events/049.png
diff --git a/graphics/map_objects/050.png b/graphics/object_events/050.png
index 8c3817c82..8c3817c82 100644
--- a/graphics/map_objects/050.png
+++ b/graphics/object_events/050.png
diff --git a/graphics/map_objects/051.png b/graphics/object_events/051.png
index 358a4dd1b..358a4dd1b 100644
--- a/graphics/map_objects/051.png
+++ b/graphics/object_events/051.png
diff --git a/graphics/map_objects/052.png b/graphics/object_events/052.png
index 95089c7ee..95089c7ee 100644
--- a/graphics/map_objects/052.png
+++ b/graphics/object_events/052.png
diff --git a/graphics/map_objects/053.png b/graphics/object_events/053.png
index 6671943dd..6671943dd 100644
--- a/graphics/map_objects/053.png
+++ b/graphics/object_events/053.png
diff --git a/graphics/map_objects/054.png b/graphics/object_events/054.png
index 7717ce43b..7717ce43b 100644
--- a/graphics/map_objects/054.png
+++ b/graphics/object_events/054.png
diff --git a/graphics/map_objects/055.png b/graphics/object_events/055.png
index b85011c3c..b85011c3c 100644
--- a/graphics/map_objects/055.png
+++ b/graphics/object_events/055.png
diff --git a/graphics/map_objects/056.png b/graphics/object_events/056.png
index 7c4d443a2..7c4d443a2 100644
--- a/graphics/map_objects/056.png
+++ b/graphics/object_events/056.png
diff --git a/graphics/map_objects/057.png b/graphics/object_events/057.png
index 8961c0765..8961c0765 100644
--- a/graphics/map_objects/057.png
+++ b/graphics/object_events/057.png
diff --git a/graphics/map_objects/058.png b/graphics/object_events/058.png
index f6925577d..f6925577d 100644
--- a/graphics/map_objects/058.png
+++ b/graphics/object_events/058.png
diff --git a/graphics/map_objects/059.png b/graphics/object_events/059.png
index a251297b6..a251297b6 100644
--- a/graphics/map_objects/059.png
+++ b/graphics/object_events/059.png
diff --git a/graphics/map_objects/060.png b/graphics/object_events/060.png
index aedee9f67..aedee9f67 100644
--- a/graphics/map_objects/060.png
+++ b/graphics/object_events/060.png
diff --git a/graphics/map_objects/061.png b/graphics/object_events/061.png
index de57e641f..de57e641f 100644
--- a/graphics/map_objects/061.png
+++ b/graphics/object_events/061.png
diff --git a/graphics/map_objects/062.png b/graphics/object_events/062.png
index 175e14e47..175e14e47 100644
--- a/graphics/map_objects/062.png
+++ b/graphics/object_events/062.png
diff --git a/graphics/map_objects/063.png b/graphics/object_events/063.png
index fbf6aa689..fbf6aa689 100644
--- a/graphics/map_objects/063.png
+++ b/graphics/object_events/063.png
diff --git a/graphics/map_objects/064.png b/graphics/object_events/064.png
index 328d1f6b7..328d1f6b7 100644
--- a/graphics/map_objects/064.png
+++ b/graphics/object_events/064.png
diff --git a/graphics/map_objects/065.png b/graphics/object_events/065.png
index 74e081153..74e081153 100644
--- a/graphics/map_objects/065.png
+++ b/graphics/object_events/065.png
diff --git a/graphics/map_objects/066.png b/graphics/object_events/066.png
index ef0ecdba4..ef0ecdba4 100644
--- a/graphics/map_objects/066.png
+++ b/graphics/object_events/066.png
diff --git a/graphics/map_objects/067.png b/graphics/object_events/067.png
index d1c20e818..d1c20e818 100644
--- a/graphics/map_objects/067.png
+++ b/graphics/object_events/067.png
diff --git a/graphics/map_objects/068.png b/graphics/object_events/068.png
index 485678492..485678492 100644
--- a/graphics/map_objects/068.png
+++ b/graphics/object_events/068.png
diff --git a/graphics/map_objects/069.png b/graphics/object_events/069.png
index f503cf0c9..f503cf0c9 100644
--- a/graphics/map_objects/069.png
+++ b/graphics/object_events/069.png
diff --git a/graphics/map_objects/070.png b/graphics/object_events/070.png
index a3f994a83..a3f994a83 100644
--- a/graphics/map_objects/070.png
+++ b/graphics/object_events/070.png
diff --git a/graphics/map_objects/071.png b/graphics/object_events/071.png
index fab2b23ac..fab2b23ac 100644
--- a/graphics/map_objects/071.png
+++ b/graphics/object_events/071.png
diff --git a/graphics/map_objects/072.png b/graphics/object_events/072.png
index a66593653..a66593653 100644
--- a/graphics/map_objects/072.png
+++ b/graphics/object_events/072.png
diff --git a/graphics/map_objects/073.png b/graphics/object_events/073.png
index 85b82a47f..85b82a47f 100644
--- a/graphics/map_objects/073.png
+++ b/graphics/object_events/073.png
diff --git a/graphics/map_objects/074.png b/graphics/object_events/074.png
index b7426b280..b7426b280 100644
--- a/graphics/map_objects/074.png
+++ b/graphics/object_events/074.png
diff --git a/graphics/map_objects/075.png b/graphics/object_events/075.png
index b8bf3ede6..b8bf3ede6 100644
--- a/graphics/map_objects/075.png
+++ b/graphics/object_events/075.png
diff --git a/graphics/map_objects/076.png b/graphics/object_events/076.png
index 5ba2f26f8..5ba2f26f8 100644
--- a/graphics/map_objects/076.png
+++ b/graphics/object_events/076.png
diff --git a/graphics/map_objects/077.png b/graphics/object_events/077.png
index 0b535572e..0b535572e 100644
--- a/graphics/map_objects/077.png
+++ b/graphics/object_events/077.png
diff --git a/graphics/map_objects/078.png b/graphics/object_events/078.png
index 4b6983de6..4b6983de6 100644
--- a/graphics/map_objects/078.png
+++ b/graphics/object_events/078.png
diff --git a/graphics/map_objects/079.png b/graphics/object_events/079.png
index ac5ee5e9f..ac5ee5e9f 100644
--- a/graphics/map_objects/079.png
+++ b/graphics/object_events/079.png
diff --git a/graphics/map_objects/080.png b/graphics/object_events/080.png
index bf48c8dd7..bf48c8dd7 100644
--- a/graphics/map_objects/080.png
+++ b/graphics/object_events/080.png
diff --git a/graphics/map_objects/081.png b/graphics/object_events/081.png
index 0e4a837b5..0e4a837b5 100644
--- a/graphics/map_objects/081.png
+++ b/graphics/object_events/081.png
diff --git a/graphics/map_objects/082.png b/graphics/object_events/082.png
index 07435e777..07435e777 100644
--- a/graphics/map_objects/082.png
+++ b/graphics/object_events/082.png
diff --git a/graphics/map_objects/083.png b/graphics/object_events/083.png
index 015b6bbe3..015b6bbe3 100644
--- a/graphics/map_objects/083.png
+++ b/graphics/object_events/083.png
diff --git a/graphics/map_objects/084.png b/graphics/object_events/084.png
index b45ec3f25..b45ec3f25 100644
--- a/graphics/map_objects/084.png
+++ b/graphics/object_events/084.png
diff --git a/graphics/map_objects/085.png b/graphics/object_events/085.png
index 101dfb0e0..101dfb0e0 100644
--- a/graphics/map_objects/085.png
+++ b/graphics/object_events/085.png
diff --git a/graphics/map_objects/086.png b/graphics/object_events/086.png
index 19ccb8fcc..19ccb8fcc 100644
--- a/graphics/map_objects/086.png
+++ b/graphics/object_events/086.png
diff --git a/graphics/map_objects/087.png b/graphics/object_events/087.png
index 5f9585a61..5f9585a61 100644
--- a/graphics/map_objects/087.png
+++ b/graphics/object_events/087.png
diff --git a/graphics/map_objects/088.png b/graphics/object_events/088.png
index c7e79eefd..c7e79eefd 100644
--- a/graphics/map_objects/088.png
+++ b/graphics/object_events/088.png
diff --git a/graphics/map_objects/089.png b/graphics/object_events/089.png
index 1dc91873d..1dc91873d 100644
--- a/graphics/map_objects/089.png
+++ b/graphics/object_events/089.png
diff --git a/graphics/map_objects/090.png b/graphics/object_events/090.png
index 320da6daa..320da6daa 100644
--- a/graphics/map_objects/090.png
+++ b/graphics/object_events/090.png
diff --git a/graphics/map_objects/091.png b/graphics/object_events/091.png
index 8a55cd3d3..8a55cd3d3 100644
--- a/graphics/map_objects/091.png
+++ b/graphics/object_events/091.png
diff --git a/graphics/map_objects/092.png b/graphics/object_events/092.png
index 5b91624c7..5b91624c7 100644
--- a/graphics/map_objects/092.png
+++ b/graphics/object_events/092.png
diff --git a/graphics/map_objects/093.png b/graphics/object_events/093.png
index 1092e5695..1092e5695 100644
--- a/graphics/map_objects/093.png
+++ b/graphics/object_events/093.png
diff --git a/graphics/map_objects/094.png b/graphics/object_events/094.png
index 9089df959..9089df959 100644
--- a/graphics/map_objects/094.png
+++ b/graphics/object_events/094.png
diff --git a/graphics/map_objects/095.png b/graphics/object_events/095.png
index ce110cd9e..ce110cd9e 100644
--- a/graphics/map_objects/095.png
+++ b/graphics/object_events/095.png
diff --git a/graphics/map_objects/096.png b/graphics/object_events/096.png
index 315fb0089..315fb0089 100644
--- a/graphics/map_objects/096.png
+++ b/graphics/object_events/096.png
diff --git a/graphics/map_objects/097.png b/graphics/object_events/097.png
index 2f594708f..2f594708f 100644
--- a/graphics/map_objects/097.png
+++ b/graphics/object_events/097.png
diff --git a/graphics/map_objects/098.png b/graphics/object_events/098.png
index 2e87e553a..2e87e553a 100644
--- a/graphics/map_objects/098.png
+++ b/graphics/object_events/098.png
diff --git a/graphics/map_objects/099.png b/graphics/object_events/099.png
index 099670aa3..099670aa3 100644
--- a/graphics/map_objects/099.png
+++ b/graphics/object_events/099.png
diff --git a/graphics/map_objects/1.pal b/graphics/object_events/1.pal
index 5537faa0f..5537faa0f 100644
--- a/graphics/map_objects/1.pal
+++ b/graphics/object_events/1.pal
diff --git a/graphics/map_objects/10.pal b/graphics/object_events/10.pal
index ae8272ec4..ae8272ec4 100644
--- a/graphics/map_objects/10.pal
+++ b/graphics/object_events/10.pal
diff --git a/graphics/map_objects/100.png b/graphics/object_events/100.png
index 97a278aa5..97a278aa5 100644
--- a/graphics/map_objects/100.png
+++ b/graphics/object_events/100.png
diff --git a/graphics/map_objects/101.png b/graphics/object_events/101.png
index 82d7d9424..82d7d9424 100644
--- a/graphics/map_objects/101.png
+++ b/graphics/object_events/101.png
diff --git a/graphics/map_objects/102.png b/graphics/object_events/102.png
index 537e9b718..537e9b718 100644
--- a/graphics/map_objects/102.png
+++ b/graphics/object_events/102.png
diff --git a/graphics/map_objects/103.png b/graphics/object_events/103.png
index c255ad15a..c255ad15a 100644
--- a/graphics/map_objects/103.png
+++ b/graphics/object_events/103.png
diff --git a/graphics/map_objects/104.png b/graphics/object_events/104.png
index 2717cf7a9..2717cf7a9 100644
--- a/graphics/map_objects/104.png
+++ b/graphics/object_events/104.png
diff --git a/graphics/map_objects/105.png b/graphics/object_events/105.png
index d5cef50ea..d5cef50ea 100644
--- a/graphics/map_objects/105.png
+++ b/graphics/object_events/105.png
diff --git a/graphics/map_objects/106.png b/graphics/object_events/106.png
index 706049ee0..706049ee0 100644
--- a/graphics/map_objects/106.png
+++ b/graphics/object_events/106.png
diff --git a/graphics/map_objects/107.png b/graphics/object_events/107.png
index e0d216fb3..e0d216fb3 100644
--- a/graphics/map_objects/107.png
+++ b/graphics/object_events/107.png
diff --git a/graphics/map_objects/108.png b/graphics/object_events/108.png
index a28a5ab9a..a28a5ab9a 100644
--- a/graphics/map_objects/108.png
+++ b/graphics/object_events/108.png
diff --git a/graphics/map_objects/109.png b/graphics/object_events/109.png
index b8affc19b..b8affc19b 100644
--- a/graphics/map_objects/109.png
+++ b/graphics/object_events/109.png
diff --git a/graphics/map_objects/11.pal b/graphics/object_events/11.pal
index b36c29ab1..b36c29ab1 100644
--- a/graphics/map_objects/11.pal
+++ b/graphics/object_events/11.pal
diff --git a/graphics/map_objects/110.png b/graphics/object_events/110.png
index 499f51e8c..499f51e8c 100644
--- a/graphics/map_objects/110.png
+++ b/graphics/object_events/110.png
diff --git a/graphics/map_objects/111.png b/graphics/object_events/111.png
index ba51eaddc..ba51eaddc 100644
--- a/graphics/map_objects/111.png
+++ b/graphics/object_events/111.png
diff --git a/graphics/map_objects/112.png b/graphics/object_events/112.png
index 0c8428fd3..0c8428fd3 100644
--- a/graphics/map_objects/112.png
+++ b/graphics/object_events/112.png
diff --git a/graphics/map_objects/113.png b/graphics/object_events/113.png
index e5817bac8..e5817bac8 100644
--- a/graphics/map_objects/113.png
+++ b/graphics/object_events/113.png
diff --git a/graphics/map_objects/114.png b/graphics/object_events/114.png
index 55748d9a0..55748d9a0 100644
--- a/graphics/map_objects/114.png
+++ b/graphics/object_events/114.png
diff --git a/graphics/map_objects/115.png b/graphics/object_events/115.png
index ccd46b1f8..ccd46b1f8 100644
--- a/graphics/map_objects/115.png
+++ b/graphics/object_events/115.png
diff --git a/graphics/map_objects/116.png b/graphics/object_events/116.png
index a109eb2c6..a109eb2c6 100644
--- a/graphics/map_objects/116.png
+++ b/graphics/object_events/116.png
diff --git a/graphics/map_objects/117.png b/graphics/object_events/117.png
index 550a58260..550a58260 100644
--- a/graphics/map_objects/117.png
+++ b/graphics/object_events/117.png
diff --git a/graphics/map_objects/118.png b/graphics/object_events/118.png
index 083897483..083897483 100644
--- a/graphics/map_objects/118.png
+++ b/graphics/object_events/118.png
diff --git a/graphics/map_objects/119.png b/graphics/object_events/119.png
index ed82e390e..ed82e390e 100644
--- a/graphics/map_objects/119.png
+++ b/graphics/object_events/119.png
diff --git a/graphics/map_objects/12.pal b/graphics/object_events/12.pal
index b69e9ac0a..b69e9ac0a 100644
--- a/graphics/map_objects/12.pal
+++ b/graphics/object_events/12.pal
diff --git a/graphics/map_objects/120.png b/graphics/object_events/120.png
index 7b837e11b..7b837e11b 100644
--- a/graphics/map_objects/120.png
+++ b/graphics/object_events/120.png
diff --git a/graphics/map_objects/121.png b/graphics/object_events/121.png
index 1f0dd24e0..1f0dd24e0 100644
--- a/graphics/map_objects/121.png
+++ b/graphics/object_events/121.png
diff --git a/graphics/map_objects/122.png b/graphics/object_events/122.png
index b25ee75f4..b25ee75f4 100644
--- a/graphics/map_objects/122.png
+++ b/graphics/object_events/122.png
diff --git a/graphics/map_objects/123.png b/graphics/object_events/123.png
index 4a2768475..4a2768475 100644
--- a/graphics/map_objects/123.png
+++ b/graphics/object_events/123.png
diff --git a/graphics/map_objects/124.png b/graphics/object_events/124.png
index 8cdfa0ef2..8cdfa0ef2 100644
--- a/graphics/map_objects/124.png
+++ b/graphics/object_events/124.png
diff --git a/graphics/map_objects/125.png b/graphics/object_events/125.png
index 31203db01..31203db01 100644
--- a/graphics/map_objects/125.png
+++ b/graphics/object_events/125.png
diff --git a/graphics/map_objects/126.png b/graphics/object_events/126.png
index 2cd14040c..2cd14040c 100644
--- a/graphics/map_objects/126.png
+++ b/graphics/object_events/126.png
diff --git a/graphics/map_objects/127.png b/graphics/object_events/127.png
index 973306673..973306673 100644
--- a/graphics/map_objects/127.png
+++ b/graphics/object_events/127.png
diff --git a/graphics/map_objects/128.png b/graphics/object_events/128.png
index 9baab0bbe..9baab0bbe 100644
--- a/graphics/map_objects/128.png
+++ b/graphics/object_events/128.png
diff --git a/graphics/map_objects/129.png b/graphics/object_events/129.png
index 1cd63f1eb..1cd63f1eb 100644
--- a/graphics/map_objects/129.png
+++ b/graphics/object_events/129.png
diff --git a/graphics/map_objects/130.png b/graphics/object_events/130.png
index db791455b..db791455b 100644
--- a/graphics/map_objects/130.png
+++ b/graphics/object_events/130.png
diff --git a/graphics/map_objects/131.png b/graphics/object_events/131.png
index c8252a957..c8252a957 100644
--- a/graphics/map_objects/131.png
+++ b/graphics/object_events/131.png
diff --git a/graphics/map_objects/132.png b/graphics/object_events/132.png
index 9a63cab7e..9a63cab7e 100644
--- a/graphics/map_objects/132.png
+++ b/graphics/object_events/132.png
diff --git a/graphics/map_objects/133.png b/graphics/object_events/133.png
index c26ced826..c26ced826 100644
--- a/graphics/map_objects/133.png
+++ b/graphics/object_events/133.png
diff --git a/graphics/map_objects/134.png b/graphics/object_events/134.png
index 74a29680c..74a29680c 100644
--- a/graphics/map_objects/134.png
+++ b/graphics/object_events/134.png
diff --git a/graphics/map_objects/135.png b/graphics/object_events/135.png
index 3fd66ec1d..3fd66ec1d 100644
--- a/graphics/map_objects/135.png
+++ b/graphics/object_events/135.png
diff --git a/graphics/map_objects/136.png b/graphics/object_events/136.png
index 58dfd65fa..58dfd65fa 100644
--- a/graphics/map_objects/136.png
+++ b/graphics/object_events/136.png
diff --git a/graphics/map_objects/137.png b/graphics/object_events/137.png
index d9b6a0b68..d9b6a0b68 100644
--- a/graphics/map_objects/137.png
+++ b/graphics/object_events/137.png
diff --git a/graphics/map_objects/138.png b/graphics/object_events/138.png
index c062c6022..c062c6022 100644
--- a/graphics/map_objects/138.png
+++ b/graphics/object_events/138.png
diff --git a/graphics/map_objects/139.png b/graphics/object_events/139.png
index a587d78a9..a587d78a9 100644
--- a/graphics/map_objects/139.png
+++ b/graphics/object_events/139.png
diff --git a/graphics/map_objects/140.png b/graphics/object_events/140.png
index 934aec110..934aec110 100644
--- a/graphics/map_objects/140.png
+++ b/graphics/object_events/140.png
diff --git a/graphics/map_objects/141.png b/graphics/object_events/141.png
index c646f7bce..c646f7bce 100644
--- a/graphics/map_objects/141.png
+++ b/graphics/object_events/141.png
diff --git a/graphics/map_objects/142.png b/graphics/object_events/142.png
index f471416e6..f471416e6 100644
--- a/graphics/map_objects/142.png
+++ b/graphics/object_events/142.png
diff --git a/graphics/map_objects/143.png b/graphics/object_events/143.png
index 727d674e8..727d674e8 100644
--- a/graphics/map_objects/143.png
+++ b/graphics/object_events/143.png
diff --git a/graphics/map_objects/144.png b/graphics/object_events/144.png
index 22794f5c6..22794f5c6 100644
--- a/graphics/map_objects/144.png
+++ b/graphics/object_events/144.png
diff --git a/graphics/map_objects/145.png b/graphics/object_events/145.png
index 3d2a7f11b..3d2a7f11b 100644
--- a/graphics/map_objects/145.png
+++ b/graphics/object_events/145.png
diff --git a/graphics/map_objects/146.png b/graphics/object_events/146.png
index 743a072d2..743a072d2 100644
--- a/graphics/map_objects/146.png
+++ b/graphics/object_events/146.png
diff --git a/graphics/map_objects/147.png b/graphics/object_events/147.png
index 50339fbc0..50339fbc0 100644
--- a/graphics/map_objects/147.png
+++ b/graphics/object_events/147.png
diff --git a/graphics/map_objects/148.png b/graphics/object_events/148.png
index 9079690f0..9079690f0 100644
--- a/graphics/map_objects/148.png
+++ b/graphics/object_events/148.png
diff --git a/graphics/map_objects/149.png b/graphics/object_events/149.png
index 84c160d61..84c160d61 100644
--- a/graphics/map_objects/149.png
+++ b/graphics/object_events/149.png
diff --git a/graphics/map_objects/150.png b/graphics/object_events/150.png
index 48695b960..48695b960 100644
--- a/graphics/map_objects/150.png
+++ b/graphics/object_events/150.png
diff --git a/graphics/map_objects/151.png b/graphics/object_events/151.png
index 0331e4440..0331e4440 100644
--- a/graphics/map_objects/151.png
+++ b/graphics/object_events/151.png
diff --git a/graphics/map_objects/152.png b/graphics/object_events/152.png
index d39504689..d39504689 100644
--- a/graphics/map_objects/152.png
+++ b/graphics/object_events/152.png
diff --git a/graphics/map_objects/16.pal b/graphics/object_events/16.pal
index 3097a6556..3097a6556 100644
--- a/graphics/map_objects/16.pal
+++ b/graphics/object_events/16.pal
diff --git a/graphics/map_objects/17.pal b/graphics/object_events/17.pal
index 5537faa0f..5537faa0f 100644
--- a/graphics/map_objects/17.pal
+++ b/graphics/object_events/17.pal
diff --git a/graphics/map_objects/19.pal b/graphics/object_events/19.pal
index c20bacb57..c20bacb57 100644
--- a/graphics/map_objects/19.pal
+++ b/graphics/object_events/19.pal
diff --git a/graphics/map_objects/2.pal b/graphics/object_events/2.pal
index 0cebd6c4d..0cebd6c4d 100644
--- a/graphics/map_objects/2.pal
+++ b/graphics/object_events/2.pal
diff --git a/graphics/map_objects/20.pal b/graphics/object_events/20.pal
index c25501332..c25501332 100644
--- a/graphics/map_objects/20.pal
+++ b/graphics/object_events/20.pal
diff --git a/graphics/map_objects/21.pal b/graphics/object_events/21.pal
index cf19fedfa..cf19fedfa 100644
--- a/graphics/map_objects/21.pal
+++ b/graphics/object_events/21.pal
diff --git a/graphics/map_objects/3.pal b/graphics/object_events/3.pal
index c62e8ce06..c62e8ce06 100644
--- a/graphics/map_objects/3.pal
+++ b/graphics/object_events/3.pal
diff --git a/graphics/map_objects/4.pal b/graphics/object_events/4.pal
index e245ba013..e245ba013 100644
--- a/graphics/map_objects/4.pal
+++ b/graphics/object_events/4.pal
diff --git a/graphics/map_objects/5.pal b/graphics/object_events/5.pal
index 0c60b08a5..0c60b08a5 100644
--- a/graphics/map_objects/5.pal
+++ b/graphics/object_events/5.pal
diff --git a/graphics/map_objects/6.pal b/graphics/object_events/6.pal
index 1646e805e..1646e805e 100644
--- a/graphics/map_objects/6.pal
+++ b/graphics/object_events/6.pal
diff --git a/graphics/map_objects/7.pal b/graphics/object_events/7.pal
index 9fdd95ccc..9fdd95ccc 100644
--- a/graphics/map_objects/7.pal
+++ b/graphics/object_events/7.pal
diff --git a/graphics/map_objects/8.pal b/graphics/object_events/8.pal
index d0e386c7c..d0e386c7c 100644
--- a/graphics/map_objects/8.pal
+++ b/graphics/object_events/8.pal
diff --git a/graphics/map_objects/9.pal b/graphics/object_events/9.pal
index ae24bbfe4..ae24bbfe4 100644
--- a/graphics/map_objects/9.pal
+++ b/graphics/object_events/9.pal
diff --git a/graphics/map_objects/emoticons.png b/graphics/object_events/emoticons.png
index 43cb818da..43cb818da 100644
--- a/graphics/map_objects/emoticons.png
+++ b/graphics/object_events/emoticons.png
diff --git a/graphics/map_objects/female_surf.png b/graphics/object_events/female_surf.png
index 325af3f5e..325af3f5e 100644
--- a/graphics/map_objects/female_surf.png
+++ b/graphics/object_events/female_surf.png
diff --git a/graphics/map_objects/fldeff_cut.png b/graphics/object_events/fldeff_cut.png
index 031d04b40..031d04b40 100644
--- a/graphics/map_objects/fldeff_cut.png
+++ b/graphics/object_events/fldeff_cut.png
diff --git a/graphics/map_objects/male_surf.png b/graphics/object_events/male_surf.png
index 310e6900f..310e6900f 100644
--- a/graphics/map_objects/male_surf.png
+++ b/graphics/object_events/male_surf.png
diff --git a/graphics/map_objects/unk_396B08.png b/graphics/object_events/unk_396B08.png
index ae2222d45..ae2222d45 100644
--- a/graphics/map_objects/unk_396B08.png
+++ b/graphics/object_events/unk_396B08.png
diff --git a/graphics/map_objects/unk_835B988.pal b/graphics/object_events/unk_835B988.pal
index 27436be92..27436be92 100644
--- a/graphics/map_objects/unk_835B988.pal
+++ b/graphics/object_events/unk_835B988.pal
diff --git a/graphics/map_objects/unk_8369F28.png b/graphics/object_events/unk_8369F28.png
index e01e3ea8e..e01e3ea8e 100644
--- a/graphics/map_objects/unk_8369F28.png
+++ b/graphics/object_events/unk_8369F28.png
diff --git a/graphics/map_objects/unk_8372AA8.png b/graphics/object_events/unk_8372AA8.png
index 36f112e85..36f112e85 100644
--- a/graphics/map_objects/unk_8372AA8.png
+++ b/graphics/object_events/unk_8372AA8.png
diff --git a/graphics/map_objects/unk_838D5A8.png b/graphics/object_events/unk_838D5A8.png
index bb0ca5d34..bb0ca5d34 100644
--- a/graphics/map_objects/unk_838D5A8.png
+++ b/graphics/object_events/unk_838D5A8.png
diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk
index 81f8d8d42..57fcb3c2e 100644
--- a/graphics_file_rules.mk
+++ b/graphics_file_rules.mk
@@ -526,10 +526,10 @@ $(POKEDEXAREAMARKERSDATADIR)/marker.4bpp: $(POKEDEXAREAMARKERFILES)
 graphics/pokemon/heracross/unk_icon.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 4 -mheight 4
 
-graphics/map_objects/151.4bpp: %.4bpp: %.png
+graphics/object_events/151.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 8 -mheight 4
 
-graphics/map_objects/emoticons.4bpp: %.4bpp: %.png
+graphics/object_events/emoticons.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 2
 
 $(ITEMMENUGFXDIR)/bag_tiles.4bpp: %.4bpp: %.png
diff --git a/include/berry.h b/include/berry.h
index d55192301..5bf272d42 100644
--- a/include/berry.h
+++ b/include/berry.h
@@ -25,7 +25,7 @@ enum
 
 #define NUM_BERRIES 44
 
-extern const u8 *const gBerryTreeFieldObjectGraphicsIdTablePointers[NUM_BERRIES];
+extern const u8 *const gBerryTreeObjectEventGraphicsIdTablePointers[NUM_BERRIES];
 extern const struct SpriteFrameImage *const gBerryTreePicTablePointers[NUM_BERRIES];
 extern const u8 *const gBerryTreePaletteSlotTablePointers[NUM_BERRIES];
 
@@ -35,7 +35,7 @@ u32 GetEnigmaBerryChecksum(struct EnigmaBerry *enigmaBerry);
 bool32 IsEnigmaBerryValid(void);
 const struct Berry *GetBerryInfo(u8 berry);
 struct BerryTree *GetBerryTreeInfo(u8 id);
-bool32 FieldObjectInteractionWaterBerryTree(void);
+bool32 ObjectEventInteractionWaterBerryTree(void);
 bool8 IsPlayerFacingPlantedBerryTree(void);
 bool8 TryToWaterBerryTree(void);
 void ClearBerryTrees(void);
@@ -56,10 +56,10 @@ u8 CalcBerryYield(struct BerryTree *tree);
 u8 GetBerryCountByBerryTreeId(u8 id);
 u16 GetStageDurationByBerryType(u8);
 void Bag_ChooseBerry(void);
-void FieldObjectInteractionGetBerryTreeData(void);
-void FieldObjectInteractionPlantBerryTree(void);
-void FieldObjectInteractionPickBerryTree(void);
-void FieldObjectInteractionRemoveBerryTree(void);
+void ObjectEventInteractionGetBerryTreeData(void);
+void ObjectEventInteractionPlantBerryTree(void);
+void ObjectEventInteractionPickBerryTree(void);
+void ObjectEventInteractionRemoveBerryTree(void);
 u8 PlayerHasBerries(void);
 void ResetBerryTreeSparkleFlags(void);
 void sub_809C794(void);
diff --git a/include/event_data.h b/include/event_data.h
index 719ba37b2..7987720f1 100644
--- a/include/event_data.h
+++ b/include/event_data.h
@@ -46,7 +46,7 @@ bool32 CanResetRTC(void);
 u16 *GetVarPointer(u16 id);
 u16 VarGet(u16 id);
 bool8 VarSet(u16 id, u16 value);
-u8 VarGetFieldObjectGraphicsId(u8 id);
+u8 VarGetObjectEventGraphicsId(u8 id);
 u8 *GetFlagPointer(u16 id);
 u8 FlagSet(u16 id);
 u8 FlagClear(u16 id);
diff --git a/include/field_effect_helpers.h b/include/field_effect_helpers.h
index 5cd29fc5b..f2a4f83a7 100644
--- a/include/field_effect_helpers.h
+++ b/include/field_effect_helpers.h
@@ -13,7 +13,7 @@
 
 // Exported ROM declarations
 u8 sub_8154228(void);
-bool8 sub_8155DA0(struct MapObject *);
+bool8 sub_8155DA0(struct ObjectEvent *);
 void sub_80DC44C(u8, u8);
 
 #endif //GUARD_FIELD_EFFECT_HELPERS_H
diff --git a/include/field_ground_effect.h b/include/field_ground_effect.h
index 49448db6a..1233dec69 100644
--- a/include/field_ground_effect.h
+++ b/include/field_ground_effect.h
@@ -16,9 +16,9 @@ void SetObjectSubpriorityByZCoord(u8, struct Sprite *, u8);
 void InitObjectPriorityByZCoord(struct Sprite *, u8);
 bool8 IsZCoordMismatchAt(u8, s16, s16);
 bool8 AreZCoordsCompatible(u8, u8);
-void FieldObjectUpdateSubpriority(struct MapObject *, struct Sprite *);
-void DoGroundEffects_OnSpawn(struct MapObject *, struct Sprite *);
-void DoGroundEffects_OnBeginStep(struct MapObject *, struct Sprite *);
-void DoGroundEffects_OnFinishStep(struct MapObject *, struct Sprite *);
+void ObjectEventUpdateSubpriority(struct ObjectEvent *, struct Sprite *);
+void DoGroundEffects_OnSpawn(struct ObjectEvent *, struct Sprite *);
+void DoGroundEffects_OnBeginStep(struct ObjectEvent *, struct Sprite *);
+void DoGroundEffects_OnFinishStep(struct ObjectEvent *, struct Sprite *);
 
 #endif //GUARD_FIELD_GROUND_EFFECT_H
diff --git a/include/field_map_obj.h b/include/field_map_obj.h
index 6177cba1c..e962c39e7 100644
--- a/include/field_map_obj.h
+++ b/include/field_map_obj.h
@@ -27,12 +27,12 @@ enum SpinnerRunnerFollowPatterns {
 // Exported ROM declarations
 
 void sub_808D438(void);
-u8 GetFieldObjectIdByLocalIdAndMap(u8, u8, u8);
-bool8 TryGetFieldObjectIdByLocalIdAndMap(u8, u8, u8, u8 *);
-u8 GetFieldObjectIdByXY(s16, s16);
-void FieldObjectSetDirection(struct MapObject *, u8);
+u8 GetObjectEventIdByLocalIdAndMap(u8, u8, u8);
+bool8 TryGetObjectEventIdByLocalIdAndMap(u8, u8, u8, u8 *);
+u8 GetObjectEventIdByXY(s16, s16);
+void ObjectEventSetDirection(struct ObjectEvent *, u8);
 u8 sub_808D4F4(void);
-void RemoveFieldObjectByLocalIdAndMap(u8, u8, u8);
+void RemoveObjectEventByLocalIdAndMap(u8, u8, u8);
 void npc_load_two_palettes__no_record(u16, u8);
 void npc_load_two_palettes__and_record(u16, u8);
 void sub_805F7C4(u8, u8, u8, s16, s16);
@@ -40,59 +40,59 @@ void pal_patch_for_npc(u16, u8);
 void sub_808E16C(s16, s16);
 void sub_808F28C(u8 localId, u8 mapNum, u8 mapGroup, u8 decorCat);
 void sub_8092FF0(s16, s16, s16 *, s16 *);
-u8 FieldObjectDirectionToImageAnimId(u8);
+u8 ObjectEventDirectionToImageAnimId(u8);
 void sub_80930E0(s16 *, s16 *, s16, s16);
-void FieldObjectClearAnim(struct MapObject *);
-void FieldObjectClearAnimIfSpecialAnimActive(struct MapObject *);
-void SpawnFieldObjectsInView(s16, s16);
+void ObjectEventClearAnim(struct ObjectEvent *);
+void ObjectEventClearAnimIfSpecialAnimActive(struct ObjectEvent *);
+void SpawnObjectEventsInView(s16, s16);
 u8 sprite_new(u8, u8, s16, s16, u8, u8);
 u8 AddPseudoEventObject(u16, SpriteCallback, s16, s16, u8);
 u8 show_sprite(u8, u8, u8);
-u8 SpawnSpecialFieldObjectParameterized(u8, u8, u8, s16, s16, u8);
-u8 SpawnSpecialFieldObject(struct MapObjectTemplate *);
+u8 SpawnSpecialObjectEventParameterized(u8, u8, u8, s16, s16, u8);
+u8 SpawnSpecialObjectEvent(struct ObjectEventTemplate *);
 void sub_8093038(s16, s16, s16 *, s16 *);
 void CameraObjectReset1(void);
 void CameraObjectReset2(void);
-void FieldObjectSetGraphicsId(struct MapObject *, u8);
-void FieldObjectTurn(struct MapObject *, u8);
-void FieldObjectTurnByLocalIdAndMap(u8, u8, u8, u8);
-void FieldObjectForceSetSpecialAnim(struct MapObject *, u8);
+void ObjectEventSetGraphicsId(struct ObjectEvent *, u8);
+void ObjectEventTurn(struct ObjectEvent *, u8);
+void ObjectEventTurnByLocalIdAndMap(u8, u8, u8, u8);
+void ObjectEventForceSetSpecialAnim(struct ObjectEvent *, u8);
 u8 sub_8064270(u8 a0);
-const struct MapObjectGraphicsInfo *GetFieldObjectGraphicsInfo(u8);
+const struct ObjectEventGraphicsInfo *GetObjectEventGraphicsInfo(u8);
 void npc_by_local_id_and_map_set_field_1_bit_x20(u8, u8, u8, u8);
 void gpu_pal_allocator_reset__manage_upper_four(void);
 void sub_808E82C(u8, u8, u8, s16, s16);
 void sub_805F400(u8, u8, u8);
 void sub_805F3A8(u8, u8, u8, u8);
 void sub_808E75C(s16, s16);
-void FieldObjectGetLocalIdAndMap(struct MapObject *, u8 *, u8 *, u8 *);
-void npc_coords_shift(struct MapObject *, s16, s16);
-void sub_808EB08(struct MapObject *, s16, s16);
+void ObjectEventGetLocalIdAndMap(struct ObjectEvent *, u8 *, u8 *, u8 *);
+void npc_coords_shift(struct ObjectEvent *, s16, s16);
+void sub_808EB08(struct ObjectEvent *, s16, s16);
 void sub_805FE94(u8, u8, u8);
-void FieldObjectStep(struct MapObject *, struct Sprite *, bool8(struct MapObject *, struct Sprite *));
-u8 FieldObjectFaceOppositeDirection(struct MapObject *, u8);
+void ObjectEventStep(struct ObjectEvent *, struct Sprite *, bool8(struct ObjectEvent *, struct Sprite *));
+u8 ObjectEventFaceOppositeDirection(struct ObjectEvent *, u8);
 u8 GetOppositeDirection(u8);
 u8 GetStepInPlaceDelay4AnimId(u32);
 u8 GetStepInPlaceDelay8AnimId(u32);
 u8 GetStepInPlaceDelay16AnimId(u32);
 u8 GetStepInPlaceDelay32AnimId(u32);
-u8 npc_block_way(struct MapObject *, s16, s16, u32);
+u8 npc_block_way(struct ObjectEvent *, s16, s16, u32);
 void MoveCoords(u8, s16 *, s16 *);
-bool8 FieldObjectIsSpecialAnimActive(struct MapObject *);
-u8 FieldObjectClearHeldMovementIfFinished(struct MapObject *);
-u8 GetFieldObjectIdByXYZ(u16 x, u16 y, u8 z);
-void sub_8063E28(struct MapObject *, struct Sprite *);
-void FieldObjectSetHeldMovement(struct MapObject *, u8);
-void npc_coords_shift_still(struct MapObject *);
-void sub_805FE7C(struct MapObject *, u8);
-void SetTrainerMovementType(struct MapObject *, u8);
+bool8 ObjectEventIsSpecialAnimActive(struct ObjectEvent *);
+u8 ObjectEventClearHeldMovementIfFinished(struct ObjectEvent *);
+u8 GetObjectEventIdByXYZ(u16 x, u16 y, u8 z);
+void sub_8063E28(struct ObjectEvent *, struct Sprite *);
+void ObjectEventSetHeldMovement(struct ObjectEvent *, u8);
+void npc_coords_shift_still(struct ObjectEvent *);
+void sub_805FE7C(struct ObjectEvent *, u8);
+void SetTrainerMovementType(struct ObjectEvent *, u8);
 u8 sub_80634F0(u8 direction);
 u8 sub_8063500(u8 a0);
-void EventObjectSetGraphicsId(struct MapObject *mapObject, u8 a1);
+void EventObjectSetGraphicsId(struct ObjectEvent *mapObject, u8 a1);
 u8 sub_805EB44(u8, u8, s16, s16);
 void npc_paltag_set_load(u8 mode);
-bool8 FieldObjectIsMovementOverridden(struct MapObject *mapObject);
-u8 FieldObjectCheckHeldMovementStatus(struct MapObject *mapObject);
+bool8 ObjectEventIsMovementOverridden(struct ObjectEvent *mapObject);
+u8 ObjectEventCheckHeldMovementStatus(struct ObjectEvent *mapObject);
 u8 sub_8063F84(u8 direction);
 u8 GetTrainerFacingDirectionMovementType(u8 direction);
 void CameraObjectSetFollowedObjectId(u8 spriteId);
diff --git a/include/field_map_obj_helpers.h b/include/field_map_obj_helpers.h
index cd1b19eaf..dec3639ef 100644
--- a/include/field_map_obj_helpers.h
+++ b/include/field_map_obj_helpers.h
@@ -3,7 +3,7 @@
 
 #include "global.h"
 
-void UnfreezeMapObjects(void);
+void UnfreezeObjectEvents(void);
 void sub_8069058(u8, u8);
 
 #endif
diff --git a/include/fieldmap.h b/include/fieldmap.h
index f1107100f..1560a0841 100644
--- a/include/fieldmap.h
+++ b/include/fieldmap.h
@@ -11,8 +11,8 @@
 #define NUM_PALS_TOTAL 13
 #define VIRTUAL_MAP_SIZE 0x2800
 
-extern struct BackupMapData VMap;
-extern const struct MapData Route1_Layout;
+extern struct BackupMapLayout VMap;
+extern const struct MapLayout Route1_Layout;
 
 u32 MapGridGetMetatileIdAt(int, int);
 u32 MapGridGetMetatileBehaviorAt(int, int);
@@ -23,7 +23,7 @@ void GetCameraCoords(u16*, u16*);
 bool8 MapGridIsImpassableAt(s32, s32);
 s32 GetMapBorderIdAt(s32, s32);
 bool32 CanCameraMoveInDirection(s32);
-u32 GetBehaviorByMetatileIdAndMapData(struct MapData *mapData, u16 metatile, u8 attr);
+u32 GetBehaviorByMetatileIdAndMapLayout(struct MapLayout *mapLayout, u16 metatile, u8 attr);
 const struct MapHeader * mapconnection_get_mapheader(struct MapConnection * connection);
 struct MapConnection * GetMapConnectionAtPos(s16 x, s16 y);
 void sub_8059948(u8 a0, u8 a1);
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h
index 186185104..72970f28a 100644
--- a/include/global.fieldmap.h
+++ b/include/global.fieldmap.h
@@ -26,7 +26,7 @@ struct Tileset
     /*0x14*/ void *metatileAttributes;
 };
 
-struct MapData
+struct MapLayout
 {
     /*0x00*/ s32 width;
     /*0x04*/ s32 height;
@@ -38,14 +38,14 @@ struct MapData
     /*0x19*/ u8 unk19;
 };
 
-struct BackupMapData
+struct BackupMapLayout
 {
     s32 Xsize;
     s32 Ysize;
     u16 *map;
 };
 
-union __attribute__((packed)) MapObjectRange {
+union __attribute__((packed)) ObjectEventRange {
     u8 as_byte;
     struct __attribute__((packed)) {
         u8 x:4;
@@ -53,7 +53,7 @@ union __attribute__((packed)) MapObjectRange {
     } __attribute__((aligned (1))) as_nybbles;
 } __attribute__((aligned (1)));
 
-struct MapObjectTemplate
+struct ObjectEventTemplate
 {
     /*0x00*/ u8 localId;
     /*0x01*/ u8 graphicsId;
@@ -123,12 +123,12 @@ struct BgEvent
 
 struct MapEvents
 {
-    u8 mapObjectCount;
+    u8 objectEventCount;
     u8 warpCount;
     u8 coordEventCount;
     u8 bgEventCount;
 
-    struct MapObjectTemplate *mapObjects;
+    struct ObjectEventTemplate *objectEvents;
     struct WarpEvent *warps;
     struct CoordEvent *coordEvents;
     struct BgEvent *bgEvents;
@@ -150,12 +150,12 @@ struct MapConnections
 
 struct MapHeader
 {
-    /* 0x00 */ struct MapData *mapData;
+    /* 0x00 */ struct MapLayout *mapLayout;
     /* 0x04 */ struct MapEvents *events;
     /* 0x08 */ u8 *mapScripts;
     /* 0x0C */ struct MapConnections *connections;
     /* 0x10 */ u16 music;
-    /* 0x12 */ u16 mapDataId;
+    /* 0x12 */ u16 mapLayoutId;
     /* 0x14 */ u8 regionMapSectionId;
     /* 0x15 */ u8 cave;
     /* 0x16 */ u8 weather;
@@ -166,7 +166,7 @@ struct MapHeader
     /* 0x1B */ u8 battleType;
 };
 
-struct MapObject
+struct ObjectEvent
 {
     /*0x00*/ u32 active:1;
              u32 mapobj_bit_1:1;
@@ -214,7 +214,7 @@ struct MapObject
     /*0x14*/ struct Coords16 coords3;
     /*0x18*/ u8 facingDirection:4;  //current direction?
     /*0x18*/ u8 placeholder18:4;
-    /*0x19*/ union MapObjectRange range;
+    /*0x19*/ union ObjectEventRange range;
     /*0x1A*/ u8 mapobj_unk_1A;
     /*0x1B*/ u8 mapobj_unk_1B;
     /*0x1C*/ u8 mapobj_unk_1C;
@@ -227,7 +227,7 @@ struct MapObject
     /*size = 0x24*/
 };
 
-struct MapObjectGraphicsInfo
+struct ObjectEventGraphicsInfo
 {
     /*0x00*/ u16 tileTag;
     /*0x02*/ u16 paletteTag1;
@@ -309,8 +309,8 @@ struct Camera
     s32 y;
 };
 
-extern struct MapObject gMapObjects[NUM_FIELD_OBJECTS];
-extern u8 gSelectedEventObject;
+extern struct ObjectEvent gObjectEvents[NUM_FIELD_OBJECTS];
+extern u8 gSelectedObjectEvent;
 extern struct MapHeader gMapHeader;
 extern struct PlayerAvatar gPlayerAvatar;
 extern struct Camera gCamera;
diff --git a/include/global.h b/include/global.h
index 9df153270..ea94512f7 100644
--- a/include/global.h
+++ b/include/global.h
@@ -564,7 +564,7 @@ union QuestLogMovement
     } ident_struct;
 };
 
-struct QuestLogMapObject
+struct QuestLogObjectEvent
 {
     /*0x00*/ u8 active:1;
     /*0x00*/ u8 mapobj_bit_3:1;
@@ -609,7 +609,7 @@ struct QuestLog
     /*0x0003*/ s8 unk_003;
     /*0x0004*/ s16 unk_004;
     /*0x0006*/ s16 unk_006;
-    /*0x0008*/ struct QuestLogMapObject unk_008[MAP_OBJECTS_COUNT];
+    /*0x0008*/ struct QuestLogObjectEvent unk_008[MAP_OBJECTS_COUNT];
 
     // These arrays hold the game state for
     // playing back the quest log
@@ -727,7 +727,7 @@ struct SaveBlock1
     /*0x002E*/ u8 weather;
     /*0x002F*/ u8 filler_2F;
     /*0x0030*/ u8 flashLevel;
-    /*0x0032*/ u16 mapDataId;
+    /*0x0032*/ u16 mapLayoutId;
     /*0x0034*/ u8 playerPartyCount;
     /*0x0038*/ struct Pokemon playerParty[PARTY_SIZE];
     /*0x0290*/ u32 money;
@@ -744,8 +744,8 @@ struct SaveBlock1
     /*0x0632*/ u8 field_632[6]; // unused?
     /*0x0638*/ u16 trainerRematchStepCounter;
     /*0x063A*/ u8 ALIGNED(2) trainerRematches[100];
-    /*0x06A0*/ struct MapObject mapObjects[MAP_OBJECTS_COUNT];
-    /*0x08E0*/ struct MapObjectTemplate mapObjectTemplates[64];
+    /*0x06A0*/ struct ObjectEvent objectEvents[MAP_OBJECTS_COUNT];
+    /*0x08E0*/ struct ObjectEventTemplate mapObjectTemplates[64];
     /*0x0EE0*/ u8 flags[FLAGS_COUNT];
     /*0x1000*/ u16 vars[VARS_COUNT];
     /*0x1200*/ u32 gameStats[NUM_GAME_STATS];
diff --git a/include/map_obj_80688E4.h b/include/map_obj_80688E4.h
index bfd5dd3c7..7132d2aa8 100644
--- a/include/map_obj_80688E4.h
+++ b/include/map_obj_80688E4.h
@@ -4,7 +4,7 @@
 #include "global.h"
 
 void FreezeEventObjects(void);
-void FreezeMapObject(struct MapObject *);
-void FreezeMapObjectsExceptOne(u8 mapObjectId);
+void FreezeObjectEvent(struct ObjectEvent *);
+void FreezeObjectEventsExceptOne(u8 objEventId);
 
 #endif //GUARD_MAP_OBJ_80688E4_H
diff --git a/include/map_obj_8097404.h b/include/map_obj_8097404.h
index ad90bed9c..84ecbf26f 100644
--- a/include/map_obj_8097404.h
+++ b/include/map_obj_8097404.h
@@ -14,21 +14,21 @@ extern void *gUnknown_020375B8;
 
 // Exported ROM declarations
 void sub_8097AC8(struct Sprite *);
-void npc_sync_anim_pause_bits(struct MapObject *);
+void npc_sync_anim_pause_bits(struct ObjectEvent *);
 void oamt_npc_ministep_reset(struct Sprite *, u8, u8);
-u8 sub_8097F78(struct MapObject *);
+u8 sub_8097F78(struct ObjectEvent *);
 bool8 obj_npc_ministep(struct Sprite *sprite);
 bool8 sub_80976EC(struct Sprite *sprite);
 void sub_80976DC(struct Sprite *, u8);
 void sub_809783C(struct Sprite *, u8, u8, u8);
-void DoShadowFieldEffect(struct MapObject *);
+void DoShadowFieldEffect(struct ObjectEvent *);
 u8 sub_809785C(struct Sprite *);
 u8 sub_80978E4(struct Sprite *);
 void obj_anim_image_set_and_seek(struct Sprite *, u8, u8);
 bool8 sub_80979BC(struct Sprite *);
 void sub_8097750(struct Sprite *);
 bool8 sub_8097758(struct Sprite *);
-void sub_8097FA4(struct MapObject *);
+void sub_8097FA4(struct ObjectEvent *);
 void sub_8098044(u8);
 
 #endif //GUARD_MAP_OBJ_8097404_H
diff --git a/include/map_obj_lock.h b/include/map_obj_lock.h
index 0d130973b..12e0eae53 100644
--- a/include/map_obj_lock.h
+++ b/include/map_obj_lock.h
@@ -4,9 +4,9 @@
 #include "global.h"
 
 bool8 sub_8069590(void);
-void ScriptFreezeMapObjects(void);
+void ScriptFreezeObjectEvents(void);
 bool8 sub_8069648(void);
-void LockSelectedMapObject(void);
+void LockSelectedObjectEvent(void);
 void sub_8098630(void);
 bool8 sub_8098734(void);
 void sub_80696C0(void);
diff --git a/include/overworld.h b/include/overworld.h
index ab20d9ff0..c6f1595d3 100644
--- a/include/overworld.h
+++ b/include/overworld.h
@@ -10,7 +10,7 @@ struct UnkPlayerStruct
     u8 player_field_1;
 };
 
-struct LinkPlayerMapObject
+struct LinkPlayerObjectEvent
 {
     u8 active;
     u8 linkPlayerId;
@@ -32,7 +32,7 @@ struct CreditsOverworldCmd
 
 extern struct UCoords32 gDirectionToVectors[];
 
-extern struct LinkPlayerMapObject gLinkPlayerMapObjects[4];
+extern struct LinkPlayerObjectEvent gLinkPlayerMapObjects[4];
 extern MainCallback gFieldCallback;
 
 extern struct WarpData gUnknown_2031DB4;
@@ -73,7 +73,7 @@ bool32 IsUpdateLinkStateCBActive(void);
 
 void strange_npc_table_clear(void);
 const struct MapHeader *Overworld_GetMapHeaderByGroupAndId(u16, u16);
-void FieldObjectMoveDestCoords(struct MapObject *, u32, s16 *, s16 *);
+void ObjectEventMoveDestCoords(struct ObjectEvent *, u32, s16 *, s16 *);
 void sub_8086230(void);
 void CB2_ReturnToField(void);
 bool32 sub_8087598(void);
@@ -99,11 +99,11 @@ void Overworld_PlaySpecialMapMusic(void);
 
 u8 GetCurrentRegionMapSectionId(void);
 
-void SetCurrentMapLayout(u16 mapDataId);
+void SetCurrentMapLayout(u16 mapLayoutId);
 void SetWarpDestinationToFixedHoleWarp(s16 x, s16 y);
 
 void ResetInitialPlayerAvatarState(void);
-void sub_8055D40(u16 mapDataId);
+void sub_8055D40(u16 mapLayoutId);
 void CleanupOverworldWindowsAndTilemaps(void);
 u32 ComputeWhiteOutMoneyLoss(void);
 
diff --git a/include/quest_log_815A008.h b/include/quest_log_815A008.h
index 2577450a4..72613be86 100644
--- a/include/quest_log_815A008.h
+++ b/include/quest_log_815A008.h
@@ -4,6 +4,6 @@
 #include "global.h"
 
 void sub_815A008(struct QuestLog *);
-void sub_815A1F8(struct QuestLog *, struct MapObjectTemplate *);
+void sub_815A1F8(struct QuestLog *, struct ObjectEventTemplate *);
 
 #endif //GUARD_QUEST_LOG_815A008_H
diff --git a/include/rom_81BE66C.h b/include/rom_81BE66C.h
index fa439d8da..17b02ffa4 100644
--- a/include/rom_81BE66C.h
+++ b/include/rom_81BE66C.h
@@ -8,7 +8,7 @@
 #include "global.h"
 
 bool32 InTrainerHill(void);
-bool8 FieldObjectIsFarawayIslandMew(struct MapObject *);
+bool8 ObjectEventIsFarawayIslandMew(struct ObjectEvent *);
 u32 sub_81D427C(void);
 
 #endif //GUARD_ROM_81BE66C_H
diff --git a/include/save_location.h b/include/save_location.h
index 4e01c64e4..fb71ab728 100644
--- a/include/save_location.h
+++ b/include/save_location.h
@@ -12,4 +12,4 @@ bool32 IsCurMapPokeCenter(void);
 void sub_810B810(void);
 void sub_810B82C(void);
 
-#endif // GUARD_SAVE_LOCATION_H
\ No newline at end of file
+#endif // GUARD_SAVE_LOCATION_H
diff --git a/include/trainer_see.h b/include/trainer_see.h
index f87189377..511edf404 100644
--- a/include/trainer_see.h
+++ b/include/trainer_see.h
@@ -3,8 +3,8 @@
 
 #include "global.h"
 
-void sub_80B4578(struct MapObject *);
+void sub_80B4578(struct ObjectEvent *);
 u8 sub_80B47BC(void);
-void sub_8155D78(struct MapObject *);
+void sub_8155D78(struct ObjectEvent *);
 
 #endif //GUARD_TRAINER_SEE_H
diff --git a/src/battle_setup.c b/src/battle_setup.c
index 9fef6a8a5..57797ba43 100644
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -768,7 +768,7 @@ static void SetMapVarsToTrainer(void)
     if (sTrainerEventObjectLocalId != 0)
     {
         gSpecialVar_LastTalked = sTrainerEventObjectLocalId;
-        gSelectedEventObject = GetFieldObjectIdByLocalIdAndMap(sTrainerEventObjectLocalId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
+        gSelectedObjectEvent = GetObjectEventIdByLocalIdAndMap(sTrainerEventObjectLocalId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
     }
 }
 
@@ -819,8 +819,8 @@ const u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data)
 
 void ConfigureAndSetUpOneTrainerBattle(u8 trainerEventObjId, const u8 *trainerScript)
 {
-    gSelectedEventObject = trainerEventObjId;
-    gSpecialVar_LastTalked = gMapObjects[trainerEventObjId].localId;
+    gSelectedObjectEvent = trainerEventObjId;
+    gSpecialVar_LastTalked = gObjectEvents[trainerEventObjId].localId;
     BattleSetup_ConfigureTrainerBattle(trainerScript + 1);
     ScriptContext1_SetupScript(gUnknown_81A4EB4);
     ScriptContext2_Enable();
@@ -835,7 +835,7 @@ bool32 GetTrainerFlagFromScriptPointer(const u8 *data)
 
 void SetUpTrainerMovement(void)
 {
-    struct MapObject *eventObject = &gMapObjects[gSelectedEventObject];
+    struct ObjectEvent *eventObject = &gObjectEvents[gSelectedObjectEvent];
 
     SetTrainerMovementType(eventObject, GetTrainerFacingDirectionMovementType(eventObject->facingDirection));
 }
diff --git a/src/data/pokemon/pokedex_entries.h b/src/data/pokemon/pokedex_entries.h
index 4f14c64e9..1f388e05e 100644
--- a/src/data/pokemon/pokedex_entries.h
+++ b/src/data/pokemon/pokedex_entries.h
@@ -5030,4 +5030,4 @@ const struct PokedexEntry gPokedexEntries[] =
         .trainerScale = 337,
         .trainerOffset = 2,
     },
-};
\ No newline at end of file
+};
diff --git a/src/event_data.c b/src/event_data.c
index 4aca57e50..9291c06aa 100644
--- a/src/event_data.c
+++ b/src/event_data.c
@@ -238,7 +238,7 @@ bool8 VarSet(u16 idx, u16 val)
     return TRUE;
 }
 
-u8 VarGetFieldObjectGraphicsId(u8 idx)
+u8 VarGetObjectEventGraphicsId(u8 idx)
 {
     return VarGet(VAR_OBJ_GFX_ID_0 + idx);
 }
diff --git a/src/field_fadetransition.c b/src/field_fadetransition.c
index d6bf4ea07..670e91d96 100644
--- a/src/field_fadetransition.c
+++ b/src/field_fadetransition.c
@@ -350,7 +350,7 @@ static void sub_807DFBC(u8 taskId)
         {
             PlayerGetDestCoords(&task->data[12], &task->data[13]);
             sub_807DCB0(TRUE);
-            FieldObjectSetHeldMovement(&gMapObjects[GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0)], 16);
+            ObjectEventSetHeldMovement(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0)], 16);
             task->data[0] = 8;
         }
         break;
@@ -365,7 +365,7 @@ static void sub_807DFBC(u8 taskId)
     case 9:
         if (sub_807E418() && walkrun_is_standing_still() && !FieldIsDoorAnimationRunning() && !FuncIsActiveTask(sub_807F204))
         {
-            FieldObjectClearHeldMovementIfFinished(&gMapObjects[GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0)]);
+            ObjectEventClearHeldMovementIfFinished(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0)]);
             task->data[0] = 4;
         }
         break;
@@ -374,7 +374,7 @@ static void sub_807DFBC(u8 taskId)
         if (sub_807E418())
         {
             sub_807DCB0(TRUE);
-            FieldObjectSetHeldMovement(&gMapObjects[GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0)], 16);
+            ObjectEventSetHeldMovement(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0)], 16);
             task->data[0] = 2;
         }
         break;
@@ -382,7 +382,7 @@ static void sub_807DFBC(u8 taskId)
         if (walkrun_is_standing_still())
         {
             task->data[1] = FieldAnimateDoorClose(*x, *y);
-            FieldObjectClearHeldMovementIfFinished(&gMapObjects[GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0)]);
+            ObjectEventClearHeldMovementIfFinished(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0)]);
             task->data[0] = 3;
         }
         break;
@@ -391,7 +391,7 @@ static void sub_807DFBC(u8 taskId)
             task->data[0] = 4;
         break;
     case 4:
-        UnfreezeMapObjects();
+        UnfreezeObjectEvents();
         ScriptContext2_Disable();
         DestroyTask(taskId);
         break;
@@ -416,7 +416,7 @@ static void task_map_chg_seq_0807E20C(u8 taskId)
         if (sub_807E418())
         {
             sub_807DCB0(TRUE);
-            FieldObjectSetHeldMovement(&gMapObjects[GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0)], sub_8063F84(GetPlayerFacingDirection()));
+            ObjectEventSetHeldMovement(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0)], sub_8063F84(GetPlayerFacingDirection()));
             task->data[0] = 2;
         }
         break;
@@ -427,7 +427,7 @@ static void task_map_chg_seq_0807E20C(u8 taskId)
         }
         break;
     case 3:
-        UnfreezeMapObjects();
+        UnfreezeObjectEvents();
         ScriptContext2_Disable();
         DestroyTask(taskId);
         break;
@@ -446,7 +446,7 @@ static void task_map_chg_seq_0807E2CC(u8 taskId)
     case 1:
         if (sub_807E418())
         {
-            UnfreezeMapObjects();
+            UnfreezeObjectEvents();
             ScriptContext2_Disable();
             DestroyTask(taskId);
         }
@@ -467,7 +467,7 @@ static void sub_807E31C(u8 taskId)
     case 1:
         if (sub_807E418() && sub_805DC24() != TRUE)
         {
-            UnfreezeMapObjects();
+            UnfreezeObjectEvents();
             ScriptContext2_Disable();
             DestroyTask(taskId);
         }
@@ -753,8 +753,8 @@ static void sub_807E80C(u8 taskId)
     case 1:
         if (task->data[1] < 0 || gTasks[task->data[1]].isActive != TRUE)
         {
-            FieldObjectClearAnimIfSpecialAnimActive(&gMapObjects[GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0)]);
-            FieldObjectSetHeldMovement(&gMapObjects[GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0)], 17);
+            ObjectEventClearAnimIfSpecialAnimActive(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0)]);
+            ObjectEventSetHeldMovement(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0)], 17);
             task->data[0] = 2;
         }
         break;
@@ -762,7 +762,7 @@ static void sub_807E80C(u8 taskId)
         if (walkrun_is_standing_still())
         {
             task->data[1] = FieldAnimateDoorClose(*xp, *yp - 1);
-            FieldObjectClearHeldMovementIfFinished(&gMapObjects[GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0)]);
+            ObjectEventClearHeldMovementIfFinished(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0)]);
             sub_807DCB0(FALSE);
             task->data[0] = 3;
         }
@@ -792,7 +792,7 @@ static void sub_807E80C(u8 taskId)
 static void sub_807E980(u8 taskId)
 {
     s16 * data = gTasks[taskId].data;
-    struct MapObject *playerObj = &gMapObjects[gPlayerAvatar.mapObjectId];
+    struct ObjectEvent *playerObj = &gObjectEvents[gPlayerAvatar.mapObjectId];
     struct Sprite *playerSpr = &gSprites[gPlayerAvatar.spriteId];
     switch (data[0])
     {
@@ -803,7 +803,7 @@ static void sub_807E980(u8 taskId)
         data[0]++;
         break;
     case 1:
-        if (!FieldObjectIsMovementOverridden(playerObj) || FieldObjectClearHeldMovementIfFinished(playerObj))
+        if (!ObjectEventIsMovementOverridden(playerObj) || ObjectEventClearHeldMovementIfFinished(playerObj))
         {
             if (data[15] != 0)
                 data[15]--;
@@ -844,7 +844,7 @@ static void sub_807E980(u8 taskId)
 static void sub_807EAC4(s16 a0, s16 a1, s16 *a2, s16 *a3, s16 *a4)
 {
     struct Sprite *playerSpr = &gSprites[gPlayerAvatar.spriteId];
-    struct MapObject *playerObj = &gMapObjects[gPlayerAvatar.mapObjectId];
+    struct ObjectEvent *playerObj = &gObjectEvents[gPlayerAvatar.mapObjectId];
     if (a1 > 0 || *a4 > 6)
         *a3 += a1;
     *a2 += a0;
@@ -853,13 +853,13 @@ static void sub_807EAC4(s16 a0, s16 a1, s16 *a2, s16 *a3, s16 *a4)
     playerSpr->pos2.y = *a3 >> 5;
     if (playerObj->mapobj_bit_7)
     {
-        FieldObjectForceSetSpecialAnim(playerObj, GetStepInPlaceDelay16AnimId(GetPlayerFacingDirection()));
+        ObjectEventForceSetSpecialAnim(playerObj, GetStepInPlaceDelay16AnimId(GetPlayerFacingDirection()));
     }
 }
 
 static void sub_807EB64(u16 a0, s16 *a1, s16 *a2)
 {
-    FieldObjectForceSetSpecialAnim(&gMapObjects[gPlayerAvatar.mapObjectId], GetStepInPlaceDelay16AnimId(GetPlayerFacingDirection()));
+    ObjectEventForceSetSpecialAnim(&gObjectEvents[gPlayerAvatar.mapObjectId], GetStepInPlaceDelay16AnimId(GetPlayerFacingDirection()));
     sub_807EBBC(a0, a1, a2);
 }
 
@@ -931,7 +931,7 @@ static void sub_807ECBC(s16 *a0, s16 *a1, s16 *a2, s16 *a3, s16 *a4)
         r1 = 3;
     else
         r1 = 4;
-    FieldObjectForceSetSpecialAnim(&gMapObjects[gPlayerAvatar.mapObjectId], sub_8064270(r1));
+    ObjectEventForceSetSpecialAnim(&gObjectEvents[gPlayerAvatar.mapObjectId], sub_8064270(r1));
     sub_807EBBC(behavior, a0, a1);
     *a2 = *a0 * 16;
     *a3 = *a1 * 16;
diff --git a/src/field_specials.c b/src/field_specials.c
index 374c74f3c..598ceea8e 100644
--- a/src/field_specials.c
+++ b/src/field_specials.c
@@ -314,15 +314,15 @@ void Special_AnimatePcTurnOff()
 
 void SpawnCameraObject(void)
 {
-    u8 mapObjectId = SpawnSpecialFieldObjectParameterized(MAP_OBJ_GFX_YOUNGSTER, 8, 127, gSaveBlock1Ptr->pos.x + 7, gSaveBlock1Ptr->pos.y + 7, 3);
-    gMapObjects[mapObjectId].mapobj_bit_13 = TRUE;
-    CameraObjectSetFollowedObjectId(gMapObjects[mapObjectId].spriteId);
+    u8 mapObjectId = SpawnSpecialObjectEventParameterized(MAP_OBJ_GFX_YOUNGSTER, 8, 127, gSaveBlock1Ptr->pos.x + 7, gSaveBlock1Ptr->pos.y + 7, 3);
+    gObjectEvents[mapObjectId].mapobj_bit_13 = TRUE;
+    CameraObjectSetFollowedObjectId(gObjectEvents[mapObjectId].spriteId);
 }
 
 void RemoveCameraObject(void)
 {
     CameraObjectSetFollowedObjectId(GetPlayerAvatarObjectId());
-    RemoveFieldObjectByLocalIdAndMap(127, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
+    RemoveObjectEventByLocalIdAndMap(127, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
 }
 
 void Special_BufferEReaderTrainerName5(void)
@@ -1499,7 +1499,7 @@ void Special_SetSeenMon(void)
 
 void sub_80CBDE8(void)
 {
-    gSelectedEventObject = 0;
+    gSelectedObjectEvent = 0;
     gSpecialVar_TextColor = 0xFF;
 }
 
@@ -1508,13 +1508,13 @@ u8 ContextNpcGetTextColor(void)
     u8 gfxId;
     if (gSpecialVar_TextColor != 0xFF)
         return gSpecialVar_TextColor;
-    else if (gSelectedEventObject == 0)
+    else if (gSelectedObjectEvent == 0)
         return 3;
     else
     {
-        gfxId = gMapObjects[gSelectedEventObject].graphicsId;
+        gfxId = gObjectEvents[gSelectedObjectEvent].graphicsId;
         if (gfxId >= MAP_OBJ_GFX_VAR_0)
-            gfxId = VarGetFieldObjectGraphicsId(gfxId - MAP_OBJ_GFX_VAR_0);
+            gfxId = VarGetObjectEventGraphicsId(gfxId - MAP_OBJ_GFX_VAR_0);
         return GetColorFromTextColorTable(gfxId);
     }
 }
@@ -2359,7 +2359,7 @@ static void MoveDeoxysObject(u8 num)
     u8 mapObjId;
     LoadPalette(sDeoxysObjectPals[num], 0x1A0, 0x08);
     sub_8083598(10);
-    TryGetFieldObjectIdByLocalIdAndMap(1, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &mapObjId);
+    TryGetObjectEventIdByLocalIdAndMap(1, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &mapObjId);
     if (num == 0)
         PlaySE(SE_W109);
     else
diff --git a/src/fieldmap.c b/src/fieldmap.c
index e5901c149..5582b6977 100644
--- a/src/fieldmap.c
+++ b/src/fieldmap.c
@@ -28,8 +28,8 @@ struct MapConnection *sub_8059600(u8 direction, s32 x, s32 y);
 bool8 sub_8059658(u8 direction, s32 x, s32 y, struct MapConnection *connection);
 bool8 sub_80596BC(s32 x, s32 src_width, s32 dest_width, s32 offset);
 
-struct BackupMapData VMap;
-EWRAM_DATA u16 gBackupMapData[VIRTUAL_MAP_SIZE] = {};
+struct BackupMapLayout VMap;
+EWRAM_DATA u16 gBackupMapLayout[VIRTUAL_MAP_SIZE] = {};
 EWRAM_DATA struct MapHeader gMapHeader = {};
 EWRAM_DATA struct Camera gCamera = {};
 EWRAM_DATA struct ConnectionFlags gMapConnectionFlags = {};
@@ -78,13 +78,13 @@ void sub_80589E8(void)
 
 void sub_8058A00(struct MapHeader * mapHeader)
 {
-    const struct MapData * mapData = mapHeader->mapData;
-    CpuFastFill(0x03FF03FF, gBackupMapData, sizeof(gBackupMapData));
-    VMap.map = gBackupMapData;
-    VMap.Xsize = mapData->width + 15;
-    VMap.Ysize = mapData->height + 14;
+    const struct MapLayout * mapLayout = mapHeader->mapLayout;
+    CpuFastFill(0x03FF03FF, gBackupMapLayout, sizeof(gBackupMapLayout));
+    VMap.map = gBackupMapLayout;
+    VMap.Xsize = mapLayout->width + 15;
+    VMap.Ysize = mapLayout->height + 14;
     AGB_ASSERT_EX(VMap.Xsize * VMap.Ysize <= VIRTUAL_MAP_SIZE, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/fieldmap.c", 158);
-    map_copy_with_padding(mapData->map, mapData->width, mapData->height);
+    map_copy_with_padding(mapLayout->map, mapLayout->width, mapLayout->height);
     mapheader_copy_mapdata_of_adjacent_maps(mapHeader);
 }
 
@@ -155,8 +155,8 @@ void sub_8058B54(s32 x, s32 y, const struct MapHeader *connectedMapHeader, s32 x
     u16 *dest;
     s32 mapWidth;
 
-    mapWidth = connectedMapHeader->mapData->width;
-    src = &connectedMapHeader->mapData->map[mapWidth * y2 + x2];
+    mapWidth = connectedMapHeader->mapLayout->width;
+    src = &connectedMapHeader->mapLayout->map[mapWidth * y2 + x2];
     dest = &VMap.map[VMap.Xsize * y + x];
 
     for (i = 0; i < height; i++)
@@ -176,9 +176,9 @@ void fillSouthConnection(struct MapHeader const *mapHeader, struct MapHeader con
 
     if (connectedMapHeader)
     {
-        cWidth = connectedMapHeader->mapData->width;
+        cWidth = connectedMapHeader->mapLayout->width;
         x = offset + 7;
-        y = mapHeader->mapData->height + 7;
+        y = mapHeader->mapLayout->height + 7;
         if (x < 0)
         {
             x2 = -x;
@@ -223,8 +223,8 @@ void fillNorthConnection(struct MapHeader const *mapHeader, struct MapHeader con
 
     if (connectedMapHeader)
     {
-        cWidth = connectedMapHeader->mapData->width;
-        cHeight = connectedMapHeader->mapData->height;
+        cWidth = connectedMapHeader->mapLayout->width;
+        cHeight = connectedMapHeader->mapLayout->height;
         x = offset + 7;
         y2 = cHeight - 7;
         if (x < 0)
@@ -271,8 +271,8 @@ void fillWestConnection(struct MapHeader const *mapHeader, struct MapHeader cons
     s32 cWidth, cHeight;
     if (connectedMapHeader)
     {
-        cWidth = connectedMapHeader->mapData->width;
-        cHeight = connectedMapHeader->mapData->height;
+        cWidth = connectedMapHeader->mapLayout->width;
+        cHeight = connectedMapHeader->mapLayout->height;
         y = offset + 7;
         x2 = cWidth - 7;
         if (y < 0)
@@ -317,8 +317,8 @@ void fillEastConnection(struct MapHeader const *mapHeader, struct MapHeader cons
     s32 cHeight;
     if (connectedMapHeader)
     {
-        cHeight = connectedMapHeader->mapData->height;
-        x = mapHeader->mapData->width + 7;
+        cHeight = connectedMapHeader->mapLayout->height;
+        x = mapHeader->mapLayout->width + 7;
         y = offset + 7;
         if (y < 0)
         {
@@ -370,17 +370,17 @@ union Block
     s32 xprime;                                                \
     s32 yprime;                                                \
                                                                \
-    struct MapData *mapData = gMapHeader.mapData;              \
+    struct MapLayout *mapLayout = gMapHeader.mapLayout;              \
                                                                \
     xprime = x - 7;                                            \
-    xprime += 8 * mapData->unk18;                              \
-    xprime %= mapData->unk18;                                  \
+    xprime += 8 * mapLayout->unk18;                              \
+    xprime %= mapLayout->unk18;                                  \
                                                                \
     yprime = y - 7;                                            \
-    yprime += 8 * mapData->unk19;                              \
-    yprime %= mapData->unk19;                                  \
+    yprime += 8 * mapLayout->unk19;                              \
+    yprime %= mapLayout->unk19;                                  \
                                                                \
-    block = mapData->border[xprime + yprime * mapData->unk18]; \
+    block = mapLayout->border[xprime + yprime * mapLayout->unk18]; \
     block |= 0xC00;                                            \
     block;                                                     \
 })
@@ -390,17 +390,17 @@ union Block
     s32 xprime;                                                        \
     s32 yprime;                                                        \
                                                                        \
-    struct MapData *mapData = gMapHeader.mapData;                      \
+    struct MapLayout *mapLayout = gMapHeader.mapLayout;                      \
                                                                        \
     xprime = x - 7;                                                    \
-    xprime += 8 * mapData->unk18;                                      \
-    xprime %= mapData->unk18;                                          \
+    xprime += 8 * mapLayout->unk18;                                      \
+    xprime %= mapLayout->unk18;                                          \
                                                                        \
     yprime = y - 7;                                                    \
-    yprime += 8 * mapData->unk19;                                      \
-    yprime %= mapData->unk19;                                          \
+    yprime += 8 * mapLayout->unk19;                                      \
+    yprime %= mapLayout->unk19;                                          \
                                                                        \
-    block = mapData->border[xprime + yprime * mapData->unk18] | 0xC00; \
+    block = mapLayout->border[xprime + yprime * mapLayout->unk18] | 0xC00; \
     block;                                                             \
 })
 
@@ -455,7 +455,7 @@ u32 sub_8058F1C(u32 original, u8 bit)
 u32 sub_8058F48(s16 x, s16 y, u8 z)
 {
     u16 metatileId = MapGridGetMetatileIdAt(x, y);
-    return GetBehaviorByMetatileIdAndMapData(gMapHeader.mapData, metatileId, z);
+    return GetBehaviorByMetatileIdAndMapLayout(gMapHeader.mapLayout, metatileId, z);
 }
 
 u32 MapGridGetMetatileBehaviorAt(s32 x, s32 y)
@@ -506,18 +506,18 @@ void sub_8059024(s32 x, s32 y, bool32 arg2)
     }
 }
 
-u32 GetBehaviorByMetatileIdAndMapData(struct MapData *mapData, u16 metatile, u8 attr)
+u32 GetBehaviorByMetatileIdAndMapLayout(struct MapLayout *mapLayout, u16 metatile, u8 attr)
 {
     u32 * attributes;
 
     if (metatile < NUM_METATILES_IN_PRIMARY)
     {
-        attributes = mapData->primaryTileset->metatileAttributes;
+        attributes = mapLayout->primaryTileset->metatileAttributes;
         return sub_8058F1C(attributes[metatile], attr);
     }
     else if (metatile < 0x400)
     {
-        attributes = mapData->secondaryTileset->metatileAttributes;
+        attributes = mapLayout->secondaryTileset->metatileAttributes;
         return sub_8058F1C(attributes[metatile - NUM_METATILES_IN_PRIMARY], attr);
     }
     else
@@ -540,7 +540,7 @@ void save_serialize_map(void)
     {
         for (j = x; j < x + 15; j++)
         {
-            *mapView++ = gBackupMapData[width * i + j];
+            *mapView++ = gBackupMapLayout[width * i + j];
         }
     }
 }
@@ -581,7 +581,7 @@ void LoadSavedMapView(void)
         {
             for (j = x; j < x + 15; j++)
             {
-                gBackupMapData[j + width * i] = *mapView;
+                gBackupMapLayout[j + width * i] = *mapView;
                 mapView++;
             }
         }
@@ -636,7 +636,7 @@ void sub_8059250(u8 a1)
             desti = width * (y + y0);
             srci = (y + r8) * 15 + r9;
             src = &mapView[srci + i];
-            dest = &gBackupMapData[x0 + desti + j];
+            dest = &gBackupMapLayout[x0 + desti + j];
             *dest = *src;
             i++;
             j++;
@@ -720,7 +720,7 @@ void sub_80594AC(struct MapConnection *connection, int direction, s32 x, s32 y)
             gSaveBlock1Ptr->pos.y -= connection->offset;
             break;
         case CONNECTION_WEST:
-            gSaveBlock1Ptr->pos.x = mapHeader->mapData->width;
+            gSaveBlock1Ptr->pos.x = mapHeader->mapLayout->width;
             gSaveBlock1Ptr->pos.y -= connection->offset;
             break;
         case CONNECTION_SOUTH:
@@ -729,7 +729,7 @@ void sub_80594AC(struct MapConnection *connection, int direction, s32 x, s32 y)
             break;
         case CONNECTION_NORTH:
             gSaveBlock1Ptr->pos.x -= connection->offset;
-            gSaveBlock1Ptr->pos.y = mapHeader->mapData->height;
+            gSaveBlock1Ptr->pos.y = mapHeader->mapLayout->height;
             break;
     }
 }
@@ -788,10 +788,10 @@ bool8 sub_8059658(u8 direction, s32 x, s32 y, struct MapConnection *connection)
     {
         case CONNECTION_SOUTH:
         case CONNECTION_NORTH:
-            return sub_80596BC(x, gMapHeader.mapData->width, mapHeader->mapData->width, connection->offset);
+            return sub_80596BC(x, gMapHeader.mapLayout->width, mapHeader->mapLayout->width, connection->offset);
         case CONNECTION_WEST:
         case CONNECTION_EAST:
-            return sub_80596BC(y, gMapHeader.mapData->height, mapHeader->mapData->height, connection->offset);
+            return sub_80596BC(y, gMapHeader.mapLayout->height, mapHeader->mapLayout->height, connection->offset);
     }
     return FALSE;
 }
@@ -825,10 +825,10 @@ s32 sub_80596FC(struct MapConnection *connection, s32 x, s32 y)
     {
         case CONNECTION_SOUTH:
         case CONNECTION_NORTH:
-            return sub_80596E8(x - connection->offset, mapHeader->mapData->width);
+            return sub_80596E8(x - connection->offset, mapHeader->mapLayout->width);
         case CONNECTION_WEST:
         case CONNECTION_EAST:
-            return sub_80596E8(y - connection->offset, mapHeader->mapData->height);
+            return sub_80596E8(y - connection->offset, mapHeader->mapLayout->height);
     }
     return FALSE;
 }
@@ -852,9 +852,9 @@ struct MapConnection *GetMapConnectionAtPos(s16 x, s16 y)
             direction = connection->direction;
             if ((direction == CONNECTION_DIVE || direction == CONNECTION_EMERGE)
                 || (direction == CONNECTION_NORTH && y > 6)
-                || (direction == CONNECTION_SOUTH && y < gMapHeader.mapData->height + 7)
+                || (direction == CONNECTION_SOUTH && y < gMapHeader.mapLayout->height + 7)
                 || (direction == CONNECTION_WEST && x > 6)
-                || (direction == CONNECTION_EAST && x < gMapHeader.mapData->width + 7))
+                || (direction == CONNECTION_EAST && x < gMapHeader.mapLayout->width + 7))
             {
                 continue;
             }
@@ -981,45 +981,45 @@ void apply_map_tileset_palette(struct Tileset const *tileset, u16 destOffset, u1
     }
 }
 
-void copy_map_tileset1_to_vram(const struct MapData *mapData)
+void copy_map_tileset1_to_vram(const struct MapLayout *mapLayout)
 {
-    copy_tileset_patterns_to_vram(mapData->primaryTileset, NUM_TILES_IN_PRIMARY, 0);
+    copy_tileset_patterns_to_vram(mapLayout->primaryTileset, NUM_TILES_IN_PRIMARY, 0);
 }
 
-void copy_map_tileset2_to_vram(const struct MapData *mapData)
+void copy_map_tileset2_to_vram(const struct MapLayout *mapLayout)
 {
-    copy_tileset_patterns_to_vram(mapData->secondaryTileset, NUM_TILES_TOTAL - NUM_TILES_IN_PRIMARY, NUM_TILES_IN_PRIMARY);
+    copy_tileset_patterns_to_vram(mapLayout->secondaryTileset, NUM_TILES_TOTAL - NUM_TILES_IN_PRIMARY, NUM_TILES_IN_PRIMARY);
 }
 
-void copy_map_tileset2_to_vram_2(const struct MapData *mapData)
+void copy_map_tileset2_to_vram_2(const struct MapLayout *mapLayout)
 {
-    copy_tileset_patterns_to_vram2(mapData->secondaryTileset, NUM_TILES_TOTAL - NUM_TILES_IN_PRIMARY, NUM_TILES_IN_PRIMARY);
+    copy_tileset_patterns_to_vram2(mapLayout->secondaryTileset, NUM_TILES_TOTAL - NUM_TILES_IN_PRIMARY, NUM_TILES_IN_PRIMARY);
 }
 
-void apply_map_tileset1_palette(const struct MapData *mapData)
+void apply_map_tileset1_palette(const struct MapLayout *mapLayout)
 {
-    apply_map_tileset_palette(mapData->primaryTileset, 0, NUM_PALS_IN_PRIMARY * 16 * 2);
+    apply_map_tileset_palette(mapLayout->primaryTileset, 0, NUM_PALS_IN_PRIMARY * 16 * 2);
 }
 
-void apply_map_tileset2_palette(const struct MapData *mapData)
+void apply_map_tileset2_palette(const struct MapLayout *mapLayout)
 {
-    apply_map_tileset_palette(mapData->secondaryTileset, NUM_PALS_IN_PRIMARY * 16, (NUM_PALS_TOTAL - NUM_PALS_IN_PRIMARY) * 16 * 2);
+    apply_map_tileset_palette(mapLayout->secondaryTileset, NUM_PALS_IN_PRIMARY * 16, (NUM_PALS_TOTAL - NUM_PALS_IN_PRIMARY) * 16 * 2);
 }
 
-void copy_map_tileset1_tileset2_to_vram(struct MapData const *mapData)
+void copy_map_tileset1_tileset2_to_vram(struct MapLayout const *mapLayout)
 {
-    if (mapData)
+    if (mapLayout)
     {
-        copy_tileset_patterns_to_vram2(mapData->primaryTileset, NUM_TILES_IN_PRIMARY, 0);
-        copy_tileset_patterns_to_vram2(mapData->secondaryTileset, NUM_TILES_TOTAL - NUM_TILES_IN_PRIMARY, NUM_TILES_IN_PRIMARY);
+        copy_tileset_patterns_to_vram2(mapLayout->primaryTileset, NUM_TILES_IN_PRIMARY, 0);
+        copy_tileset_patterns_to_vram2(mapLayout->secondaryTileset, NUM_TILES_TOTAL - NUM_TILES_IN_PRIMARY, NUM_TILES_IN_PRIMARY);
     }
 }
 
-void apply_map_tileset1_tileset2_palette(struct MapData const *mapData)
+void apply_map_tileset1_tileset2_palette(struct MapLayout const *mapLayout)
 {
-    if (mapData)
+    if (mapLayout)
     {
-        apply_map_tileset1_palette(mapData);
-        apply_map_tileset2_palette(mapData);
+        apply_map_tileset1_palette(mapLayout);
+        apply_map_tileset2_palette(mapLayout);
     }
 }
diff --git a/src/fldeff_rocksmash.c b/src/fldeff_rocksmash.c
index 90abda81f..704771865 100644
--- a/src/fldeff_rocksmash.c
+++ b/src/fldeff_rocksmash.c
@@ -31,10 +31,10 @@ bool8 CheckObjectGraphicsInFrontOfPlayer(u8 graphicsId)
 
     GetXYCoordsOneStepInFrontOfPlayer(&gPlayerFacingPosition.x, &gPlayerFacingPosition.y);
     gPlayerFacingPosition.height = PlayerGetZCoord();
-    mapObjId = GetFieldObjectIdByXYZ(gPlayerFacingPosition.x, gPlayerFacingPosition.y, gPlayerFacingPosition.height);
-    if (gMapObjects[mapObjId].graphicsId != graphicsId)
+    mapObjId = GetObjectEventIdByXYZ(gPlayerFacingPosition.x, gPlayerFacingPosition.y, gPlayerFacingPosition.height);
+    if (gObjectEvents[mapObjId].graphicsId != graphicsId)
         return FALSE;
-    gSpecialVar_LastTalked = gMapObjects[mapObjId].localId;
+    gSpecialVar_LastTalked = gObjectEvents[mapObjId].localId;
     return TRUE;
 }
 
@@ -51,8 +51,8 @@ static void task08_080C9820(u8 taskId)
     ScriptContext2_Enable();
     gPlayerAvatar.unk6 = TRUE;
     mapObjId = gPlayerAvatar.mapObjectId;
-    if (!FieldObjectIsMovementOverridden(&gMapObjects[mapObjId])
-     || FieldObjectClearHeldMovementIfFinished(&gMapObjects[mapObjId]))
+    if (!ObjectEventIsMovementOverridden(&gObjectEvents[mapObjId])
+     || ObjectEventClearHeldMovementIfFinished(&gObjectEvents[mapObjId]))
     {
         if (gMapHeader.mapType == MAP_TYPE_UNDERWATER)
         {
@@ -62,7 +62,7 @@ static void task08_080C9820(u8 taskId)
         else
         {
             sub_805CB70();
-            FieldObjectSetHeldMovement(&gMapObjects[mapObjId], 0x45);
+            ObjectEventSetHeldMovement(&gObjectEvents[mapObjId], 0x45);
             gTasks[taskId].func = sub_80C98B0;
         }
     }
@@ -70,7 +70,7 @@ static void task08_080C9820(u8 taskId)
 
 static void sub_80C98B0(u8 taskId)
 {
-    if (FieldObjectCheckHeldMovementStatus(&gMapObjects[gPlayerAvatar.mapObjectId]) == TRUE)
+    if (ObjectEventCheckHeldMovementStatus(&gObjectEvents[gPlayerAvatar.mapObjectId]) == TRUE)
     {
         FieldEffectStart(FLDEFF_FIELD_MOVE_SHOW_MON_INIT);
         gTasks[taskId].func = sub_80C98FC;
@@ -90,7 +90,7 @@ static void sub_80C98FC(u8 taskId)
             gFieldEffectArguments[2] = 2;
         if (gFieldEffectArguments[1] == 4)
             gFieldEffectArguments[2] = 3;
-        EventObjectSetGraphicsId(&gMapObjects[gPlayerAvatar.mapObjectId], GetPlayerAvatarGraphicsIdByCurrentState());
+        EventObjectSetGraphicsId(&gObjectEvents[gPlayerAvatar.mapObjectId], GetPlayerAvatarGraphicsIdByCurrentState());
         StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], gFieldEffectArguments[2]);
         FieldEffectActiveListRemove(6);
         gTasks[taskId].func = sub_80C99A0;
diff --git a/src/item_use.c b/src/item_use.c
index 256711463..71c67c540 100644
--- a/src/item_use.c
+++ b/src/item_use.c
@@ -235,7 +235,7 @@ static void sub_80A11C0(u8 taskId)
 {
     if (IsWeatherNotFadingIn() == TRUE)
     {
-        UnfreezeMapObjects();
+        UnfreezeObjectEvents();
         ScriptContext2_Disable();
         DestroyTask(taskId);
     }
diff --git a/src/itemfinder.c b/src/itemfinder.c
index 05072c49e..5ae30e6e4 100644
--- a/src/itemfinder.c
+++ b/src/itemfinder.c
@@ -325,23 +325,23 @@ static bool8 HiddenItemInConnectedMapAtPos(struct MapConnection * connection, s3
     case 2:
         localOffset = connection->offset + 7;
         localX = x - localOffset;
-        localLength = mapHeader->mapData->height - 7;
+        localLength = mapHeader->mapLayout->height - 7;
         localY = localLength + y; // additions are reversed for some reason
         break;
     case 1:
         localOffset = connection->offset + 7;
         localX = x - localOffset;
-        localLength = gMapHeader.mapData->height + 7;
+        localLength = gMapHeader.mapLayout->height + 7;
         localY = y - localLength;
         break;
     case 3:
-        localLength = mapHeader->mapData->width - 7;
+        localLength = mapHeader->mapLayout->width - 7;
         localX = localLength + x; // additions are reversed for some reason
         localOffset = connection->offset + 7;
         localY = y - localOffset;
         break;
     case 4:
-        localLength = gMapHeader.mapData->width + 7;
+        localLength = gMapHeader.mapLayout->width + 7;
         localX = x - localLength;
         localOffset = connection->offset + 7;
         localY = y - localOffset;
@@ -356,8 +356,8 @@ static void FindHiddenItemsInConnectedMaps(u8 taskId)
 {
     s16 x, y;
     s16 curX, curY;
-    s16 width = gMapHeader.mapData->width + 7;
-    s16 height = gMapHeader.mapData->height + 7;
+    s16 width = gMapHeader.mapLayout->width + 7;
+    s16 height = gMapHeader.mapLayout->height + 7;
 
     s16 var1 = 7;
     s16 var2 = 7;
diff --git a/src/load_save.c b/src/load_save.c
index da469d4e6..8bfd0bc5e 100644
--- a/src/load_save.c
+++ b/src/load_save.c
@@ -174,32 +174,32 @@ void LoadPlayerParty(void)
         gPlayerParty[i] = gSaveBlock1Ptr->playerParty[i];
 }
 
-void SaveMapObjects(void)
+void SaveObjectEvents(void)
 {
     int i;
 
     for (i = 0; i < NUM_FIELD_OBJECTS; i++)
-        gSaveBlock1Ptr->mapObjects[i] = gMapObjects[i];
+        gSaveBlock1Ptr->objectEvents[i] = gObjectEvents[i];
 }
 
-void LoadMapObjects(void)
+void LoadObjectEvents(void)
 {
     int i;
 
     for (i = 0; i < NUM_FIELD_OBJECTS; i++)
-        gMapObjects[i] = gSaveBlock1Ptr->mapObjects[i];
+        gObjectEvents[i] = gSaveBlock1Ptr->objectEvents[i];
 }
 
 void SaveSerializedGame(void)
 {
     SavePlayerParty();
-    SaveMapObjects();
+    SaveObjectEvents();
 }
 
 void LoadSerializedGame(void)
 {
     LoadPlayerParty();
-    LoadMapObjects();
+    LoadObjectEvents();
 }
 
 void LoadPlayerBag(void)
diff --git a/src/map_obj_lock.c b/src/map_obj_lock.c
index e28872fd4..385b5d470 100644
--- a/src/map_obj_lock.c
+++ b/src/map_obj_lock.c
@@ -36,7 +36,7 @@ bool8 sub_8069590(void)
     }
 }
 
-void ScriptFreezeMapObjects(void)
+void ScriptFreezeObjectEvents(void)
 {
     FreezeEventObjects();
     CreateTask(sub_8069570, 80);
@@ -52,9 +52,9 @@ void sub_80695CC(u8 taskId)
         task->data[0] = 1;
     }
 
-    if (task->data[1] == 0 && !gMapObjects[gSelectedEventObject].mapobj_bit_1)
+    if (task->data[1] == 0 && !gObjectEvents[gSelectedObjectEvent].mapobj_bit_1)
     {
-        FreezeMapObject(&gMapObjects[gSelectedEventObject]);
+        FreezeObjectEvent(&gObjectEvents[gSelectedObjectEvent]);
         task->data[1] = 1;
     }
 
@@ -73,44 +73,44 @@ bool8 sub_8069648(void)
     }
 }
 
-void LockSelectedMapObject(void)
+void LockSelectedObjectEvent(void)
 {
     u8 taskId;
 
-    FreezeMapObjectsExceptOne(gSelectedEventObject);
+    FreezeObjectEventsExceptOne(gSelectedObjectEvent);
     taskId = CreateTask(sub_80695CC, 80);
-    if (!gMapObjects[gSelectedEventObject].mapobj_bit_1)
+    if (!gObjectEvents[gSelectedObjectEvent].mapobj_bit_1)
     {
-        FreezeMapObject(&gMapObjects[gSelectedEventObject]);
+        FreezeObjectEvent(&gObjectEvents[gSelectedObjectEvent]);
         gTasks[taskId].data[1] = 1;
     }
 }
 
 void sub_80696C0(void)
 {
-    u8 fieldObjectId = GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0);
-    FieldObjectClearHeldMovementIfFinished(&gMapObjects[fieldObjectId]);
+    u8 fieldObjectId = GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0);
+    ObjectEventClearHeldMovementIfFinished(&gObjectEvents[fieldObjectId]);
     sub_80974D8();
-    UnfreezeMapObjects();
+    UnfreezeObjectEvents();
 }
 
 void sub_80696F0(void)
 {
     u8 fieldObjectId;
-    if (gMapObjects[gSelectedEventObject].active)
-        FieldObjectClearHeldMovementIfFinished(&gMapObjects[gSelectedEventObject]);
-    fieldObjectId = GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0);
-    FieldObjectClearHeldMovementIfFinished(&gMapObjects[fieldObjectId]);
+    if (gObjectEvents[gSelectedObjectEvent].active)
+        ObjectEventClearHeldMovementIfFinished(&gObjectEvents[gSelectedObjectEvent]);
+    fieldObjectId = GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0);
+    ObjectEventClearHeldMovementIfFinished(&gObjectEvents[fieldObjectId]);
     sub_80974D8();
-    UnfreezeMapObjects();
+    UnfreezeObjectEvents();
 }
 
 void sub_8069740(void)
 {
-    FieldObjectFaceOppositeDirection(&gMapObjects[gSelectedEventObject], gSpecialVar_Facing);
+    ObjectEventFaceOppositeDirection(&gObjectEvents[gSelectedObjectEvent], gSpecialVar_Facing);
 }
 
 void sub_8069768(void)
 {
-    FieldObjectClearAnimIfSpecialAnimActive(&gMapObjects[gSelectedEventObject]);
+    ObjectEventClearAnimIfSpecialAnimActive(&gObjectEvents[gSelectedObjectEvent]);
 }
diff --git a/src/quest_log.c b/src/quest_log.c
index 04369f1c2..d44eee96d 100644
--- a/src/quest_log.c
+++ b/src/quest_log.c
@@ -627,7 +627,7 @@ static void sub_8110D94(void)
 
 static void sub_8110E20(void)
 {
-    VarSet(VAR_0x40AE, gSaveBlock1Ptr->mapDataId);
+    VarSet(VAR_0x40AE, gSaveBlock1Ptr->mapLayoutId);
 }
 
 static void sub_8110E3C(void)
@@ -984,11 +984,11 @@ void sub_8111708(void)
 {
     struct MapHeader sp0;
 
-    gSaveBlock1Ptr->mapDataId = VarGet(VAR_0x40AE);
-    if (gSaveBlock1Ptr->mapDataId == 0)
+    gSaveBlock1Ptr->mapLayoutId = VarGet(VAR_0x40AE);
+    if (gSaveBlock1Ptr->mapLayoutId == 0)
     {
         sp0 = *Overworld_GetMapHeaderByGroupAndId(gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum);
-        gSaveBlock1Ptr->mapDataId = sp0.mapDataId;
+        gSaveBlock1Ptr->mapLayoutId = sp0.mapLayoutId;
     }
 }
 
@@ -1532,12 +1532,12 @@ void sub_8112450(void)
 
 void sub_811246C(struct Sprite *sprite)
 {
-    struct MapObject *mapObject = &gMapObjects[sprite->data[0]];
+    struct ObjectEvent *mapObject = &gObjectEvents[sprite->data[0]];
     if (mapObject->localId == 0xFF)
     {
         if (gUnknown_203AF9A[0][0] != 0xFF)
         {
-            FieldObjectSetHeldMovement(mapObject, gUnknown_203AF9A[0][0]);
+            ObjectEventSetHeldMovement(mapObject, gUnknown_203AF9A[0][0]);
             gUnknown_203AF9A[0][0] = 0xFF;
         }
         if (gUnknown_203AF9A[0][1] != 0xFF)
@@ -1551,7 +1551,7 @@ void sub_811246C(struct Sprite *sprite)
     {
         if (gUnknown_203AF9A[mapObject->localId][0] != 0xFF)
         {
-            FieldObjectSetHeldMovement(mapObject, gUnknown_203AF9A[mapObject->localId][0]);
+            ObjectEventSetHeldMovement(mapObject, gUnknown_203AF9A[mapObject->localId][0]);
             gUnknown_203AF9A[mapObject->localId][0] = 0xFF;
         }
         sub_8063E28(mapObject, sprite);
diff --git a/src/quest_log_8150454.c b/src/quest_log_8150454.c
index 09cf47f93..93b3e6b61 100644
--- a/src/quest_log_8150454.c
+++ b/src/quest_log_8150454.c
@@ -20,7 +20,7 @@ static void sub_81507CC(void);
 static void sub_81507D8(void);
 static void sub_81507E4(void);
 static void sub_81507F0(void);
-static void sub_81507BC(struct MapObject *a0, u8 a1);
+static void sub_81507BC(struct ObjectEvent *a0, u8 a1);
 
 static void (*const gUnknown_8471EDC[])(void) = {
     sub_81504A8,
@@ -57,24 +57,24 @@ void sub_8150498(u8 a0)
 
 static void sub_81504A8(void)
 {
-    struct MapObject *mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
+    struct ObjectEvent *mapObject = &gObjectEvents[gPlayerAvatar.mapObjectId];
     sub_81507BC(mapObject, sub_805C808(0));
-    FieldObjectTurn(mapObject, mapObject->placeholder18);
+    ObjectEventTurn(mapObject, mapObject->placeholder18);
     SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_ON_FOOT);
 }
 
 static void sub_81504E8(void)
 {
-    struct MapObject *mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
+    struct ObjectEvent *mapObject = &gObjectEvents[gPlayerAvatar.mapObjectId];
     sub_81507BC(mapObject, sub_805C808(1));
-    FieldObjectTurn(mapObject, mapObject->placeholder18);
+    ObjectEventTurn(mapObject, mapObject->placeholder18);
     SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_MACH_BIKE);
     sub_80BD620(0, 0);
 }
 
 static void sub_8150530(void)
 {
-    struct MapObject *mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
+    struct ObjectEvent *mapObject = &gObjectEvents[gPlayerAvatar.mapObjectId];
     struct Sprite *sprite = &gSprites[mapObject->spriteId];
 
     if (gUnknown_3005E88 == 1 || gUnknown_3005E88 == 3)
@@ -94,13 +94,13 @@ static void sub_8150530(void)
 
 static void sub_81505C4(u8 taskId)
 {
-    struct MapObject *mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
+    struct ObjectEvent *mapObject = &gObjectEvents[gPlayerAvatar.mapObjectId];
     struct Sprite *sprite = &gSprites[mapObject->spriteId];
 
     switch (gTasks[taskId].data[0])
     {
         case 0:
-            FieldObjectClearAnimIfSpecialAnimActive(mapObject);
+            ObjectEventClearAnimIfSpecialAnimActive(mapObject);
             mapObject->mapobj_bit_11 = TRUE;
             sub_81507BC(mapObject, sub_805C808(4));
             StartSpriteAnim(sprite, sub_80634F0(mapObject->facingDirection));
@@ -126,7 +126,7 @@ static void sub_81505C4(u8 taskId)
                     sub_81507BC(mapObject, sub_805C808(0));
                 else
                     sub_81507BC(mapObject, sub_805C808(2));
-                FieldObjectTurn(mapObject, mapObject->placeholder18);
+                ObjectEventTurn(mapObject, mapObject->placeholder18);
                 sprite->pos2.x = 0;
                 sprite->pos2.y = 0;
                 ScriptContext2_Disable();
@@ -138,13 +138,13 @@ static void sub_81505C4(u8 taskId)
 
 static void sub_8150708(void)
 {
-    struct MapObject *mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
+    struct ObjectEvent *mapObject = &gObjectEvents[gPlayerAvatar.mapObjectId];
     u8 fieldEffectId;
 
     if (!(gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING))
     {
         sub_81507BC(mapObject, sub_805C808(2));
-        FieldObjectTurn(mapObject, mapObject->placeholder18);
+        ObjectEventTurn(mapObject, mapObject->placeholder18);
         SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_SURFING);
         gFieldEffectArguments[0] = mapObject->coords2.x;
         gFieldEffectArguments[1] = mapObject->coords2.y;
@@ -165,13 +165,13 @@ static void sub_8150794(u8 taskId)
 {
     if (!FieldEffectActiveListContains(0x41))
     {
-        UnfreezeMapObjects();
+        UnfreezeObjectEvents();
         ScriptContext2_Disable();
         DestroyTask(taskId);
     }
 }
 
-static void sub_81507BC(struct MapObject * a0, u8 a1)
+static void sub_81507BC(struct ObjectEvent * a0, u8 a1)
 {
     EventObjectSetGraphicsId(a0, a1);
 }
diff --git a/src/quest_log_815A008.c b/src/quest_log_815A008.c
index fb49fc880..234d5ad9c 100644
--- a/src/quest_log_815A008.c
+++ b/src/quest_log_815A008.c
@@ -11,125 +11,125 @@ void sub_815A008(struct QuestLog * questLog)
 {
     u32 i;
 
-    for (i = 0; i < MAP_OBJECTS_COUNT; i++)
+    for (i = 0; i < OBJECT_EVENTS_COUNT; i++)
     {
-        questLog->unk_008[i].active = gMapObjects[i].active;
-        questLog->unk_008[i].mapobj_bit_3 = gMapObjects[i].mapobj_bit_3;
-        questLog->unk_008[i].mapobj_bit_4 = gMapObjects[i].mapobj_bit_4;
-        questLog->unk_008[i].mapobj_bit_5 = gMapObjects[i].mapobj_bit_5;
-        questLog->unk_008[i].mapobj_bit_8 = gMapObjects[i].mapobj_bit_8;
-        questLog->unk_008[i].mapobj_bit_9 = gMapObjects[i].mapobj_bit_9;
-        questLog->unk_008[i].mapobj_bit_10 = gMapObjects[i].mapobj_bit_10;
-        questLog->unk_008[i].mapobj_bit_11 = gMapObjects[i].mapobj_bit_11;
-        questLog->unk_008[i].mapobj_bit_12 = gMapObjects[i].mapobj_bit_12;
-        questLog->unk_008[i].mapobj_bit_13 = gMapObjects[i].mapobj_bit_13;
-        questLog->unk_008[i].mapobj_bit_14 = gMapObjects[i].mapobj_bit_14;
-        questLog->unk_008[i].mapobj_bit_15 = gMapObjects[i].mapobj_bit_15;
-        questLog->unk_008[i].mapobj_bit_16 = gMapObjects[i].mapobj_bit_16;
-        questLog->unk_008[i].mapobj_bit_23 = gMapObjects[i].mapobj_bit_23;
-        questLog->unk_008[i].mapobj_bit_24 = gMapObjects[i].mapobj_bit_24;
-        questLog->unk_008[i].mapobj_bit_25 = gMapObjects[i].mapobj_bit_25;
-        questLog->unk_008[i].mapobj_bit_26 = gMapObjects[i].mapobj_bit_26;
-        questLog->unk_008[i].mapobj_unk_18 = gMapObjects[i].facingDirection;
-        questLog->unk_008[i].mapobj_unk_0B_0 = gMapObjects[i].mapobj_unk_0B_0;
-        questLog->unk_008[i].elevation = gMapObjects[i].elevation;
-        questLog->unk_008[i].graphicsId = gMapObjects[i].graphicsId;
-        questLog->unk_008[i].animPattern = gMapObjects[i].animPattern;
-        questLog->unk_008[i].trainerType = gMapObjects[i].trainerType;
-        questLog->unk_008[i].localId = gMapObjects[i].localId;
-        questLog->unk_008[i].mapNum = gMapObjects[i].mapNum;
-        questLog->unk_008[i].mapGroup = gMapObjects[i].mapGroup;
-        questLog->unk_008[i].x = gMapObjects[i].coords2.x;
-        questLog->unk_008[i].y = gMapObjects[i].coords2.y;
-        questLog->unk_008[i].trainerRange_berryTreeId = gMapObjects[i].trainerRange_berryTreeId;
-        questLog->unk_008[i].mapobj_unk_1F = gMapObjects[i].mapobj_unk_1F;
-        questLog->unk_008[i].mapobj_unk_21 = gMapObjects[i].mapobj_unk_21;
-        questLog->unk_008[i].animId = gMapObjects[i].animId;
+        questLog->unk_008[i].active = gObjectEvents[i].active;
+        questLog->unk_008[i].mapobj_bit_3 = gObjectEvents[i].mapobj_bit_3;
+        questLog->unk_008[i].mapobj_bit_4 = gObjectEvents[i].mapobj_bit_4;
+        questLog->unk_008[i].mapobj_bit_5 = gObjectEvents[i].mapobj_bit_5;
+        questLog->unk_008[i].mapobj_bit_8 = gObjectEvents[i].mapobj_bit_8;
+        questLog->unk_008[i].mapobj_bit_9 = gObjectEvents[i].mapobj_bit_9;
+        questLog->unk_008[i].mapobj_bit_10 = gObjectEvents[i].mapobj_bit_10;
+        questLog->unk_008[i].mapobj_bit_11 = gObjectEvents[i].mapobj_bit_11;
+        questLog->unk_008[i].mapobj_bit_12 = gObjectEvents[i].mapobj_bit_12;
+        questLog->unk_008[i].mapobj_bit_13 = gObjectEvents[i].mapobj_bit_13;
+        questLog->unk_008[i].mapobj_bit_14 = gObjectEvents[i].mapobj_bit_14;
+        questLog->unk_008[i].mapobj_bit_15 = gObjectEvents[i].mapobj_bit_15;
+        questLog->unk_008[i].mapobj_bit_16 = gObjectEvents[i].mapobj_bit_16;
+        questLog->unk_008[i].mapobj_bit_23 = gObjectEvents[i].mapobj_bit_23;
+        questLog->unk_008[i].mapobj_bit_24 = gObjectEvents[i].mapobj_bit_24;
+        questLog->unk_008[i].mapobj_bit_25 = gObjectEvents[i].mapobj_bit_25;
+        questLog->unk_008[i].mapobj_bit_26 = gObjectEvents[i].mapobj_bit_26;
+        questLog->unk_008[i].mapobj_unk_18 = gObjectEvents[i].facingDirection;
+        questLog->unk_008[i].mapobj_unk_0B_0 = gObjectEvents[i].mapobj_unk_0B_0;
+        questLog->unk_008[i].elevation = gObjectEvents[i].elevation;
+        questLog->unk_008[i].graphicsId = gObjectEvents[i].graphicsId;
+        questLog->unk_008[i].animPattern = gObjectEvents[i].animPattern;
+        questLog->unk_008[i].trainerType = gObjectEvents[i].trainerType;
+        questLog->unk_008[i].localId = gObjectEvents[i].localId;
+        questLog->unk_008[i].mapNum = gObjectEvents[i].mapNum;
+        questLog->unk_008[i].mapGroup = gObjectEvents[i].mapGroup;
+        questLog->unk_008[i].x = gObjectEvents[i].coords2.x;
+        questLog->unk_008[i].y = gObjectEvents[i].coords2.y;
+        questLog->unk_008[i].trainerRange_berryTreeId = gObjectEvents[i].trainerRange_berryTreeId;
+        questLog->unk_008[i].mapobj_unk_1F = gObjectEvents[i].mapobj_unk_1F;
+        questLog->unk_008[i].mapobj_unk_21 = gObjectEvents[i].mapobj_unk_21;
+        questLog->unk_008[i].animId = gObjectEvents[i].animId;
     }
 }
 
-void sub_815A1F8(const struct QuestLog * questLog, const struct MapObjectTemplate * templates)
+void sub_815A1F8(const struct QuestLog * questLog, const struct ObjectEventTemplate * templates)
 {
     u32 i, j;
-    const struct QuestLogMapObject * questLogMapObjects = questLog->unk_008;
+    const struct QuestLogMapObject * questLogObjectEvents = questLog->unk_008;
 
-    CpuFill16(0, gMapObjects, sizeof(gMapObjects));
+    CpuFill16(0, gObjectEvents, sizeof(gObjectEvents));
 
-    for (i = 0; i < MAP_OBJECTS_COUNT; i++)
+    for (i = 0; i < OBJECT_EVENTS_COUNT; i++)
     {
-        gMapObjects[i].active = questLogMapObjects[i].active;
-        gMapObjects[i].mapobj_bit_3 = questLogMapObjects[i].mapobj_bit_3;
-        gMapObjects[i].mapobj_bit_4 = questLogMapObjects[i].mapobj_bit_4;
-        gMapObjects[i].mapobj_bit_5 = questLogMapObjects[i].mapobj_bit_5;
-        gMapObjects[i].mapobj_bit_8 = questLogMapObjects[i].mapobj_bit_8;
-        gMapObjects[i].mapobj_bit_9 = questLogMapObjects[i].mapobj_bit_9;
-        gMapObjects[i].mapobj_bit_10 = questLogMapObjects[i].mapobj_bit_10;
-        gMapObjects[i].mapobj_bit_11 = questLogMapObjects[i].mapobj_bit_11;
-        gMapObjects[i].mapobj_bit_12 = questLogMapObjects[i].mapobj_bit_12;
-        gMapObjects[i].mapobj_bit_13 = questLogMapObjects[i].mapobj_bit_13;
-        gMapObjects[i].mapobj_bit_14 = questLogMapObjects[i].mapobj_bit_14;
-        gMapObjects[i].mapobj_bit_15 = questLogMapObjects[i].mapobj_bit_15;
-        gMapObjects[i].mapobj_bit_16 = questLogMapObjects[i].mapobj_bit_16;
-        gMapObjects[i].mapobj_bit_23 = questLogMapObjects[i].mapobj_bit_23;
-        gMapObjects[i].mapobj_bit_24 = questLogMapObjects[i].mapobj_bit_24;
-        gMapObjects[i].mapobj_bit_25 = questLogMapObjects[i].mapobj_bit_25;
-        gMapObjects[i].mapobj_bit_26 = questLogMapObjects[i].mapobj_bit_26;
-        gMapObjects[i].facingDirection = questLogMapObjects[i].mapobj_unk_18;
-        gMapObjects[i].mapobj_unk_0B_0 = questLogMapObjects[i].mapobj_unk_0B_0;
-        gMapObjects[i].elevation = questLogMapObjects[i].elevation;
-        gMapObjects[i].graphicsId = questLogMapObjects[i].graphicsId;
-        gMapObjects[i].animPattern = questLogMapObjects[i].animPattern;
-        gMapObjects[i].trainerType = questLogMapObjects[i].trainerType;
-        gMapObjects[i].localId = questLogMapObjects[i].localId;
-        gMapObjects[i].mapNum = questLogMapObjects[i].mapNum;
-        gMapObjects[i].mapGroup = questLogMapObjects[i].mapGroup;
-        gMapObjects[i].coords2.x = questLogMapObjects[i].x;
-        gMapObjects[i].coords2.y = questLogMapObjects[i].y;
-        gMapObjects[i].trainerRange_berryTreeId = questLogMapObjects[i].trainerRange_berryTreeId;
-        gMapObjects[i].mapobj_unk_1F = questLogMapObjects[i].mapobj_unk_1F;
-        gMapObjects[i].mapobj_unk_21 = questLogMapObjects[i].mapobj_unk_21;
-        gMapObjects[i].animId = questLogMapObjects[i].animId;
+        gObjectEvents[i].active = questLogObjectEvents[i].active;
+        gObjectEvents[i].mapobj_bit_3 = questLogObjectEvents[i].mapobj_bit_3;
+        gObjectEvents[i].mapobj_bit_4 = questLogObjectEvents[i].mapobj_bit_4;
+        gObjectEvents[i].mapobj_bit_5 = questLogObjectEvents[i].mapobj_bit_5;
+        gObjectEvents[i].mapobj_bit_8 = questLogObjectEvents[i].mapobj_bit_8;
+        gObjectEvents[i].mapobj_bit_9 = questLogObjectEvents[i].mapobj_bit_9;
+        gObjectEvents[i].mapobj_bit_10 = questLogObjectEvents[i].mapobj_bit_10;
+        gObjectEvents[i].mapobj_bit_11 = questLogObjectEvents[i].mapobj_bit_11;
+        gObjectEvents[i].mapobj_bit_12 = questLogObjectEvents[i].mapobj_bit_12;
+        gObjectEvents[i].mapobj_bit_13 = questLogObjectEvents[i].mapobj_bit_13;
+        gObjectEvents[i].mapobj_bit_14 = questLogObjectEvents[i].mapobj_bit_14;
+        gObjectEvents[i].mapobj_bit_15 = questLogObjectEvents[i].mapobj_bit_15;
+        gObjectEvents[i].mapobj_bit_16 = questLogObjectEvents[i].mapobj_bit_16;
+        gObjectEvents[i].mapobj_bit_23 = questLogObjectEvents[i].mapobj_bit_23;
+        gObjectEvents[i].mapobj_bit_24 = questLogObjectEvents[i].mapobj_bit_24;
+        gObjectEvents[i].mapobj_bit_25 = questLogObjectEvents[i].mapobj_bit_25;
+        gObjectEvents[i].mapobj_bit_26 = questLogObjectEvents[i].mapobj_bit_26;
+        gObjectEvents[i].facingDirection = questLogObjectEvents[i].mapobj_unk_18;
+        gObjectEvents[i].mapobj_unk_0B_0 = questLogObjectEvents[i].mapobj_unk_0B_0;
+        gObjectEvents[i].elevation = questLogObjectEvents[i].elevation;
+        gObjectEvents[i].graphicsId = questLogObjectEvents[i].graphicsId;
+        gObjectEvents[i].animPattern = questLogObjectEvents[i].animPattern;
+        gObjectEvents[i].trainerType = questLogObjectEvents[i].trainerType;
+        gObjectEvents[i].localId = questLogObjectEvents[i].localId;
+        gObjectEvents[i].mapNum = questLogObjectEvents[i].mapNum;
+        gObjectEvents[i].mapGroup = questLogObjectEvents[i].mapGroup;
+        gObjectEvents[i].coords2.x = questLogObjectEvents[i].x;
+        gObjectEvents[i].coords2.y = questLogObjectEvents[i].y;
+        gObjectEvents[i].trainerRange_berryTreeId = questLogObjectEvents[i].trainerRange_berryTreeId;
+        gObjectEvents[i].mapobj_unk_1F = questLogObjectEvents[i].mapobj_unk_1F;
+        gObjectEvents[i].mapobj_unk_21 = questLogObjectEvents[i].mapobj_unk_21;
+        gObjectEvents[i].animId = questLogObjectEvents[i].animId;
 
         for (j = 0; j < 0x40; j++)
         {
-            if (gMapObjects[i].localId == templates[j].localId)
+            if (gObjectEvents[i].localId == templates[j].localId)
             {
-                gMapObjects[i].coords1.x = templates[j].x + 7;
-                gMapObjects[i].coords1.y = templates[j].y + 7;
-                gMapObjects[i].range.as_nybbles.x = templates[j].movementRangeX;
-                gMapObjects[i].range.as_nybbles.y = templates[j].movementRangeY;
+                gObjectEvents[i].coords1.x = templates[j].x + 7;
+                gObjectEvents[i].coords1.y = templates[j].y + 7;
+                gObjectEvents[i].range.as_nybbles.x = templates[j].movementRangeX;
+                gObjectEvents[i].range.as_nybbles.y = templates[j].movementRangeY;
             }
         }
 
-        gMapObjects[i].mapobj_unk_1E = MapGridGetMetatileBehaviorAt(gMapObjects[i].coords2.x, gMapObjects[i].coords2.y);
-        if (gMapObjects[i].mapobj_unk_1F == MapGridGetMetatileBehaviorAt((s16)(gMapObjects[i].coords2.x), (s16)(gMapObjects[i].coords2.y)))
+        gObjectEvents[i].mapobj_unk_1E = MapGridGetMetatileBehaviorAt(gObjectEvents[i].coords2.x, gObjectEvents[i].coords2.y);
+        if (gObjectEvents[i].mapobj_unk_1F == MapGridGetMetatileBehaviorAt((s16)(gObjectEvents[i].coords2.x), (s16)(gObjectEvents[i].coords2.y)))
         {
-            gMapObjects[i].coords3.x = gMapObjects[i].coords2.x;
-            gMapObjects[i].coords3.y = gMapObjects[i].coords2.y;
+            gObjectEvents[i].coords3.x = gObjectEvents[i].coords2.x;
+            gObjectEvents[i].coords3.y = gObjectEvents[i].coords2.y;
         }
-        else if (gMapObjects[i].mapobj_unk_1F == MapGridGetMetatileBehaviorAt((s16)(gMapObjects[i].coords2.x - 1), (s16)(gMapObjects[i].coords2.y)))
+        else if (gObjectEvents[i].mapobj_unk_1F == MapGridGetMetatileBehaviorAt((s16)(gObjectEvents[i].coords2.x - 1), (s16)(gObjectEvents[i].coords2.y)))
         {
-            gMapObjects[i].coords3.x = gMapObjects[i].coords2.x - 1;
-            gMapObjects[i].coords3.y = gMapObjects[i].coords2.y;
+            gObjectEvents[i].coords3.x = gObjectEvents[i].coords2.x - 1;
+            gObjectEvents[i].coords3.y = gObjectEvents[i].coords2.y;
         }
-        else if (gMapObjects[i].mapobj_unk_1F == MapGridGetMetatileBehaviorAt((s16)(gMapObjects[i].coords2.x + 1), (s16)(gMapObjects[i].coords2.y)))
+        else if (gObjectEvents[i].mapobj_unk_1F == MapGridGetMetatileBehaviorAt((s16)(gObjectEvents[i].coords2.x + 1), (s16)(gObjectEvents[i].coords2.y)))
         {
-            gMapObjects[i].coords3.x = gMapObjects[i].coords2.x + 1;
-            gMapObjects[i].coords3.y = gMapObjects[i].coords2.y;
+            gObjectEvents[i].coords3.x = gObjectEvents[i].coords2.x + 1;
+            gObjectEvents[i].coords3.y = gObjectEvents[i].coords2.y;
         }
-        else if (gMapObjects[i].mapobj_unk_1F == MapGridGetMetatileBehaviorAt((s16)(gMapObjects[i].coords2.x), (s16)(gMapObjects[i].coords2.y - 1)))
+        else if (gObjectEvents[i].mapobj_unk_1F == MapGridGetMetatileBehaviorAt((s16)(gObjectEvents[i].coords2.x), (s16)(gObjectEvents[i].coords2.y - 1)))
         {
-            gMapObjects[i].coords3.x = gMapObjects[i].coords2.x;
-            gMapObjects[i].coords3.y = gMapObjects[i].coords2.y - 1;
+            gObjectEvents[i].coords3.x = gObjectEvents[i].coords2.x;
+            gObjectEvents[i].coords3.y = gObjectEvents[i].coords2.y - 1;
         }
-        else if (gMapObjects[i].mapobj_unk_1F == MapGridGetMetatileBehaviorAt((s16)(gMapObjects[i].coords2.x), (s16)(gMapObjects[i].coords2.y + 1)))
+        else if (gObjectEvents[i].mapobj_unk_1F == MapGridGetMetatileBehaviorAt((s16)(gObjectEvents[i].coords2.x), (s16)(gObjectEvents[i].coords2.y + 1)))
         {
-            gMapObjects[i].coords3.x = gMapObjects[i].coords2.x;
-            gMapObjects[i].coords3.y = gMapObjects[i].coords2.y + 1;
+            gObjectEvents[i].coords3.x = gObjectEvents[i].coords2.x;
+            gObjectEvents[i].coords3.y = gObjectEvents[i].coords2.y + 1;
         }
     }
 
-    CpuCopy16(gMapObjects, gSaveBlock1Ptr->mapObjects, sizeof(gMapObjects));
+    CpuCopy16(gObjectEvents, gSaveBlock1Ptr->mapObjects, sizeof(gObjectEvents));
 }
 
 void sub_815A540(void)
@@ -141,7 +141,7 @@ void sub_815A540(void)
         PlayerGetDestCoords(&x, &y);
         if (!MetatileBehavior_IsSurfable(MapGridGetMetatileBehaviorAt(x, y)) && TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING))
         {
-            struct MapObject * mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
+            struct ObjectEvent * mapObject = &gObjectEvents[gPlayerAvatar.mapObjectId];
             SetPlayerAvatarTransitionFlags(0x01);
             DestroySprite(&gSprites[mapObject->mapobj_unk_1A]);
         }
diff --git a/src/scrcmd.c b/src/scrcmd.c
index 9675a132e..dadd3ecc7 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -60,7 +60,7 @@ static EWRAM_DATA u16 sFieldEffectScriptId = 0;
 
 struct ScriptContext * gUnknown_3005070;
 
-extern u8 gSelectedEventObject;
+extern u8 gSelectedObjectEvent;
 
 // This is defined in here so the optimizer can't see its value when compiling
 // script.c.
@@ -1048,7 +1048,7 @@ bool8 ScrCmd_removeobject(struct ScriptContext *ctx)
 {
     u16 localId = VarGet(ScriptReadHalfword(ctx));
 
-    RemoveFieldObjectByLocalIdAndMap(localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
+    RemoveObjectEventByLocalIdAndMap(localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
     return FALSE;
 }
 
@@ -1058,7 +1058,7 @@ bool8 ScrCmd_removeobject_at(struct ScriptContext *ctx)
     u8 mapGroup = ScriptReadByte(ctx);
     u8 mapNum = ScriptReadByte(ctx);
 
-    RemoveFieldObjectByLocalIdAndMap(objectId, mapNum, mapGroup);
+    RemoveObjectEventByLocalIdAndMap(objectId, mapNum, mapGroup);
     return FALSE;
 }
 
@@ -1151,9 +1151,9 @@ bool8 ScrCmd_resetobjectpriority(struct ScriptContext *ctx)
 
 bool8 ScrCmd_faceplayer(struct ScriptContext *ctx)
 {
-    if (gMapObjects[gSelectedEventObject].active)
+    if (gObjectEvents[gSelectedObjectEvent].active)
     {
-        FieldObjectFaceOppositeDirection(&gMapObjects[gSelectedEventObject],
+        ObjectEventFaceOppositeDirection(&gObjectEvents[gSelectedObjectEvent],
                                          GetPlayerFacingDirection());
     }
     return FALSE;
@@ -1164,7 +1164,7 @@ bool8 ScrCmd_turnobject(struct ScriptContext *ctx)
     u16 localId = VarGet(ScriptReadHalfword(ctx));
     u8 direction = ScriptReadByte(ctx);
 
-    FieldObjectTurnByLocalIdAndMap(localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, direction);
+    ObjectEventTurnByLocalIdAndMap(localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, direction);
     return FALSE;
 }
 
@@ -1207,7 +1207,7 @@ bool8 ScrCmd_lockall(struct ScriptContext *ctx)
     }
     else
     {
-        ScriptFreezeMapObjects();
+        ScriptFreezeObjectEvents();
         SetupNativeScript(ctx, sub_8069590);
         return TRUE;
     }
@@ -1221,14 +1221,14 @@ bool8 ScrCmd_lock(struct ScriptContext *ctx)
     }
     else
     {
-        if (gMapObjects[gSelectedEventObject].active)
+        if (gObjectEvents[gSelectedObjectEvent].active)
         {
-            LockSelectedMapObject();
+            LockSelectedObjectEvent();
             SetupNativeScript(ctx, sub_8069648);
         }
         else
         {
-            ScriptFreezeMapObjects();
+            ScriptFreezeObjectEvents();
             SetupNativeScript(ctx, sub_8069590);
         }
         return TRUE;
@@ -1240,10 +1240,10 @@ bool8 ScrCmd_releaseall(struct ScriptContext *ctx)
     u8 playerObjectId;
 
     HideFieldMessageBox();
-    playerObjectId = GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0);
-    FieldObjectClearHeldMovementIfFinished(&gMapObjects[playerObjectId]);
+    playerObjectId = GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0);
+    ObjectEventClearHeldMovementIfFinished(&gObjectEvents[playerObjectId]);
     sub_80974D8();
-    UnfreezeMapObjects();
+    UnfreezeObjectEvents();
     return FALSE;
 }
 
@@ -1252,12 +1252,12 @@ bool8 ScrCmd_release(struct ScriptContext *ctx)
     u8 playerObjectId;
 
     HideFieldMessageBox();
-    if (gMapObjects[gSelectedEventObject].active)
-        FieldObjectClearHeldMovementIfFinished(&gMapObjects[gSelectedEventObject]);
-    playerObjectId = GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0);
-    FieldObjectClearHeldMovementIfFinished(&gMapObjects[playerObjectId]);
+    if (gObjectEvents[gSelectedObjectEvent].active)
+        ObjectEventClearHeldMovementIfFinished(&gObjectEvents[gSelectedObjectEvent]);
+    playerObjectId = GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0);
+    ObjectEventClearHeldMovementIfFinished(&gObjectEvents[playerObjectId]);
     sub_80974D8();
-    UnfreezeMapObjects();
+    UnfreezeObjectEvents();
     return FALSE;
 }
 
diff --git a/src/shop.c b/src/shop.c
index 12f3f3263..3df41133d 100644
--- a/src/shop.c
+++ b/src/shop.c
@@ -55,7 +55,7 @@ enum
 // shop view window NPC info enum
 enum
 {
-    EVENT_OBJ_ID,
+    OBJECT_EVENT_ID,
     X_COORD,
     Y_COORD,
     ANIM_NUM
@@ -89,7 +89,7 @@ struct MartHistory
     /*0x0B*/ u8 unkB;
 }; /* size = 12 */
 
-static EWRAM_DATA s16 sViewportMapObjects[MAP_OBJECTS_COUNT][4] = {0};
+static EWRAM_DATA s16 sViewportObjectEvents[OBJECT_EVENTS_COUNT][4] = {0};
 EWRAM_DATA struct ShopData gShopData = {0};
 static EWRAM_DATA u8 sShopMenuWindowId = 0;
 EWRAM_DATA u16 (*gShopTilemapBuffer1)[0x400] = {0};
@@ -140,7 +140,7 @@ static void BuyMenuDrawMapBg(void);
 static void BuyMenuDrawMapMetatile(s16 x, s16 y, const u16 *src, u8 metatileLayerType);
 static void BuyMenuDrawMapMetatileLayer(u16 *dest, s16 offset1, s16 offset2, const u16 *src);
 static void BuyMenuCollectEventObjectData(void);
-static void BuyMenuDrawEventObjects(void);
+static void BuyMenuDrawObjectEvents(void);
 static void BuyMenuCopyTilemapData(void);
 static void BuyMenuPrintItemQuantityAndPrice(u8 taskId);
 static void Task_BuyMenu(u8 taskId);
@@ -736,7 +736,7 @@ static void BuyMenuRemoveScrollIndicatorArrows(void)
 static void sub_809B764(void)
 {
     BuyMenuCollectEventObjectData();
-    BuyMenuDrawEventObjects();
+    BuyMenuDrawObjectEvents();
     BuyMenuDrawMapBg();
 }
 
@@ -810,34 +810,34 @@ static void BuyMenuCollectEventObjectData(void)
     GetXYCoordsOneStepInFrontOfPlayer(&facingX, &facingY);
     z = PlayerGetZCoord();
     
-    for (y = 0; y < MAP_OBJECTS_COUNT; y++)
-        sViewportMapObjects[y][EVENT_OBJ_ID] = MAP_OBJECTS_COUNT;
+    for (y = 0; y < OBJECT_EVENTS_COUNT; y++)
+        sViewportObjectEvents[y][OBJECT_EVENT_ID] = OBJECT_EVENTS_COUNT;
     
     for (y = 0; y < 5; y++)
     {
         for (x = 0; x < 7; x++)
         {
-            u8 eventObjId = GetFieldObjectIdByXYZ(facingX - 3 + x, facingY - 2 + y, z);
-            if (eventObjId != MAP_OBJECTS_COUNT)
+            u8 eventObjId = GetObjectEventIdByXYZ(facingX - 3 + x, facingY - 2 + y, z);
+            if (eventObjId != OBJECT_EVENTS_COUNT)
             {
-                sViewportMapObjects[num][EVENT_OBJ_ID] = eventObjId;
-                sViewportMapObjects[num][X_COORD] = x;
-                sViewportMapObjects[num][Y_COORD] = y;
+                sViewportObjectEvents[num][OBJECT_EVENT_ID] = eventObjId;
+                sViewportObjectEvents[num][X_COORD] = x;
+                sViewportObjectEvents[num][Y_COORD] = y;
 
-                switch (gMapObjects[eventObjId].facingDirection)
+                switch (gObjectEvents[eventObjId].facingDirection)
                 {
                     case DIR_SOUTH:
-                        sViewportMapObjects[num][ANIM_NUM] = 0;
+                        sViewportObjectEvents[num][ANIM_NUM] = 0;
                         break;
                     case DIR_NORTH:
-                        sViewportMapObjects[num][ANIM_NUM] = 1;
+                        sViewportObjectEvents[num][ANIM_NUM] = 1;
                         break;
                     case DIR_WEST:
-                        sViewportMapObjects[num][ANIM_NUM] = 2;
+                        sViewportObjectEvents[num][ANIM_NUM] = 2;
                         break;
                     case DIR_EAST:
                     default:
-                        sViewportMapObjects[num][ANIM_NUM] = 3;
+                        sViewportObjectEvents[num][ANIM_NUM] = 3;
                         break;
                 }
                 num++;
@@ -846,24 +846,24 @@ static void BuyMenuCollectEventObjectData(void)
     }
 }
 
-static void BuyMenuDrawEventObjects(void)
+static void BuyMenuDrawObjectEvents(void)
 {
     u8 i, spriteId;
-    const struct MapObjectGraphicsInfo *graphicsInfo;
+    const struct ObjectEventGraphicsInfo *graphicsInfo;
 
-    for (i = 0; i < MAP_OBJECTS_COUNT; i++)
+    for (i = 0; i < OBJECT_EVENTS_COUNT; i++)
     {
-        if (sViewportMapObjects[i][EVENT_OBJ_ID] == MAP_OBJECTS_COUNT)
+        if (sViewportObjectEvents[i][OBJECT_EVENT_ID] == OBJECT_EVENTS_COUNT)
             continue;
 
-        graphicsInfo = GetFieldObjectGraphicsInfo(gMapObjects[sViewportMapObjects[i][EVENT_OBJ_ID]].graphicsId);        
+        graphicsInfo = GetObjectEventGraphicsInfo(gObjectEvents[sViewportObjectEvents[i][OBJECT_EVENT_ID]].graphicsId);        
         spriteId = AddPseudoEventObject(
-            gMapObjects[sViewportMapObjects[i][EVENT_OBJ_ID]].graphicsId,
+            gObjectEvents[sViewportObjectEvents[i][OBJECT_EVENT_ID]].graphicsId,
             SpriteCallbackDummy,
-            (u16)sViewportMapObjects[i][X_COORD] * 16 - 8,
-            (u16)sViewportMapObjects[i][Y_COORD] * 16 + 48 - graphicsInfo->height / 2,
+            (u16)sViewportObjectEvents[i][X_COORD] * 16 - 8,
+            (u16)sViewportObjectEvents[i][Y_COORD] * 16 + 48 - graphicsInfo->height / 2,
             2);
-        StartSpriteAnim(&gSprites[spriteId], sViewportMapObjects[i][ANIM_NUM]);
+        StartSpriteAnim(&gSprites[spriteId], sViewportObjectEvents[i][ANIM_NUM]);
     }
 }
 
diff --git a/src/ss_anne.c b/src/ss_anne.c
index 19c3c8e08..dcd85e359 100644
--- a/src/ss_anne.c
+++ b/src/ss_anne.c
@@ -104,7 +104,7 @@ static void Task_SSAnneRun(u8 taskId)
 {
     s16 * data = gTasks[taskId].data;
     u8 mapObjectId;
-    struct MapObject * boatObject;
+    struct ObjectEvent * boatObject;
     s16 x;
 
     data[1]++;
@@ -114,8 +114,8 @@ static void Task_SSAnneRun(u8 taskId)
         data[1] = 0;
         CreateSmokeSprite();
     }
-    TryGetFieldObjectIdByLocalIdAndMap(1, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &mapObjectId);
-    boatObject = &gMapObjects[mapObjectId];
+    TryGetObjectEventIdByLocalIdAndMap(1, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &mapObjectId);
+    boatObject = &gObjectEvents[mapObjectId];
     if (gSprites[boatObject->spriteId].pos1.x + gSprites[boatObject->spriteId].pos2.x < -120)
     {
         PlaySE(SE_KITEKI);
@@ -144,12 +144,12 @@ static void Task_SSAnneFinish(u8 taskId)
 static void CreateWakeBehindBoat(void)
 {
     u8 mapObjectId;
-    struct MapObject * boatObject;
+    struct ObjectEvent * boatObject;
     u16 x;
     u8 spriteId;
 
-    TryGetFieldObjectIdByLocalIdAndMap(1, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &mapObjectId);
-    boatObject = &gMapObjects[mapObjectId];
+    TryGetObjectEventIdByLocalIdAndMap(1, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &mapObjectId);
+    boatObject = &gObjectEvents[mapObjectId];
     x = gSprites[boatObject->spriteId].pos1.x + gSprites[boatObject->spriteId].pos2.x + 80;
     spriteId = CreateSprite(&sWakeSpriteTemplate, x, 109, 0xFF);
     gSprites[spriteId].oam.priority = 2;
@@ -159,11 +159,11 @@ static void CreateWakeBehindBoat(void)
 static void WakeSpriteCallback(struct Sprite * sprite)
 {
     u8 mapObjectId;
-    struct MapObject * boatObject;
+    struct ObjectEvent * boatObject;
     u16 x;
 
-    TryGetFieldObjectIdByLocalIdAndMap(1, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &mapObjectId);
-    boatObject = &gMapObjects[mapObjectId];
+    TryGetObjectEventIdByLocalIdAndMap(1, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &mapObjectId);
+    boatObject = &gObjectEvents[mapObjectId];
     x = gSprites[boatObject->spriteId].pos1.x + gSprites[boatObject->spriteId].pos2.x + 80;
     sprite->pos1.x = x;
     if (sprite->data[0] / 6 < 22)
@@ -176,12 +176,12 @@ static void WakeSpriteCallback(struct Sprite * sprite)
 static void CreateSmokeSprite(void)
 {
     u8 mapObjectId;
-    struct MapObject * boatObject;
+    struct ObjectEvent * boatObject;
     u16 x;
     u8 spriteId;
 
-    TryGetFieldObjectIdByLocalIdAndMap(1, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &mapObjectId);
-    boatObject = &gMapObjects[mapObjectId];
+    TryGetObjectEventIdByLocalIdAndMap(1, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &mapObjectId);
+    boatObject = &gObjectEvents[mapObjectId];
     x = gSprites[boatObject->spriteId].pos1.x + gSprites[boatObject->spriteId].pos2.x + 49;
     if ((s16)x >= -32)
     {
diff --git a/src/teachy_tv.c b/src/teachy_tv.c
index 2720f3204..5f1316350 100644
--- a/src/teachy_tv.c
+++ b/src/teachy_tv.c
@@ -112,11 +112,11 @@ static void TeachyTvGrassAnimationObjCallback(struct Sprite *sprite);
 static void TeachyTvRestorePlayerPartyCallback(void);
 static void TeachyTvPreBattleAnimAndSetBattleCallback(u8 taskId);
 static void TeachyTvLoadMapTilesetToBuffer(struct Tileset *ts, u8 *dstBuffer, u16 size);
-static void TeachyTvPushBackNewMapPalIndexArrayEntry(const struct MapData *mStruct, u16 *buf1, u8 *palIndexArray, u16 mapEntry, u16 offset);
+static void TeachyTvPushBackNewMapPalIndexArrayEntry(const struct MapLayout *mStruct, u16 *buf1, u8 *palIndexArray, u16 mapEntry, u16 offset);
 static void TeachyTvComputeMapTilesFromTilesetAndMetaTiles(u16 *metaTilesArray, u8 *blockBuf, u8 *tileset);
 static void TeachyTvComputeSingleMapTileBlockFromTilesetAndMetaTiles(u8 *blockBuf, u8 *tileset, u8 metaTile);
 static u16 TeachyTvComputePalIndexArrayEntryByMetaTile(u8 *palIndexArrayBuf, u16 metaTile);
-static void TeachyTvLoadMapPalette(const struct MapData * mStruct, const u8 *palIndexArray);
+static void TeachyTvLoadMapPalette(const struct MapLayout * mStruct, const u8 *palIndexArray);
 
 static const struct BgTemplate sBgTemplates[] = 
 {
@@ -1240,7 +1240,7 @@ static void TeachyTvLoadBg3Map(u16 *buffer)
     void * tilesetsBuffer;
     void * palIndicesBuffer;
     u16 numMapTilesRows = 0;
-    const struct MapData *layout = &Route1_Layout;
+    const struct MapLayout *layout = &Route1_Layout;
     u16 * blockIndicesBuffer = AllocZeroed(0x800);
     tilesetsBuffer = AllocZeroed(0x8000);
     palIndicesBuffer = Alloc(16);
@@ -1307,7 +1307,7 @@ static void TeachyTvLoadMapTilesetToBuffer(struct Tileset *ts, u8 *dstBuffer, u1
     }
 }
 
-static void TeachyTvPushBackNewMapPalIndexArrayEntry(const struct MapData *mStruct, u16 *buf1, u8 *palIndexArray, u16 mapEntry, u16 offset)
+static void TeachyTvPushBackNewMapPalIndexArrayEntry(const struct MapLayout *mStruct, u16 *buf1, u8 *palIndexArray, u16 mapEntry, u16 offset)
 {
     u16 * metaTileEntryAddr = mapEntry <= 0x27F ? &((u16*)(mStruct->primaryTileset->metatiles))[8 * mapEntry] : &((u16*)(mStruct->secondaryTileset->metatiles))[8 * (mapEntry - 0x280)];
     buf1[0] = (TeachyTvComputePalIndexArrayEntryByMetaTile(palIndexArray, metaTileEntryAddr[0]) << 12) + 4 * offset;
@@ -1397,7 +1397,7 @@ static u16 TeachyTvComputePalIndexArrayEntryByMetaTile(u8 *palIndexArrayBuf, u16
     return (0xF - i);
 }
 
-static void TeachyTvLoadMapPalette(const struct MapData * mStruct, const u8 * palIndexArray)
+static void TeachyTvLoadMapPalette(const struct MapLayout * mStruct, const u8 * palIndexArray)
 {
     u8 i;
     const struct Tileset * ts;
diff --git a/src/tileset_anims.c b/src/tileset_anims.c
index a8539a5d8..44e86448f 100644
--- a/src/tileset_anims.c
+++ b/src/tileset_anims.c
@@ -194,8 +194,8 @@ static void _InitPrimaryTilesetAnimation(void)
     sPrimaryTilesetAnimCounter = 0;
     sPrimaryTilesetAnimCounterMax = 0;
     sPrimaryTilesetAnimCallback = NULL;
-    if (gMapHeader.mapData->primaryTileset && gMapHeader.mapData->primaryTileset->callback)
-        gMapHeader.mapData->primaryTileset->callback();
+    if (gMapHeader.mapLayout->primaryTileset && gMapHeader.mapLayout->primaryTileset->callback)
+        gMapHeader.mapLayout->primaryTileset->callback();
 }
 
 static void _InitSecondaryTilesetAnimation(void)
@@ -203,8 +203,8 @@ static void _InitSecondaryTilesetAnimation(void)
     sSecondaryTilesetAnimCounter = 0;
     sSecondaryTilesetAnimCounterMax = 0;
     sSecondaryTilesetAnimCallback = NULL;
-    if (gMapHeader.mapData->secondaryTileset && gMapHeader.mapData->secondaryTileset->callback)
-        gMapHeader.mapData->secondaryTileset->callback();
+    if (gMapHeader.mapLayout->secondaryTileset && gMapHeader.mapLayout->secondaryTileset->callback)
+        gMapHeader.mapLayout->secondaryTileset->callback();
 }
 
 static void sub_80700A4(u16 timer)
diff --git a/src/trade.c b/src/trade.c
index 4921a1ba3..f52950d82 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -142,7 +142,7 @@ static u32 sub_804FA14(struct Pokemon * party, int partyCount, int cursorPos);
 static const size_t gUnknown_8260814[] = {
     sizeof(struct SaveBlock2),
     sizeof(struct SaveBlock1),
-    sizeof(struct MapData),
+    sizeof(struct MapLayout),
     0x530, // unk
     0x34, // unk
     sizeof(struct MailStruct),
diff --git a/src/trainer_tower.c b/src/trainer_tower.c
index 19d44d7cc..93e908778 100644
--- a/src/trainer_tower.c
+++ b/src/trainer_tower.c
@@ -521,7 +521,7 @@ static void sub_815DC8C(void) // fakematching
     const struct TrainerTowerFloor *const * r7;
 
     sTrainerTowerState = AllocZeroed(sizeof(*sTrainerTowerState));
-    sTrainerTowerState->floorIdx = gMapHeader.mapDataId - 42;
+    sTrainerTowerState->floorIdx = gMapHeader.mapLayoutId - 42;
     if (sub_815D834() == TRUE)
         CEReaderTool_LoadTrainerTower(&sTrainerTowerState->unk_0004);
     else
@@ -628,7 +628,7 @@ static void sub_815DD2C(void)
 
 static void sub_815DD44(void)
 {
-    if (gMapHeader.mapDataId - LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_LOBBY > sTrainerTowerState->unk_0004.count)
+    if (gMapHeader.mapLayoutId - LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_LOBBY > sTrainerTowerState->unk_0004.count)
     {
         gSpecialVar_Result = 3;
         SetCurrentMapLayout(LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_ROOF);
@@ -831,8 +831,8 @@ static void sub_815E1F0(void)
 
 static void TTSpecial_HasReachedTheRoof(void)
 {
-    u16 mapDataId = gMapHeader.mapDataId;
-    if (mapDataId - LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_1F == gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unk8 && mapDataId - LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_LOBBY <= sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].floorIdx)
+    u16 mapLayoutId = gMapHeader.mapLayoutId;
+    if (mapLayoutId - LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_1F == gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unk8 && mapLayoutId - LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_LOBBY <= sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].floorIdx)
         gSpecialVar_Result = FALSE;
     else
         gSpecialVar_Result = TRUE;
@@ -1008,7 +1008,7 @@ static void sub_815E8CC(void)
 
 static void sub_815E908(void)
 {
-    if (gMapHeader.mapDataId == LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_LOBBY && VarGet(VAR_MAP_SCENE_TRAINER_TOWER) == 0)
+    if (gMapHeader.mapLayoutId == LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_LOBBY && VarGet(VAR_MAP_SCENE_TRAINER_TOWER) == 0)
     {
         gSpecialVar_Result = FALSE;
     }
diff --git a/src/vs_seeker.c b/src/vs_seeker.c
index bf85c68b3..23e1c5a59 100644
--- a/src/vs_seeker.c
+++ b/src/vs_seeker.c
@@ -68,8 +68,8 @@ struct VsSeekerStruct
 };
 
 extern u16 gSpecialVar_LastTalked;
-extern struct MapObject gMapObjects[MAP_OBJECTS_COUNT];
-extern u8 gSelectedEventObject;
+extern struct ObjectEvent gObjectEvents[MAP_OBJECTS_COUNT];
+extern u8 gSelectedObjectEvent;
 
 // static declarations
 static EWRAM_DATA struct VsSeekerStruct *sVsSeeker = NULL;
@@ -595,9 +595,9 @@ static void sub_810C3B8(u8 taskId)
         {
             if (sub_810CF04(i) == TRUE)
             {
-                if (gMapObjects[i].mapobj_bit_1)
+                if (gObjectEvents[i].mapobj_bit_1)
                     return;
-                FreezeMapObject(&gMapObjects[i]);
+                FreezeObjectEvent(&gObjectEvents[i]);
             }
         }
     }
@@ -613,19 +613,19 @@ static void sub_810C3B8(u8 taskId)
 
 void sub_810C444(void)
 {
-    struct MapObjectTemplate * templates = gSaveBlock1Ptr->mapObjectTemplates;
+    struct ObjectEventTemplate * templates = gSaveBlock1Ptr->mapObjectTemplates;
     u8 i;
     u8 r6;
     u8 sp0;
-    struct MapObject * mapObject;
+    struct ObjectEvent * mapObject;
 
-    for (i = 0; i < gMapHeader.events->mapObjectCount; i++)
+    for (i = 0; i < gMapHeader.events->objectEventCount; i++)
     {
         if ((templates[i].trainerType == 1 || templates[i].trainerType == 3) && (templates[i].movementType == 0x4D || templates[i].movementType == 0x4E || templates[i].movementType == 0x4F))
         {
             r6 = sub_810CF54();
-            TryGetFieldObjectIdByLocalIdAndMap(templates[i].localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &sp0);
-            mapObject = &gMapObjects[sp0];
+            TryGetObjectEventIdByLocalIdAndMap(templates[i].localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &sp0);
+            mapObject = &gObjectEvents[sp0];
             if (sub_810CF04(sp0) == TRUE)
             {
                 SetTrainerMovementType(mapObject, r6);
@@ -758,7 +758,7 @@ static void sub_810C594(void)
 
     for (i = 0; i < MAP_OBJECTS_COUNT; i++)
     {
-        struct MapObject * mapObject = &gMapObjects[i];
+        struct ObjectEvent * mapObject = &gObjectEvents[i];
         if (mapObject->animPattern == 0x4D || mapObject->animPattern == 0x4E || mapObject->animPattern == 0x4F)
         {
             u8 r3 = sub_810CF54();
@@ -857,22 +857,22 @@ static void Task_VsSeeker_2(u8 taskId)
 
 static void GatherNearbyTrainerInfo(void)
 {
-    struct MapObjectTemplate *templates = gSaveBlock1Ptr->mapObjectTemplates;
+    struct ObjectEventTemplate *templates = gSaveBlock1Ptr->mapObjectTemplates;
     u8 fieldObjectId = 0;
     u8 vsSeekerObjectIdx = 0;
     s32 mapObjectIdx;
 
-    for (mapObjectIdx = 0; mapObjectIdx < gMapHeader.events->mapObjectCount; mapObjectIdx++)
+    for (mapObjectIdx = 0; mapObjectIdx < gMapHeader.events->objectEventCount; mapObjectIdx++)
     {
         if (templates[mapObjectIdx].trainerType == 1 || templates[mapObjectIdx].trainerType == 3)
         {
             sVsSeeker->trainerInfo[vsSeekerObjectIdx].script = templates[mapObjectIdx].script;
             sVsSeeker->trainerInfo[vsSeekerObjectIdx].trainerIdx = GetTrainerFlagFromScript(templates[mapObjectIdx].script);
             sVsSeeker->trainerInfo[vsSeekerObjectIdx].localId = templates[mapObjectIdx].localId;
-            TryGetFieldObjectIdByLocalIdAndMap(templates[mapObjectIdx].localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &fieldObjectId);
+            TryGetObjectEventIdByLocalIdAndMap(templates[mapObjectIdx].localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &fieldObjectId);
             sVsSeeker->trainerInfo[vsSeekerObjectIdx].fieldObjectId = fieldObjectId;
-            sVsSeeker->trainerInfo[vsSeekerObjectIdx].xCoord = gMapObjects[fieldObjectId].coords2.x - 7;
-            sVsSeeker->trainerInfo[vsSeekerObjectIdx].yCoord = gMapObjects[fieldObjectId].coords2.y - 7;
+            sVsSeeker->trainerInfo[vsSeekerObjectIdx].xCoord = gObjectEvents[fieldObjectId].coords2.x - 7;
+            sVsSeeker->trainerInfo[vsSeekerObjectIdx].yCoord = gObjectEvents[fieldObjectId].coords2.y - 7;
             sVsSeeker->trainerInfo[vsSeekerObjectIdx].graphicsId = templates[mapObjectIdx].graphicsId;
             vsSeekerObjectIdx++;
         }
@@ -960,7 +960,7 @@ static u8 GetVsSeekerResponseInArea(const VsSeekerData * a0)
                     else
                     {
                         gSaveBlock1Ptr->trainerRematches[sVsSeeker->trainerInfo[vsSeekerIdx].localId] = r7;
-                        npc_coords_shift_still(&gMapObjects[sVsSeeker->trainerInfo[vsSeekerIdx].fieldObjectId]);
+                        npc_coords_shift_still(&gObjectEvents[sVsSeeker->trainerInfo[vsSeekerIdx].fieldObjectId]);
                         StartTrainerObjectMovementScript(&sVsSeeker->trainerInfo[vsSeekerIdx], gUnknown_8453F64);
                         sVsSeeker->trainerIdxArray[sVsSeeker->numRematchableTrainers] = r8;
                         sVsSeeker->runningBehaviourEtcArray[sVsSeeker->numRematchableTrainers] = GetRunningBehaviorFromGraphicsId(sVsSeeker->trainerInfo[vsSeekerIdx].graphicsId);
@@ -1120,7 +1120,7 @@ static u8 GetVsSeekerResponseInArea(const VsSeekerData * a0)
                 "\tlsls r0, r1, 3\n"
                 "\tadds r0, r1\n"
                 "\tlsls r0, 2\n"
-                "\tldr r1, _0810CB5C @ =gMapObjects\n"
+                "\tldr r1, _0810CB5C @ =gObjectEvents\n"
                 "\tadds r0, r1\n"
                 "\tbl npc_coords_shift_still\n"
                 "\tldr r0, [r6]\n"
@@ -1194,7 +1194,7 @@ static u8 GetVsSeekerResponseInArea(const VsSeekerData * a0)
                 "\t.align 2, 0\n"
                 "_0810CB54: .4byte gSaveBlock1Ptr\n"
                 "_0810CB58: .4byte 0x0000063a\n"
-                "_0810CB5C: .4byte gMapObjects\n"
+                "_0810CB5C: .4byte gObjectEvents\n"
                 "_0810CB60: .4byte gUnknown_8453F64\n"
                 "_0810CB64: .4byte 0x00000431\n"
                 "_0810CB68: .4byte sVsSeeker\n"
@@ -1223,25 +1223,25 @@ static u8 GetVsSeekerResponseInArea(const VsSeekerData * a0)
 void sub_810CB90(void)
 {
     u8 sp0 = 0;
-    struct MapObjectTemplate *r4 = gSaveBlock1Ptr->mapObjectTemplates;
+    struct ObjectEventTemplate *r4 = gSaveBlock1Ptr->mapObjectTemplates;
     s32 r9 = sub_810CE10(sVsSeekerData, gTrainerBattleOpponent_A);
 
     if (r9 != -1)
     {
         s32 r8;
 
-        for (r8 = 0; r8 < gMapHeader.events->mapObjectCount; r8++)
+        for (r8 = 0; r8 < gMapHeader.events->objectEventCount; r8++)
         {
             if ((r4[r8].trainerType == 1 || r4[r8].trainerType == 3) && r9 == sub_810CE10(sVsSeekerData, GetTrainerFlagFromScript(r4[r8].script)))
             {
-                struct MapObject *r4_2;
+                struct ObjectEvent *r4_2;
 
-                TryGetFieldObjectIdByLocalIdAndMap(r4[r8].localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &sp0);
-                r4_2 = &gMapObjects[sp0];
+                TryGetObjectEventIdByLocalIdAndMap(r4[r8].localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &sp0);
+                r4_2 = &gObjectEvents[sp0];
                 sub_810CF54(&r4[r8]); // You are using this function incorrectly.  Please consult the manual.
                 sub_805FE7C(r4_2, gUnknown_8453F67[r4_2->facingDirection]);
                 gSaveBlock1Ptr->trainerRematches[r4[r8].localId] = 0;
-                if (gSelectedEventObject == sp0)
+                if (gSelectedObjectEvent == sp0)
                     r4_2->animPattern = gUnknown_8453F67[r4_2->facingDirection];
                 else
                     r4_2->animPattern = 0x08;
@@ -1384,9 +1384,9 @@ static bool8 sub_810CED0(const VsSeekerData * a0, u16 a1)
 
 bool8 sub_810CF04(u8 a0)
 {
-    struct MapObject *r1 = &gMapObjects[a0];
+    struct ObjectEvent *r1 = &gObjectEvents[a0];
 
-    if (r1->active && gMapHeader.events->mapObjectCount >= r1->localId && gSprites[r1->spriteId].data[0] == a0)
+    if (r1->active && gMapHeader.events->objectEventCount >= r1->localId && gSprites[r1->spriteId].data[0] == a0)
         return TRUE;
     return FALSE;
 }
@@ -1560,7 +1560,7 @@ static u8 GetRematchableTrainerLocalId(void)
 
 static void StartTrainerObjectMovementScript(struct VsSeekerTrainerInfo * trainerInfo, const u8 * script)
 {
-    npc_sync_anim_pause_bits(&gMapObjects[trainerInfo->fieldObjectId]);
+    npc_sync_anim_pause_bits(&gObjectEvents[trainerInfo->fieldObjectId]);
     ScriptMovement_StartObjectMovementScript(trainerInfo->localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, script);
 }
 
@@ -1596,7 +1596,7 @@ static void StartAllRespondantIdleMovements(void)
         {
             if (sVsSeeker->trainerInfo[j].trainerIdx == sVsSeeker->trainerIdxArray[i])
             {
-                struct MapObject *r4 = &gMapObjects[sVsSeeker->trainerInfo[j].fieldObjectId];
+                struct ObjectEvent *r4 = &gObjectEvents[sVsSeeker->trainerInfo[j].fieldObjectId];
 
                 if (sub_810CF04(sVsSeeker->trainerInfo[j].fieldObjectId) == 1)
                     SetTrainerMovementType(r4, sVsSeeker->runningBehaviourEtcArray[i]);
diff --git a/sym_common.txt b/sym_common.txt
index 345829a24..17f0cd306 100644
--- a/sym_common.txt
+++ b/sym_common.txt
@@ -49,7 +49,7 @@ gUnknown_300506C: @ 300506C
 
 	.include "scrcmd.o"
 
-gSelectedEventObject: @ 3005074
+gSelectedObjectEvent: @ 3005074
 	.space 0x4
 
 gUnknown_3005078: @ 3005078
diff --git a/sym_ewram.txt b/sym_ewram.txt
index ba4f765d0..963159658 100644
--- a/sym_ewram.txt
+++ b/sym_ewram.txt
@@ -90,7 +90,7 @@ gUnknown_2036E30: @ 2036E30
 gUnknown_2036E34: @ 2036E34
 	.space 0x4
 
-gMapObjects: @ 2036E38
+gObjectEvents: @ 2036E38
 	.space 0x240
 
 gPlayerAvatar: @ 2037078